Merge branch 'master' into dev-vj

resources/views/app/generic-bills/add-bill-form/Note.blade.php

@@ -39,7 +39,7 @@
                 </div>
             @else
                 @include('app.generic-bills.add-bill-form._default-fields')
-                <div class="mb-2 border px-2 pt-2 generic-bill-actions">
+                <!-- <div class="mb-2 border px-2 pt-2 generic-bill-actions">
                     <p class="text-sm mb-1 text-secondary font-weight-bold">Please indicate the activities time was spent on:</p>
                     <input type="text" name="genericDescription" value="" class="zero-height-field m-0 p-0 border-0" required>
                     <label class="d-flex align-items-baseline">
@@ -66,7 +66,7 @@
                                onchange="return updateGenericBillAction(this)">
                         <span>Provided Patient w/ Visit-Related Education.</span>
                     </label>
-                </div>
+                </div> -->
                 @include('app.generic-bills.add-bill-form._default-actions')
             @endif
         </form>

resources/views/app/generic-bills/inline.blade.php

@@ -38,7 +38,9 @@ $genericBills = genericBills($pro, @$patient, @$careMonth, @$entityType, @$entit
                         <th class="border-bottom-0">Context</th>
                     @endif
                     <th class="border-bottom-0">Service</th>
+                    @if(@$label != 'NA')
                     <th class="border-bottom-0">Billable</th>
+                    @endif
                     <th class="border-bottom-0 screen-only">Total</th>
                     <th class="border-bottom-0">Sign</th>
                     <th class="border-bottom-0">Cancellation</th>
@@ -99,6 +101,7 @@ $genericBills = genericBills($pro, @$patient, @$careMonth, @$entityType, @$entit
                                 </div>
                             @endif
                         </td>
+                        @if(@$label != 'NA')
                         <td class="">
                             <?php
                             $totalSeconds = $bill->number_of_units * 3600;
@@ -114,6 +117,7 @@ $genericBills = genericBills($pro, @$patient, @$careMonth, @$entityType, @$entit
                             ?>
                             {{ time_in_hrminsec($totalSeconds) }}
                         </td>
+                        @endif
                         <td class="pr-3 screen-only text-nowrap">
                             @if($bill->has_generic_pro_been_paid)
                                 <span class="text-secondary">Paid. </span>

resources/views/app/patient/settings.blade.php

@@ -862,6 +862,59 @@
                         </div>
                     </form>
                 </div>
+                <hr class="m-negator-3 my-3">
+                <div>
+                <h3><b>AWV Settings</b></h3>
+                <?php $patientDetailJson = json_decode($patient->detail_json, true); ?>
+                <div class="pl-3">
+                    <div class="mb-3">
+                        <div class="d-flex align-items-start">
+                            <div>
+                                <span>2022 AWV Claim</span>
+                                <span class="text-secondary mx-2">|</span>
+                                <div moe relative>
+                                    <a start show href="#"><i class="fa fa-edit"></i></a>
+                                    <form url="/api/client/put2022AwvClaim" class="mcp-theme-1">
+                                        <input type="hidden" name="uid" value="{{$patient->uid}}">
+                                        <div class="mb-2">
+                                            <label class="mb-1 text-secondary text-sm">2022 AWV Claim</label>
+                                            <input type="text" class="form-control form-control-sm" name="put2022AwvClaim" />
+                                        </div>
+                                        <div>
+                                            <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                                            <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                                        </div>
+                                    </form>
+                                </div>
+                            </div>
+                        </div>
+                        <div><small class="text-muted">{{ $patientDetailJson['2022_awv_claim'] ?? ''  }}</small></div>
+                    </div>
+                    <div>
+                        <div class="d-flex align-items-start">
+                            <div>
+                                <span>2022 AWV Status:</span>
+                                <span class="text-secondary font-weight-bold mx-2">{{ $patientDetailJson['2022_awv_status'] ?? '' }}</span>
+                                <div moe relative>
+                                    <a start show href="#"><i class="fa fa-edit"></i></a>
+                                    <form url="/api/client/put2022AwvStatus" class="mcp-theme-1">
+                                        <input type="hidden" name="uid" value="{{$patient->uid}}">
+                                        <div class="mb-2">
+                                            <label class="mb-1 text-secondary text-sm">2022 AWV Claim</label>
+                                            <input type="text" class="form-control form-control-sm" name="put2022AwvStatus" />
+                                        </div>
+                                        <div>
+                                            <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                                            <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                                        </div>
+                                    </form>
+                                </div>
+                            </div>
+                        </div>
+                        <div><small class="text-muted">{{ $patient->client_2022_awv_claim_status }}</small></div>
+                    </div>
+                </div>
+                </div>
                 @endif
             </div>
             <div class="col-6 border-left">