Vijayakrishnan Krishnan пре 4 година
родитељ
комит
2442022328
1 измењених фајлова са 29 додато и 15 уклоњено
  1. 29 15
      resources/views/app/patient/note/dashboard.blade.php

+ 29 - 15
resources/views/app/patient/note/dashboard.blade.php

@@ -148,13 +148,13 @@
                         @if($note->is_signed_by_hcp)
                             <span class="text-secondary">
                         <i class="fa fa-check"></i>
-                        HCP Signed
+                        Note Signed
                     </span>
                         @else
                             <div moe
                                  class="{{ $note->hcp_pro_id !== $pro->id ? 'moe-disabled' : '' }}"
                                  title="{{ $note->hcp_pro_id !== $pro->id ? 'Only the note\'s HCP can sign' : '' }}">
-                                <a class="" href="" show start>Sign as HCP</a>
+                                <a class="" href="" show start>Sign Note</a>
                                 <form url="/api/note/signAsHcp">
                                     <input type="hidden" name="uid" value="{{$note->uid}}">
                                     <p>Sign this note as HCP?</p>
@@ -173,7 +173,7 @@
                         <div moe relatve
                              class="{{ $hasBills ? 'moe-disabled' : '' }}"
                              title="{{ $hasBills ? 'Cannot cancel note since it has un-cancelled bills in it' : '' }}">
-                            <a class="text-danger" href="" show start>Cancel Note</a>
+                            <a class="text-danger" href="" show start>Cancel</a>
                             <form url="/api/note/cancel" right>
                                 <input type="hidden" name="uid" value="{{$note->uid}}">
                                 <p class="small mb-2">Are you sure you want to cancel this note?</p>
@@ -255,9 +255,10 @@
                         <table class="table table-sm tabe-striped mb-3 border-left border-right border-bottom">
                             <thead class="bg-light">
                             <tr>
-                                <th class="border-bottom-0 w-25 pl-3">HCP</th>
-                                <th class="border-bottom-0 w-25 pl-3">Code</th>
+                                <th class="border-bottom-0 pl-3">HCP</th>
+                                <th class="border-bottom-0 w-25 pl-3">Service</th>
                                 {{--<th class="border-bottom-0 w-25 pl-2">Reason</th>--}}
+                                <th class="border-bottom-0 pl-3">Billable</th>
                                 <th class="border-bottom-0 pl-2">Amount</th>
                                 <th class="border-bottom-0"></th>
                             </tr>
@@ -271,6 +272,17 @@
                                         {{ $bill->reason1 }}
                                         <div class="text-secondary small">{{ $bill->reason2 }}</div>
                                     </td>--}}
+                                    <td class="pl-3">
+                                        @if(strpos(strtolower($bill->code), 'hourly') !== FALSE)
+                                            {{ time_in_hrminsec($bill->number_of_units * 3600) }}
+                                        @else
+                                            @if(!!$bill->number_of_units)
+                                                {{ $bill->number_of_units }} unit(s)
+                                            @else
+                                                -
+                                            @endif
+                                        @endif
+                                    </td>
                                     <td class="pl-2">
                                         @if($bill->has_hcp_been_paid)
                                             <span class="text-dark">Received:</span><span class="font-weight-bold text-success ml-2">${{ $bill->hcp_payment_amount }}</span>
@@ -279,18 +291,18 @@
                                         @endif
                                     </td>
                                     <td>
-                                        <div class="">
+                                        <div class="d-flex align-items-center">
                                             @if(!$bill->is_cancelled)
                                                 @if($bill->is_signed_by_hcp)
-                                                    <div class="d-block text-secondary">
+                                                    <span class="d-block text-secondary">
                                                         <i class="fa fa-check"></i>
                                                         HCP Signed
-                                                    </div>
+                                                    </span>
                                                 @else
-                                                    <div moe
+                                                    <span moe
                                                          class="d-block {{ $bill->hcp_pro_id !== $pro->id ? 'moe-disabled' : '' }}"
                                                          title="{{ $bill->hcp_pro_id !== $pro->id ? 'Only the bill\'s HCP can sign' : '' }}">
-                                                        <a class="" href="" show start>Sign as HCP</a>
+                                                        <a class="" href="" show start>Sign</a>
                                                         <form url="/api/bill/signAsHcp">
                                                             <input type="hidden" name="uid" value="{{$bill->uid}}">
                                                             <p>Sign this bill as HCP?</p>
@@ -299,15 +311,17 @@
                                                                 <button class="btn btn-default border btn-sm" cancel>Cancel</button>
                                                             </div>
                                                         </form>
-                                                    </div>
+                                                    </span>
                                                 @endif
                                             @endif
                                             @if($bill->is_cancelled)
-                                                <div class="d-block text-secondary">
+                                                <span class="mx-2 text-secondary">|</span>
+                                                <span class="d-block text-secondary">
                                                     Cancelled
-                                                </div>
+                                                </span>
                                             @else
-                                                <div class="d-block" moe>
+                                                <span class="mx-2 text-secondary">|</span>
+                                                <span class="d-block" moe>
                                                     <a class="text-danger" href="" show start>Cancel</a>
                                                     <form url="/api/bill/markCancelled">
                                                         <input type="hidden" name="uid" value="{{$bill->uid}}">
@@ -317,7 +331,7 @@
                                                             <button class="btn btn-default border btn-sm" cancel>No</button>
                                                         </div>
                                                     </form>
-                                                </div>
+                                                </span>
                                             @endif
                                         </div>
                                     </td>