Преглед изворни кода

Merge branch 'dev' into dev-vj

Vijayakrishnan пре 3 година
родитељ
комит
ef3a4dbc79
26 измењених фајлова са 308 додато и 275 уклоњено
  1. 3 3
      resources/views/app/generic-bills/inline.blade.php
  2. 15 15
      resources/views/app/patient/accounts.blade.php
  3. 1 0
      resources/views/app/patient/claims-resolver.blade.php
  4. 11 11
      resources/views/app/patient/dashboard.blade.php
  5. 17 12
      resources/views/app/patient/documents.blade.php
  6. 13 13
      resources/views/app/patient/handouts.blade.php
  7. 1 0
      resources/views/app/patient/history.blade.php
  8. 19 14
      resources/views/app/patient/incoming-reports.blade.php
  9. 54 49
      resources/views/app/patient/insurance-coverage.blade.php
  10. 34 33
      resources/views/app/patient/mcp-requests.blade.php
  11. 16 11
      resources/views/app/patient/measurement-confirmation-numbers.blade.php
  12. 10 10
      resources/views/app/patient/memos.blade.php
  13. 1 1
      resources/views/app/patient/partials/appointments.blade.php
  14. 2 2
      resources/views/app/patient/point-based-partials/allergies.blade.php
  15. 1 1
      resources/views/app/patient/point-based-partials/care-team.blade.php
  16. 1 1
      resources/views/app/patient/point-based-partials/dx.blade.php
  17. 1 1
      resources/views/app/patient/point-based-partials/rx.blade.php
  18. 13 13
      resources/views/app/patient/prescriptions/list.blade.php
  19. 9 9
      resources/views/app/patient/pros.blade.php
  20. 1 1
      resources/views/app/patient/rm-setup.blade.php
  21. 1 1
      resources/views/app/patient/settings.blade.php
  22. 25 25
      resources/views/app/patient/shipments.blade.php
  23. 13 8
      resources/views/app/patient/sms-numbers.blade.php
  24. 18 13
      resources/views/app/patient/sms-reminders.blade.php
  25. 14 14
      resources/views/app/patient/sms.blade.php
  26. 14 14
      resources/views/app/patient/supply-orders.blade.php

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

@@ -16,18 +16,18 @@ $genericBills = genericBills($pro, @$patient, @$entityType, @$entityUid);
 
 @if(!count($genericBills))
     <div class="{{@$class ? $class : ''}} d-flex align-items-center">
-        <p class="font-weight-bold mb-0 text-secondary">No {{@$label ? $label : 'Generic'}} bills</p>
+        <p class="font-weight-bold mb-0 font-size-16">No {{@$label ? $label : 'Generic'}} bills</p>
         @include('app.generic-bills.create_generic-bill')
     </div>
 @else
     <div class="{{@$class ? $class : ''}}">
         <div class="d-flex align-items-center mb-2">
-            <p class="font-weight-bold text-secondary font-size-13 m-0">{{@$label ? $label : 'Generic'}} Bills</p>
+            <p class="font-weight-bold font-size-16 m-0">{{@$label ? $label : 'Generic'}} Bills</p>
             @if(!@$noCreate)
                 @include('app.generic-bills.create_generic-bill')
             @endif
         </div>
-            <table class="table table-sm tabe-striped mb-0 table-bordered">
+            <table class="table table-sm table-striped mb-0 table-bordered">
                 <thead class="bg-light">
                 <tr class="text-secondary">
                     <th class="border-bottom-0">Date</th>

+ 15 - 15
resources/views/app/patient/accounts.blade.php

@@ -40,31 +40,31 @@
                 </form>
             </div>
         </div>
-        <table class="table table-sm table-bordered mb-0">
+        <table class="table table-sm table-striped table-bordered mb-0">
             @if($patient->linkedAccounts && count($patient->linkedAccounts))
                 <thead>
                 <tr class="bg-light">
-                    <th class="px-2 text-secondary border-bottom-0">Created At</th>
-                    <th class="px-2 text-secondary border-bottom-0">Name</th>
-                    <th class="px-2 text-secondary border-bottom-0">Email</th>
-                    <th class="px-2 text-secondary border-bottom-0">Cell Number</th>
-                    <th class="px-2 text-secondary border-bottom-0">Access Allowed?</th>
-                    <th class="px-2 text-secondary border-bottom-0">Is Removed?</th>
-                    <th class="px-2 text-secondary border-bottom-0">&nbsp;</th>
+                    <th class="text-secondary border-0">Created At</th>
+                    <th class="text-secondary border-0">Name</th>
+                    <th class="text-secondary border-0">Email</th>
+                    <th class="text-secondary border-0">Cell Number</th>
+                    <th class="text-secondary border-0">Access Allowed?</th>
+                    <th class="text-secondary border-0">Is Removed?</th>
+                    <th class="text-secondary border-0">&nbsp;</th>
                 </tr>
                 </thead>
                 <tbody>
                 @foreach($patient->linkedAccounts as $linkedAccount)
                     <tr class="{{$linkedAccount->is_removed ? 'bg-light text-secondary' : ''}}">
-                        <td class="px-2">{{ friendlier_date_time($linkedAccount->created_at) }}
+                        <td>{{ friendlier_date_time($linkedAccount->created_at) }}
                             @if($linkedAccount->is_removed)
                                 <span class="text-sm text-secondary">(REMOVED)</span>
                             @endif
                         </td>
-                        <td class="px-2">{{ $linkedAccount->account->name_first }} {{ $linkedAccount->account->name_last }}</pre></td>
-                        <td class="px-2">{{ $linkedAccount->account->email }}</td>
-                        <td class="px-2">{{ $linkedAccount->account->phone_number }}</td>
-                        <td class="px-2">
+                        <td>{{ $linkedAccount->account->name_first }} {{ $linkedAccount->account->name_last }}</pre></td>
+                        <td>{{ $linkedAccount->account->email }}</td>
+                        <td>{{ $linkedAccount->account->phone_number }}</td>
+                        <td>
                             <div class="d-flex">
                                 <span class="width-40px">{{ $linkedAccount->is_access_allowed ? 'YES' : 'NO' }}</span>
                                 @if(!$linkedAccount->is_removed)
@@ -96,8 +96,8 @@
                                 @endif
                             </div>
                         </td>
-                        <td class="px-2">{{ $linkedAccount->is_removed ? 'YES' : 'NO' }}</td>
-                        <td class="px-2">
+                        <td>{{ $linkedAccount->is_removed ? 'YES' : 'NO' }}</td>
+                        <td>
                             @if(!$linkedAccount->is_removed)
                                 <div moe class="ml-1" relative>
                                     <a class="text-danger" href="" show start><i class="fa fa-trash-alt"></i></a>

+ 1 - 0
resources/views/app/patient/claims-resolver.blade.php

@@ -54,6 +54,7 @@
     }
     ?>
     <div id="claims-resolver">
+    <h4 class="font-weight-bold m-0 font-size-16 mb-3">Claims Resolver</h4>
     <h2><strong>Numbers:</strong></h2>
     <table class="table table-sm table-striped">
         <tr>

+ 11 - 11
resources/views/app/patient/dashboard.blade.php

@@ -543,32 +543,32 @@
                             @if($patient->memos && count($patient->memos))
                                 <thead class="bg-light">
                                 <tr class="text-nowrap">
-                                    <th class="px-2 text-secondary">Category</th>
-                                    <th class="px-2 text-secondary w-50">Summary</th>
-                                    <th class="px-2 text-secondary">Created</th>
+                                    <th class="border-0 text-secondary">Category</th>
+                                    <th class="border-0 text-secondary w-50">Summary</th>
+                                    <th class="border-0 text-secondary">Created</th>
                                     @if($performer->pro->pro_type === 'ADMIN')
-                                    <th class="px-2 text-secondary">Admins Only</th>
+                                    <th class="border-0 text-secondary">Admins Only</th>
                                     @endif
-                                    <th class="px-2 text-secondary">Ack. by MCP</th>
-                                    <th class="px-2 text-secondary delete-column">&nbsp;</th>
+                                    <th class="border-0 text-secondary">Ack. by MCP</th>
+                                    <th class="border-0 text-secondary delete-column">&nbsp;</th>
                                 </tr>
                                 </thead>
                                 <tbody>
                                 @foreach($patient->memos as $memo)
                                     @if(!$memo->is_admin_only || ($memo->is_admin_only && $performer->pro->pro_type === 'ADMIN') )
                                     <tr>
-                                        <td class="px-2 text-nowrap">{{ $memo->category }}</td>
+                                        <td class="text-nowrap">{{ $memo->category }}</td>
                                         <td class="px-2">
                                             <pre class="m-0 break-spaces">{{ $memo->content }}</pre>
                                         </td>
-                                        <td class="px-2 text-nowrap">
+                                        <td class="text-nowrap">
                                             @if($performer->pro->pro_type == 'ADMIN')
                                             <strong>{{$memo->createdBy->proname_first}} {{$memo->createdBy->pro->name_last}}</strong><br/>
                                             @endif
                                             {{ friendly_date_time($memo->created_at) }}
                                         </td>
                                         @if($performer->pro->pro_type === 'ADMIN' )
-                                        <td class="px-2 text-secondary">
+                                        <td class="text-secondary">
                                             @if($memo->is_admin_only)
                                                 <span class="text-success"><i class="fas fa-lock"></i> YES</span>
                                             @else
@@ -576,14 +576,14 @@
                                             @endif
                                         </td>
                                         @endif
-                                        <td class="px-2">
+                                        <td>
                                             @if($memo->mcp_stamp_id)
                                             <span class="text-success">YES <i class="fas fa-info-circle c-pointer" data-toggle="tooltip" data-placement="bottom" title="{{ friendly_date_time($memo->stamp->created_at) }}"></i></span>
                                             @else
                                             <span class="text-secondary">NO</span>
                                             @endif
                                         </td>
-                                        <td class="px-2 text-center delete-column">
+                                        <td class="text-center delete-column">
                                             @if($performer->pro->pro_type == 'ADMIN')
                                                 <div moe relative bottom class="mr-2">
                                                     <a start show><i class="fa fa-history"></i></a>

+ 17 - 12
resources/views/app/patient/documents.blade.php

@@ -2,7 +2,7 @@
 @section('inner-content')
     <div>
         <div class="d-flex align-items-center pb-2">
-            <h4 class="font-weight-bold m-0">Documents</h4>
+            <h4 class="font-weight-bold m-0 font-size-16">Documents</h4>
             <span class="mx-2 text-secondary">|</span>
             <div moe>
                 <a start show class="">Upload</a>
@@ -146,24 +146,24 @@
             </div>
         </div>
         <table class="table table-striped table-sm table-bordered mb-0">
-            <thead>
+            <thead class="bg-light">
             <tr>
-                <th class="px-2 text-secondary">Created</th>
-                <th class="px-2 text-secondary">Title</th>
-                <th class="px-2 text-secondary">Category</th>
-                <th class="px-2 text-secondary">Status</th>
-                <th class="px-2"></th>
+                <th class="border-0 text-secondary">Created</th>
+                <th class="border-0 text-secondary">Title</th>
+                <th class="border-0 text-secondary">Category</th>
+                <th class="border-0 text-secondary">Status</th>
+                <th class="border-0"></th>
             </tr>
             </thead>
             <tbody>
             @foreach($patient->documents as $document)
                 @if(!$document->is_removed)
                 <tr>
-                    <td class="px-2">{{ friendly_date_time($document->created_at) }}</td>
-                    <td class="px-2">{{ $document->title }}</td>
-                    <td class="px-2">{{ $document->category }}</td>
-                    <td class="px-2">{{ $document->status }}</td>
-                    <td class="px-2">
+                    <td>{{ friendly_date_time($document->created_at) }}</td>
+                    <td>{{ $document->title }}</td>
+                    <td>{{ $document->category }}</td>
+                    <td>{{ $document->status }}</td>
+                    <td>
                         <a class="on-hover-opaque mr-2 pdf-viewer-trigger" native target="_blank"
                            href="/api/clientDocument/download/{{ $document->uid }}"
                            title="View">
@@ -322,6 +322,11 @@
                 </tr>
                 @endif
             @endforeach
+            @if(!count($patient->documents))
+                <tr>
+                    <td colspan="5">No records found.</td>
+                </tr>
+            @endif
             </tbody>
         </table>
     </div>

+ 13 - 13
resources/views/app/patient/handouts.blade.php

@@ -3,7 +3,7 @@
 @section('inner-content')
     <div class="">
         <div class="d-flex align-items-center pb-2">
-            <h4 class="font-weight-bold m-0">Handouts</h4>
+            <h4 class="font-weight-bold m-0 font-size-16">Handouts</h4>
             <span class="mx-2 text-secondary">|</span>
             <div moe>
                 <a start show class="">Add</a>
@@ -30,28 +30,28 @@
             </div>
         </div>
         <table class="table table-striped table-sm table-bordered m-0">
-            <thead>
+            <thead class="bg-light">
             <tr>
-                <th class="px-2 text-secondary">Internal Name</th>
-                <th class="px-2 text-secondary">Display Name</th>
-                <th class="px-2 text-secondary">View</th>
-                <th class="px-2 text-secondary w-50">Shareable Link</th>
-                <th class="px-2 text-secondary"></th>
+                <th class="border-0 text-secondary">Internal Name</th>
+                <th class="border-0 text-secondary">Display Name</th>
+                <th class="border-0 text-secondary">View</th>
+                <th class="border-0 text-secondary w-50">Shareable Link</th>
+                <th class="border-0 text-secondary"></th>
             </tr>
             </thead>
             <tbody>
             @foreach($patient->handouts() as $handout)
                 <?php $downloadLink = env('APP_URL') . "/guest/handout/{$handout->handout_client_uid}"; ?>
                 <tr>
-                    <td class="px-2">{{$handout->internal_name}}</td>
-                    <td class="px-2">{{$handout->display_name}}</td>
-                    <td class="px-2">
-                        <a native href="{{ $downloadLink }}" target="_blank" class="pdf-viewer-trigger">
+                    <td>{{$handout->internal_name}}</td>
+                    <td>{{$handout->display_name}}</td>
+                    <td>
+                        <a native href="{{ $downloadLink }}" target="_blank" class="pdf-viewer-triggerd-flex align-items-center">
                             <i class="fa fa-eye mr-2"></i>View
                         </a>
                     </td>
-                    <td class="px-2"><b>{{ $downloadLink }}</b></td>
-                    <td class="px-2">
+                    <td><b>{{ $downloadLink }}</b></td>
+                    <td>
                         <div moe="" relative="">
                             <a start="" show="" href="#">SMS Link</a>
                             <form url="/api/clientSms/createOutgoing" right="" class="mcp-theme-1">

+ 1 - 0
resources/views/app/patient/history.blade.php

@@ -1,6 +1,7 @@
 @extends ('layouts.patient')
 <?php $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_create($patient->created_at))->invert === 1); ?>
 @section('inner-content')
+    <h6 class="my-0 font-weight-bold font-size-16">History</h6>
     @include('app.patient.point-based-partials.pmhx')
     @include('app.patient.point-based-partials.shx')
     @include('app.patient.point-based-partials.fhx')

+ 19 - 14
resources/views/app/patient/incoming-reports.blade.php

@@ -2,7 +2,7 @@
 @section('inner-content')
     <div id="incoming-reports">
         <div class="d-flex align-items-center pb-2">
-            <h4 class="font-weight-bold m-0">Incoming Reports</h4>
+            <h4 class="font-weight-bold m-0 font-size-16">Incoming Reports</h4>
             <span class="mx-2 text-secondary">|</span>
             <div moe>
                 <a start show class="">Upload</a>
@@ -59,37 +59,37 @@
         <div class="d-flex align-items-start h-100">
             <div class="flex-grow-1">
                 <table class="table table-striped table-sm table-bordered mb-0">
-                    <thead>
+                    <thead class="bg-light">
                     <tr>
-                        <th class="px-2 text-secondary">Created</th>
-                        <th class="px-2 text-secondary">Pro</th>
-                        <th class="px-2 text-secondary">Title</th>
-                        <th class="px-2 text-secondary">Report Date</th>
-                        <th class="px-2 text-secondary">Sign</th>
-                        <th class="px-2 text-secondary">Category</th>
+                        <th class="border-0 text-secondary">Created</th>
+                        <th class="border-0 text-secondary">Pro</th>
+                        <th class="border-0 text-secondary">Title</th>
+                        <th class="border-0 text-secondary">Report Date</th>
+                        <th class="border-0 text-secondary">Sign</th>
+                        <th class="border-0 text-secondary">Category</th>
                     </tr>
                     </thead>
                     <tbody>
                     @foreach($patient->incomingReports as $document)
                         <tr class="{{$document->is_entry_error ? 'entry-error' : ''}} {{@$currentReport->uid === $document->uid ? 'bg-aliceblue' : ''}}">
-                            <td class="px-2">
+                            <td>
                                 {{ friendly_date_time($document->created_at, false) }}
                                 @if(request()->input('noteUid') && $document->note && $document->note->uid === request()->input('noteUid'))
                                     <div class="mt-1 text-info text-sm">Created on this note</div>
                                 @endif
                             </td>
-                            <td class="px-2">
+                            <td>
                                 {{$document->hcp ? $document->hcp->displayName() : '-'}}
                             </td>
-                            <td class="px-2">
+                            <td>
                                 <a mc-initer="incoming-reports"
                                    href="{{route('patients.view.incoming-reports', ['patient' => $patient, 'currentReport' => $document])}}{{request()->input('noteUid') ? '?noteUid=' . request()->input('noteUid') : ''}}"
                                    class="{{@$currentReport->uid === $document->uid ? 'font-weight-bold' : ''}}">
                                     {{ $document->title ? $document->title : '(not set)' }}
                                 </a>
                             </td>
-                            <td class="px-2">{{ friendly_date_time($document->report_date, false) }}</td>
-                            <td class="px-2">
+                            <td>{{ friendly_date_time($document->report_date, false) }}</td>
+                            <td>
                                 @if(!$document->has_hcp_pro_signed)
                                     -
                                 @else
@@ -105,9 +105,14 @@
                                     @endif
                                 @endif
                             </td>
-                            <td class="px-2">{{ $document->category }}{{ $document->subcategory ? ' / ' . $document->subcategory : '' }}</td>
+                            <td>{{ $document->category }}{{ $document->subcategory ? ' / ' . $document->subcategory : '' }}</td>
                         </tr>
                     @endforeach
+                    @if(!count($patient->incomingReports))
+                        <tr>
+                            <td colspan="6">No records found.</td>
+                        </tr>
+                    @endif
                     </tbody>
                 </table>
             </div>

+ 54 - 49
resources/views/app/patient/insurance-coverage.blade.php

@@ -1,46 +1,45 @@
 @extends ('layouts.patient')
 
 @section('inner-content')
-    <?php
-    function toHumanReadable($name) {
-        return ucwords(preg_replace("/[^0-9a-z]/i", " ", $name));
-    }
-    function parseRender($_data) {
-        if($_data) {
-            $type = gettype($_data);
-            if(is_string($_data) || is_numeric($_data)) {
-                echo $_data;
-            }
-            else {
-                echo "<table class='table table-sm border w-100'>";
-                foreach($_data as $k => $v) {
-                    echo "<tr>";
-                    echo "<td><b class='text-secondary'>" . toHumanReadable($k) . "</b></td>";
-                    echo "<td>";
-                    if(is_object($v)) {
-                        parseRender($v);
-                    }
-                    elseif(is_array($v)) {
-                        foreach($v as $k2 => $v2) {
-                            parseRender($v2);
-                        }
+<?php
+function toHumanReadable($name)
+{
+    return ucwords(preg_replace("/[^0-9a-z]/i", " ", $name));
+}
+function parseRender($_data)
+{
+    if ($_data) {
+        $type = gettype($_data);
+        if (is_string($_data) || is_numeric($_data)) {
+            echo $_data;
+        } else {
+            echo "<table class='table table-sm border w-100'>";
+            foreach ($_data as $k => $v) {
+                echo "<tr>";
+                echo "<td><b class='text-secondary'>" . toHumanReadable($k) . "</b></td>";
+                echo "<td>";
+                if (is_object($v)) {
+                    parseRender($v);
+                } elseif (is_array($v)) {
+                    foreach ($v as $k2 => $v2) {
+                        parseRender($v2);
                     }
-                    else {
-                        echo $v;
-                    }
-                    echo "</td>";
-                    echo "</tr>";
+                } else {
+                    echo $v;
                 }
-                echo "</table>";
+                echo "</td>";
+                echo "</tr>";
             }
+            echo "</table>";
         }
     }
-    ?>
-    <style>
-        .eligible-table td {
-            white-space: nowrap;
-        }
-    </style>
+}
+?>
+<style>
+    .eligible-table td {
+        white-space: nowrap;
+    }
+</style>
 <div>
     <div class="d-flex align-items-center">
         <h4 class="font-weight-bold m-0 font-size-16">Insurance Coverage</h4>
@@ -50,7 +49,7 @@
                 <form url="/api/client/validateAgainstMBPayer" class="mcp-theme-1">
                     <input type="hidden" name="uid" value="{{$patient->uid}}">
                     <div class="form-group">
-                        <select name="mbPayerUid"  class="form-control" select2>
+                        <select name="mbPayerUid" class="form-control" select2>
                             <option value=""></option>
                             @foreach($mbPayers as $mbPayer)
                             <option value="{{$mbPayer->uid}}">{{$mbPayer->name()}}</option>
@@ -82,18 +81,18 @@
         </div>
     </div>
 
-    <table class="table table-sm table-bordered mt-3 mb-0">
+    <table class="table table-sm table-striped table-bordered mt-3 mb-0">
         <thead>
-        <tr>
-            <th>Created At</th>
-            <th class="border-bottom-0 w-25">Payer Name </th>
-            <th class="border-bottom-0 w-25">Eligible Payer ID</th>
-            <th class="border-bottom-0 w-25">Member Details</th>
-            <th class="border-bottom-0">Result</th>
-        </tr>
+            <tr>
+                <th class="border-0">Created At</th>
+                <th class="border-0 w-25">Payer Name </th>
+                <th class="border-0 w-25">Eligible Payer ID</th>
+                <th class="border-0 w-25">Member Details</th>
+                <th class="border-0">Result</th>
+            </tr>
         </thead>
         <tbody>
-        @foreach($patient->mbPayerValidationResults as $mbpvResult)
+            @foreach($patient->mbPayerValidationResults as $mbpvResult)
             <tr>
                 <td class="text-nowrap">{{friendly_date_time($mbpvResult->created_at)}}</td>
                 <td>{{$mbpvResult->mbPayer->vendor_identifier}}</td>
@@ -101,11 +100,17 @@
                 <td># {{$mbpvResult->member_id}} | {{$mbpvResult->member_first_name}} | {{$mbpvResult->member_last_name}} | {{$mbpvResult->member_dob}}</td>
                 <td class="">
                     <pre>
-                    {{json_encode(json_decode($mbpvResult->validation_result_json), JSON_PRETTY_PRINT)}}</td>
-                    </pre>
+                    {{json_encode(json_decode($mbpvResult->validation_result_json), JSON_PRETTY_PRINT)}}
+                </td>
+                </pre>
+            </tr>
+            @endforeach
+            @if(!count($patient->mbPayerValidationResults))
+            <tr>
+                <td colspan="5">No records found</td>
             </tr>
-        @endforeach
+            @endif
         </tbody>
     </table>
 </div>
-@endsection
+@endsection

+ 34 - 33
resources/views/app/patient/mcp-requests.blade.php

@@ -4,39 +4,40 @@
 <div id="client-settings-container">
     <div class="row">
         <div class="col-md-12">
-            <h1>MCP Requests</h1>
-            <hr>
-            <table class="table table-condensed table-striped">
-                <thead>
-                    <tr>
-                        <th>Created At</th>
-                        <th>Created By</th>
-                        <th>Was Claimed?</th>
-                        <th>Claimed At</th>
-                        <th>Claimed By</th>
-                        <th>Waiting Time</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    @foreach($patient->mcpRequests as $mcp)
-                    <tr>
-                        <td>{{friendly_date_time($mcp->created_at)}}</td>
-                        <td>[{{$mcp->createdBy->session_type}}] {{$mcp->createdByName()}}</td>
-                        <td>{{$mcp->was_claimed?'Yes':'No'}}</td>
-                       
-                        @if($mcp->was_claimed)
-                        <td>{{friendly_date_time($mcp->proClientWork->created_at)}}</td>
-                        <td>{{$mcp->proClientWork->pro->name_first}} {{$mcp->proClientWork->pro->name_last}}</td>
-                        @else 
-                        <td>-</td>
-                        <td>-</td>
-                        @endif
-                        <td>{{$mcp->getWaitTime()}}</td>
-                    </tr>
-                    @endforeach
-                </tbody>
-            </table>
+            <h4 class="font-weight-bold m-0 font-size-16 mb-3">MCP Requests</h4>
+            <div class="table-responsive border border-bottom-0">
+                <table class="table table-sm table-striped table-bordered m-0">
+                    <thead class="bg-light">
+                        <tr>
+                            <th class="border-0">Created At</th>
+                            <th class="border-0">Created By</th>
+                            <th class="border-0">Was Claimed?</th>
+                            <th class="border-0">Claimed At</th>
+                            <th class="border-0">Claimed By</th>
+                            <th class="border-0">Waiting Time</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach($patient->mcpRequests as $mcp)
+                        <tr>
+                            <td>{{friendly_date_time($mcp->created_at)}}</td>
+                            <td>[{{$mcp->createdBy->session_type}}] {{$mcp->createdByName()}}</td>
+                            <td>{{$mcp->was_claimed?'Yes':'No'}}</td>
+
+                            @if($mcp->was_claimed)
+                            <td>{{friendly_date_time($mcp->proClientWork->created_at)}}</td>
+                            <td>{{$mcp->proClientWork->pro->name_first}} {{$mcp->proClientWork->pro->name_last}}</td>
+                            @else
+                            <td>-</td>
+                            <td>-</td>
+                            @endif
+                            <td>{{$mcp->getWaitTime()}}</td>
+                        </tr>
+                        @endforeach
+                    </tbody>
+                </table>
+            </div>
         </div>
     </div>
 </div>
-@endsection
+@endsection

+ 16 - 11
resources/views/app/patient/measurement-confirmation-numbers.blade.php

@@ -4,8 +4,8 @@
 
     <div id="simpleSMSReminderComponent">
         <div class="pt-2 d-flex align-items-start">
-            <h6 class="my-0 text-secondary d-flex align-items-center w-100">
-                <span class="font-weight-bold text-secondary">Measurement Confirmation Numbers</span>
+            <h6 class="my-0 d-flex align-items-center w-100">
+                <span class="font-weight-bold font-size-16">Measurement Confirmation Numbers</span>
                 <span class="mx-2 text-secondary">|</span>
                 <div moe>
                     <a start show class="py-0 mb-3">Add</a>
@@ -31,13 +31,13 @@
             </h6>
         </div>
 
-        <table class="table table-sm table-bordered mb-0 mt-2 notes-list">
+        <table class="table table-sm table-striped table-bordered mb-0 mt-2 notes-list">
             <thead>
             <tr class="bg-light">
-                <th class="px-2 text-secondary border-bottom-0">#</th>
-                <th class="px-2 text-secondary border-bottom-0">SMS Number</th>
-                <th class="px-2 text-secondary border-bottom-0">Include Client Name</th>
-                <th class="px-2 text-secondary border-bottom-0">Actions</th>
+                <th class="text-secondary border-0">#</th>
+                <th class="text-secondary border-0">SMS Number</th>
+                <th class="text-secondary border-0">Include Client Name</th>
+                <th class="text-secondary border-0">Actions</th>
             </tr>
             </thead>
             <tbody>
@@ -45,10 +45,10 @@
             @foreach ($patient->measurementConfirmationNumbers as $measurementConfirmationNumber)
                 <?php $index++; ?>
                 <tr class="{{$measurementConfirmationNumber->is_active ? '' : 'bg-light text-secondary'}}">
-                    <td class="px-2">{{$index}}</td>
-                    <td class="px-2">{{$measurementConfirmationNumber->sms_number}}</td>
-                    <td class="px-2">{{$measurementConfirmationNumber->should_include_client_name ? 'Yes' : 'No'}}</td>
-                    <td class="px-2">
+                    <td>{{$index}}</td>
+                    <td>{{$measurementConfirmationNumber->sms_number}}</td>
+                    <td>{{$measurementConfirmationNumber->should_include_client_name ? 'Yes' : 'No'}}</td>
+                    <td>
                         <div class="d-flex align-items-center">
                             <div moe relative="">
                                 <a start show class="py-0 mb-3">Edit</a>
@@ -100,6 +100,11 @@
                     </td>
                 </tr>
             @endforeach
+            @if(!count($patient->measurementConfirmationNumbers))
+                <tr>
+                    <td colspan="5">No records found.</td>
+                </tr>
+            @endif
             </tbody>
         </table>
     </div>

+ 10 - 10
resources/views/app/patient/memos.blade.php

@@ -2,7 +2,7 @@
 @section('inner-content')
     <div class="">
         <div class="d-flex align-items-start pb-2">
-            <h4 class="font-weight-bold m-0">Client Memos</h4>
+            <h4 class="font-weight-bold m-0 font-size-16">Client Memos</h4>
         </div>
         <div moe class="w-50 p-2 border mb-3">
             <form url="/api/clientMemo/create" show>
@@ -27,21 +27,21 @@
         </div>
         <table class="table table-striped table-sm table-bordered mb-0">
             @if($patient->memos && count($patient->memos))
-                <thead>
+                <thead class="bg-light">
                 <tr>
-                    <th class="px-2 text-secondary w-25">Category</th>
-                    <th class="px-2 text-secondary w-50">Summary</th>
-                    <th class="px-2 text-secondary">Created</th>
-                    <th class="px-2 text-secondary delete-column">&nbsp;</th>
+                    <th class="border-0 text-secondary w-25">Category</th>
+                    <th class="border-0 text-secondary w-50">Summary</th>
+                    <th class="border-0 text-secondary">Created</th>
+                    <th class="border-0 text-secondary delete-column">&nbsp;</th>
                 </tr>
                 </thead>
                 <tbody>
                 @foreach($patient->memos as $memo)
                     <tr>
-                        <td class="px-2">{{ $memo->category }}</td>
-                        <td class="px-2"><pre class="m-0 break-spaces">{{ $memo->content }}</pre></td>
-                        <td class="px-2">{{ friendly_date_time($memo->created_at) }}</td>
-                        <td class="px-2 text-center delete-column">
+                        <td>{{ $memo->category }}</td>
+                        <td><pre class="m-0 break-spaces">{{ $memo->content }}</pre></td>
+                        <td>{{ friendly_date_time($memo->created_at) }}</td>
+                        <td class="text-center delete-column">
                             <div moe wide relative class="mr-2">
                                 <a class="on-hover-opaque" start show title="Edit">
                                     <i class="font-size-11 fa fa-edit"></i>

+ 1 - 1
resources/views/app/patient/partials/appointments.blade.php

@@ -1,6 +1,6 @@
 <div class="mt-0 pb-1">
     <div class="d-flex align-items-center mb-2 pt-2">
-        <h6 class="my-0 font-weight-bold text-secondary">Appointments</h6>
+        <h6 class="my-0 font-weight-bold font-size-16">Appointments</h6>
         <span class="mx-2 text-secondary">|</span>
         <a href="/patients/view/{{$patient->uid}}/calendar">Calendar</a>
     </div>

+ 2 - 2
resources/views/app/patient/point-based-partials/allergies.blade.php

@@ -2,8 +2,8 @@
 $allergies = \App\Models\Point::getPointsOfCategory($patient, "ALLERGY");
 ?>
 <div class="pt-2 mt-2">
-    <div class="d-flex align-items-baseline pb-2">
-        <h6 class="my-0 font-weight-bold text-secondary">Allergies</h6>
+    <div class="d-flex align-items-center pb-2">
+        <h6 class="my-0 font-weight-bold font-size-16">Allergies</h6>
         @if($isOldClient)
             <div class="px-2 font-weight-bold alert alert-info text-sm my-0 ml-2 py-1">New</div>
         @endif

+ 1 - 1
resources/views/app/patient/point-based-partials/care-team.blade.php

@@ -3,7 +3,7 @@ $careTeamMembers = \App\Models\Point::getPointsOfCategory($patient, "CARE_TEAM_M
 ?>
 <div class="pt-2 mt-2">
     <div class="d-flex align-items-center pb-2">
-        <h6 class="my-0 font-weight-bold text-secondary">Care Team</h6>
+        <h6 class="my-0 font-weight-bold font-size-16">Care Team</h6>
         @if($isOldClient)
             <div class="px-2 font-weight-bold alert alert-info text-sm my-0 ml-2 py-1">New</div>
         @endif

+ 1 - 1
resources/views/app/patient/point-based-partials/dx.blade.php

@@ -3,7 +3,7 @@ $problems = \App\Models\Point::getPointsOfCategory($patient, "PROBLEM");
 ?>
 <div class="pt-2">
     <div class="d-flex align-items-center pb-2">
-        <h6 class="my-0 font-weight-bold text-secondary">Current Problems / Focus Areas</h6>
+        <h6 class="my-0 font-weight-bold font-size-16">Current Problems / Focus Areas</h6>
         @if($isOldClient)
             <div class="px-2 font-weight-bold alert alert-info text-sm my-0 ml-2 py-1">New</div>
         @endif

+ 1 - 1
resources/views/app/patient/point-based-partials/rx.blade.php

@@ -3,7 +3,7 @@ $medications = \App\Models\Point::getPointsOfCategory($patient, "MEDICATION");
 ?>
 <div class="pt-2 mt-2">
     <div class="d-flex align-items-center pb-2">
-        <h6 class="my-0 font-weight-bold text-secondary">Current Medications</h6>
+        <h6 class="my-0 font-weight-bold font-size-16">Current Medications</h6>
         @if($isOldClient)
             <div class="px-2 font-weight-bold alert alert-info text-sm my-0 ml-2 py-1">New</div>
         @endif

+ 13 - 13
resources/views/app/patient/prescriptions/list.blade.php

@@ -1,6 +1,6 @@
 <div id="prescriptions-{{$patient->id}}" v-cloak>
-    <div class="d-flex align-items-baseline py-2">
-        <h6 class="my-0 font-weight-bold text-secondary font-size-14">ERx &amp; Orders</h6>
+    <div class="d-flex align-items-center py-2">
+        <h6 class="my-0 font-weight-bold font-size-16">ERx &amp; Orders</h6>
         @if(!request()->input('erx_category') || request()->input('erx_category') === 'DRUG')
             <span class="mx-2 text-secondary on-hover-opaque">|</span>
             <a href="#" v-on:click.prevent="newERx('DRUG')">Drug</a>
@@ -28,20 +28,20 @@
     </div>
     <div class="d-flex align-items-start bg-white">
         <table class="table table-striped table-sm table-bordered mb-0 flex-grow-1">
-            <thead>
+            <thead class="bg-light">
             <tr>
-                <th class="px-2 text-secondary border-bottom-0">Created</th>
+                <th class="border-0 text-secondary">Created</th>
                 @if(!request()->input('erx_category'))
-                    <th class="px-2 text-secondary border-bottom-0">Type</th>
+                    <th class="border-0 text-secondary">Type</th>
                 @endif
-                <th class="px-2 text-secondary border-bottom-0 w-50">Clinical</th>
-                <th class="px-2 text-secondary border-bottom-0">Prescriber</th>
-                <th class="px-2 text-secondary border-bottom-0" v-if="!currentPrescription">Sign</th>
+                <th class="border-0 text-secondary w-50">Clinical</th>
+                <th class="border-0 text-secondary">Prescriber</th>
+                <th class="border-0 text-secondary" v-if="!currentPrescription">Sign</th>
             </tr>
             </thead>
             <tbody>
             <tr v-for="(prescription, index) in prescriptions" :class="currentPrescription && currentPrescription.id === prescription.id ? 'bg-aliceblue' : ''">
-                <td class="px-2">
+                <td>
                     <a href="#" v-on:click.prevent="currentPrescription=prescription"
                        class="text-nowrap"
                        :class="currentPrescription && currentPrescription.id === prescription.id ? 'font-weight-bold' : ''">
@@ -56,9 +56,9 @@
                     </div>
                 </td>
                 @if(!request()->input('erx_category'))
-                <td class="px-2">@{{prescription.erx_category}}</td>
+                <td>@{{prescription.erx_category}}</td>
                 @endif
-                <td class="px-2">
+                <td>
                     <div class="d-flex align-items-baseline">
                         {{--
                         <a v-if="!prescription.has_hcp_pro_signed" class="mr-2" href="#" v-on:click.prevent="editClinicalDetails(prescription)"><i class="fa fa-edit on-hover-opaque"></i></a>
@@ -102,7 +102,7 @@
                         <div v-else>-</div>
                     </div>
                 </td>
-                <td class="px-2">
+                <td>
                     <div class="d-flex align-items-baseline">
                         {{--
                         <a v-if="!prescription.has_hcp_pro_signed" class="mr-2" href="#" v-on:click.prevent="editHcpPro(prescription)"><i class="fa fa-edit on-hover-opaque"></i></a>
@@ -111,7 +111,7 @@
                         <div>@{{prescription.hcpProDisplayName}}</div>
                     </div>
                 </td>
-                <td class="px-2" v-if="!currentPrescription">
+                <td v-if="!currentPrescription">
                     <div v-if="prescription.has_hcp_pro_signed" class="d-flex align-items-baseline">
                         <i class="text-secondary fa fa-check mr-1"></i>
                         <span class="text-secondary">Signed</span>

+ 9 - 9
resources/views/app/patient/pros.blade.php

@@ -1,16 +1,16 @@
 @extends ('layouts.patient')
 @section('inner-content')
     <div class="">
-        <div class="d-flex align-items-start pb-2">
-            <h4 class="font-weight-bold m-0">Pros With Access</h4>
+        <div class="d-flex align-items-center pb-2">
+            <h4 class="font-weight-bold m-0 font-size-16">Pros With Access</h4>
         </div>
         <table class="table table-striped table-sm table-bordered mb-0">
             @php $prosWithAccess = $patient->prosWithAccess(); @endphp
             @if($prosWithAccess && count($prosWithAccess))
-                <thead>
+                <thead class="bg-light">
                 <tr>
-                    <th class="px-2 text-secondary">Pro</th>
-                    <th class="px-2 text-secondary w-75">Association</th>
+                    <th class="border-0 text-secondary">Pro</th>
+                    <th class="border-0 text-secondary w-75">Association</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -18,12 +18,12 @@
                 @foreach($prosWithAccess as $aPro)
                     <tr>
                         @if($pro->pro_type === 'ADMIN')
-                            <td class="px-2 {{ $aPro['pro'] !== $prevPro ? 'font-weight-bold' : 'text-secondary' }}">{{ $aPro['pro'] }}</td>
-                            <td class="px-2">{{ $aPro['association'] }}</td>
+                            <td class="{{ $aPro['pro'] !== $prevPro ? 'font-weight-bold' : 'text-secondary' }}">{{ $aPro['pro'] }}</td>
+                            <td>{{ $aPro['association'] }}</td>
                         @else
                             @if($aPro['pro'] !== $prevPro)
-                                <td class="px-2 {{ $aPro['pro'] !== $prevPro ? 'font-weight-bold' : 'text-secondary' }}">{{ $aPro['pro'] }}</td>
-                                <td class="px-2">{{ $aPro['association'] }}</td>
+                                <td class="{{ $aPro['pro'] !== $prevPro ? 'font-weight-bold' : 'text-secondary' }}">{{ $aPro['pro'] }}</td>
+                                <td>{{ $aPro['association'] }}</td>
                             @endif
                         @endif
                         @php $prevPro = $aPro['pro']; @endphp

+ 1 - 1
resources/views/app/patient/rm-setup.blade.php

@@ -2,7 +2,7 @@
 
 @section('inner-content')
 
-    <h4 class="font-weight-bold mb-3 text-secondary font-size-16" id="rm-setup">RM Setup</h4>
+    <h4 class="font-weight-bold mb-3 font-size-16" id="rm-setup">RM Setup</h4>
 
     @include('app.patient.partials.rm-setup')
 

+ 1 - 1
resources/views/app/patient/settings.blade.php

@@ -3,7 +3,7 @@
 @section('inner-content')
 
     <div id="client-settings-container">
-
+    <h4 class="font-weight-bold m-0 mb-3 font-size-16">Settings</h4>
         <div class="row">
             <div class="col-6">
 

+ 25 - 25
resources/views/app/patient/shipments.blade.php

@@ -2,7 +2,7 @@
 @section('inner-content')
     <div class="">
         <div class="d-flex align-items-center mb-3">
-            <h4 class="font-weight-bold m-0">Shipments</h4>
+            <h4 class="font-weight-bold m-0 font-size-16">Shipments</h4>
             <span class="mx-2 text-secondary">|</span>
             <div moe>
                 <a start show href="#">Add</a>
@@ -28,34 +28,34 @@
             @if($patient->readyToShipSupplyOrders && count($patient->readyToShipSupplyOrders))
             {{--<div class="mb-3 p-2 border bg-aliceblue">
                 <div class="font-weight-bold mb-2 text-info">Ready to Ship Supply Orders</div>
-                <table class="table table-sm table-bordered mb-0 bg-white">
+                <table class="table table-sm table-striped table-bordered mb-0 bg-white">
                     @if($patient->readyToShipSupplyOrders && count($patient->readyToShipSupplyOrders))
-                        <thead>
+                        <thead class="bg-light">
                         <tr class="">
-                            <th class="px-2 text-nowrap text-secondary border-bottom-0">Title</th>
-                            <th class="px-2 text-nowrap text-secondary border-bottom-0">Reason</th>
+                            <th class="border-0 text-nowrap text-secondary">Title</th>
+                            <th class="border-0 text-nowrap text-secondary">Reason</th>
                             @if(!$shipment)
-                                <th class="px-2 text-nowrap text-secondary border-bottom-0">Created At</th>
-                                <th class="px-2 text-nowrap text-secondary border-bottom-0">Pro Signed?</th>
-                                <th class="px-2 text-nowrap text-secondary border-bottom-0">Cancelled?</th>
-                                <th class="px-2 text-nowrap text-secondary border-bottom-0">Shipment</th>
+                                <th class="border-0 text-nowrap text-secondary">Created At</th>
+                                <th class="border-0 text-nowrap text-secondary">Pro Signed?</th>
+                                <th class="border-0 text-nowrap text-secondary">Cancelled?</th>
+                                <th class="border-0 text-nowrap text-secondary">Shipment</th>
                             @endif
                         </tr>
                         </thead>
                         <tbody>
                         @foreach($patient->readyToShipSupplyOrders as $iSupplyOrder)
                             <tr class="">
-                                <td class="px-2">
+                                <td>
                                     <a href="{{route('patients.view.supply-orders', ['patient' => $patient, 'supplyOrder' => $iSupplyOrder])}}">
                                         {{ $iSupplyOrder->product->title }}
                                     </a>
                                 </td>
-                                <td class="px-2">{{ $iSupplyOrder->reason }}</td>
+                                <td>{{ $iSupplyOrder->reason }}</td>
                                 @if(!$shipment)
-                                    <td class="px-2">{{ friendlier_date_time($iSupplyOrder->created_at) }}</td>
-                                    <td class="px-2">{{ $iSupplyOrder->is_signed_by_pro ? $iSupplyOrder->signedPro->displayName() : '-' }}</td>
-                                    <td class="px-2">{{ $iSupplyOrder->is_cancelled ? 'Yes' : 'No' }}</td>
-                                    <td class="px-2">{{ $iSupplyOrder->shipment_id ? $iSupplyOrder->shipment->status : '-' }}</td>
+                                    <td>{{ friendlier_date_time($iSupplyOrder->created_at) }}</td>
+                                    <td>{{ $iSupplyOrder->is_signed_by_pro ? $iSupplyOrder->signedPro->displayName() : '-' }}</td>
+                                    <td>{{ $iSupplyOrder->is_cancelled ? 'Yes' : 'No' }}</td>
+                                    <td>{{ $iSupplyOrder->shipment_id ? $iSupplyOrder->shipment->status : '-' }}</td>
                                 @endif
                             </tr>
                         @endforeach
@@ -76,25 +76,25 @@
                     cleared for shipment
                 </div>
             @endif
-            <table class="table table-sm table-bordered mb-0" style="table-layout: fixed">
+            <table class="table table-sm table-striped table-bordered mb-0" style="table-layout: fixed">
                 @if($patient->shipments && count($patient->shipments))
                     <thead>
                     <tr class="bg-light">
-                        <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Created At</div></th>
-                        <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Supply Orders</div></th>
-                        <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Status</div></th>
+                        <th class="text-nowrap text-secondary border-0"><div class="text-ellipsis">Created At</div></th>
+                        <th class="text-nowrap text-secondary border-0"><div class="text-ellipsis">Supply Orders</div></th>
+                        <th class="text-nowrap text-secondary border-0"><div class="text-ellipsis">Status</div></th>
                     </tr>
                     </thead>
                     <tbody>
                     @foreach($patient->shipments as $iShipment)
                         <tr class="{{@$shipment && @$shipment->uid === $iShipment->uid ? 'bg-aliceblue' : ''}}">
-                            <td class="px-2">
+                            <td>
                                 <a href="{{route('patients.view.shipments', ['patient' => $patient, 'shipment' => $iShipment])}}">
                                     {{ friendlier_date_time($iShipment->created_at) }}
                                 </a>
                             </td>
-                            <td class="px-2">{{count($iShipment->supplyOrders)}}</td>
-<!--                            <td class="px-2">
+                            <td>{{count($iShipment->supplyOrders)}}</td>
+<!--                            <td>
                                 @if($iShipment->label_system_file_id)
                                     <a class="pdf-viewer-trigger" native="" target="_blank"
                                        href="/api/shipment/downloadLabel/{{$iShipment->uid}}" title="View">
@@ -103,9 +103,9 @@
                                     </a>
                                 @endif
                             </td>
-                            <td class="px-2">{{ $iShipment->courier }}</td>
-                            <td class="px-2">{{ $iShipment->tracking_number }}</td>-->
-                            <td class="px-2">{{ $iShipment->status }}</td>
+                            <td>{{ $iShipment->courier }}</td>
+                            <td>{{ $iShipment->tracking_number }}</td>-->
+                            <td>{{ $iShipment->status }}</td>
                         </tr>
                     @endforeach
                     </tbody>

+ 13 - 8
resources/views/app/patient/sms-numbers.blade.php

@@ -2,7 +2,7 @@
 @section('inner-content')
     <div>
         <div class="d-flex align-items-center pb-2">
-            <h4 class="font-weight-bold m-0">SMS Numbers</h4>
+            <h4 class="font-weight-bold m-0 font-size-16">SMS Numbers</h4>
             <span class="mx-2 text-secondary">|</span>
             <div moe relative>
                 <a start show class="">+ Add New</a>
@@ -20,19 +20,19 @@
             </div>
         </div>
         <table class="table table-striped table-sm table-bordered">
-            <thead>
+            <thead class="bg-light">
             <tr>
-                <th class="px-2 text-secondary">Created</th>
-                <th class="px-2 text-secondary w-75">Number</th>
-                <th class="px-2 text-secondary">Actions</th>
+                <th class="border-0 text-secondary">Created</th>
+                <th class="border-0 text-secondary w-75">Number</th>
+                <th class="border-0 text-secondary">Actions</th>
             </tr>
             </thead>
             <tbody>
             @foreach($patient->smsNumbers as $number)
                 <tr>
-                    <td class="px-2">{{ friendly_date_time($number->created_at) }}</td>
-                    <td class="px-2">{{ $number->sms_number }}</td>
-                    <td class="px-2">
+                    <td>{{ friendly_date_time($number->created_at) }}</td>
+                    <td>{{ $number->sms_number }}</td>
+                    <td>
                         <div class="d-flex align-items-center">
                             <div moe relative>
                                 <a start show class="">Edit</a>
@@ -52,6 +52,11 @@
                     </td>
                 </tr>
             @endforeach
+            @if(!count($patient->smsNumbers))
+                <tr>
+                    <td colspan="3">No records found.</td>
+                </tr>
+            @endif
             </tbody>
         </table>
     </div>

+ 18 - 13
resources/views/app/patient/sms-reminders.blade.php

@@ -4,8 +4,8 @@
 
     <div id="simpleSMSReminderComponent">
         <div class="pt-2 d-flex align-items-start">
-            <h6 class="my-0 text-secondary d-flex align-items-center w-100">
-                <span class="font-weight-bold text-secondary">SMS Reminders</span>
+            <h6 class="my-0 d-flex align-items-center w-100">
+                <span class="font-weight-bold font-size-16">SMS Reminders</span>
                 <span class="mx-2 text-secondary">|</span>
                 <div moe>
                     <a start show class="py-0 mb-3">Add</a>
@@ -70,14 +70,14 @@
             </h6>
         </div>
 
-        <table class="table table-sm table-bordered mb-0 mt-2 notes-list">
+        <table class="table table-sm table-striped table-bordered mb-0 mt-2 notes-list">
             <thead>
             <tr class="bg-light">
-                <th class="px-2 text-secondary border-bottom-0">#</th>
-                <th class="px-2 text-secondary border-bottom-0">To Number</th>
-                <th class="px-2 text-secondary border-bottom-0">Message</th>
-                <th class="px-2 text-secondary border-bottom-0">Schedule</th>
-                <th class="px-2 text-secondary border-bottom-0">Actions</th>
+                <th class="text-secondary border-0">#</th>
+                <th class="text-secondary border-0">To Number</th>
+                <th class="text-secondary border-0">Message</th>
+                <th class="text-secondary border-0">Schedule</th>
+                <th class="text-secondary border-0">Actions</th>
             </tr>
             </thead>
             <tbody>
@@ -85,10 +85,10 @@
             @foreach ($patient->smsReminders as $smsReminder)
                 <?php $index++; ?>
                 <tr class="{{$smsReminder->is_active ? '' : 'bg-light text-secondary'}}">
-                    <td class="px-2">{{$index}}</td>
-                    <td class="px-2">{{$smsReminder->sms_number}}</td>
-                    <td class="px-2">{{$smsReminder->message}}</td>
-                    <td class="px-2">
+                    <td>{{$index}}</td>
+                    <td>{{$smsReminder->sms_number}}</td>
+                    <td>{{$smsReminder->message}}</td>
+                    <td>
                         @if($smsReminder->time_of_day_sunday)
                             <div>
                                 <span class="text-secondary width-40px d-inline-block">Sun:</span>
@@ -132,7 +132,7 @@
                             </div>
                         @endif
                     </td>
-                    <td class="px-2">
+                    <td>
                         <div class="d-flex align-items-center">
                             <div moe relative="">
                                 <a start show class="py-0 mb-3">Edit</a>
@@ -223,6 +223,11 @@
                     </td>
                 </tr>
             @endforeach
+            @if(!count($patient->smsReminders))
+                <tr>
+                    <td colspan="5">No records found.</td>
+                </tr>
+            @endif
             </tbody>
         </table>
     </div>

+ 14 - 14
resources/views/app/patient/sms.blade.php

@@ -2,7 +2,7 @@
 @section('inner-content')
     <div class="">
         <div class="d-flex align-items-center pb-2">
-            <h4 class="font-weight-bold m-0">SMS Messages</h4>
+            <h4 class="font-weight-bold m-0 font-size-16">SMS Messages</h4>
             <span class="mx-2 text-secondary">|</span>
             <div moe>
                 <a start show class="">Send SMS</a>
@@ -24,13 +24,13 @@
             </div>
         </div>
         <table class="table table-striped table-sm table-bordered">
-            <thead>
+            <thead class="bg-light">
             <tr>
-                <th class="px-2 text-secondary">Date &amp; Time</th>
-                <th class="px-2 text-secondary w-25">Type</th>
-                <th class="px-2 text-secondary w-25">From</th>
-                <th class="px-2 text-secondary w-25">To</th>
-                <th class="px-2 text-secondary w-50">Content</th>
+                <th class="border-0 text-secondary text-nowrap">Date &amp; Time</th>
+                <th class="border-0 text-secondary w-25">Type</th>
+                <th class="border-0 text-secondary w-25">From</th>
+                <th class="border-0 text-secondary w-25">To</th>
+                <th class="border-0 text-secondary w-50">Content</th>
                 <th></th>
                 @if($performer->pro->pro_type == 'ADMIN')
                     <th></th>
@@ -40,12 +40,12 @@
             <tbody>
             @foreach($patient->smses as $sms)
                 <tr class="{{$sms->created_at > $patient->last_sms_sent_to_client_at && $sms->is_reply_needed == 'YES' ? 'bg-warning': ''}}">
-                    <td class="px-2">{{ friendly_date_time($sms->created_at) }}</td>
-                    <td class="px-2">{{ ucwords($sms->incoming_or_outgoing) }}</td>
-                    <td class="px-2">{{ $sms->from_number }}</td>
-                    <td class="px-2">{{ $sms->to_number }}</td>
-                    <td class="px-2">{{ $sms->body }}</td>
-                    <td class="px-2">
+                    <td class="text-nowrap">{{ friendly_date_time($sms->created_at) }}</td>
+                    <td>{{ ucwords($sms->incoming_or_outgoing) }}</td>
+                    <td>{{ $sms->from_number }}</td>
+                    <td>{{ $sms->to_number }}</td>
+                    <td>{{ $sms->body }}</td>
+                    <td>
                         @if($sms->is_reply_needed == 'YES')
                             <div moe relative>
                                 <a start show class="">clear</a>
@@ -66,7 +66,7 @@
                         @endif
                     </td>
                     @if($performer->pro->pro_type == 'ADMIN')
-                        <td>
+                        <td class="text-nowrap">
                             <div moe relative>
                                 <a start show class="">Update Is Reply Needed</a>
                                 <form url="/api/clientSms/updateIsReplyNeeded" class="mcp-theme-1" right>

+ 14 - 14
resources/views/app/patient/supply-orders.blade.php

@@ -2,7 +2,7 @@
 @section('inner-content')
     <div class="" id="patient-supply-orders">
         <div class="d-flex align-items-center pb-2">
-            <h4 class="font-weight-bold m-0">Supply Orders</h4>
+            <h4 class="font-weight-bold m-0 font-size-16">Supply Orders</h4>
             @if($pro->pro_type === 'ADMIN' || request()->input('note-uid'))
                 <span class="mx-2 text-secondary">|</span>
                 <div moe large>
@@ -69,7 +69,7 @@
         </div>
         <div class="d-flex align-items-start h-100">
             <div class="flex-grow-1">
-                <table class="table table-sm table-bordered mb-0" style="table-layout: fixed">
+                <table class="table table-sm table-striped table-bordered mb-0" style="table-layout: fixed">
                     <?php
                     $supplyOrdersList = $patient->activeSupplyOrders;
                     if(request()->input('filter')) {
@@ -87,18 +87,18 @@
                     @if($supplyOrdersList && count($supplyOrdersList))
                         <thead>
                         <tr class="bg-light">
-                            <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Title</div></th>
-                            <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Reason</div></th>
-                            <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Created At</div></th>
-                            <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Pro Signed?</div></th>
-                            <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Cancelled?</div></th>
-                            <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Shipment</div></th>
+                            <th class="border-0 text-nowrap text-secondary"><div class="text-ellipsis">Title</div></th>
+                            <th class="border-0 text-nowrap text-secondary"><div class="text-ellipsis">Reason</div></th>
+                            <th class="border-0 text-nowrap text-secondary"><div class="text-ellipsis">Created At</div></th>
+                            <th class="border-0 text-nowrap text-secondary"><div class="text-ellipsis">Pro Signed?</div></th>
+                            <th class="border-0 text-nowrap text-secondary"><div class="text-ellipsis">Cancelled?</div></th>
+                            <th class="border-0 text-nowrap text-secondary"><div class="text-ellipsis">Shipment</div></th>
                         </tr>
                         </thead>
                         <tbody>
                         @foreach($supplyOrdersList as $iSupplyOrder)
                             <tr class="{{@$supplyOrder && @$supplyOrder->uid === $iSupplyOrder->uid ? 'bg-aliceblue' : ''}} {{$iSupplyOrder->is_cancelled ? 'on-hover-opaque' : ''}}">
-                                <td class="px-2">
+                                <td>
                                     @if(request()->input('note-uid') && request()->input('popupmode'))
                                         <a class="c-pointer" onclick="return refreshDynamicStagPopup('{{route('patients.view.supply-orders', ['patient' => $patient, 'supplyOrder' => $iSupplyOrder])}}?{{request()->input('filter') ? 'filter=' . request()->input('filter') : ''}}&popupmode=1&{{request()->input('note-uid') ? 'note-uid=' . request()->input('note-uid') : ''}}')">
                                             {{ $iSupplyOrder->product->title }}
@@ -112,11 +112,11 @@
                                         <div class="font-weight-bold text-sm text-secondary"><i class="fa fa-ban"></i> CANCELLED</div>
                                     @endif
                                 </td>
-                                <td class="px-2">{{ $iSupplyOrder->reason }}</td>
-                                <td class="px-2">{{ friendlier_date_time($iSupplyOrder->created_at) }}</td>
-                                <td class="px-2">{{ $iSupplyOrder->is_signed_by_pro ? $iSupplyOrder->signedPro->displayName() : '-' }}</td>
-                                <td class="px-2">{{ $iSupplyOrder->is_cancelled ? 'Yes' : 'No' }}</td>
-                                <td class="px-2">
+                                <td>{{ $iSupplyOrder->reason }}</td>
+                                <td>{{ friendlier_date_time($iSupplyOrder->created_at) }}</td>
+                                <td>{{ $iSupplyOrder->is_signed_by_pro ? $iSupplyOrder->signedPro->displayName() : '-' }}</td>
+                                <td>{{ $iSupplyOrder->is_cancelled ? 'Yes' : 'No' }}</td>
+                                <td>
                                     @if($iSupplyOrder->shipment_id)
                                         <i class="fa fa-building"></i>
                                         {{$iSupplyOrder->shipment->status ? $iSupplyOrder->shipment->status : 'CREATED'}}