server changes

app/Helpers/helpers.php

@@ -13,6 +13,32 @@ use App\Models\Bill;
 //require_once './class.Diff.php';
 use Soundasleep\Html2Text as Html2Text;
 
+if(!function_exists('toFeetAndInches')) {
+    function toFeetAndInches($value) {
+        if(!$value) return '-';
+        $value = round($value);
+        $ft = round(floor($value / 12));
+        $in = $value % 12;
+        return "$ft ft. $in in.";
+    }
+}
+
+if(!function_exists('feetFromInches')) {
+    function feetFromInches($value) {
+        if(!$value) return 0;
+        $value = round($value);
+        return round(floor($value / 12));
+    }
+}
+
+if(!function_exists('inchesAfterFeetFromInches')) {
+    function inchesAfterFeetFromInches($value) {
+        if(!$value) return 0;
+        $value = round($value);
+        return round($value % 12);
+    }
+}
+
 if(!function_exists('genericBills')) {
     function genericBills(Pro $performerPro, $patient, $entityType, $entityUid) {
         $genericBills = Bill::where('bill_service_type', 'GENERIC');

app/Http/Controllers/McpController.php

@@ -277,6 +277,25 @@ class McpController extends Controller
         ];
         return view('app.mcp.notes_pending_billing', $data);
     }
+    public function bills_pending_signature(Request $request){
+        $data = [
+            'records' => Bill::where('bill_service_type', '<>', 'CARE_MONTH')->where(function ($query) {
+                $query->where('hcp_pro_id', $this->performer->pro->id)->where('is_signed_by_hcp', false)->where('is_cancelled', false);
+            })
+                ->orWhere(function ($query) {
+                    $query->where('cm_pro_id', $this->performer->pro->id)->where('is_signed_by_cm', false)->where('is_cancelled', false);
+                })->orWhere(function ($query) {
+                    $query->where('rme_pro_id', $this->performer->pro->id)->where('is_signed_by_rme', false)->where('is_cancelled', false);
+                })->orWhere(function ($query) {
+                    $query->where('rmm_pro_id', $this->performer->pro->id)->where('is_signed_by_rmm', false)->where('is_cancelled', false);
+                })->orWhere(function ($query) {
+                    $query->where('generic_pro_id', $this->performer->pro->id)->where('is_signed_by_generic_pro', false)->where('is_cancelled', false);
+                })
+                ->orderBy('created_at', 'DESC')
+                ->get()
+        ];
+        return view('app.mcp.bills_pending_signature', $data);
+    }
     public function reports_pending_signature(Request $request){
         $data = [
             'records' => IncomingReport::where('hcp_pro_id', $this->performer->pro->id)

app/Http/Controllers/PracticeManagementController.php

@@ -251,6 +251,9 @@ class PracticeManagementController extends Controller
                             })
                             ->orWhere(function ($q2) use ($proID) {
                                 $q2->where('rmm_pro_id', $proID)->where('is_signed_by_rmm', false);
+                            })
+                            ->orWhere(function ($q2) use ($proID) {
+                                $q2->where('generic_pro_id', $proID)->where('is_signed_by_generic_pro', false);
                             });
                     });
                 break;

app/Models/Pro.php

@@ -374,19 +374,20 @@ WHERE mcp_pro_id = :pro_id
     }
 
     function get_bills_pending_signature_count_as_mcp(){
-        return;
-        $pendingBillsToSign = Bill::where('bill_service_type', '<>', 'CARE_MONTH')->where(function ($query) use ($performerProID) {
-            $query->where('hcp_pro_id', $performerProID)->where('is_signed_by_hcp', false)->where('is_cancelled', false);
+        $pendingBillsToSign = Bill::where('bill_service_type', '<>', 'CARE_MONTH')->where(function ($query) {
+            $query->where('hcp_pro_id', $this->id)->where('is_signed_by_hcp', false)->where('is_cancelled', false);
         })
-            ->orWhere(function ($query) use ($performerProID) {
-                $query->where('cm_pro_id', $performerProID)->where('is_signed_by_cm', false)->where('is_cancelled', false);;
-            })->orWhere(function ($query) use ($performerProID) {
-                $query->where('rme_pro_id', $performerProID)->where('is_signed_by_rme', false)->where('is_cancelled', false);;
-            })->orWhere(function ($query) use ($performerProID) {
-                $query->where('rmm_pro_id', $performerProID)->where('is_signed_by_rmm', false)->where('is_cancelled', false);;
+            ->orWhere(function ($query) {
+                $query->where('cm_pro_id', $this->id)->where('is_signed_by_cm', false)->where('is_cancelled', false);
+            })->orWhere(function ($query) {
+                $query->where('rme_pro_id', $this->id)->where('is_signed_by_rme', false)->where('is_cancelled', false);
+            })->orWhere(function ($query) {
+                $query->where('rmm_pro_id', $this->id)->where('is_signed_by_rmm', false)->where('is_cancelled', false);
+            })->orWhere(function ($query) {
+                $query->where('generic_pro_id', $this->id)->where('is_signed_by_generic_pro', false)->where('is_cancelled', false);
             })->count();
 
-        $keyNumbers['pendingBillsToSign'] = $pendingBillsToSign;
+        return $pendingBillsToSign;
     }
 
     function get_incoming_reports_pending_signature_count_as_mcp() {

config/app.php

@@ -65,7 +65,7 @@ return [
 
     'hrm2_url' => env('HRM2_URL'),
 
-    'asset_version' => 24,
+    'asset_version' => 25,
 
     'temp_dir' => env('TEMP_DIR'),
 

public/css/style.css

@@ -209,6 +209,14 @@ body.stag_rhs_collapsed .app-right-panel {
     border-color: rgb(13, 89, 175);
     box-shadow: none;
 }
+.mcp-theme-1 .btn.btn-success,
+.mcp-theme-1 .btn.btn-success:active {
+    background: #35b7b2;
+    border-color: #35b7b2;
+}
+.mcp-theme-1 .btn.btn-success:focus {
+    box-shadow: 0 0 0 0.2rem #35b7b277;
+}
 #sidebarMenu .mcp-theme-1 .nav-item {
     margin: 0;
 }
@@ -1632,8 +1640,24 @@ button.note-templates-trigger-assessment {
     transform: translateY(-18px);
 }
 
-/* appt. confirmation history */
-.appointment-confirmation-history-trigger .appointment-confirmation-history {
+.on-hover-text-reveal {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+.on-hover-text-reveal:hover {
+    white-space: normal;
+    overflow: unset;
+    text-overflow: unset;
+}
+.on-hover-show {
+    position: relative;
+}
+.on-hover-show:hover .on-hover-content {
+    opacity: 1;
+    pointer-events: all;
+}
+.on-hover-show .on-hover-content {
     position: absolute;
     width: 300px;
     right: 0;
@@ -1647,20 +1671,6 @@ button.note-templates-trigger-assessment {
     z-index: 2;
     top: 0;
 }
-.appointment-confirmation-history-trigger:hover .appointment-confirmation-history {
-    opacity: 1;
-    pointer-events: all;
-}
-.on-hover-text-reveal {
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-.on-hover-text-reveal:hover {
-    white-space: normal;
-    overflow: unset;
-    text-overflow: unset;
-}
 .collapsible-tbody.collapsed {
     display: none;
 }
@@ -2355,4 +2365,40 @@ table .stag-filter-highlight {
 
 .event-bg-gray {
     background-color: #ececec;
+}
+.popover-header {
+    padding: 3px 10px;
+    font-size: 13px;
+    font-weight: bold;
+}
+.popover-body {
+    font-size: 13px;
+}
+
+/* stag-collapsible-card */
+[stag-collapsible-card] .stag-collapse-trigger {
+    padding: 0;
+    width: 22px;
+    align-self: stretch;
+    margin-right: -11px;
+    align-items: center;
+    justify-content: center;
+    display: inline-flex;
+    border-radius: 2px;
+}
+[stag-collapsible-card] .stag-collapse-trigger:hover {
+    text-decoration: none !important;
+    background: #4441;
+}
+[stag-collapsible-card] .stag-collapse-trigger i {
+    display: none;
+}
+[stag-collapsible-card][collapsed] .stag-collapse-trigger i.if-collapsed {
+    display: block;
+}
+[stag-collapsible-card]:not([collapsed]) .stag-collapse-trigger i.if-not-collapsed {
+    display: block;
+}
+[stag-collapsible-card][collapsed] .card-body {
+    display: none;
 }

public/js/icd-autocomplete.js

@@ -0,0 +1,28 @@
+(function() {
+
+    function init() {
+        let self = this;
+        $('[icd-autocomplete-code]:not([ac-initialized])').each(function() {
+            let elem = this, dynID = 'icd-' + Math.ceil(Math.random() * 1000000),
+                codeElem = $(this), descElem = $(this).closest('form').find('[icd-autocomplete-description]');
+            $(elem).attr('id', dynID);
+            new window.Def.Autocompleter.Search(dynID,
+                'https://clinicaltables.nlm.nih.gov/api/icd10cm/v3/search?sf=code,name&ef=name', {
+                    tableFormat: true,
+                    valueCols: [0],
+                    colHeaders: ['Code', 'Name'],
+                }
+            );
+            window.Def.Autocompleter.Event.observeListSelections(dynID, function() {
+                let autocomp = elem.autocomp, acData = autocomp.getSelectedItemData();
+                codeElem.val(acData[0].code).trigger('change');
+                descElem.val(acData[0].data['name']).trigger('change');
+                return false;
+            });
+            $(elem).attr('ac-initialized', 1);
+        });
+    }
+
+    addMCInitializer('icd-autocomplete', init);
+
+}).call(window);

public/js/stag-collapsible-card.js

@@ -0,0 +1,49 @@
+(function() {
+    function init() {
+        $('.card[stag-collapsible-card]:not([stag-collapsible-card-initialized])').each(function() {
+            let header = $(this).find('>.card-header').first();
+            if(header.length) {
+                let html = header.html();
+                let newHeader = $('<div class="d-flex align-items-center"></div>');
+                newHeader.append(html);
+                let collapseTrigger = $('<a href="#" class="stag-collapse-trigger ml-auto" />');
+                collapseTrigger.append('<i class="fa fa-chevron-up if-not-collapsed"/>');
+                collapseTrigger.append('<i class="fa fa-chevron-down if-collapsed"/>');
+                newHeader.append(collapseTrigger);
+                header
+                    .empty()
+                    .append(newHeader);
+            }
+            if(!!$(this).attr('stag-collapsible-card')) {
+                let state = localStorage['collapseState_' + $(this).attr('stag-collapsible-card')];
+                if(state === 'collapsed') {
+                    $(this).attr('collapsed', 1);
+                }
+                else if(state === 'not-collapsed') {
+                    $(this).removeAttr('collapsed');
+                }
+            }
+            $(this).attr('stag-collapsible-card-initialized', 1);
+        });
+
+        $(document)
+            .off('click.stag-collapse-toggle', '.card[stag-collapsible-card][stag-collapsible-card-initialized] .stag-collapse-trigger')
+            .on('click.stag-collapse-toggle', '.card[stag-collapsible-card][stag-collapsible-card-initialized] .stag-collapse-trigger', function() {
+                let card = $(this).closest('.card');
+                if(card.is('[collapsed]')) {
+                    card.removeAttr('collapsed');
+                    if(!!card.attr('stag-collapsible-card')) {
+                        localStorage['collapseState_' + card.attr('stag-collapsible-card')] = 'not-collapsed';
+                    }
+                }
+                else {
+                    card.attr('collapsed', 1);
+                    if(!!card.attr('stag-collapsible-card')) {
+                        localStorage['collapseState_' + card.attr('stag-collapsible-card')] = 'collapsed';
+                    }
+                }
+                return false;
+            });
+    }
+    addMCInitializer('stag-collapsible-card', init);
+}).call(window);

resources/views/app/dashboard-dna.blade.php

@@ -24,73 +24,73 @@
                     <div class="mb-4">
                         <div class="pro-dashboard-inline-calendar"></div>
                     </div>
-                    <div class="card mb-4">
+                    <div class="card mb-4" stag-collapsible-card="dna-key-numbers">
                         <div class="card-header pl-2">
                             <strong>
                                 Key Numbers
                             </strong>
                         </div>
                         <div class="card-body p-0">
-                            <table class="table table-sm mb-0 dashboard-stats-table">
+                            <table class="table table-sm mb-0">
                                 <tbody>
                                     <tr>
                                         <th class="px-2 text-center">{{$pro->patientsCountAsDna()}}<th>  
                                         <th class="pl-2">
-                                            <a href="{{route('dna.my-patients')}}" native target="_blank" open-in-stag-popup popup-style="tall" title="Patients ">Patients </a>
+                                            <a class="font-weight-normal" href="{{route('dna.my-patients')}}" native target="_blank" open-in-stag-popup popup-style="tall" title="Patients ">Patients </a>
                                         </th>
                                     </tr>
                                     <tr>
                                         <th class="px-2 text-center">{{$pro->patientsAwaitingMcpVisitCountAsDna()}}<th>
                                         <th class="pl-2">
-                                            <a href="{{route('dna.patients_awaiting_mcp_visit')}}" native target="_blank" open-in-stag-popup popup-style="tall" title="Patients Awaiting MCP Visit">Patients Awaiting MCP Visit</a>
+                                            <a class="font-weight-normal" href="{{route('dna.patients_awaiting_mcp_visit')}}" native target="_blank" open-in-stag-popup popup-style="tall" title="Patients Awaiting MCP Visit">Patients Awaiting MCP Visit</a>
                                         </th>
                                     </tr>
                                     <tr>
                                         <th class="px-2 text-center">{{$pro->patientsWithoutAppointmentCountAsDna()}}<th>
                                         <th class="pl-2">
-                                            <a href="{{route('dna.patients_without_appointment')}}" native target="_blank" open-in-stag-popup popup-style="tall" title="Patients w/o Appointment ">Patients w/o Appointment </a>
+                                            <a class="font-weight-normal" href="{{route('dna.patients_without_appointment')}}" native target="_blank" open-in-stag-popup popup-style="tall" title="Patients w/o Appointment ">Patients w/o Appointment </a>
                                         </th>
                                     </tr>
                                     <tr>
                                         <th class="px-2 text-center">{{$pro->encountersPendingMyReviewCountAsDna()}}<th>
                                         <th class="pl-2">
-                                            <a href="{{route('dna.encounters_pending_my_review')}}" native target="_blank" open-in-stag-popup popup-style="tall" title="Encounters Pending My Review ">Encounters Pending My Review </a>
+                                            <a class="font-weight-normal" href="{{route('dna.encounters_pending_my_review')}}" native target="_blank" open-in-stag-popup popup-style="tall" title="Encounters Pending My Review ">Encounters Pending My Review </a>
                                         </th>
                                     </tr>
                                     <tr>
                                         <th class="px-2 text-center">{{$pro->encountersInProgressCountAsDna()}}<th>
                                         <th class="pl-2">
-                                            <a href="{{route('dna.encounters_in_progress')}}" native target="_blank" open-in-stag-popup popup-style="tall" title="Encounters In Progress">Encounters In Progress</a>
+                                            <a class="font-weight-normal" href="{{route('dna.encounters_in_progress')}}" native target="_blank" open-in-stag-popup popup-style="tall" title="Encounters In Progress">Encounters In Progress</a>
                                         </th>
                                     </tr>
                                     <tr>
                                         <th class="px-2 text-center">{{$pro->appointmentsPendingConfirmationCountAsDna()}}<th>
                                         <th class="pl-2">
-                                            <a href="{{route('dna.appointments_pending_confirmation')}}" native target="_blank" open-in-stag-popup popup-style="tall" title="Appointments Pending Confirmation">Appointments Pending Confirmation</a>
+                                            <a class="font-weight-normal" href="{{route('dna.appointments_pending_confirmation')}}" native target="_blank" open-in-stag-popup popup-style="tall" title="Appointments Pending Confirmation">Appointments Pending Confirmation</a>
                                         </th>
                                     </tr>
                                     <tr>
                                         <th class="px-2 text-center">{{$pro->cancelledAppointmentsPendingAckCountAsDna()}}<th>
                                         <th class="pl-2">
-                                            <a href="{{route('dna.cancelled_appointments_pending_ack')}}" native target="_blank" open-in-stag-popup popup-style="tall" title="Cancelled Appointments Pending Ack.">Cancelled Appointments Pending Ack.</a>
+                                            <a class="font-weight-normal" href="{{route('dna.cancelled_appointments_pending_ack')}}" native target="_blank" open-in-stag-popup popup-style="tall" title="Cancelled Appointments Pending Ack.">Cancelled Appointments Pending Ack.</a>
                                         </th>
                                     </tr>
                                     <tr>
                                         <th class="px-2 text-center">{{$pro->reportsPendingAckCountAsDna()}}<th>
                                         <th class="pl-2">
-                                            <a href="{{route('dna.reports_pending_ack')}}" native target="_blank" open-in-stag-popup popup-style="tall" title="Reports Pending Ack.">Reports Pending Ack.</a>
+                                            <a class="font-weight-normal" href="{{route('dna.reports_pending_ack')}}" native target="_blank" open-in-stag-popup popup-style="tall" title="Reports Pending Ack.">Reports Pending Ack.</a>
                                         </th>
                                     </tr>
                                     <tr>
                                         <th class="px-2 text-center">{{$pro->supplyOrdersPendingMyAckCountAsDna()}}<th>
                                         <th class="pl-2">
-                                            <a href="{{route('dna.supply_orders_pending_my_ack')}}" native target="_blank" open-in-stag-popup popup-style="tall" title="Supply Orders Pending My Ack.">Supply Orders Pending My Ack.</a>
+                                            <a class="font-weight-normal" href="{{route('dna.supply_orders_pending_my_ack')}}" native target="_blank" open-in-stag-popup popup-style="tall" title="Supply Orders Pending My Ack.">Supply Orders Pending My Ack.</a>
                                         </th>
                                     </tr>
                                     <tr>
                                         <th class="px-2 text-center">{{$pro->supplyOrdersPendingHcpApprovalCountAsDna()}}<th>
                                         <th class="pl-2">
-                                            <a href="{{route('dna.supply_orders_pending_hcp_approval')}}" native target="_blank" open-in-stag-popup popup-style="tall" title="Supply Orders Pending HCP Approval">Supply Orders Pending HCP Approval</a>
+                                            <a class="font-weight-normal" href="{{route('dna.supply_orders_pending_hcp_approval')}}" native target="_blank" open-in-stag-popup popup-style="tall" title="Supply Orders Pending HCP Approval">Supply Orders Pending HCP Approval</a>
                                         </th>
                                     </tr>
                                 </tbody>
@@ -98,14 +98,14 @@
                         </div>
                     </div>
                     
-                    <div class="card mb-4">
+                    <div class="card mb-4" stag-collapsible-card="dna-practice-management" collapsed>
                         <div class="card-header pl-2">
                             <strong>
                                 Practice Management
                             </strong>
                         </div>
                         <div class="card-body p-0">
-                            <table class="table mb-0 dashboard-stats-table">
+                            <table class="table table-sm mb-0">
                                 <tbody>
                                 <tr class="thin">
                                     <th colspan="2" class="font-weight-normal px-2 pl-2">Billing & Reimbursement</th>

resources/views/app/dashboard-mcp.blade.php

@@ -24,7 +24,7 @@
                     <div class="mb-4">
                         <div class="pro-dashboard-inline-calendar"></div>
                     </div>
-                    <div class="card mb-4">
+                    <div class="card mb-4" stag-collapsible-card="mcp-key-numbers">
                         <div class="card-header pl-2">
                             <strong>
                                 Key Numbers
@@ -75,6 +75,18 @@
                                         </a>
                                     </th>
                                 </tr>
+                                <tr>
+                                    <th class="px-2 text-center">{{$pro->get_bills_pending_signature_count_as_mcp()}}</th>
+                                    <th class="pl-2">
+                                        <a href="{{ route('mcp.bills_pending_signature') }}"
+                                           native target="_blank"
+                                           open-in-stag-popup
+                                           popup-style="tall"
+                                           title="Bills Pending Signature">
+                                            Bills Pending Signature
+                                        </a>
+                                    </th>
+                                </tr>
                                 <tr>
                                     <th class="px-2 text-center">{{$pro->get_incoming_reports_pending_signature_count_as_mcp()}}</th>
                                     <th class="pl-2">
@@ -189,7 +201,7 @@
                             </table>
                         </div>
                     </div>
-                    <div class="card mb-4">
+                    <div class="card mb-4" stag-collapsible-card="mcp-rm">
                         <div class="card-header pl-2">
                             <strong>
                                 Remote Monitoring: {{friendly_month(date('Y-m-d'))}}
@@ -219,7 +231,7 @@
                             </table>
                         </div>
                     </div>
-                    <div class="card mb-4">
+                    <div class="card mb-4" stag-collapsible-card="mcp-practice-management" collapsed>
                         <div class="card-header pl-2">
                             <strong>
                                 Practice Management
@@ -286,7 +298,7 @@
                 <div class="col-md-9 pl-1">
                     <div class="row mcp-theme-1">
                         <div class="col-md-6 mcp-theme-1">
-                            <div id="mcp-dashboard-appointments" class="mb-4  max-height-200px overflow-auto">
+                            <div id="mcp-dashboard-appointments" class="mb-4">
 
                             </div>
                             <div class="card mb-4">

resources/views/app/dna/appointments.blade.php

@@ -24,7 +24,7 @@
                         <th class="border-0">Age</th>
                         <th class="border-0">Sex</th>
                         <th class="border-0">Insurance</th>
-                        <th class="border-0">MCP</th>
+                        <th class="border-0">HCP</th>
                         <th class="border-0">Time</th>
                         <th class="border-0">Status</th>
                     </tr>
@@ -32,7 +32,6 @@
                 <tbody>
                     @foreach($appointments as $appointment)
                     <tr>
-
                         <td class="text-nowrap">
                             <a native target="_blank" href="{{route('patients.view.dashboard', $appointment->client)}}">
                                 {{$appointment->client->chart_number}}
@@ -62,7 +61,7 @@
                                 @endif
                             </div>
                         </td>
-                        <td>{{ $appointment->client->mcp->displayName() }}</td>
+                        <td>{{ $appointment->pro->displayName() }}</td>
                         <td>
                             <a href="/patients/view/{{$appointment->client->uid}}/calendar/{{$appointment->uid}}" class="text-nowrap">
                                 {{friendlier_date_time($appointment->raw_date . ' ' . $appointment->raw_start_time)}}

resources/views/app/dna/dashboard/encounters_pending_my_review.blade.php

@@ -9,10 +9,14 @@
             <table class="table table-sm table-striped mb-0">
                 <thead class="bg-light">
                     <tr>
+                        <th class="border-0">Chart#</th>
                         <th class="border-0">Patient</th>
-                        <th class="border-0">Type</th>
-                        <th class="border-0">Value</th>
+                        <th class="border-0">DOB</th>
+                        <th class="border-0">Gender</th>
+                        <th class="border-0">Coverage</th>
+                        <th class="border-0">MCP</th>
                         <th class="border-0">Timestamp</th>
+                        <th class="border-0"></th>
                     </tr>
                 </thead>
                 <tbody>
@@ -41,6 +45,23 @@
                         <td class="text-nowrap">
                             {{friendly_date($row->effective_dateest)}}
                         </td>
+                        <td>
+                            @if(!$row->is_signed_by_ally)
+                            <div moe relative class="ml-auto">
+                                <form show url="/api/note/signAsAlly">
+                                    <input type="hidden" name="uid" value="{{ $row->uid }}">
+                                    <button submit class="bg-transparent border-0 p-0 text-primary">Ack.</button>
+                                </form>
+                            </div>
+                            @else
+                            <div moe relative class="ml-auto">
+                                <form show url="/api/note/undoSignAsAlly">
+                                    <input type="hidden" name="uid" value="{{ $row->uid }}">
+                                    <button submit class="bg-transparent border-0 p-0 text-primary">Ack.</button>
+                                </form>
+                            </div>    
+                            @endif
+                        </td>
                     </tr>
                     @endforeach
                 </tbody>

resources/views/app/dna/dashboard/encounters_pending_my_review_dashboard.blade.php

@@ -9,10 +9,14 @@
             <table class="table table-sm table-striped mb-0">
                 <thead class="bg-light">
                     <tr>
+                    <th class="border-0">Chart#</th>
                         <th class="border-0">Patient</th>
-                        <th class="border-0">Type</th>
-                        <th class="border-0">Value</th>
+                        <th class="border-0">DOB</th>
+                        <th class="border-0">Gender</th>
+                        <th class="border-0">Coverage</th>
+                        <th class="border-0">MCP</th>
                         <th class="border-0">Timestamp</th>
+                        <th class="border-0"></th>
                     </tr>
                 </thead>
                 <tbody>
@@ -41,6 +45,23 @@
                         <td class="text-nowrap">
                             {{friendly_date($row->effective_dateest)}}
                         </td>
+                        <td>
+                            @if($row->is_signed_by_ally)
+                            <div moe relative class="ml-auto">
+                                <form show url="/api/note/signAsAlly">
+                                    <input type="hidden" name="uid" value="{{ $row->uid }}">
+                                    <button submit class="bg-transparent border-0 p-0 text-primary">Ack.</button>
+                                </form>
+                            </div>
+                            @else
+                            <div moe relative class="ml-auto">
+                                <form show url="/api/note/undoSignAsAlly">
+                                    <input type="hidden" name="uid" value="{{ $row->uid }}">
+                                    <button submit class="bg-transparent border-0 p-0 text-primary">Ack.</button>
+                                </form>
+                            </div>                            
+                            @endif
+                        </td>
                     </tr>
                     @endforeach
                 </tbody>

resources/views/app/dna/dashboard/patients_without_appointment.blade.php

@@ -9,10 +9,12 @@
                 <table class="table table-sm table-striped mb-0">
                     <thead class="bg-light">
                         <tr>
+                            <th class="border-0">Chart #</th>
                             <th class="border-0">Patient</th>
-                            <th class="border-0">Type</th>
-                            <th class="border-0">Value</th>
-                            <th class="border-0" colspan="4">Timestamp</th>
+                            <th class="border-0">DOB</th>
+                            <th class="border-0">Gender</th>
+                            <th class="border-0">Insurance</th>
+                            <th class="border-0">MCP</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -38,9 +40,6 @@
                             <td class="text-nowrap">
                                 {{$row->mcp->name_display ?? '' }}
                             </td>
-                            <td class="text-nowrap">
-                                {{friendly_date($row->most_recent_completed_mcp_note_date)}}
-                            </td>
                         </tr>
                         @endforeach
                     </tbody>

resources/views/app/dna/dashboard/reports_pending_ack.blade.php

@@ -12,6 +12,7 @@
                         <th class="border-0">Category</th>
                         <th class="border-0">Report Date</th>
                         <th class="border-0">Sign</th>
+                        <th class="border-0"></th>
                     </tr>
                 </thead>
                 <tbody>
@@ -41,6 +42,16 @@
                             @endif
                             @endif
                         </td>
+                        <td>
+                            @if(!$report->has_na_pro_signed)
+                            <div moe relative class="ml-auto">
+                                <form show url="/api/incomingReport/signAsNa">
+                                    <input type="hidden" name="uid" value="{{ $report->uid }}">
+                                    <button submit class="bg-transparent border-0 p-0 text-primary">Ack.</button>
+                                </form>
+                            </div>
+                            @endif
+                        </td>
                     </tr>
                     @endforeach
 

resources/views/app/dna/dashboard/supply_orders_pending_my_ack.blade.php

@@ -1,5 +1,5 @@
-@php 
-    $supplyOrdersPendingMyAck = $performer->pro->supplyOrdersPendingMyAckRecordsAsDna();
+@php
+$supplyOrdersPendingMyAck = $performer->pro->supplyOrdersPendingMyAckRecordsAsDna();
 @endphp
 <div class="p-3" id="patients-list">
     <div class="card">
@@ -13,6 +13,7 @@
                         <th class="border-0">Reason</th>
                         <th class="border-0">Is Cancelled</th>
                         <th class="border-0">Shipment</th>
+                        <th class="border-0"></th>
                     </tr>
                 </thead>
                 <tbody>
@@ -39,6 +40,16 @@
                             </span>
                             @endif
                         </td>
+                        <td>
+                            @if(!$supplyOrder->has_na_pro_signed)
+                            <div moe relative class="ml-auto">
+                                <form show url="/api/supplyOrder/signAsNa">
+                                    <input type="hidden" name="uid" value="{{ $supplyOrder->uid }}">
+                                    <button submit class="bg-transparent border-0 p-0 text-primary">Ack.</button>
+                                </form>
+                            </div>
+                            @endif
+                        </td>
                     </tr>
                     @endforeach
 
@@ -51,9 +62,9 @@
 
             </table>
             @if($supplyOrdersPendingMyAck->hasPages())
-                <div class="ml-2 mt-2">
-                    {{ $supplyOrdersPendingMyAck->appends(request()->input())->links() }}
-                </div>
+            <div class="ml-2 mt-2">
+                {{ $supplyOrdersPendingMyAck->appends(request()->input())->links() }}
+            </div>
             @endif
         </div>
     </div>

resources/views/app/dna/encounters.blade.php

@@ -24,7 +24,7 @@
                         <th class="border-0">Age</th>
                         <th class="border-0">Sex</th>
                         <th class="border-0">Insurance</th>
-                        <th class="border-0">MCP</th>
+                        <th class="border-0">HCP</th>
                         <th class="border-0">Visit Date</th>
                     </tr>
                 </thead>
@@ -60,7 +60,7 @@
                                 @endif
                             </div>
                         </td>
-                        <td>{{ $note->client->mcp->displayName() }}</td>
+                        <td>{{ $note->hcpPro ? $note->hcpPro->displayName() : '' }}</td>
                         <td class="px-2">
                             <a href="/patients/view/{{ $note->client->uid }}/notes/view/{{ $note->uid }}" class="font-weight-bold">
                                 {{ friendly_date_time($note->effective_dateest, false) }}

resources/views/app/dna/patients-table.blade.php

@@ -1,3 +1,4 @@
+<div class="table-responsive">
 <table class="table table-sm table-striped p-0 m-0">
 	<thead class="bg-light border-top">
 		<tr>
@@ -55,7 +56,16 @@
 			</td>
 			<td>
 				<div class="d-flex flex-column">
-					<span>{{ $patient->mcp ? $patient->mcp->displayName() :'' }}</span>					
+					<span>{{ $patient->mcp ? $patient->mcp->displayName() :'' }}</span>	
+					<span>Status: 
+						@if($patient->has_mcp_done_onboarding_visit === 'YES')
+						<i class="fas fa-check-circle text-success" data-toggle="tooltip" data-placement="bottom" title="YES"></i>
+						@elseif($patient->has_mcp_done_onboarding_visit === 'NO')
+						<i class="fas fa-times-circle text-danger" data-toggle="tooltip" data-placement="bottom" title="NO"></i>
+						@elseif($patient->has_mcp_done_onboarding_visit === 'UNKNOWN')
+							<i class="fas fa-question-circle text-secondary" data-toggle="tooltip" data-placement="bottom" title="UNKNOWN"></i>
+						@endif
+					</span>				
 					@if($patient->mostRecentCompletedMcpNote)
 						<span>Last Encounter:  
 						<a href="/patients/view/{{ $patient->mostRecentCompletedMcpNote->client->uid }}/notes/view/{{ $patient->mostRecentCompletedMcpNote->uid }}" class="font-weight-bold">
@@ -66,7 +76,7 @@
 					@if($patient->next_mcp_appointment_date)
 						<span class="text-muted">Next Appt. <b>{{ friendly_date_time($patient->next_mcp_appointment_date) }}</b></span>
 					@endif
-					<?= $recentNote = $patient->mostRecentCompletedMcpNote; ?>
+					<?php $recentNote = $patient->mostRecentCompletedMcpNote; ?>
 					@if($recentNote)
 					<div>
 						Note: <a href="/patients/view/{{ $patient->uid }}/notes/view/{{ $recentNote->uid }}" class="font-weight-bold">
@@ -77,15 +87,44 @@
 				</div>
 			</td>
 			<td>
-			   <div class="d-flex flex-column">
-			   		<span>Enrolled: {{$patient->is_enrolled_in_rm ? 'Yes' : 'No'}}</span>
+			   <div class="">
+				   <div class="on-hover-show d-inline-block">
+					   <span>Enrolled:
+						   @if($patient->is_enrolled_in_rm === 'YES')
+							   <i class="fas fa-check-circle text-success" data-toggle="tooltip" data-placement="bottom" title="YES"></i>
+						   @elseif($patient->is_enrolled_in_rm === 'NO')
+							   <i
+									   class="fas fa-times-circle text-danger"
+									   tabindex="0"
+									   data-toggle="popover"
+									   title="No"
+									   data-target="#enrollment-{{ $patient->uid }}"
+							   ></i>
+						   @elseif($patient->is_enrolled_in_rm === 'UNKNOWN')
+							   <i
+									   tabindex="0"
+									   data-toggle="popover"
+									   title="Uknown"
+									   data-target="#enrollment-{{ $patient->uid }}"
+									   class="fas fa-question-circle text-secondary"
+									   popover
+							   ></i>
+						   @endif
+						</span>
+					   	<div id="enrollment-{{ $patient->uid }}" class="on-hover-content">
+						   	<h6 class="mt-2 font-weight-bold">{{ $patient->is_enrolled_in_rm }}</h6>
+							<span>Is Eligible for RM: {{ $patient->is_eligible_for_rm }}</span><br>
+							<span>Why not eligible: {{ $patient->why_not_eligible_for_rm_category ?? '---' }}</span><br>
+							<span>{{ $patient->why_not_eligible_for_rm_memo }}</span>
+						</div>
+				   </div>
 				<?php $m = $patient->lastMeasurementOfType('Wt. (lbs.)');?>
 				@if($m)
-				<span>Wt. (lbs.) {{$m && $m->value ? round($m->value, 2) : '-'}}</span>
+				<span class="d-block mt-1">Wt. (lbs.) {{$m && $m->value ? round($m->value, 2) : '-'}}</span>
 				@endif
 				<?php $bp = $patient->lastMeasurementOfType('BP'); ?>
 				@if($bp)
-				<span>BP. {{$bp && $bp->value ? $bp->value : '-'}}</span>
+				<span class="d-block mt-1">BP. {{$bp && $bp->value ? $bp->value : '-'}}</span>
 				@endif
 			   </div>
 			</td>
@@ -100,6 +139,7 @@
 	</tbody>
 
 </table>
+</div>
 <div class="p-3">
 	{{$patients->withQueryString()->links()}}
 </div>

resources/views/app/dna/patients.blade.php

@@ -19,5 +19,6 @@
         </div>
     </div>
 </div>
+
 @endsection
 

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

@@ -142,7 +142,7 @@ $genericBills = genericBills($pro, @$patient, @$entityType, @$entityUid);
                                         <p>Update Cancellation Memo</p>
                                         <div class="mb-2">
                                             <textarea class="text form-control form-control-sm" name="cancellationMemo"
-                                                      placeholder="">{{$bill->cancellation_memo ? $bill->cancellation_memo : 'Please contact billing.'}}</textarea>
+                                                      placeholder="">{{$bill->cancellation_memo ? $bill->cancellation_memo : ($pro->pro_type === 'ADMIN' ? 'Please contact billing.' : '')}}</textarea>
                                         </div>
                                         <div>
                                             <button class="btn btn-success btn-sm" submit>Submit</button>
@@ -158,7 +158,7 @@ $genericBills = genericBills($pro, @$patient, @$entityType, @$entityUid);
                                         <p class="mb-2">Cancel this bill?</p>
                                         <div class="mb-2">
                                             <label class="mb-1 text-secondary">Cancellation Memo</label>
-                                            <textarea type="text" name="memo" placeholder="Memo" class="form-control form-control-sm">Please contact billing.</textarea>
+                                            <textarea type="text" name="memo" placeholder="Memo" class="form-control form-control-sm">@if($pro->pro_type === 'ADMIN')Please contact billing.@endif</textarea>
                                         </div>
                                         <div class="mb-0">
                                             <button class="btn btn-danger btn-sm" submit>Yes</button>

resources/views/app/mcp/appointments.blade.php

@@ -15,37 +15,37 @@
             <div class="p-3">
                 @include('app.mcp.appointments_filters')
             </div>
-            <table class="table table-condensed p-0 m-0">
-                <thead class="bg-light">
+            <table class="table table-sm table-striped p-0 m-0">
+                <thead class="bg-light border-top">
                     <tr>
-                        <th class="px-3 border-0">Date & Time</th>
-                        <th class="px-3 border-0">Patient</th>
-                        <th class="px-3 border-0">Title</th>
-                        <th class="px-3 border-0">Description</th>
-                        <th class="px-3 border-0">Status</th>
-                        <th class="px-3 border-0">Confirmation</th>
+                        <th class="border-0">Date & Time</th>
+                        <th class="border-0">Patient</th>
+                        <th class="border-0">Title</th>
+                        <th class="border-0">Description</th>
+                        <th class="border-0">Status</th>
+                        <th class="border-0">Confirmation</th>
                     </tr>
                 </thead>
                 <tbody>
                     @foreach($appointments as $appointment)
                     <tr>
-                        <td class="px-2">
-                            <a href="/patients/view/{{$appointment->client->uid}}/calendar/{{$appointment->uid}}" class="font-weight-bold text-nowrap">
+                        <td>
+                            <a href="/patients/view/{{$appointment->client->uid}}/calendar/{{$appointment->uid}}">
                                 {{friendlier_date_time($appointment->raw_date . ' ' . $appointment->raw_start_time)}}
                             </a>
                         </td>
-                        <td class="px-2">{{ $appointment->client->displayName() }}</pre>
+                        <td>{{ $appointment->client->displayName() }}</pre>
                         </td>
-                        <td class="px-2">{{ $appointment->title }}</td>
-                        <td class="px-2">{{ $appointment->description }}</td>
-                        <td class="px-2">
+                        <td>{{ $appointment->title }}</td>
+                        <td>{{ $appointment->description }}</td>
+                        <td>
                             {{ $appointment->status }}
                             @if($appointment->status_memo)
                             <hr>
                             {{$appointment->status_memo}}
                             @endif
                         </td>
-                        <td class="px-2">
+                        <td>
                             @include('app.patient.partials.appointment-confirmation',['patient' => $appointment->client])
                         </td>
                     </tr>
@@ -57,11 +57,12 @@
                     </tr>
                     @endif
                 </tbody>
-
             </table>
+            @if($appointments->hasPages())
             <div class="ml-2 mt-2">
                 {{ $appointments->appends(request()->input())->links() }}
             </div>
+            @endif
         </div>
     </div>
 </div>

resources/views/app/mcp/bills.blade.php

@@ -4,7 +4,7 @@
 <div class="p-3 mcp-theme-1" id="patients-list">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center">
+        <div class="card-header px-2 py-1 d-flex align-items-center">
             <strong class="mr-4">
                 <i class="fas fa-file-invoice-dollar"></i>
                 Bills
@@ -15,14 +15,14 @@
             <div class="p-3">
                 @include('app.mcp.bills_filters')
             </div>
-            <table class="table table-condensed p-0 m-0">
+            <table class="table table-sm table-striped border-top p-0 m-0">
                 <thead class="bg-light">
                     <tr>
-                        <th class="px-3 border-0">Date</th>
-                        <th class="px-3 border-0">Patient</th>
-                        <th class="px-3 border-0">Service</th>
-                        <th class="px-3 border-0">Amount</th>
-                        <th class="px-3 border-0">Is Cancelled</th>
+                        <th class="border-0">Date</th>
+                        <th class="border-0">Patient</th>
+                        <th class="border-0">Service</th>
+                        <th class="border-0">Amount</th>
+                        <th class="border-0">Is Cancelled</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -48,10 +48,12 @@
                 </tbody>
 
             </table>
-            <div class="ml-2 mt-2">
-                {{ $bills->appends(request()->input())->links() }}
-            </div>
+
         </div>
     </div>
+    <div class="mt-3">
+        {{ $bills->appends(request()->input())->links() }}
+    </div>
+
 </div>
 @endsection

resources/views/app/mcp/bills_pending_signature.blade.php

@@ -0,0 +1,42 @@
+<div class="p-3 mcp-theme-1">
+    <div class="card border-top-0">
+
+        <div class="card-header px-2 py-1 hide-inside-popup border-bottom-0">
+            <strong class="mr-4">
+                <i class="fas fa-sticky-note"></i>
+                Bills Pending Signature
+            </strong>
+        </div>
+
+        <div class="card-body p-0 border-top-0 pb-0">
+            <table class="table table-sm table-striped mb-0">
+                <thead class="bg-light">
+                <tr>
+                    <th class="border-0">Date</th>
+                    <th class="border-0">Patient</th>
+                    <th class="border-0">Service</th>
+                    <th class="border-0">Context</th>
+                    <th class="border-0">Minutes</th>
+                    <th class="border-0">Amount</th>
+                </tr>
+                </thead>
+                <tbody>
+                @foreach($records as $row)
+                    <tr>
+                        <td>{{ friendly_date_time($row->effective_date, false) }}</td>
+                        <td>
+                            <a target="_blank" native href="{{route('patients.view.dashboard', $row->client)}}">
+                                {{$row->client->displayName()}}
+                            </a>
+                        </td>
+                        <td>{{ $row->code }}</td>
+                        <td>{{ $row->generic_target_entity_type ?: '-' }}</td>
+                        <td>{{ round(floor($row->number_of_units * 60)) }} m</td>
+                        <td>{{ $row->hcp_expected_payment_amount ? '$'.$row->hcp_expected_payment_amount : '' }}</td>
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div>

resources/views/app/mcp/cancelled_appointments_pending_review.blade.php

@@ -4,7 +4,7 @@
     <div class="p-3 mcp-theme-1" id="patients-list">
         <div class="card">
 
-            <div class="card-header px-3 py-2 hide-inside-popup">
+            <div class="card-header px-2 py-1 hide-inside-popup">
                 <strong class="mr-4">
                     <i class="fas fa-calendar-alt"></i>
                     Cancelled Appointments Pending Review

resources/views/app/mcp/cancelled_bills_pending_review.blade.php

@@ -1,7 +1,7 @@
 <div class="p-3 mcp-theme-1">
     <div class="card">
 
-        <div class="card-header px-3 py-2 hide-inside-popup border-bottom-0">
+        <div class="card-header px-2 py-1 hide-inside-popup border-bottom-0">
             <strong class="mr-4">
                 <i class="fas fa-file-invoice-dollar"></i>
                 Cancelled Bills Pending Review
@@ -12,13 +12,13 @@
 
 
             <table class="table table-sm table-striped mb-0">
-                <thead>
+                <thead class="bg-light">
                 <tr>
-                    <th class="border-bottom-0">Date</th>
-                    <th class="border-bottom-0">Patient</th>
-                    <th class="border-bottom-0">Service</th>
-                    <th class="border-bottom-0">Amount</th>
-                    <th class="border-bottom-0">Status</th>
+                    <th class="border-0">Date</th>
+                    <th class="border-0">Patient</th>
+                    <th class="border-0">Service</th>
+                    <th class="border-0">Amount</th>
+                    <th class="border-0">Status</th>
                 </tr>
                 </thead>
                 <tbody>

resources/views/app/mcp/cancelled_supply_orders_pending_review.blade.php

@@ -1,7 +1,7 @@
 <div class="p-3 mcp-theme-1">
     <div class="card">
 
-        <div class="card-header px-3 py-2 hide-inside-popup border-bottom-0">
+        <div class="card-header px-2 py-1 hide-inside-popup border-bottom-0">
             <strong class="mr-4">
                 <i class="fas fa-box"></i>
                 Cancelled Supply Orders
@@ -9,34 +9,34 @@
         </div>
 
         <div class="card-body p-0 border-top-0 pb-0">
-
-
-            <table class="table table-sm table-striped mb-0">
-                <thead>
-                <tr>
-                    <th class="border-bottom-0">Date</th>
-                    <th class="border-bottom-0">Patient</th>
-                    <th class="border-bottom-0">Product</th>
-                    <th class="border-bottom-0">Reason</th>
-                    <th class="border-bottom-0">Status</th>
-                </tr>
-                </thead>
-                <tbody>
-                @foreach($records as $row)
-                    <tr>
-                        <td>{{ friendly_date_time($row->created_at, false) }}</td>
-                        <td>
-                            <a target="_blank" native href="{{route('patients.view.dashboard', $row->client)}}">
-                                {{$row->client->displayName()}}
-                            </a>
-                        </td>
-                        <td>{{ $row->product->title }}</td>
-                        <td>{{ $row->reason ?: '-' }}</td>
-                        <td>Cancelled</td>
-                    </tr>
-                @endforeach
-                </tbody>
-            </table>
+            <div class="table-responsive">
+                <table class="table table-sm table-striped mb-0">
+                    <thead class="bg-light">
+                        <tr>
+                            <th class="border-0">Date</th>
+                            <th class="border-0">Patient</th>
+                            <th class="border-0">Product</th>
+                            <th class="border-0">Reason</th>
+                            <th class="border-0">Status</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach($records as $row)
+                        <tr>
+                            <td>{{ friendly_date_time($row->created_at, false) }}</td>
+                            <td class="text-nowrap">
+                                <a target="_blank" native href="{{route('patients.view.dashboard', $row->client)}}">
+                                    {{$row->client->displayName()}}
+                                </a>
+                            </td>
+                            <td class="text-nowrap">{{ $row->product->title }}</td>
+                            <td>{{ $row->reason ?: '-' }}</td>
+                            <td>Cancelled</td>
+                        </tr>
+                        @endforeach
+                    </tbody>
+                </table>
+            </div>
         </div>
     </div>
-</div>
+</div>

resources/views/app/mcp/client_messages.blade.php

@@ -4,7 +4,7 @@
 <div class="p-3 mcp-theme-1" id="patients-list">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center">
+        <div class="card-header px-2 py-1 d-flex align-items-center">
             <strong class="mr-4">
                 <i class="far fa-comments"></i>
                 Client Messages
@@ -15,16 +15,16 @@
             <div class="p-3">
                 @include('app.mcp.client_messages_filters')
             </div>
-            <table class="table table-condensed p-0 m-0">
+            <table class="table table-sm table-striped border-top p-0 m-0">
                 <thead class="bg-light">
                     <tr>
-                        <th class="px-3 border-0">Date</th>
-                        <th class="px-3 border-0">Folder</th>
-                        <th class="px-3 border-0">To</th>
-                        <th class="px-3 border-0">From</th>
-                        <th class="px-3 border-0">Client</th>
-                        <th class="px-3 border-0">Message</th>
-                        <th class="px-3 border-0">Status</th>
+                        <th class="border-0">Date</th>
+                        <th class="border-0">Folder</th>
+                        <th class="border-0">To</th>
+                        <th class="border-0">From</th>
+                        <th class="border-0">Client</th>
+                        <th class="border-0">Message</th>
+                        <th class="border-0">Status</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -35,7 +35,7 @@
                         <td>{{$clientMessage->to_number}}</td>
                         <td>{{$clientMessage->from_number}}</td>
                         <td>{{ $clientMessage->client->displayName() }}</td>
-                        <td style="width:300px;"><?= nl2br($clientMessage->body) ?></td>                        
+                        <td style="width:300px;"><?= nl2br($clientMessage->body) ?></td>
                         <td>{{ $clientMessage->sms_status }} </td>
                     </tr>
                     @endforeach
@@ -48,10 +48,11 @@
                 </tbody>
 
             </table>
-            <div class="ml-2 mt-2">
-                {{ $clientMessages->appends(request()->input())->links() }}
-            </div>
+
         </div>
     </div>
+    <div class="mt-3">
+        {{ $clientMessages->appends(request()->input())->links() }}
+    </div>
 </div>
-@endsection
+@endsection

resources/views/app/mcp/clients_bdt_devices.blade.php

@@ -4,7 +4,7 @@
 <div class="p-3 mcp-theme-1" id="patients-list">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center">
+        <div class="card-header px-2 py-1 d-flex align-items-center">
             <strong class="mr-4">
                 <i class="fas fa-weight"></i>
                 Clients BDT Devices
@@ -15,21 +15,21 @@
             <div class="p-3">
                 @include('app.mcp.clients_bdt_devices_filters')
             </div>
-            <table class="table table-condensed p-0 m-0">
+            <table class="table table-sm table-striped border-top p-0 m-0">
                 <thead class="bg-light">
                     <tr>
-                        <th class="px-3 border-0">IMEI</th>
-                        <th class="px-3 border-0">Client</th>
-                        <th class="px-3 border-0">Created</th>
-                        <th class="px-3 border-0">Category</th>
-                        <th class="px-3 border-0">Last Measurement</th>
-                        <th class="px-3 border-0">Status</th>
+                        <th class="border-0">IMEI</th>
+                        <th class="border-0">Client</th>
+                        <th class="border-0">Created</th>
+                        <th class="border-0">Category</th>
+                        <th class="border-0">Last Measurement</th>
+                        <th class="border-0">Status</th>
                     </tr>
                 </thead>
                 <tbody>
                     @foreach($devices as $device)
                     <tr>
-                        <td class="px-2">
+                        <td>
                             <pre class="m-0">{{ $device->device->imei }}</pre>
                         </td>
                         <td>
@@ -37,9 +37,9 @@
                                 {{$device->client->displayName()}}
                             </a>
                         </td>
-                        <td class="px-2 text-nowrap">{{ friendly_date_time($device->device->created_at) }}</td>
-                        <td class="px-2">{{ $device->device->category }}</td>
-                        <td class="px-2 d-flex align-items-center">
+                        <td class="text-nowrap">{{ friendly_date_time($device->device->created_at) }}</td>
+                        <td>{{ $device->device->category }}</td>
+                        <td class="d-flex align-items-center">
                             <?php $lastMeasurement = $device->lastDeviceMeasurement(); ?>
                             @if($lastMeasurement)
                             @if($lastMeasurement->is_cellular_zero)
@@ -60,9 +60,9 @@
                         </td>
                         <td>
                             @if($device->is_active)
-                                <span class="text-success">Active</span>
+                            <span class="text-success">Active</span>
                             @else
-                                <span class="text-danger">Deactivated</span>
+                            <span class="text-danger">Deactivated</span>
                             @endif
                         </td>
                     </tr>
@@ -76,10 +76,11 @@
                 </tbody>
 
             </table>
-            <div class="ml-2 mt-2">
-                {{ $devices->appends(request()->input())->links() }}
-            </div>
+
         </div>
     </div>
+    <div class="mt-3">
+        {{ $devices->appends(request()->input())->links() }}
+    </div>
 </div>
 @endsection

resources/views/app/mcp/dashboard/appointments-list.blade.php

@@ -1,4 +1,4 @@
-<div class="card">
+<div class="card overflow-hidden">
     <div class="card-header pl-2">
         <div class="font-weight-bold">
             @if(@$from)
@@ -8,9 +8,9 @@
             @endif
         </div>
     </div>
-    <div class="card-body p-0">
+    <div class="card-body p-0 max-height-200px overflow-auto">
         @if(@$appointments && count($appointments))
-            <table class="mb-0 table table-sm appointments border-top-0">
+            <table class="mb-0 table table-sm table-striped appointments border-top-0">
                 @foreach($appointments as $appointment)
                     <tr class="{{$appointment->bgColor}}">
                         <td>

resources/views/app/mcp/erx_and_orders.blade.php

@@ -4,7 +4,7 @@
 <div class="p-3 mcp-theme-1" id="patients-list">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center">
+        <div class="card-header px-2 py-1 d-flex align-items-center">
             <strong class="mr-4">
                 <i class="fas fa-file-prescription"></i>
                 ERx & Orders
@@ -15,14 +15,14 @@
             <div class="p-3">
                 @include('app.mcp.erx_and_orders_filters')
             </div>
-            <table class="table table-condensed p-0 m-0">
+            <table class="table table-sm table-striped border-top p-0 m-0">
                 <thead class="bg-light">
                     <tr>
-                        <th class="px-3 border-0">Date</th>
-                        <th class="px-3 border-0">Patient</th>
-                        <th class="border-bottom-0">Category</th>
-                        <th class="px-3 border-0">Content</th>
-                        <th class="px-3 border-0">Status</th>
+                        <th class="border-0">Date</th>
+                        <th class="border-0">Patient</th>
+                        <th class="border-0">Category</th>
+                        <th class="border-0">Content</th>
+                        <th class="border-0">Status</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -38,33 +38,33 @@
                         <td>
                             <?php $parsed = @$row->clinical_detail_json ? json_decode($row->clinical_detail_json) : false; ?>
                             @if($row->erx_category === 'DRUG')
-                                <?php
-                                $drugs = ($parsed && @$parsed->items) ? $parsed->items : [];
-                                ?>
-                                @foreach($drugs as $drug)
-                                    <div class="d-flex align-items-baseline mb-1">
-                                        <b class="mr-2">{{$drug->medication ?? '-'}}</b>
-                                        <span class="text-secondary mr-1">{{$drug->frequency ?? ''}}</span>
-                                    </div>
-                                @endforeach
+                            <?php
+                            $drugs = ($parsed && @$parsed->items) ? $parsed->items : [];
+                            ?>
+                            @foreach($drugs as $drug)
+                            <div class="d-flex align-items-baseline mb-1">
+                                <b class="mr-2">{{$drug->medication ?? '-'}}</b>
+                                <span class="text-secondary mr-1">{{$drug->frequency ?? ''}}</span>
+                            </div>
+                            @endforeach
                             @elseif($row->erx_category === 'LAB' || $row->erx_category === 'IMAGING')
-                                <?php
-                                $tests = ($parsed && @$parsed->tests) ? $parsed->tests : [];
-                                ?>
-                                @foreach($tests as $test)
-                                    <div class="d-flex align-items-baseline mb-1">
-                                        <b class="mr-2">{{$test ?? '-'}}</b>
-                                    </div>
-                                @endforeach
+                            <?php
+                            $tests = ($parsed && @$parsed->tests) ? $parsed->tests : [];
+                            ?>
+                            @foreach($tests as $test)
+                            <div class="d-flex align-items-baseline mb-1">
+                                <b class="mr-2">{{$test ?? '-'}}</b>
+                            </div>
+                            @endforeach
                             @elseif($row->erx_category === 'REFERRAL')
-                                <b class="mr-2">{{@$parsed->to ?? '-'}}</b>
-                                <span class="text-secondary mr-1">{{@$parsed->memo ?? '-'}}</span>
+                            <b class="mr-2">{{@$parsed->to ?? '-'}}</b>
+                            <span class="text-secondary mr-1">{{@$parsed->memo ?? '-'}}</span>
                             @elseif($row->erx_category === 'SUPPLY')
-                                <b class="mr-2">{{@$parsed->item ?? '-'}}</b>
-                                <span class="text-secondary mr-1">{{@$parsed->quantity ?? '-'}}</span>
+                            <b class="mr-2">{{@$parsed->item ?? '-'}}</b>
+                            <span class="text-secondary mr-1">{{@$parsed->quantity ?? '-'}}</span>
                             @elseif($row->erx_category === 'OTHER')
-                                <b class="mr-2">{{@$parsed->title ?? '-'}}</b>
-                                <span class="text-secondary mr-1">{{@$parsed->memo ?? '-'}}</span>
+                            <b class="mr-2">{{@$parsed->title ?? '-'}}</b>
+                            <span class="text-secondary mr-1">{{@$parsed->memo ?? '-'}}</span>
                             @endif
                         </td>
                         <td>{{ $row->pro_declared_status ?: '-' }}</td>
@@ -79,10 +79,11 @@
                 </tbody>
 
             </table>
-            <div class="ml-2 mt-2">
-                {{ $erxAndOrders->appends(request()->input())->links() }}
-            </div>
+
         </div>
     </div>
+    <div class="mt-3">
+        {{ $erxAndOrders->appends(request()->input())->links() }}
+    </div>
 </div>
 @endsection

resources/views/app/mcp/erx_and_orders_pending_signature.blade.php

@@ -1,7 +1,7 @@
 <div class="p-3 mcp-theme-1">
     <div class="card">
 
-        <div class="card-header px-3 py-2 hide-inside-popup border-bottom-0">
+        <div class="card-header px-2 py-1 hide-inside-popup border-bottom-0">
             <strong class="mr-4">
                 <i class="fas fa-box"></i>
                 ERx & Orders Pending Signature
@@ -12,13 +12,13 @@
 
 
             <table class="table table-sm table-striped mb-0">
-                <thead>
+                <thead class="bg-light">
                 <tr>
-                    <th class="border-bottom-0">Date</th>
-                    <th class="border-bottom-0">Patient</th>
-                    <th class="border-bottom-0">Category</th>
-                    <th class="border-bottom-0">Content</th>
-                    <th class="border-bottom-0">Status</th>
+                    <th class="border-0">Date</th>
+                    <th class="border-0">Patient</th>
+                    <th class="border-0">Category</th>
+                    <th class="border-0">Content</th>
+                    <th class="border-0">Status</th>
                 </tr>
                 </thead>
                 <tbody>

resources/views/app/mcp/memos.blade.php

@@ -4,7 +4,7 @@
 <div class="p-3 mcp-theme-1" id="patients-list">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center">
+        <div class="card-header px-2 py-1 d-flex align-items-center">
             <strong class="mr-4">
                 <i class="fas fa-notes-medical"></i>
                 Memos
@@ -15,30 +15,30 @@
             <div class="p-3">
                 @include('app.mcp.memos_filters')
             </div>
-            <table class="table table-condensed p-0 m-0">
+            <table class="table table-sm table-striped border-top p-0 m-0">
                 <thead class="bg-light">
                     <tr>
-                        <th class="px-3 border-0">Category</th>
-                        <th class="px-3 border-0">Patient</th>
-                        <th class="px-3 border-0 w-25">Summary</th>
-                        <th class="px-3 border-0">Created</th>
-                        <th class="px-3 border-0 delete-column">&nbsp;</th>
+                        <th class="border-0">Category</th>
+                        <th class="border-0">Patient</th>
+                        <th class="border-0 w-25">Summary</th>
+                        <th class="border-0">Created</th>
+                        <th class="border-0 delete-column">&nbsp;</th>
                     </tr>
                 </thead>
                 <tbody>
                     @foreach($memos as $memo)
                     <tr>
-                        <td class="px-2">{{ $memo->category }}</td>
+                        <td>{{ $memo->category }}</td>
                         <td>
                             <a target="_blank" native href="{{route('patients.view.dashboard', $memo->client)}}">
                                 {{$memo->client->displayName()}}
                             </a>
                         </td>
-                        <td class="px-2">
+                        <td>
                             <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>{{ 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>
@@ -80,16 +80,18 @@
 
                     @if(count($memos) === 0)
                     <tr>
-                        <td colspan="4">No records found!</td>
+                        <td colspan="5">No records found!</td>
                     </tr>
                     @endif
                 </tbody>
 
             </table>
-            <div class="ml-2 mt-2">
-                {{ $memos->appends(request()->input())->links() }}
-            </div>
+
         </div>
     </div>
+    <div class="mt-3">
+        {{ $memos->appends(request()->input())->links() }}
+    </div>
+
 </div>
 @endsection

resources/views/app/mcp/new_patients_awaiting_visit.blade.php

@@ -12,38 +12,38 @@
             </div>
 
             <div class="card-body p-0 pb-0">
-                <table class="table table-sm table-striped mb-0">
-                    <thead>
+                <table class="table table-sm table-striped border-top mb-0">
+                    <thead class="bg-light">
                     <tr>
-                        <th class="border-bottom-0"> #</th>
-                        <th class="border-bottom-0">Name</th>
-                        <th class="border-bottom-0">DOB</th>
-                        <th class="border-bottom-0">Gender</th>
-                        <th class="border-bottom-0">BMI</th>
-                        <th class="border-bottom-0">Insurance</th>
-                        <th class="border-bottom-0">Last Visit</th>
-                        <th class="border-bottom-0">Next Appt.</th>
-                        <th class="border-bottom-0">Status</th>
-                        <th class="border-bottom-0">CCM</th>
-                        <th class="border-bottom-0">RPM</th>
-                        <th class="border-bottom-0 d-none">Last Weight-In</th>
-                        <th class="border-bottom-0 d-none">Last BP</th>
-                        <th class="border-bottom-0">Assigned On</th>
+                        <th class="border-0"> #</th>
+                        <th class="border-0">Name</th>
+                        <th class="border-0">DOB</th>
+                        <th class="border-0">Gender</th>
+                        <th class="border-0">BMI</th>
+                        <th class="border-0">Insurance</th>
+                        <th class="border-0">Last Visit</th>
+                        <th class="border-0">Next Appt.</th>
+                        <th class="border-0">Status</th>
+                        <th class="border-0">CCM</th>
+                        <th class="border-0">RPM</th>
+                        <th class="border-0 d-none">Last Weight-In</th>
+                        <th class="border-0 d-none">Last BP</th>
+                        <th class="border-0">Assigned On</th>
                     </tr>
                     </thead>
                     <tbody>
                     @foreach($records as $row)
                         <tr>
-                            <td class="border-bottom-0">
+                            <td>
                                 <a target="_blank" native href="{{route('patients.view.dashboard', $row)}}">
                                     {{$row->chart_number}}
                                 </a>
                             </td>
-                            <td class="border-bottom-0">{{implode(' ', [$row->name_first, $row->name_last])}}</td>
-                            <td class="border-bottom-0">{{$row->dob}}</td>
-                            <td class="border-bottom-0">{{$row->sex}}</td>
-                            <td class="border-bottom-0">{{$row->usual_bmi}}</td>
-                            <td class="border-bottom-0">
+                            <td>{{implode(' ', [$row->name_first, $row->name_last])}}</td>
+                            <td>{{$row->dob}}</td>
+                            <td>{{$row->sex}}</td>
+                            <td>{{$row->usual_bmi}}</td>
+                            <td>
                                 <?php $coverageStatus = $row->getPrimaryCoverageStatus(); ?>
                                 <div class="text-nowrap">
                                 @if($coverageStatus === 'YES')
@@ -59,20 +59,20 @@
                                 @endif
                               </div>
                             </td>
-                            <td class="border-bottom-0">{{$row->lastMcpAppointment() ? $row->lastMcpAppointment()->start_date : '-'}}</td>
-                            <td class="border-bottom-0">{{$row->nextMcpAppointment() ? $row->nextMcpAppointment()->start_date : '-'}}</td>
-                            <td class="border-bottom-0">{{$row->nextMcpAppointment() ? $row->nextMcpAppointment()->status : '-'}}</td>
-                            <td class="border-bottom-0">{{$row->is_enrolled_in_cm ? 'Yes' : 'No'}}</td>
-                            <td class="border-bottom-0">{{$row->is_enrolled_in_rm ? 'Yes' : 'No'}}</td>
-                            <td class="border-bottom-0 d-none">
+                            <td>{{$row->lastMcpAppointment() ? @$row->lastMcpAppointment()->start_date : '-'}}</td>
+                            <td>{{$row->nextMcpAppointment() ? @$row->nextMcpAppointment()->start_date : '-'}}</td>
+                            <td>{{$row->nextMcpAppointment() ? @$row->nextMcpAppointment()->status : '-'}}</td>
+                            <td>{{$row->is_enrolled_in_cm ? 'Yes' : 'No'}}</td>
+                            <td>{{$row->is_enrolled_in_rm ? 'Yes' : 'No'}}</td>
+                            <td class="d-none">
                                 <?php $m = $row->lastMeasurementOfType('Wt. (lbs.)'); ?>
                                 {{$m && $m->value ? round($m->value, 2) : '-'}}
                             </td>
-                            <td class="border-bottom-0 d-none">
+                            <td class="d-none">
                                 <?php $m = $row->lastMeasurementOfType('BP'); ?>
                                 {{$m && $m->value ? $m->value : '-'}}
                             </td>
-                            <td class="border-bottom-0">{{$row->getMcpAssignedOn()}}</td>
+                            <td>{{$row->getMcpAssignedOn()}}</td>
                         </tr>
                     @endforeach
                     </tbody>

resources/views/app/mcp/notes.blade.php

@@ -4,7 +4,7 @@
 <div class="p-3 mcp-theme-1" id="patients-list">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center">
+        <div class="card-header px-2 py-1 d-flex align-items-center">
             <strong class="mr-4">
                 <i class="fas fa-notes-medical"></i>
                 Notes
@@ -15,23 +15,23 @@
             <div class="p-3">
                 @include('app.mcp.notes_filters')
             </div>
-            <table class="table table-condensed p-0 m-0">
+            <table class="table table-sm table-striped border-top p-0 m-0">
                 <thead class="bg-light">
                     <tr>
-                        <th class="px-3 border-0">Effective Date</th>
-                        <th class="px-3 border-0">Patient</th>
-                        <th class="px-3 border-0">New Patient / FU</th>
+                        <th class="border-0">Effective Date</th>
+                        <th class="border-0">Patient</th>
+                        <th class="border-0">New Patient / FU</th>
 
-                        <th class="px-3 border-0">HCP</th>
+                        <th class="border-0">HCP</th>
 
-                        <th class="px-3 border-0">HCP Signed</th>
-                        <th class="px-3 border-0">&nbsp;</th>
+                        <th class="border-0">HCP Signed</th>
+                        <th class="border-0">&nbsp;</th>
                     </tr>
                 </thead>
                 <tbody>
                     @foreach ($notes as $note)
                     <tr class="{{ $note->is_cancelled ? 'cancelled-item always-clickable' : '' }}">
-                        <td class="px-2">
+                        <td>
                             <a href="/patients/view/{{ $note->client->uid }}/notes/view/{{ $note->uid }}" class="font-weight-bold">
                                 {{ friendly_date_time($note->effective_dateest, false) }}
                             </a>
@@ -40,22 +40,22 @@
                             @endif
                             <span class="ml-1">{{ $note->is_cancelled ? '[cancelled]' : '' }}</span>
                         </td>
-                        <td class="px-2">
+                        <td>
                             {{ $note->client->displayName() }}
                         </td>
 
-                        <td class="px-2">
+                        <td>
                             {{ $note->new_or_fu_or_na === 'NEW' ? 'New Patient' : $note->new_or_fu_or_na }}
                         </td>
 
-                        <td class="px-2">
+                        <td>
                             {{$note->hcpPro ? $note->hcpPro->name_display: '-'}}
                         </td>
 
-                        <td class="px-2">
+                        <td>
                             {!! $note->hcpPro && $note->is_signed_by_hcp ? '<b class="text-success">Yes</b>' : 'No' !!}
                         </td>
-                        <td class="px-2">
+                        <td>
                             <div class="position-relative c-pointer text-center stag-tooltip">
                                 <i class="fa fa-info-circle"></i>
                                 <div class="position-absolute bg-white border rounded p-2 stag-tooltip-content">
@@ -75,10 +75,12 @@
                 </tbody>
 
             </table>
-            <div class="ml-2 mt-2">
-                {{ $notes->appends(request()->input())->links() }}
-            </div>
+
         </div>
     </div>
+    <div class="mt-3">
+        {{ $notes->appends(request()->input())->links() }}
+    </div>
+
 </div>
 @endsection

resources/views/app/mcp/notes_pending_billing.blade.php

@@ -1,33 +1,26 @@
 <div class="p-3 mcp-theme-1">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center border-bottom-0">
-            <strong class="mr-4">
-                <i class="fas fa-sticky-note"></i>
-                Notes Pending Billing
-            </strong>
-        </div>
-
         <div class="card-body border-top-0 p-0 pb-0">
             <table class="table table-sm table-striped mb-0">
-                <thead>
+                <thead class="bg-light">
                 <tr>
-                    <th class="border-bottom-0">Date</th>
-                    <th class="border-bottom-0">Patient</th>
-                    <th class="border-bottom-0">ICD</th>
-                    <th class="border-bottom-0">Status</th>
+                    <th class="border-0">Date</th>
+                    <th class="border-0">Patient</th>
+                    <th class="border-0">ICD</th>
+                    <th class="border-0">Status</th>
                 </tr>
                 </thead>
                 <tbody>
                 @foreach($records as $row)
                     <tr>
-                        <td class="border-bottom-0">
-                            <a native target="_blank" href="/patients/view/{{ $row->client->uid }}/notes/view/{{ $row->uid }}" class="font-weight-bold">
+                        <td>
+                            <a native target="_blank" href="/patients/view/{{ $row->client->uid }}/notes/view/{{ $row->uid }}">
                                 {{ friendlier_date($row->effective_dateest) }}
                             </a>
                         </td>
-                        <td class="border-bottom-0">{{$row->client->displayName()}}</td>
-                        <td class="border-bottom-0">
+                        <td>{{$row->client->displayName()}}</td>
+                        <td>
                             @foreach($row->reasons as $reason)
                                 <span class="pr-2">{{$reason->code}}</span>
                             @endforeach
@@ -35,7 +28,7 @@
                                 -
                             @endif
                         </td>
-                        <td class="border-bottom-0">
+                        <td>
                             {{$row->overallStatus()}}
                         </td>
                     </tr>

resources/views/app/mcp/notes_pending_signature.blade.php

@@ -1,7 +1,7 @@
 <div class="p-3 mcp-theme-1">
     <div class="card border-top-0">
 
-        <div class="card-header px-3 py-2 hide-inside-popup border-bottom-0">
+        <div class="card-header px-2 py-1 hide-inside-popup border-bottom-0">
             <strong class="mr-4">
                 <i class="fas fa-sticky-note"></i>
                 Notes Pending Signature
@@ -9,25 +9,25 @@
         </div>
 
         <div class="card-body p-0 border-top-0 pb-0">
-            <table class="table table-sm table-striped mb-0">
-                <thead>
+            <table class="table table-sm border-top table-striped mb-0">
+                <thead class="bg-light">
                 <tr>
-                    <th class="border-bottom-0">Date</th>
-                    <th class="border-bottom-0">Patient</th>
-                    <th class="border-bottom-0">ICD</th>
-                    <th class="border-bottom-0">Status</th>
+                    <th class="border-0">Date</th>
+                    <th class="border-0">Patient</th>
+                    <th class="border-0">ICD</th>
+                    <th class="border-0">Status</th>
                 </tr>
                 </thead>
                 <tbody>
                 @foreach($records as $row)
                     <tr>
-                        <td class="border-bottom-0">
-                            <a native target="_blank" href="/patients/view/{{ $row->client->uid }}/notes/view/{{ $row->uid }}" class="font-weight-bold">
+                        <td>
+                            <a native target="_blank" href="/patients/view/{{ $row->client->uid }}/notes/view/{{ $row->uid }}">
                                 {{ friendlier_date($row->effective_dateest) }}
                             </a>
                         </td>
-                        <td class="border-bottom-0">{{$row->client->displayName()}}</td>
-                        <td class="border-bottom-0">
+                        <td>{{$row->client->displayName()}}</td>
+                        <td>
                             @foreach($row->reasons as $reason)
                                 <span class="pr-2">{{$reason->code}}</span>
                             @endforeach
@@ -35,7 +35,7 @@
                                 -
                             @endif
                         </td>
-                        <td class="border-bottom-0">
+                        <td>
                             {{$row->overallStatus()}}
                         </td>
                     </tr>

resources/views/app/mcp/patients-accounts-invites.blade.php

@@ -5,48 +5,48 @@
 <div class="p-3 mcp-theme-1">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center">
+        <div class="card-header px-2 py-1 d-flex align-items-center">
             <strong class="mr-4">
                 <i class="fas fa-user"></i>
                 Accounts Invites ({{ $accountInvites->total() }})
             </strong>
         </div>
         <div class="card-body p-0">
-        <div class="p-3">
+            <div class="p-3">
                 @include('app.practice-management.patients-accounts-invites-filters')
             </div>
-            <table class="table table-sm table-condensed p-0 m-0">
+            <table class="table table-sm table-striped border-top p-0 m-0">
                 <thead class="bg-light">
                     <tr>
-                        <th class="px-2 text-secondary border-bottom-0">Created At</th>
-                        <th class="px-2 text-secondary border-bottom-0">Client</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">Status</th>
-                        <th class="px-2 text-secondary border-bottom-0">&nbsp;</th>
+                        <th class="border-0">Created At</th>
+                        <th class="border-0">Client</th>
+                        <th class="border-0">Name</th>
+                        <th class="border-0">Email</th>
+                        <th class="border-0">Cell Number</th>
+                        <th class="border-0">Status</th>
+                        <th class="border-0">&nbsp;</th>
                     </tr>
                 </thead>
                 <tbody>
                     @foreach($accountInvites as $accountInvite)
                     <tr>
-                        <td class="px-2">
+                        <td>
                             {{ friendlier_date_time($accountInvite->created_at) }}
                             @if($accountInvite->status === 'CANCELLED')
                             <span class="text-sm text-secondary">(CANCELLED)</span>
                             @endif
                         </td>
-                        <td class="px-2">{{ $accountInvite->client->displayName() }}</td>
-                        <td class="px-2">{{ $accountInvite->first_name }} {{ $accountInvite->last_name }}</pre>
+                        <td>{{ $accountInvite->client->displayName() }}</td>
+                        <td>{{ $accountInvite->first_name }} {{ $accountInvite->last_name }}</pre>
                         </td>
-                        <td class="px-2">{{ $accountInvite->to_email_address }}</td>
-                        <td class="px-2">{{ $accountInvite->cell_number }}</td>
-                        <td class="px-2">{{ $accountInvite->status }} <span class="text-sm text-secondary">(Updated: {{friendlier_date_time($accountInvite->status_updated_at)}})</span>
+                        <td>{{ $accountInvite->to_email_address }}</td>
+                        <td>{{ $accountInvite->cell_number }}</td>
+                        <td>{{ $accountInvite->status }} <span class="text-sm text-secondary">(Updated: {{friendlier_date_time($accountInvite->status_updated_at)}})</span>
                             @if($accountInvite->status_memo)
                             <div class="py-1 font-italic text-secondary text-sm">{{$accountInvite->status_memo}}</div>
                             @endif
                         </td>
-                        <td class="px-2">
+                        <td>
                             <div class="d-flex">
                                 @if($accountInvite->status === 'PENDING')
                                 <span moe class="ml-1" relative>
@@ -80,11 +80,12 @@
                     @endforeach
                 </tbody>
             </table>
-            <div class="ml-2 mt-2">
-                {{ $accountInvites->appends(request()->input())->links() }}
-            </div>
+
         </div>
     </div>
+    <div class="mt-3">
+        {{ $accountInvites->appends(request()->input())->links() }}
+    </div>
 </div>
 
 @endsection

resources/views/app/mcp/patients-table.blade.php

@@ -1,9 +1,11 @@
 <style>
-    td, th {
-        text-align: center !important;
-    }
+	td,
+	th {
+		text-align: center !important;
+	}
 </style>
 
+<<<<<<< HEAD
 <table class="table table-condensed p-0 m-0 table-sm table-bordered">
 	<thead class="bg-light">
 		<tr>
@@ -23,14 +25,38 @@
             <th class="px-3 border-0x d-none">BP/Pulse Timestamp</th>
             <th class="px-3 border-0x">Weight</th>
             <th class="px-3 border-0x d-none">Weight Timestamp</th>
+=======
+<div class="table-responsive">
+	<table class="table table-striped p-0 m-0 table-sm border-top text-nowrap">
+		<thead class="bg-light">
+			<tr>
+				<th class="border-0">#</th>
+				<th class="border-0">Name</th>
+				<th class="border-0">DOB</th>
+				<th class="border-0">Age</th>
+				<th class="border-0">Sex</th>
+				<th class="border-0">BMI</th>
+				<th class="border-0">Insurance</th>
+				<th class="border-0">Last Visit</th>
+				<th class="border-0">Next Appt.</th>
+				<th class="border-0">Status</th>
 
-{{--            <th>Scale <i class="fa fa-battery"></i></th>--}}
-            {{--			<th class="px-3 border-0x">RPM</th>--}}
-            {{--			<th class="px-3 border-0x">CCM</th>--}}
-{{--            <th class="px-3 border-0x d-none">Last Weight-In</th>--}}
-{{--            <th class="px-3 border-0x d-none">Last BP</th>--}}
-            <th class="px-3 border-0x">Assigned On</th>
+				<th class="border-0">BP</th>
+				<th class="border-0"> <i class="fa fa-heartbeat"></i> </th>
+				<th class="border-0">Pulse</th>
+				<th class="border-0">BP/Pulse Timestamp</th>
+				<th class="border-0">Weight</th>
+				<th class="border-0">Weight Timestamp</th>
+>>>>>>> 5728faa93ac349dab39f7b515e7970bf1f20b8f6
 
+				{{-- <th>Scale <i class="fa fa-battery"></i></th>--}}
+				{{-- <th class="border-0">RPM</th>--}}
+				{{-- <th class="border-0">CCM</th>--}}
+				{{-- <th class="border-0 d-none">Last Weight-In</th>--}}
+				{{-- <th class="border-0 d-none">Last BP</th>--}}
+				<th class="border-0">Assigned On</th>
+
+<<<<<<< HEAD
         @if($pro->pro_type == 'ADMIN')
                 <th class="px-3 border-0x">MCP</th>
             @endif
@@ -51,77 +77,108 @@
 			<td class="d-none text-nowrap">
 				<div class="d-none d-dflex flex-column">
 					@if($patient->usual_bmi_min && $patient->usual_bmi_max)
+=======
+				@if($pro->pro_type == 'ADMIN')
+				<th class="border-0">MCP</th>
+				@endif
+			</tr>
+		</thead>
+		<tbody>
+			@foreach($patients as $patient)
+			<tr>
+				<td>
+					<a native target="_blank" href="{{route('patients.view.dashboard', $patient)}}">
+						{{$patient->chart_number}}
+					</a>
+				</td>
+				<td>{{$patient->displayName()}}</td>
+				<td>{{ friendly_date_time($patient->dob, false) }}</td>
+				<td>{{ $patient->age_in_years ?  $patient->age_in_years : '-' }}</td>
+				<td>{{ $patient->sex }}</td>
+				<td>
+					<div class="d-none d-dflex flex-column">
+						@if($patient->usual_bmi_min && $patient->usual_bmi_max)
+>>>>>>> 5728faa93ac349dab39f7b515e7970bf1f20b8f6
 						<small class="text-muted">BMI (Usual): <b>{{ $patient->usual_bmi_min }}</b> {{ $patient->usual_bmi_min_category }} to <b>{{ $patient->usual_bmi_max }}</b> {{ $patient->usual_bmi_max_category }}</small>
-					@endif
-					@if($patient->ideal_bmi)
+						@endif
+						@if($patient->ideal_bmi)
 						<small class="text-muted">BMI (Ideal) <b>{{ $patient->ideal_bmi }}</b> {{ $patient->ideal_bmi_category }}</small>
-					@endif
-				</div>
-			</td>
-			<td class="text-nowrap">
-				<?php $coverageStatus = $patient->getPrimaryCoverageStatus(); ?>
-				<div class="text-nowrap">
-					@if($coverageStatus === 'YES')
-							 <i class="fa fa-check-circle text-success" data-toggle="tooltip" data-placement="bottom" title="Covered"></i>
-					@elseif($coverageStatus === 'NO')
-							<i class="fa fa-times text-danger" data-toggle="tooltip" data-placement="bottom" title="Not Covered"></i>
-					@else
-							<i class="fa fa-exclamation-triangle text-warning-mellow" data-toggle="tooltip" data-placement="bottom" title="Unknown"></i>
-					@endif
+						@endif
+					</div>
+				</td>
+				<td>
 					<?php $coverage = $patient->getPrimaryCoverage(); ?>
-					@if($coverage)
-					{{$coverage->insuranceDisplayName()}}
-					@endif
-				</div>
-			</td>
-			<td class="text-nowrap">
-                {{ friendly_date($patient->most_recent_completed_mcp_note_date) }}
-{{--                {{$patient->lastMcpAppointment ? friendly_date_time($patient->lastMcpAppointment->raw_date.' '.$patient->lastMcpAppointment->raw_start_time) : '-'}}--}}
-            </td>
-			<td class="text-nowrap">{{$patient->nextMcpAppointment ? friendly_date_time($patient->nextMcpAppointment->raw_date.' '.$patient->nextMcpAppointment->raw_start_time) : '-'}}</td>
-			<td class="text-nowrap">{{$patient->nextMcpAppointment ? $patient->nextMcpAppointment->status : '-'}}</td>
+					<?php $coverageStatus = $coverage ? $coverage->getStatus() : 'NO' ?>
+					<div class="text-nowrap">
+						@if($coverageStatus === 'YES')
+						<i class="fa fa-check-circle text-success" data-toggle="tooltip" data-placement="bottom" title="Covered"></i>
+						@elseif($coverageStatus === 'NO')
+						<i class="fa fa-times text-danger" data-toggle="tooltip" data-placement="bottom" title="Not Covered"></i>
+						@else
+						<i class="fa fa-exclamation-triangle text-warning-mellow" data-toggle="tooltip" data-placement="bottom" title="Unknown"></i>
+						@endif
+						@if($coverage)
+						{{$coverage->insuranceDisplayName()}}
+						@endif
+					</div>
+				</td>
+				<td>
+					{{ friendly_date($patient->most_recent_completed_mcp_note_date) }}
+					{{-- {{$patient->lastMcpAppointment ? friendly_date_time($patient->lastMcpAppointment->raw_date.' '.$patient->lastMcpAppointment->raw_start_time) : '-'}}--}}
+				</td>
+				<td>{{$patient->nextMcpAppointment ? friendly_date_time($patient->nextMcpAppointment->raw_date.' '.$patient->nextMcpAppointment->raw_start_time) : '-'}}</td>
+				<td>{{$patient->nextMcpAppointment ? $patient->nextMcpAppointment->status : '-'}}</td>
 
-            <td class="text-nowrap">
-                @if($patient->most_recent_cellular_bp_measurement_at)
-                    {{ $patient->most_recent_cellular_bp_sbp_mm_hg }} / {{ $patient->most_recent_cellular_bp_dbp_mm_hg }}
-                @endif
-            </td>
+				<td>
+					@if($patient->most_recent_cellular_bp_measurement_at)
+					{{ $patient->most_recent_cellular_bp_sbp_mm_hg }} / {{ $patient->most_recent_cellular_bp_dbp_mm_hg }}
+					@endif
+				</td>
 
-            <td class="text-nowrap"><?= $patient->most_recent_cellular_bp_value_irregular ? '<i class="fa fa-heartbeat"></i>' : '' ?></td>
+				<td><?= $patient->most_recent_cellular_bp_value_irregular ? '<i class="fa fa-heartbeat"></i>' : '' ?></td>
 
-            <td class="text-nowrap">{{ $patient->most_recent_cellular_bp_value_pulse }}</td>
+				<td>{{ $patient->most_recent_cellular_bp_value_pulse }}</td>
 
+<<<<<<< HEAD
             <td class="text-nowrap d-none">{{ friendlier_date_time($patient->most_recent_cellular_bp_measurement_at, false) }}</td>
+=======
+				<td>{{ friendlier_date_time($patient->most_recent_cellular_bp_measurement_at, false) }}</td>
+>>>>>>> 5728faa93ac349dab39f7b515e7970bf1f20b8f6
 
-            <td class="text-nowrap">{{ $patient->most_recent_cellular_weight_value ? round($patient->most_recent_cellular_weight_value, 2) : '--' }}</td>
+				<td>{{ $patient->most_recent_cellular_weight_value ? round($patient->most_recent_cellular_weight_value, 2) : '--' }}</td>
 
+<<<<<<< HEAD
             <td class="text-nowrap d-none">{{ friendlier_date_time($patient->most_recent_cellular_weight_measurement_at, false) }}</td>
+=======
+				<td>{{ friendlier_date_time($patient->most_recent_cellular_weight_measurement_at, false) }}</td>
+>>>>>>> 5728faa93ac349dab39f7b515e7970bf1f20b8f6
 
-{{--			<td class=text-nowrap">{{$patient->is_enrolled_in_cm ? 'Yes' : 'No'}}</td>--}}
-{{--			<td class=text-nowrap">{{$patient->is_enrolled_in_rm ? 'Yes' : 'No'}}</td>--}}
-			<td class="d-none text-nowrap">
-				<?php $m = $patient->lastMeasurementOfType('Wt. (lbs.)'); ?>
-				{{$m && $m->value ? round($m->value, 2) : '-'}}
-			</td>
-			<td class="d-none text-nowrap">
-				<?php $m = $patient->lastMeasurementOfType('BP'); ?>
-				{{$m && $m->value ? $m->value : '-'}}
-			</td>
-			<td class="text-nowrap"">{{$patient->getMcpAssignedOn()}}</td>
-            @if($pro->pro_type == 'ADMIN')
-                <td class="text-nowrap"">{{$patient->mcp->display_name ?? '--'}}</td>
-            @endif
-		</tr>
-		@endforeach
+				{{-- <td>{{$patient->is_enrolled_in_cm ? 'Yes' : 'No'}}</td>--}}
+				{{-- <td>{{$patient->is_enrolled_in_rm ? 'Yes' : 'No'}}</td>--}}
+				<td class="d-none text-nowrap">
+					<?php $m = $patient->lastMeasurementOfType('Wt. (lbs.)'); ?>
+					{{$m && $m->value ? round($m->value, 2) : '-'}}
+				</td>
+				<td class="d-none text-nowrap">
+					<?php $m = $patient->lastMeasurementOfType('BP'); ?>
+					{{$m && $m->value ? $m->value : '-'}}
+				</td>
+				<td>{{$patient->getMcpAssignedOn()}}</td>
+				@if($pro->pro_type == 'ADMIN')
+				<td>{{$patient->mcp->display_name ?? '--'}}</td>
+				@endif
+			</tr>
+			@endforeach
 
-		@if(count($patients) === 0)
-		<tr>
-			<td colspan="14">No records found!</td>
-		</tr>
-		@endif
-	</tbody>
+			@if(count($patients) === 0)
+			<tr>
+				<td colspan="14">No records found!</td>
+			</tr>
+			@endif
+		</tbody>
 
-</table>
+	</table>
+</div>
 <div class="p-3">
 	{{$patients->withQueryString()->links()}}
-</div>
+</div>

resources/views/app/mcp/reports.blade.php

@@ -4,7 +4,7 @@
 <div class="p-3 mcp-theme-1" id="patients-list">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center">
+        <div class="card-header px-2 py-1 d-flex align-items-center">
             <strong class="mr-4">
                 <i class="fas fa-file-invoice-dollar"></i>
                 Reports Pending Signature
@@ -15,14 +15,14 @@
             <div class="p-3">
                 @include('app.mcp.reports_filters')
             </div>
-            <table class="table table-condensed p-0 m-0">
+            <table class="table table-sm table-striped border-top p-0 m-0">
                 <thead class="bg-light">
                     <tr>
-                        <th class="px-3 border-0">Patient</th>
-                        <th class="px-3 border-0">Title</th>
-                        <th class="px-3 border-0">Category</th>
-                        <th class="px-3 border-0">Report Date</th>
-                        <th class="px-3 border-0">Sign</th>
+                        <th class="border-0">Patient</th>
+                        <th class="border-0">Title</th>
+                        <th class="border-0">Category</th>
+                        <th class="border-0">Report Date</th>
+                        <th class="border-0">Sign</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -63,10 +63,11 @@
                 </tbody>
 
             </table>
-            <div class="ml-2 mt-2">
-                {{ $reports->appends(request()->input())->links() }}
-            </div>
+
         </div>
     </div>
+    <div class="mt-3">
+        {{ $reports->appends(request()->input())->links() }}
+    </div>
 </div>
 @endsection

resources/views/app/mcp/reports_pending_signature.blade.php

@@ -1,7 +1,7 @@
 <div class="p-3 mcp-theme-1">
     <div class="card">
 
-        <div class="card-header px-3 py-2 hide-inside-popup border-bottom-0">
+        <div class="card-header px-2 py-1 hide-inside-popup border-bottom-0">
             <strong class="mr-4">
                 <i class="fas fa-file-signature"></i>
                 Reports Pending Signature
@@ -12,22 +12,21 @@
 
 
             <table class="table table-sm table-striped mb-0">
-                <thead>
+                <thead class="bg-light">
                 <tr>
-                    <th class="border-bottom-0">Patient</th>
-                    <th class="border-bottom-0">Title</th>
-                    <th class="border-bottom-0">Category</th>
-                    <th class="border-bottom-0">Report Date</th>
-                    <th class="border-bottom-0">Sign</th>
+                    <th class="border-0">Patient</th>
+                    <th class="border-0">Title</th>
+                    <th class="border-0">Category</th>
+                    <th class="border-0">Report Date</th>
+                    <th class="border-0">Sign</th>
                 </tr>
                 </thead>
                 <tbody>
                 @foreach($records as $document)
                     <tr class="{{$document->is_entry_error ? 'entry-error' : ''}} {{@$currentReport->uid === $document->uid ? 'bg-aliceblue' : ''}}">
-                        <td class="border-bottom-0">{{$document->client->displayName()}}</td>
+                        <td>{{$document->client->displayName()}}</td>
                         <td>
-                            <a native target="_blank" href="{{route('patients.view.incoming-reports', ['patient' => $document->client, 'currentReport' => $document])}}"
-                               class="{{@$currentReport->uid === $document->uid ? 'font-weight-bold' : ''}}">
+                            <a native target="_blank" href="{{route('patients.view.incoming-reports', ['patient' => $document->client, 'currentReport' => $document])}}">
                                 {{ $document->title ? $document->title : '(not set)' }}
                             </a>
                         </td>
@@ -43,7 +42,7 @@
                                 </div>
                                 @if($document->hcp)
                                     <div class="text-secondary">
-                                        <div class="text-sm font-weight-bold">{{$document->hcp->displayName()}}</div>
+                                        <div class="text-sm">{{$document->hcp->displayName()}}</div>
                                         <div class="text-sm">{{friendlier_date_time($document->hcp_pro_signed_at)}}</div>
                                     </div>
                                 @endif

resources/views/app/mcp/supply_orders.blade.php

@@ -4,7 +4,7 @@
 <div class="p-3 mcp-theme-1" id="patients-list">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center">
+        <div class="card-header px-2 py-1 d-flex align-items-center">
             <strong class="mr-4">
                 <i class="fas fa-file-invoice-dollar"></i>
                 Supply Orders
@@ -15,15 +15,15 @@
             <div class="p-3">
                 @include('app.mcp.supply_orders_filters')
             </div>
-            <table class="table table-condensed p-0 m-0">
+            <table class="table table-sm table-striped border-top p-0 m-0">
                 <thead class="bg-light">
                     <tr>
-                        <th class="px-3 border-0">Date</th>
-                        <th class="px-3 border-0">Patient</th>
-                        <th class="px-3 border-0">Product</th>
-                        <th class="px-3 border-0">Reason</th>
-                        <th class="px-3 border-0">Is Cancelled</th>
-                        <th class="px-3 border-0">Shipment</th>
+                        <th class="border-0">Date</th>
+                        <th class="border-0">Patient</th>
+                        <th class="border-0">Product</th>
+                        <th class="border-0">Reason</th>
+                        <th class="border-0">Is Cancelled</th>
+                        <th class="border-0">Shipment</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -61,10 +61,11 @@
                 </tbody>
 
             </table>
-            <div class="ml-2 mt-2">
-                {{ $supplyOrders->appends(request()->input())->links() }}
-            </div>
+
         </div>
     </div>
+    <div class="mt-3">
+        {{ $supplyOrders->appends(request()->input())->links() }}
+    </div>
 </div>
 @endsection

resources/views/app/mcp/supply_orders_awaiting_shipment.blade.php

@@ -1,7 +1,7 @@
 <div class="p-3 mcp-theme-1">
     <div class="card">
 
-        <div class="card-header px-3 py-2 hide-inside-popup border-bottom-0">
+        <div class="card-header px-2 py-1 hide-inside-popup border-bottom-0">
             <strong class="mr-4">
                 <i class="fas fa-box"></i>
                 Supply Orders Awaiting Shipment
@@ -12,13 +12,13 @@
 
 
             <table class="table table-sm table-striped mb-0">
-                <thead>
+                <thead class="bg-light">
                 <tr>
-                    <th class="border-bottom-0">Date</th>
-                    <th class="border-bottom-0">Patient</th>
-                    <th class="border-bottom-0">Product</th>
-                    <th class="border-bottom-0">Reason</th>
-                    <th class="border-bottom-0">Status</th>
+                    <th class="border-0">Date</th>
+                    <th class="border-0">Patient</th>
+                    <th class="border-0">Product</th>
+                    <th class="border-0">Reason</th>
+                    <th class="border-0">Status</th>
                 </tr>
                 </thead>
                 <tbody>

resources/views/app/mcp/supply_orders_pending_signature.blade.php

@@ -1,7 +1,7 @@
 <div class="p-3 mcp-theme-1">
     <div class="card">
 
-        <div class="card-header px-3 py-2 hide-inside-popup border-bottom-0">
+        <div class="card-header px-2 py-1 hide-inside-popup border-bottom-0">
             <strong class="mr-4">
                 <i class="fas fa-box"></i>
                 Supply Orders Pending Signature
@@ -12,13 +12,13 @@
 
 
             <table class="table table-sm table-striped mb-0">
-                <thead>
+                <thead class="bg-light">
                 <tr>
-                    <th class="border-bottom-0">Date</th>
-                    <th class="border-bottom-0">Patient</th>
-                    <th class="border-bottom-0">Product</th>
-                    <th class="border-bottom-0">Reason</th>
-                    <th class="border-bottom-0">Status</th>
+                    <th class="border-0">Date</th>
+                    <th class="border-0">Patient</th>
+                    <th class="border-0">Product</th>
+                    <th class="border-0">Reason</th>
+                    <th class="border-0">Status</th>
                 </tr>
                 </thead>
                 <tbody>

resources/views/app/new-patient.blade.php

@@ -23,7 +23,7 @@ $medicaidStates = Config::get('constants.medicaid_states');
 					<div class="alert alert-danger">{{ session('message') }}</div>
 					@endif
 					<div class="row">
-						<div class="col-md-5">
+						<div class="border-lighter col-md-5">
 							<div class="row">
 								<div class="col-md-12 bg-light p-3 mb-2">
 									<h5 class="m-0 font-weight-bold">Patient Name / Demographics:</h5>
@@ -163,10 +163,10 @@ $medicaidStates = Config::get('constants.medicaid_states');
 						</div>
 						<div class="col-md-7">
 							<div class="border-lighter">
-								<div class="col-md-12 bg-light py-3 px-1 mb-2 ">
+								<div class="col-md-12 bg-light py-3 px-3 mb-2 ">
 									<h5 class="m-0 font-weight-bold">Insurance Coverage:</h5>
 								</div>
-								<div class="px-4">
+								<div class="px-3">
 									<div class="row">
 										<div class="form-group col-md-12">
 											<p class="mb-1 font-weight-bold">Type of insurance card:</p>
@@ -258,11 +258,11 @@ $medicaidStates = Config::get('constants.medicaid_states');
 										</div>
 										<div class="row" v-if="planType == 'MEDICAID' || planType == 'COMMERCIAL'" :class="planType == 'COMMERCIAL' ? 'mx-0' : ''">
 											<div class="col-md-12">
-												<div class="bg-light p-1 mb-2">
+												<div class="bg-light p-2 mb-2">
 													<h5 class="m-0 font-weight-bold">Medicaid Information:</h5>
 												</div>
 											</div>
-											<div class="col-12">
+											<div class="col-12 px-0">
 												<div class="px-2">
 													<div class="form-group col-md-6">
 														<label for="" class="control-label">Medicaid State</label>
@@ -285,11 +285,11 @@ $medicaidStates = Config::get('constants.medicaid_states');
 
 										<div class="row" v-if="planType == 'MEDICARE' || planType == 'COMMERCIAL'" :class="planType == 'COMMERCIAL' ? 'mx-0' : ''">
 											<div class="col-md-12">
-												<div class="bg-light p-1 mb-2">
+												<div class="bg-light p-2 mb-2">
 													<h5 class="m-0 font-weight-bold">Medicare Information:</h5>
 												</div>
 											</div>
-											<div class="col-12">
+											<div class="col-12 px-0">
 												<div class="px-2">
 													<div class="form-group col-md-6">
 														<label class="control-label">Medicare Number</label>

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

@@ -11,7 +11,7 @@
                 <a href="#" start show class="col-2-button">
                     + Add
                 </a>
-                <form url="/api/accountInvite/create" class="mcp-theme-1" right>
+                <form url="/api/accountInvite/create" class="mcp-theme-1">
                     <input type="hidden" name="forClientUid" value="{{$patient->uid}}">
                     <div class="mb-2">
                         <label class="text-secondary text-sm">Email Address</label>

resources/views/app/patient/messages-thread.blade.php

@@ -3,7 +3,7 @@
         @if($patient->smses && count($patient->smses))
             <thead>
             <tr>
-                <th class="px-2 text-secondary border-bottom-0">Date &amp; Time</th>
+                <th class="px-2 text-secondary border-bottom-0 text-nowrap">Date &amp; Time</th>
                 <th class="px-2 text-secondary border-bottom-0 w-25">Type</th>
                 <th class="px-2 text-secondary border-bottom-0 w-25">From</th>
                 <th class="px-2 text-secondary border-bottom-0 w-25">To</th>
@@ -13,7 +13,7 @@
             <tbody>
             @foreach($patient->smses as $sms)
                 <tr>
-                    <td class="px-2">{{ friendly_date_time($sms->created_at) }}</td>
+                    <td class="px-2 text-nowrap">{{ 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>

resources/views/app/patient/note/dashboard.blade.php

@@ -699,11 +699,13 @@
                                                 <div class="mb-2">
                                                     <label class="text-sm mb-1 text-secondary">Code *</label>
                                                     <input type="text" class="form-control form-control-sm"
+                                                           icd-autocomplete-code
                                                            name="code" value="{{$reason->code}}" required>
                                                 </div>
                                                 <div class="mb-2">
                                                     <label class="text-sm mb-1 text-secondary">Description</label>
                                                     <input type="text" class="form-control form-control-sm"
+                                                           icd-autocomplete-description
                                                            name="description" value="{{$reason->description}}">
                                                 </div>
                                                 <div>
@@ -725,11 +727,13 @@
                                         <div class="mb-2">
                                             <label class="text-sm mb-1 text-secondary">Code *</label>
                                             <input type="text" class="form-control form-control-sm"
+                                                   icd-autocomplete-code
                                                    name="code" value="" required>
                                         </div>
                                         <div class="mb-2">
                                             <label class="text-sm mb-1 text-secondary">Description</label>
                                             <input type="text" class="form-control form-control-sm"
+                                                   icd-autocomplete-description
                                                    name="description" value="">
                                         </div>
                                         <div>

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

@@ -67,13 +67,15 @@
                 <form url="/api/visit/create"
                       redir="/patients/view/{{$patient->uid}}/notes/view/[data]"
                       class="mcp-theme-1">
+                    <?php $proVisitTemplates = $pro->visitTemplates(); ?>
                     <input type="hidden" name="clientUid" value="{{$patient->uid}}">
                     @if($pro->isDefaultNA())
                     <input type="hidden" name="naProUid" value="{{$pro->uid}}">
                     @endif
                     <input type="hidden" name="effectiveDate" value="{{date("Y-m-d")}}">
                     <input type="hidden" name="effectiveTime" value="{{date("h:i")}}">
-                    <input type="hidden" class="form-control form-control-sm" placeholder="title" name="title" id="note-create-title" value="Note">
+                    <input type="hidden" class="form-control form-control-sm" placeholder="title"
+                           name="title" id="note-create-title" value="{{count($proVisitTemplates) === 1 ? $proVisitTemplates->first()->title : 'Note'}}">
                     <div class="form-group">
                         <label for="" class="text-secondary text-sm mb-1">HCP Pro *</label>
                         <select name="hcpProUid" class="form-control" provider-search required data-pro-uid="{{$pro->is_hcp ? $pro->uid : ''}}">
@@ -85,17 +87,23 @@
                                 onchange="$('#note-create-title').val($(this).find('option:selected').text())"
                                 required>
                             <option value=""> --select--</option>
-                            @foreach($pro->visitTemplates() as $visitTemplate)
-                                <option value="{{$visitTemplate->uid}}">{{$visitTemplate->title}}</option>
+                            @foreach($proVisitTemplates as $visitTemplate)
+                                <option value="{{$visitTemplate->uid}}" {{count($proVisitTemplates) === 1 ? 'selected' : ''}}>{{$visitTemplate->title}}</option>
                             @endforeach
                         </select>
                     </div>
                     <div class="mb-2">
-                        <label for="" class="text-secondary text-sm mb-1">New/Fu</label>
-                        <select name="newOrFuOrNa" class="form-control form-control-sm note-method-select" required>
-                            <option value="NEW">New</option>
-                            <option value="FU">Follow-Up</option>
-                        </select>
+                        <label for="" class="text-secondary text-sm mb-1">New/Follow-up</label>
+                        <div class="d-flex align-items-baseline py-1">
+                            <label class="mr-3 my-0 d-inline-flex align-items-center c-pointer">
+                                <input type="radio" name="newOrFuOrNa" value="NEW" required>
+                                <span class="ml-1 text-dark">New</span>
+                            </label>
+                            <label class="my-0 d-inline-flex align-items-center c-pointer">
+                                <input type="radio" name="newOrFuOrNa" value="FU" required>
+                                <span class="ml-1 text-dark">Follow-Up</span>
+                            </label>
+                        </div>
                     </div>
                     <div class="mb-2">
                         <label for="" class="text-secondary text-sm mb-1">Method *</label>

resources/views/app/patient/partials/appointment-confirmation.blade.php

@@ -54,10 +54,10 @@
         @endif
     </div>
     @if($appointment->latest_confirmation_request_at || $appointment->latest_confirmation_decision_at)
-        <div class="ml-4 px-2 c-pointer position-relative appointment-confirmation-history-trigger"
+        <div class="ml-4 px-2 c-pointer position-relative appointment-confirmation-history-trigger on-hover-show"
              data-uid="{{$appointment->uid}}">
             <i class="fa fa-history text-secondary"></i>
-            <div class="appointment-confirmation-history">
+            <div class="appointment-confirmation-history on-hover-content">
 
             </div>
         </div>

resources/views/app/patient/partials/rm-setup.blade.php

@@ -89,11 +89,13 @@
                                         <div class="mb-2">
                                             <label class="text-sm mb-1 text-secondary">Code *</label>
                                             <input type="text" class="form-control form-control-sm"
+                                                   icd-autocomplete-code
                                                    name="code" value="{{$reason->code}}" required>
                                         </div>
                                         <div class="mb-2">
                                             <label class="text-sm mb-1 text-secondary">Description</label>
                                             <input type="text" class="form-control form-control-sm"
+                                                   icd-autocomplete-description
                                                    name="description" value="{{$reason->description}}">
                                         </div>
                                         <div>
@@ -115,11 +117,13 @@
                             <div class="mb-2">
                                 <label class="text-sm mb-1 text-secondary">Code *</label>
                                 <input type="text" class="form-control form-control-sm"
+                                       icd-autocomplete-code
                                        name="code" value="" required>
                             </div>
                             <div class="mb-2">
                                 <label class="text-sm mb-1 text-secondary">Description</label>
                                 <input type="text" class="form-control form-control-sm"
+                                       icd-autocomplete-description
                                        name="description" value="">
                             </div>
                             <div>

resources/views/app/patient/prescriptions-popup/sign-as-hcp-form.blade.php

@@ -7,7 +7,7 @@
         </h3>
         <p>Sign as HCP Pro?</p>
         <div class="d-flex align-items-center justify-content-center mt-3">
-            <button type="button" class="btn btn-sm btn-primary mr-2" v-on:click.prevent="saveSignAsHcpPro()">Sign
+            <button type="button" class="btn btn-sm btn-success mr-2" v-on:click.prevent="saveSignAsHcpPro()">Sign
             </button>
             <button type="button" class="btn btn-sm btn-default border" onclick="return closeStagPopup()">Cancel
             </button>

resources/views/app/patient/prescriptions/list.blade.php

@@ -657,10 +657,10 @@ GROUP BY erx_category");
                                         erx_category: _type,
                                         hcpProDisplayName: "{{$pro->displayName()}}",
                                         hcpProUid: "{{$pro->uid}}",
-                                        hcp_pro_id: {{$pro->id}},
+                                        hcp_pro_id: "{{$pro->id}}",
                                         hcp_pro_signed_at: null,
                                         hcp_pro_signed_by_session_id: null,
-                                        note_id: {{@$note ? $note->id : $patient->coreNote->id}},
+                                        note_id: "{{@$note ? $note->id : @$patient->coreNote->id}}",
                                         uid: _data.data,
                                         version_number: 1,
                                     });

resources/views/app/patient/prescriptions/sign-as-hcp-form.blade.php

@@ -7,7 +7,7 @@
         </h3>
         <p>Sign as HCP Pro?</p>
         <div class="d-flex align-items-center justify-content-center mt-3">
-            <button type="button" class="btn btn-sm btn-primary mr-2" v-on:click.prevent="saveSignAsHcpPro()">Sign
+            <button type="button" class="btn btn-sm btn-success mr-2" v-on:click.prevent="saveSignAsHcpPro()">Sign
             </button>
             <button type="button" class="btn btn-sm btn-default border" onclick="return closeStagPopup()">Cancel
             </button>

resources/views/app/patient/problems-center.blade.php

@@ -64,6 +64,11 @@ $ccSegment = $ccSegment ?? $note->getSegmentByInternalName('mc_cc');
                                 <?= !!@($problem->data->icd) ? '/&nbsp;' . @($problem->data->icd) : '' ?>
                             </div>
                             @include('app.patient.wizard-partials.state-badge', ['point' => $problem, 'addedVerb' => 'Diagnosed'])
+                            @if($rel)
+                                <div class="mt-1">
+                                    <span class="text-sm text-white bg-info rounded px-2 py-1 font-weight-bold">Visit reason</span>
+                                </div>
+                            @endif
                         </div>
                     </div>
                 </td>

resources/views/app/patient/segment-templates/vitals/edit.blade.php

@@ -110,7 +110,7 @@ $copyTriggerAdded = [];
                         <td>
                             <input type="text" tabindex="-1"
                                    class="form-control form-control-sm events-none border-0"
-                                   value="{{ $k === 'systolicBP' ? 'Blood Pressure' : $v }}" readonly>
+                                   value="{{ $k === 'systolicBP' ? 'Blood Pressure' : ($k === 'heightInInches' ? 'Height' : $v) }}" readonly>
                         </td>
                         <td class="position-relative">
                             @if($k === "bmi")
@@ -118,20 +118,20 @@ $copyTriggerAdded = [];
                                     <input type="text" readonly bmi
                                            class="form-control form-control-sm vitals-title border-bottom-0 border-top-0 border-left-0 border-right width-70px"
                                            data-name="bmi" value="{{$contentData['bmi']}}">
-                                    <div class="flex-grow-1 py-1 m-0 px-2 font-weight-bold bg-light">
+                                    <div class="flex-grow-1 py-1 m-0 px-2 font-weight-bold bg-light" bmi-category>
                                         @if(isset($contentData['bmi']) && $contentData['bmi'] != "" )
                                             <?php $bmi = $contentData['bmi']; ?>
                                             @if($bmi < 18.5)
-                                                <span class="text-sm text-warning-mellow" v-if="+bmi < 18.5">Underweight</span>
+                                                <span class="text-sm text-warning-mellow">Underweight</span>
                                             @endif
                                             @if($bmi >= 18.5 && $bmi < 25)
-                                                <span class="text-sm text-success" v-if="+bmi >= 18.5 && +bmi < 25">Healthy Weight</span>
+                                                <span class="text-sm text-success">Healthy Weight</span>
                                             @endif
                                             @if($bmi >= 25 && $bmi > 30)
-                                                <span class="text-sm text-warning-mellow" v-if="+bmi >= 25 && +bmi < 30">Overweight</span>
+                                                <span class="text-sm text-warning-mellow">Overweight</span>
                                             @endif
                                             @if($bmi >= 30)
-                                                <span class="text-sm text-warning-mellow" v-if="+bmi >= 30">Obese</span>
+                                                <span class="text-sm text-warning-mellow">Obese</span>
                                             @endif
                                         @endif
                                     </div>
@@ -162,6 +162,18 @@ $copyTriggerAdded = [];
                                            data-name="diastolicBP" diastolicBP
                                            value="{{$contentData['diastolicBP']}}" placeholder="Diastolic">
                                 </div>
+                            @elseif($k === 'heightInInches')
+                                <div class="d-flex align-items-center bg-white">
+                                    <input type="text" class="form-control form-control-sm min-width-unset w-auto-input width-30px border-0 edit"
+                                           heightFeetInput
+                                           value="{{feetFromInches($contentData['heightInInches'])}}">
+                                    <span class="pl-1 pr-2 text-secondary bg-white">ft.</span>
+                                    <input type="text" class="form-control form-control-sm min-width-unset w-auto-input width-30px border-0 edit"
+                                           heightInchesInput
+                                           value="{{inchesAfterFeetFromInches($contentData['heightInInches'])}}">
+                                    <span class="pl-1 text-secondary bg-white">in.</span>
+                                    <input type="hidden" data-name="heightInInches" value="{{$contentData['heightInInches']}}">
+                                </div>
                             @else
                                 <input type="text"
                                        class="form-control form-control-sm border-0" data-name="{{$k}}" {{$k}}
@@ -175,11 +187,32 @@ $copyTriggerAdded = [];
                         @else
                             @foreach($previousData as $pDay)
                                 <td class="bg-light {{!isset($copyTriggerAdded[$k]) ? 'px-2' : 'px-2'}} py-1 text-secondary position-relative">
+                                    <span data-type="{{$k}}">
                                     @if($k === 'systolicBP')
                                         {{ @$previousDataAssoc[$pDay['date']]['systolicBP'] ?: '-' }}/{{ @$previousDataAssoc[$pDay['date']]['diastolicBP'] ?: '-' }}
+                                    @elseif($k === 'heightInInches')
+                                        {{$previousDataAssoc[$pDay['date']][$k] ? toFeetAndInches($previousDataAssoc[$pDay['date']][$k]) : '-' }}
+                                    @elseif($k === 'bmi')
+                                        {{$previousDataAssoc[$pDay['date']][$k] ?: '-' }}
+                                        <?php
+                                        $prevBMI = $previousDataAssoc[$pDay['date']][$k] ? +($previousDataAssoc[$pDay['date']][$k]) : false;
+                                        ?>
+                                        @if($prevBMI < 18.5)
+                                            <span class="text-sm text-warning-mellow ml-1">Underweight</span>
+                                        @endif
+                                        @if($prevBMI >= 18.5 && $prevBMI < 25)
+                                            <span class="text-sm text-success ml-1">Healthy Weight</span>
+                                        @endif
+                                        @if($prevBMI >= 25 && $prevBMI > 30)
+                                            <span class="text-sm text-warning-mellow ml-1">Overweight</span>
+                                        @endif
+                                        @if($prevBMI >= 30)
+                                            <span class="text-sm text-warning-mellow ml-1">Obese</span>
+                                        @endif
                                     @else
                                         {{$previousDataAssoc[$pDay['date']][$k] ?: '-' }}
                                     @endif
+                                    </span>
                                     @if(!isset($copyTriggerAdded[$k]) && $k !== "bmi")
                                         <a href="#" title="Copy to this note" class="vitals-copy-trigger"><i class="fa fa-chevron-circle-left font-size-14"></i></a>
                                     @endif
@@ -208,30 +241,80 @@ $copyTriggerAdded = [];
     window.segmentInitializers.<?= $segment->segmentTemplate->internal_name ?> = function () {
         let parentSegment = $('[data-segment-template-name="<?= $segment->segmentTemplate->internal_name ?>"] ');
 
-        parentSegment.find('[refresh-bmi]').off('change input');
-        parentSegment.find('[refresh-bmi]').on('change input', function () {
-            var height = parseInt(parentSegment.find('[heightInInches]').val());
-            var weight = parseInt(parentSegment.find('[weightPounds]').val());
-            var bmi = Math.round((weight / (height * height)) * 703.06957964)
+        function __refreshBMI() {
+            var height = parseInt(parentSegment.find('[data-name="heightInInches"]').val());
+            var weight = parseInt(parentSegment.find('[data-name="weightPounds"]').val());
+            var bmi = '', bmiCategory = '';
+            if(!isNaN(height) && !isNaN(weight)) {
+                bmi = Math.round((weight / (height * height)) * 703.06957964);
+                if(bmi < 18.5) {
+                    bmiCategory = '<span class="text-sm text-warning-mellow">Underweight</span>';
+                }
+                else if(bmi >= 18.5 && bmi < 25) {
+                    bmiCategory = '<span class="text-sm text-success">Healthy Weight</span>';
+                }
+                else if(bmi >= 25 && bmi > 30) {
+                    bmiCategory = '<span class="text-sm text-warning-mellow">Overweight</span>';
+                }
+                else if(bmi >= 30) {
+                    bmiCategory = '<span class="text-sm text-warning-mellow">Obese</span>';
+                }
+            }
             parentSegment.find('[bmi]').val(bmi);
-            parentSegment.find('[bmi-date]').val(parentSegment.find('[weight-date]').val());
+            parentSegment.find('[bmi-category]').empty().append(bmiCategory);
+        }
+
+        parentSegment.find('[refresh-bmi]').off('change input');
+        parentSegment.find('[refresh-bmi]').on('change input', __refreshBMI);
+
+        parentSegment.find('[heightFeetInput], [heightInchesInput]').off('change input paste');
+        parentSegment.find('[heightFeetInput], [heightInchesInput]').on('change input paste', function () {
+            let inches = 0;
+            let ft = +(parentSegment.find('[heightFeetInput]').val()),
+                inc = +(parentSegment.find('[heightInchesInput]').val());
+            inches = Math.round(ft * 12 + inc);
+            parentSegment.find('[data-name="heightInInches"]').val(inches);
+            __refreshBMI();
         });
 
         parentSegment.find('.vitals-copy-trigger').off('click.copy-vital');
         parentSegment.find('.vitals-copy-trigger').on('click.copy-vital', function () {
             let td = $(this).closest('td'), value = $.trim(td.text());
-            if(value.indexOf('/') === -1) {
-                td.prev().find('input').val(value).trigger('change');
-            }
-            else {
-                let parts = value.split('/');
-                if(parts.length >= 1 && parts[0] !== '-') {
-                    td.prev().find('input:eq(0)').val(parts[0]).trigger('change');
-                }
-                if(parts.length >= 2 && parts[1] !== '-') {
-                    td.prev().find('input:eq(1)').val(parts[1]).trigger('change');
-                }
+            let type = td.find('>span').first().attr('data-type');
+            if(!type) return false;
+            switch (type) {
+                case 'heightInInches':
+                    if(value.indexOf('ft.') !== -1 && value.indexOf('in.') !== -1) {
+                        value = value.replace('in.', '');
+                        value = value.replace('ft.', '|');
+                        value = value.replace('/\s/gi', '');
+                        let parts = value.split('|');
+                        if (parts.length >= 1 && parts[0] !== '-') {
+                            td.prev().find('input:eq(0)').val(parts[0]).trigger('change');
+                        }
+                        if (parts.length >= 2 && parts[1] !== '-') {
+                            td.prev().find('input:eq(1)').val(parts[1]).trigger('change');
+                        }
+                    }
+                    break;
+                case 'systolicBP':
+                    if(value.indexOf('/') !== -1) {
+                        let parts = value.split('/');
+                        if (parts.length >= 1 && parts[0] !== '-') {
+                            td.prev().find('input:eq(0)').val(parts[0]).trigger('change');
+                        }
+                        if (parts.length >= 2 && parts[1] !== '-') {
+                            td.prev().find('input:eq(1)').val(parts[1]).trigger('change');
+                        }
+                    }
+                    break;
+                default:
+                    if(value && value !== '-') {
+                        td.prev().find('input').val(value).trigger('change');
+                    }
+                    break;
             }
+
             return false;
         });
 

resources/views/app/patient/segment-templates/vitals/summary.blade.php

@@ -56,8 +56,11 @@ if(!$contentData) {
                 @if($k === 'systolicBP')
                     <span>Blood Pressure:</span>
                     <b>{{ @$contentData['systolicBP'] ?: '-' }}/{{ @$contentData['diastolicBP'] ?: '-' }}</b>
-                @elseif($k === 'diastolicBP') <!--ignore-->
-
+                @elseif($k === 'diastolicBP')
+                    <!--ignore-->
+                @elseif($k === 'heightInInches')
+                    <span>Height:</span>
+                    <b>{{ !empty($vital) ? toFeetAndInches($vital) : '-' }}</b>
                 @else
                     <span>{{$v}}:</span>
                     <b>{{ !empty($vital) ? $vital : '-' }}</b>

resources/views/app/practice-management/billing-manager.blade.php

@@ -6,7 +6,7 @@
 
         <div class="card">
 
-            <div class="card-header px-3 py-2 d-flex align-items-center">
+            <div class="card-header px-2 py-1 d-flex align-items-center">
                 <strong class="mr-4 font-size-14">
                     <i class="fas fa-user"></i>
                     Billing Manager
@@ -85,7 +85,7 @@
             @endif
             <div class="card-body p-0">
                 <div class="stag-table-container stag-table-container-lg stag-table-container-no-x-scroll border-bottom">
-                <table class="table table-sm table-condensed p-0 m-0">
+                <table class="table table-sm table-striped p-0 m-0">
                     <thead class="bg-light">
                     <tr>
                         <th class="border-0">Patient</th>

resources/views/app/practice-management/billing-report.blade.php

@@ -2,35 +2,35 @@
 
 @section('content')
 
-    <div id="practice-bills" class="p-3 mcp-theme-1">
+<div id="practice-bills" class="p-3 mcp-theme-1">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center">
+        <div class="card-header px-2 py-1 d-flex align-items-center">
             <strong class="mr-4">
                 <i class="fas fa-user"></i>
                 Note Billing Report
             </strong>
         </div>
         <div class="card-body p-0 border-0 table-responsive">
-            <table class="table table-sm table-condensed table-bordered border-0 p-0 m-0">
+            <table class="table table-sm table-striped border-0 p-0 m-0 text-nowrap">
                 <thead class="bg-light">
-                <tr>
-                    <th>Patient</th>
-                    <th>Note</th>
-                    <th>Pro</th>
-                    <th>Date</th>
-                    <th>New/FU</th>
-                    <th>Method</th>
-                    <th>Billing Closed?</th>
-                    <th>Claiming Closed?</th>
-                    <th>Claims</th>
-                    <th>Bills</th>
-                    <th>ICDs</th>
-                    <th>Status</th>
-                </tr>
+                    <tr>
+                        <th>Patient</th>
+                        <th>Note</th>
+                        <th>Pro</th>
+                        <th>Date</th>
+                        <th>New/FU</th>
+                        <th>Method</th>
+                        <th>Billing Closed?</th>
+                        <th>Claiming Closed?</th>
+                        <th>Claims</th>
+                        <th>Bills</th>
+                        <th>ICDs</th>
+                        <th>Status</th>
+                    </tr>
                 </thead>
                 <tbody>
-                @foreach ($rows as $row)
+                    @foreach ($rows as $row)
                     <tr class="{{false ? 'bg-light' : ''}}">
                         <td class="text-nowrap border-left-0">
                             <a href="/patients/view/{{$row->client_uid}}">
@@ -71,20 +71,22 @@
                         </td>
                         <td class="text-nowrap border-left-0">
                             @foreach($row->note->claims as $claim)
-                                {{ $claim->status }}<br/>
-				                <?php foreach($claim->mbClaims as $mbClaim ): continue; ?>
-                                    {{$mbClaim->status}} {{$mbClaim->status_memo}}
-                               	<?php endforeach; ?>
+                            {{ $claim->status }}<br />
+                            <?php foreach ($claim->mbClaims as $mbClaim) : continue; ?>
+                                {{$mbClaim->status}} {{$mbClaim->status_memo}}
+                            <?php endforeach; ?>
                             @endforeach
                         </td>
                     </tr>
-                @endforeach
+                    @endforeach
                 </tbody>
             </table>
-            <div>
-                {{$rows->links()}}
-            </div>
+
         </div>
     </div>
+    <div class="mt-3">
+        {{$rows->links()}}
     </div>
-@endsection
+
+</div>
+@endsection

resources/views/app/practice-management/bills-under-processing.blade.php

@@ -21,6 +21,7 @@
                         <th class="border-bottom-0 border-top-0">Role</th>
                         <th class="border-bottom-0 border-top-0">Client</th>
                         <th class="border-bottom-0 border-top-0">Code</th>
+                        <th class="border-bottom-0 border-top-0">Context</th>
                         <th class="border-bottom-0 border-top-0">Units</th>
                         <th class="border-bottom-0 border-top-0">Verified?</th>
                         <th class="border-bottom-0 border-top-0">Expected Amount</th>
@@ -73,9 +74,10 @@
                                     {{$row->client->name_last}}, {{$row->client->name_first}}
                                 @endif
                             </td>
-                            <td>{{$row->code}}
-                                @if($row->generic_target_entity_type && $row->generic_target_entity_uid)
-                                    <div class="mt-1 text-sm text-secondary font-weight-bold">{{$row->generic_target_entity_type}}</div>
+                            <td>{{$row->code}}</td>
+                            <td>
+                                @if($row->generic_target_entity_type)
+                                    {{$row->generic_target_entity_type}}
                                 @endif
                             </td>
                             <td>{{str_contains($row->code, 'Treatment Services') || str_contains($row->code, 'Administrative Services') ? ceil((float) $row->number_of_units * 60) . ' mins' : $row->number_of_units}}</td>

resources/views/app/practice-management/bills.blade.php

@@ -5,7 +5,7 @@
     <div class="p-3 mcp-theme-1">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center">
+        <div class="card-header px-2 py-1 d-flex align-items-center">
             <strong class="mr-4">
                 <i class="fas fa-user"></i>
                 Bills
@@ -18,7 +18,7 @@
         </div>
         <div class="card-body p-0">
 
-            <table class="table table-sm table-condensed p-0 m-0">
+            <table class="table table-sm table-striped p-0 m-0">
                 <thead class="bg-light">
                 <tr>
                     <th class="px-3 border-0">Created</th>

resources/views/app/practice-management/care-month-report.blade.php

@@ -4,18 +4,18 @@
     <div id="care-month-report" class="p-3 mcp-theme-1">
         <div class="card">
 
-            <div class="card-header px-3 py-2 d-flex align-items-center">
+            <div class="card-header px-2 py-1 d-flex align-items-center">
                 <strong class="mr-4">
                     <i class="fas fa-user"></i>
                     Care Month Report: {{date('M Y', strtotime($date))}}
                 </strong>
                 <div class="ml-auto">
-                    <input type="month" value="{{substr($date, 0, 7)}}" max="{{substr(date('Y-m-d'), 0, 7)}}" onchange="if(this.value){fastLoad('/pro-care-month-report?m=' + this.value.split('-')[1] + '&y=' + this.value.split('-')[0])}">
+                    <input class="form-control" type="month" value="{{substr($date, 0, 7)}}" max="{{substr(date('Y-m-d'), 0, 7)}}" onchange="if(this.value){fastLoad('/pro-care-month-report?m=' + this.value.split('-')[1] + '&y=' + this.value.split('-')[0])}">
                 </div>
             </div>
 
             <div class="card-body p-0 border-0">
-                <table class="table table-sm table-condensed p-0 m-0">
+                <table class="table table-sm table-striped p-0 m-0">
                     <thead class="bg-light">
                     <tr>
                         <th>Patient</th>

resources/views/app/practice-management/cellular-device-manager.blade.php

@@ -6,9 +6,9 @@
 
         <div class="card">
 
-            <div class="card-header px-3 py-2 d-flex align-items-center">
+            <div class="card-header px-2 py-1 d-flex align-items-center">
                 <strong class="mr-4 flex-grow-1">
-                    <i class="fas fa-user"></i>
+                    <i class="fas fa-wifi"></i>
                     Cellular Device Manager
                 </strong>
                 <div class="width-200px ml-auto">
@@ -28,7 +28,7 @@
                 }
             </style>
             <div class="card-body p-0">
-                <table class="table table-sm table-condensed table-striped p-0 m-0">
+                <table class="table table-sm table-striped p-0 m-0">
                     <colgroup>
                         <col span="8">
                         <col span="4" class="cellular-bp">

resources/views/app/practice-management/cellular-measurements.blade.php

@@ -6,7 +6,7 @@
 
         <div class="card">
             <div class="card-body p-0">
-                <table class="table table-sm table-condensed p-0 m-0">
+                <table class="table table-sm table-striped p-0 m-0">
                     <thead class="bg-light">
                     <tr>
                         <th class="border-0">ID</th>

resources/views/app/practice-management/claims.blade.php

@@ -1,78 +1,77 @@
 @extends ('layouts/template')
 
 @section('content')
-    <div id="practice-bills" class="px-3 mcp-theme-1">
-        <div class="card">
+<div id="practice-bills" class="p-3 mcp-theme-1">
+    <div class="card">
+        <ul class="nav font-weight-bold">
+            <li class="nav-item">
+                <a class="nav-link  {{!isset($status) || !$status? 'active' : ''}} active" target="_top" native href="{{route('practice-management.claims')}}">All</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link {{$status == 'VERIFIED'? 'active' : ''}} " target="_top" native href="{{route('practice-management.claims', ['status'=>'VERIFIED'])}}">Verified</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link {{$status == 'PROCESSING' ? 'active' : ''}} " target="_top" native href="{{route('practice-management.claims', ['status'=>'PROCESSING'])}}">Processing</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link  {{$status == 'SUBMITTED' ? 'active' : ''}}" target="_top" native href="{{route('practice-management.claims', ['status'=>'SUBMITTED'])}}">Submitted</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link  {{$status == 'ACCEPTED'? 'active' : ''}}" target="_top" native href="{{route('practice-management.claims', ['status'=>'ACCEPTED'])}}">Accepted</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link  {{$status == 'REJECTED'? 'active' : ''}}" target="_top" native href="{{route('practice-management.claims', ['status'=>'REJECTED'])}}">Rejected</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link  {{$status == 'CANCELLED'? 'active' : ''}}" target="_top" native href="{{route('practice-management.claims', ['status'=>'CANCELLED'])}}">Cancelled</a>
+            </li>
+        </ul>
 
-            <ul class="nav mt-2">
-                <li class="nav-item">
-                    <a class="nav-link  {{!isset($status) || !$status? 'active' : ''}} active" target="_top"  native href="{{route('practice-management.claims')}}">All</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link {{$status == 'VERIFIED'? 'active' : ''}} " target="_top" native href="{{route('practice-management.claims', ['status'=>'VERIFIED'])}}">Verified</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link {{$status == 'PROCESSING' ? 'active' : ''}} " target="_top"  native href="{{route('practice-management.claims', ['status'=>'PROCESSING'])}}">Processing</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link  {{$status == 'SUBMITTED' ? 'active' : ''}}" target="_top"  native href="{{route('practice-management.claims', ['status'=>'SUBMITTED'])}}">Submitted</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link  {{$status == 'ACCEPTED'? 'active' : ''}}" target="_top"  native href="{{route('practice-management.claims', ['status'=>'ACCEPTED'])}}">Accepted</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link  {{$status == 'REJECTED'? 'active' : ''}}" target="_top"  native href="{{route('practice-management.claims', ['status'=>'REJECTED'])}}">Rejected</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link  {{$status == 'CANCELLED'? 'active' : ''}}" target="_top"  native href="{{route('practice-management.claims', ['status'=>'CANCELLED'])}}">Cancelled</a>
-                </li>
-            </ul>
-
-            <div class="card-body p-0 border-0">
-                <table class="table table-sm table-condensed p-0 m-0">
-                    <thead class="bg-light">
+        <div class="card-body p-0 border-0">
+            <table class="table table-sm table-striped p-0 m-0">
+                <thead class="bg-light">
                     <tr>
                         <th></th>
-                        <th class="border-0">#</th>
+                        <th>#</th>
                         <th>Status</th>
-                        <th class="border-0">Lines</th>
-                        <th class="px-3 border-0">Created</th>
+                        <th>Lines</th>
+                        <th>Created</th>
                     </tr>
-                    </thead>
-                    <tbody>
+                </thead>
+                <tbody>
                     @foreach ($claims as $claim)
-                        <tr>
-                            <td>
-                                <input type="checkbox" name="claimUid" value="{{$claim->uid}}">
-                            </td>
-                            <td>{{$claim->iid}}</td>
-                            <td>{{$claim->status}}</td>
-                            <td>
-                                <strong>Claim Lines</strong>
-                                <table class="table table-sm table-condensed table-striped">
-                                    <tr>
-                                        <th>CPT</th>
-                                        <th>ICDs</th>
-                                        <th>Date of Service</th>
-                                    </tr>
-                                    @foreach($claim->lines as $claimLine)
-                                        <tr>
-                                            <td>{{$claimLine->cpt}}</td>
-                                            <td>{{$claimLine->icds()}}</td>
-                                            <td>{{$claimLine->date_of_service}}</td>
-                                        </tr>
-                                    @endforeach
-                                </table>
-                            </td>
-                            <td>{{$claim->created_at}}</td>
-                        </tr>
+                    <tr>
+                        <td>
+                            <input type="checkbox" name="claimUid" value="{{$claim->uid}}">
+                        </td>
+                        <td>{{$claim->iid}}</td>
+                        <td>{{$claim->status}}</td>
+                        <td>
+                            <strong>Claim Lines</strong>
+                            <table class="table table-sm table-striped">
+                                <tr>
+                                    <th>CPT</th>
+                                    <th>ICDs</th>
+                                    <th>Date of Service</th>
+                                </tr>
+                                @foreach($claim->lines as $claimLine)
+                                <tr>
+                                    <td>{{$claimLine->cpt}}</td>
+                                    <td>{{$claimLine->icds()}}</td>
+                                    <td>{{$claimLine->date_of_service}}</td>
+                                </tr>
+                                @endforeach
+                            </table>
+                        </td>
+                        <td>{{$claim->created_at}}</td>
+                    </tr>
                     @endforeach
-                    </tbody>
-                </table>
-                <div>
-                    {{$claims->links()}}
-                </div>
-            </div>
+                </tbody>
+            </table>
         </div>
     </div>
-@endsection
+    <div class="mt-3">
+        {{$claims->links()}}
+    </div>
+</div>
+@endsection

resources/views/app/practice-management/clients_bdt_devices.blade.php

@@ -4,7 +4,7 @@
 <div class="p-3 mcp-theme-1" id="patients-list">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center">
+        <div class="card-header px-2 py-1 d-flex align-items-center">
             <strong class="mr-4">
                 <i class="fas fa-weight"></i>
                 Clients BDT Devices
@@ -15,7 +15,7 @@
             <div class="p-3">
                 @include('app.practice-management.clients_bdt_devices_filters')
             </div>
-            <table class="table table-condensed p-0 m-0">
+            <table class="table table-sm table-striped border-top p-0 m-0">
                 <thead class="bg-light">
                     <tr>
                         <th class="px-3 border-0">IMEI</th>

resources/views/app/practice-management/financial-transactions.blade.php

@@ -3,7 +3,7 @@
 @section('content')
     <div class="p-3 mcp-theme-1">
         <div class="card">
-            <div class="card-header p-3 d-flex align-items-center">
+            <div class="card-header px-2 py-1 d-flex align-items-center">
                 <strong class="mr-4">
                     <i class="fas fa-user"></i>
                     Financial Transactions
@@ -68,7 +68,7 @@
                 </div>
             </div>
             <div class="card-body p-0">
-                <table class="table table-sm table-condensed p-0 m-0">
+                <table class="table table-sm table-striped p-0 m-0">
                     <thead class="bg-light">
                         <tr>
                             <th class="px-3 border-0">Date</th>
@@ -96,7 +96,7 @@
                                 <td>
                                     @if($transaction->client)
                                     <a href="/patients/view/{{ $transaction->client->uid }}">
-                                        <b>{{ implode(", ", [$transaction->client->name_last, $transaction->client->name_first]) }}</b>
+                                        {{ implode(", ", [$transaction->client->name_last, $transaction->client->name_first]) }}
                                     </a>
                                     @else
                                         -

resources/views/app/practice-management/handouts.blade.php

@@ -5,7 +5,7 @@
     <div class="p-3 mcp-theme-1">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center">
+        <div class="card-header px-2 py-1 d-flex align-items-center">
             <strong class="">
                 <i class="fas fa-user"></i>
                 Handouts
@@ -42,7 +42,7 @@
             </div>
         </div>
         <div class="card-body p-0">
-            <table class="table table-condensed p-0 m-0">
+            <table class="table table-sm table-striped p-0 m-0">
                 <thead class="bg-light">
                 <tr>
                     <th class="border-0">Display Name</th>

resources/views/app/practice-management/mc-code-checks.blade.php

@@ -3,17 +3,17 @@
 @section('content')
     <div class="p-3 mcp-theme-1">
         <div class="card">
-            <div class="card-header p-3 d-flex align-items-center">
+            <div class="card-header py-2 px-1 d-flex align-items-center">
                 <strong class="mr-4">
                     <i class="fas fa-user"></i>
                     MC Code Checks
                 </strong>
             </div>
             <div class="card-body p-0">
-                <table class="table table-sm table-condensed p-0 m-0" style="table-layout: fixed">
+                <table class="table table-sm table-striped p-0 m-0" style="table-layout: fixed">
                     <thead class="bg-light">
                         <tr>
-                            	<th class="px-3 border-0">Patient</th>
+                            	<th class="border-0">Patient</th>
                             
 			
 				<?php
@@ -33,7 +33,7 @@
                         ];
                 ?>
                 @foreach($codeCheckKeys as $codeCheckKey => $label)
-                        <th style="">
+                        <th class="border-0">
                                 {{ $label}}
                         </th>
                 @endforeach

resources/views/app/practice-management/medicare-partb-claims.blade.php

@@ -5,7 +5,7 @@
     <div class="p-3 mcp-theme-1">
         <div class="card">
 
-            <div class="card-header px-3 py-2 d-flex align-items-center">
+            <div class="card-header px-2 py-1 d-flex align-items-center">
                 <strong class="mr-4">
                     <i class="fas fa-user"></i>
                     Claims
@@ -17,7 +17,7 @@
                     <div class="my-1 mx-1">
                         <button submit class="btn bnt-sm btn-primary">Generate EDI</button>
                     </div>
-                    <table class="table table-sm table-condensed p-0 m-0">
+                    <table class="table table-sm table-striped p-0 m-0">
                         <thead class="bg-light">
                         <tr>
                             <th></th>
@@ -40,7 +40,7 @@
                                 <td>{{$claim->was_submitted?'Yes':'No'}}</td>
                                 <td>
                                     <strong>Claim Lines</strong>
-                                    <table class="table table-sm table-condensed table-striped">
+                                    <table class="table table-sm table-striped">
                                         <tr>
                                             <th>CPT</th>
                                             <th>ICDs</th>
@@ -67,7 +67,7 @@
         <div class="card">
             <div class="card-header">Claim EDIs</div>
             <div class="card-body">
-                <table class="table table-sm table-condensed table-striped">
+                <table class="table table-sm table-striped">
                     <thead>
                     <tr>
                         <th>Created At</th>
@@ -80,7 +80,7 @@
                         <tr>
                             <td>{{$edi->created_at}}</td>
                             <td>
-                                <table class="table table-sm table-condensed p-0 m-0">
+                                <table class="table table-sm table-striped p-0 m-0">
                                     <thead class="bg-light">
                                     <tr>
                                         <th class="border-0">#</th>
@@ -99,7 +99,7 @@
                                             <td>{{$claim->was_submitted?'Yes':'No'}}</td>
                                             <td>
                                                 <strong>Claim Lines</strong>
-                                                <table class="table table-sm table-condensed table-striped">
+                                                <table class="table table-sm table-striped">
                                                     <tr>
                                                         <th>CPT</th>
                                                         <th>ICDs</th>

resources/views/app/practice-management/memos.blade.php

@@ -4,7 +4,7 @@
 <div class="p-3 mcp-theme-1" id="patients-list">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center">
+        <div class="card-header px-1 py-2 d-flex align-items-center">
             <strong class="mr-4">
                 <i class="fas fa-notes-medical"></i>
                 Memos
@@ -15,35 +15,35 @@
             <div class="p-3">
                 @include('app.practice-management.memos_filters')
             </div>
-            <table class="table table-condensed p-0 m-0">
+            <table class="table table-sm table-striped border-top p-0 m-0">
                 <thead class="bg-light">
                     <tr>
-                        <th class="px-3 border-0">Category</th>
-                        <th class="px-3 border-0">Patient</th>
-                        <th class="px-3 border-0">MCP</th>
-                        <th class="px-3 border-0 w-25">Summary</th>
-                        <th class="px-3 border-0">Created</th>
-                        <th class="px-3 border-0 delete-column">&nbsp;</th>
+                        <th class="border-0">Category</th>
+                        <th class="border-0">Patient</th>
+                        <th class="border-0">MCP</th>
+                        <th class="border-0 w-25">Summary</th>
+                        <th class="border-0">Created</th>
+                        <th class="border-0 delete-column">&nbsp;</th>
                     </tr>
                 </thead>
                 <tbody>
                     @foreach($memos as $memo)
-                    <?php 
+                    <?php
                     $mcpName = $memo->client->mcp ? implode(', ', array_filter([$memo->client->mcp->name_last, $memo->client->mcp->name_first])) : null;
                     ?>
                     <tr>
-                        <td class="px-2">{{ $memo->category }}</td>
+                        <td>{{ $memo->category }}</td>
                         <td>
                             <a target="_blank" native href="{{route('patients.view.dashboard', $memo->client)}}">
                                 {{$memo->client->displayName()}}
                             </a>
                         </td>
-                        <td class="px-2">{{ $mcpName }}</td>
-                        <td class="px-2">
+                        <td>{{ $mcpName }}</td>
+                        <td>
                             <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>{{ 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>
@@ -91,10 +91,11 @@
                 </tbody>
 
             </table>
-            <div class="ml-2 mt-2">
-                {{ $memos->appends(request()->input())->links() }}
-            </div>
+
         </div>
     </div>
+    <div class="mt-3">
+        {{ $memos->appends(request()->input())->links() }}
+    </div>
 </div>
 @endsection

resources/views/app/practice-management/my-favorites.blade.php

@@ -5,7 +5,7 @@
     <div class="p-3 mcp-theme-1">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center">
+        <div class="card-header px-2 py-1 d-flex align-items-center">
             <strong class="">
                 <i class="fas fa-user"></i>
                 Favorites
@@ -22,7 +22,7 @@
             </select>
         </div>
         <div class="card-body p-0">
-            <table class="table table-sm table-condensed p-0 m-0">
+            <table class="table table-sm table-striped p-0 m-0">
                 <thead class="bg-light">
                 <tr>
                     <th class="px-3 border-0 width-100px">Category</th>

resources/views/app/practice-management/my-teams.blade.php

@@ -17,7 +17,7 @@
                 <thead class="bg-light">
                 <tr>
                     <th class="px-3 border-0">Team Name</th>
-                    <th class="border-0">Slug</th>
+                    <th class="border-0">URL</th>
                     <th class="border-0">MCP</th>
                     <th class="border-0">RD</th>
                     <th class="border-0">Created</th>

resources/views/app/practice-management/my-text-shortcuts.blade.php

@@ -5,7 +5,7 @@
 <div class="p-3 mcp-theme-1">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center">
+        <div class="card-header px-2 py-1 d-flex align-items-center">
             <strong class="">
                 <i class="fas fa-user"></i>
                 Text Shortcuts
@@ -45,7 +45,7 @@
                     </div>
                 </div>
                 @if($personalShortcuts && count($personalShortcuts))
-                    <table class="table table-condensed table-hover table-bordered p-0 m-0">
+                    <table class="table table-sm table-striped table-hover table-bordered p-0 m-0">
                         <thead class="bg-light">
                         <tr>
                             <th class="px-3 border-0 width-200px">Pro</th>

resources/views/app/practice-management/my-tickets.blade.php

@@ -5,7 +5,7 @@
     <div class="p-3 mcp-theme-1">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center">
+        <div class="card-header px-2 py-1 d-flex align-items-center">
             <strong class="">
                 <i class="fas fa-user"></i>
                 My Tickets
@@ -18,7 +18,7 @@
             </select>
         </div>
         <div class="card-body p-0">
-            <table class="table table-condensed p-0 m-0">
+            <table class="table table-sm table-striped p-0 m-0">
                 <thead class="bg-light">
                 <tr>
                     <th class="border-0">Patient</th>
@@ -32,7 +32,7 @@
                 @foreach($myTickets as $ticket)
                     <tr>
                         <td class="text-nowrap">
-                            <a class="font-weight-bold" href="/patients/view/{{ $ticket->patient->uid }}">{{ $ticket->patient->displayName() }}</a>
+                            <a href="/patients/view/{{ $ticket->patient->uid }}">{{ $ticket->patient->displayName() }}</a>
                         </td>
                         <td>{{ strtoupper($ticket->category) }}</td>
                         <td>
@@ -78,7 +78,7 @@
                             {{ $roles }}
                         </td>
                         <td>
-                            <a class="font-weight-bold" href="/patients/view/{{ $ticket->patient->uid }}/action-items-{{ $ticket->category }}/view/{{ $ticket->uid }}">Open</a>
+                            <a href="/patients/view/{{ $ticket->patient->uid }}/action-items-{{ $ticket->category }}/view/{{ $ticket->uid }}">Open</a>
                         </td>
                     </tr>
                 @endforeach

resources/views/app/practice-management/notes-processing-center.blade.php

@@ -103,7 +103,7 @@
             </div>
             <div class="card-body p-0">
 
-                <table class="table table-sm table-condensed table-bordered border-0 p-0 m-0">
+                <table class="table table-sm table-striped border-0 p-0 m-0">
                     <thead class="bg-light">
                     <tr>
                         <th>Patient</th>

resources/views/app/practice-management/notes.blade.php

@@ -5,7 +5,7 @@
     <div class="p-3 mcp-theme-1">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center">
+        <div class="card-header px-2 py-1 d-flex align-items-center">
             <strong class="mr-4">
                 <i class="fas fa-user"></i>
                 Notes
@@ -18,7 +18,7 @@
         </div>
         <div class="card-body p-0">
 
-            <table class="table table-sm table-condensed p-0 m-0">
+            <table class="table table-sm table-striped p-0 m-0">
                 <thead class="bg-light">
                 <tr>
                     <th class="px-3 border-0">Created</th>
@@ -34,7 +34,7 @@
                             {{ friendly_date_time($note->created_at, true) }}
                         </td>
                         <td class="">
-                            <a href="/patients/view/{{ $note->client->uid }}/notes/view/{{ $note->uid }}" class="font-weight-bold">
+                            <a href="/patients/view/{{ $note->client->uid }}/notes/view/{{ $note->uid }}">
                                 {{ friendly_date_time($note->effective_dateest, false) }}
                             </a>
                             <span class="ml-1">{{ $note->is_cancelled ? '[cancelled]' : '' }}</span>

resources/views/app/practice-management/packs-multi-print.blade.php

@@ -4,7 +4,7 @@
 
     <div id="practice-packs-multi-print" class="p-3 mcp-theme-1 only-screen">
     <div class="card border-bottom-0">
-        <div class="card-header px-3 py-3 d-flex align-items-center bg-white">
+        <div class="card-header px-2 py-1 d-flex align-items-center bg-white">
             <strong class="font-size-14">
                 Print Pack Labels
             </strong>
@@ -16,21 +16,21 @@
         </div>
 
         <div class="card-body p-0 border-0">
-            <table class="table table-sm table-bordered table-hover p-0 m-0 border-0" style="table-layout: fixed">
+            <table class="table table-sm table-striped table-hover p-0 m-0 border-0" style="table-layout: fixed">
                 <thead class="bg-light">
                 <tr>
-                    <th class="border-top-0 border-bottom-0 border-left-0 width-50px">
+                    <th class="border-0 width-50px">
                         <label class="d-flex align-items-center m-0">
                             <input type="checkbox" class="my-0 mr-1" id="select-all">
                             <span class="font-weight-normal">All</span>
                         </label>
                     </th>
-                    <th class="border-top-0 border-bottom-0">Patient</th>
-                    <th class="border-top-0 border-bottom-0">Address</th>
-                    <th class="border-top-0 border-bottom-0">Courier</th>
-                    <th class="border-top-0 border-bottom-0">Tracking #</th>
-                    <th class="border-top-0 border-bottom-0">Label</th>
-                    <th class="border-top-0 border-bottom-0">Shipment</th>
+                    <th class="border-0">Patient</th>
+                    <th class="border-0">Address</th>
+                    <th class="border-0">Courier</th>
+                    <th class="border-0">Tracking #</th>
+                    <th class="border-0">Label</th>
+                    <th class="border-0">Shipment</th>
                 </tr>
                 </thead>
                 <tbody>

resources/views/app/practice-management/patient-claim-summary.blade.php

@@ -4,7 +4,7 @@
 
     <div class="p-3 mcp-theme-1">
         <div class="card">
-            <div class="card-header px-3 py-2 d-flex align-items-center">
+            <div class="card-header px-2 py-1 d-flex align-items-center">
                 <strong class="mr-4 d-inline-block">
                     <i class="fas fa-chart-bar"></i>
                     Key numbers
@@ -117,7 +117,7 @@
     <div id="practice-bills" class="px-3 mcp-theme-1">
         <div class="card">
 
-            <div class="card-header px-3 py-2 d-flex align-items-center">
+            <div class="card-header px-2 py-1 d-flex align-items-center">
                 <strong class="mr-4 d-inline-block">
                     <i class="fas fa-user"></i>
                     Patient Claim Summary

resources/views/app/practice-management/patients-accounts-invites.blade.php

@@ -5,7 +5,7 @@
 <div class="p-3 mcp-theme-1">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center">
+        <div class="card-header px-2 py-1 d-flex align-items-center">
             <strong class="mr-4">
                 <i class="fas fa-user"></i>
                 Accounts Invites ({{ $accountInvites->total() }})
@@ -15,38 +15,38 @@
         <div class="p-3">
                 @include('app.practice-management.patients-accounts-invites-filters')
             </div>
-            <table class="table table-sm table-condensed p-0 m-0">
+            <table class="table table-sm table-striped border-top p-0 m-0">
                 <thead class="bg-light">
                     <tr>
-                        <th class="px-2 text-secondary border-bottom-0">Created At</th>
-                        <th class="px-2 text-secondary border-bottom-0">Client</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">Status</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">Client</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">Status</th>
+                        <th class="text-secondary border-0">&nbsp;</th>
                     </tr>
                 </thead>
                 <tbody>
                     @foreach($accountInvites as $accountInvite)
                     <tr>                        
-                        <td class="px-2">
+                        <td>
                             {{ friendlier_date_time($accountInvite->created_at) }}
                             @if($accountInvite->status === 'CANCELLED')
                             <span class="text-sm text-secondary">(CANCELLED)</span>
                             @endif
                         </td>
-                        <td class="px-2">{{ $accountInvite->client->displayName() }}</td>
-                        <td class="px-2">{{ $accountInvite->first_name }} {{ $accountInvite->last_name }}</pre>
+                        <td>{{ $accountInvite->client->displayName() }}</td>
+                        <td>{{ $accountInvite->first_name }} {{ $accountInvite->last_name }}</pre>
                         </td>
-                        <td class="px-2">{{ $accountInvite->to_email_address }}</td>
-                        <td class="px-2">{{ $accountInvite->cell_number }}</td>
-                        <td class="px-2">{{ $accountInvite->status }} <span class="text-sm text-secondary">(Updated: {{friendlier_date_time($accountInvite->status_updated_at)}})</span>
+                        <td>{{ $accountInvite->to_email_address }}</td>
+                        <td>{{ $accountInvite->cell_number }}</td>
+                        <td>{{ $accountInvite->status }} <span class="text-sm text-secondary">(Updated: {{friendlier_date_time($accountInvite->status_updated_at)}})</span>
                             @if($accountInvite->status_memo)
                             <div class="py-1 font-italic text-secondary text-sm">{{$accountInvite->status_memo}}</div>
                             @endif
                         </td>
-                        <td class="px-2">
+                        <td>
                             <div class="d-flex">
                                 @if($accountInvite->status === 'PENDING')
                                 <span moe class="ml-1" relative>

resources/views/app/practice-management/pro-availability.blade.php

@@ -582,7 +582,7 @@
         </div>
         <div class="col-md-6">
             <div class="card">
-                <div class="card-header px-3 py-2 d-flex align-items-center">
+                <div class="card-header px-3 py-1 d-flex align-items-center">
                     <strong class="">
                         <i class="fas fa-user"></i>
                         Pro Availability

resources/views/app/practice-management/pro-financials.blade.php

@@ -6,7 +6,7 @@
 
         <div class="card">
 
-            <div class="card-header px-3 py-2 d-flex align-items-center">
+            <div class="card-header px-2 py-1 d-flex align-items-center">
                 <strong class="text-nowrap">
                     <i class="fas fa-user"></i>
                     Pro Financials
@@ -24,7 +24,7 @@
                 @endif
             </div>
             <div class="card-body p-0">
-                <table class="table table-sm table-condensed table-hover p-0 m-0">
+                <table class="table table-sm table-striped table-hover p-0 m-0">
                     <thead class="bg-light">
                     <tr>
                         <th>Pro</th>
@@ -97,7 +97,7 @@
                                     </div>
                                     
                                 </div>
-                                <table class="table table-sm">
+                                <table class="table table-sm table-striped">
                                     <thead>
                                         <tr>
                                             <th>Bill Amount</th>

resources/views/app/practice-management/process-claims.blade.php

@@ -2,6 +2,7 @@
 
 @section('content')
     <div id="process-claims" class="px-3 mcp-theme-1 mt-3" v-cloak>
+        <div class="border p-3 rounded">
         <div class="row">
             <div class="col-9">
                 <div class="d-flex align-items-end">
@@ -251,7 +252,7 @@
                                     <div class="d-flex align-items-start mb-1">
                                         <div class="text-secondary mr-3 min-width-140px">CPT Codes</div>
                                         <div>
-                                            <table class="table table-sm table-condensed mb-0 table-bordered">
+                                            <table class="table table-sm table-striped mb-0 table-bordered">
                                                 <thead>
                                                 <tr class="bg-light">
                                                     <th class="border-0 width-100px">CPT</th>
@@ -341,6 +342,7 @@
                 </div>
             </div>
         </div>
+        <div>
     </div>
     <div class="stag-popup stag-popup-lg mcp-theme-1" stag-popup-key="note-popup">
         <form method="POST" action="" class="p-0">

resources/views/app/practice-management/processing-bill-matrix.blade.php

@@ -2,294 +2,284 @@
 
 @section('content')
 
-    <div class="p-3 mcp-theme-1" id="processing-bill-matrix">
+<div class="p-3 mcp-theme-1" id="processing-bill-matrix">
 
-        <div class="card">
+    <div class="card">
 
-            <div class="card-header px-3 py-2">
-                <div class="font-weight-bold text-nowrap mb-2">
-                    <i class="fas fa-user"></i>
-                    Processing Bills
-                </div>
-                <div class="d-flex align-items-center mb-2">
-                    <div class="width-200px">
-                        <select provider-search data-pro-uid="{{ @$targetPro->uid }}"
-                                name="proUid" class="form-control form-control-sm mr-auto width-200px min-width-unset"
-                                onchange="return billsFilter('', this.value, true)">
-                            <option value="" {{!@$targetPro ? 'selected' : ''}}>All Pros</option>
-                        </select>
-                    </div>
-                    <div class="width-300px ml-2 d-inline-flex">
-                        <select name="filter" class="form-control form-control-sm min-width-unset flex-grow-1"
-                                onchange="return billsFilter('f', this.value)">
-                            <option {{request()->input('f') === '' ? 'selected' : ''}} value="">All Bills</option>
-                            <option {{request()->input('f') === 'verified' ? 'selected' : ''}} value="verified">Verified
-                                Only
-                            </option>
-                            <option {{request()->input('f') === 'not-verified' ? 'selected' : ''}} value="not-verified">Not
-                                Verified Only
-                            </option>
-                        </select>
-                        <select name="filter" class="form-control form-control-sm min-width-unset flex-grow-1 ml-2"
-                                onchange="return billsFilter('t', this.value)">
-                            <option {{!request()->input('t') || request()->input('t') === 'hcp' ? 'selected' : ''}} value="hcp">
-                                HCP Bills
-                            </option>
-                            <option {{request()->input('t') === 'na' ? 'selected' : ''}} value="na">NA Bills</option>
-                        </select>
-                    </div>
-                    <div class="ml-4 d-inline-flex align-items-center">
-                        <span class="mr-2">Bal Post Date</span>
-                        <input type="date"
-                               value="{{request()->input('bs')}}"
-                               onchange="return billsFilter('bs', this.value)"
-                               class="form-control form-control-sm width-150px" name="bpdFrom">
-                        <span class="mx-2">to</span>
-                        <input type="date"
-                               value="{{request()->input('be')}}"
-                               onchange="return billsFilter('be', this.value)"
-                               class="form-control form-control-sm width-150px" name="bpdTo">
-                    </div>
-                    <button class="ml-auto btn btn-sm btn-primary pay-selected-pros px-3 font-weight-bold" disabled>Pay Selected</button>
+        <div class="card-header px-2 py-1">
+            <div class="font-weight-bold text-nowrap mb-2">
+                <i class="fas fa-user"></i>
+                Processing Bills
+            </div>
+            <div class="d-flex align-items-center mb-2">
+                <div class="width-200px">
+                    <select provider-search data-pro-uid="{{ @$targetPro->uid }}" name="proUid" class="form-control form-control-sm mr-auto width-200px min-width-unset" onchange="return billsFilter('', this.value, true)">
+                        <option value="" {{!@$targetPro ? 'selected' : ''}}>All Pros</option>
+                    </select>
                 </div>
-                <div class="d-flex align-items-center">
-                    <select name="filter" class="form-control form-control-sm width-200px"
-                            onchange="return billsFilter('c', this.value)">
-                        <option {{!request()->input('c') ? 'selected' : ''}} value="">All Companies</option>
-                        @foreach($companies as $company)
-                            <option {{request()->input('c') == $company->id ? 'selected' : ''}}
-                                    value="{{$company->id}}">
-                                {{$company->name}}
-                            </option>
-                        @endforeach
+                <div class="width-300px ml-2 d-inline-flex">
+                    <select name="filter" class="form-control form-control-sm min-width-unset flex-grow-1" onchange="return billsFilter('f', this.value)">
+                        <option {{request()->input('f') === '' ? 'selected' : ''}} value="">All Bills</option>
+                        <option {{request()->input('f') === 'verified' ? 'selected' : ''}} value="verified">Verified
+                            Only
+                        </option>
+                        <option {{request()->input('f') === 'not-verified' ? 'selected' : ''}} value="not-verified">Not
+                            Verified Only
+                        </option>
                     </select>
-                    <select name="filter" class="form-control form-control-sm width-300px ml-2 "
-                            onchange="return billsFilter('s', this.value)">
-                        <option {{!request()->input('s') ? 'selected' : ''}} value="">All Services</option>
-                        @foreach($codes as $code)
-                            <option {{request()->input('s') == $code->code ? 'selected' : ''}}
-                                    value="{{$code->code}}">
-                                {{$code->code}}
-                            </option>
-                        @endforeach
+                    <select name="filter" class="form-control form-control-sm min-width-unset flex-grow-1 ml-2" onchange="return billsFilter('t', this.value)">
+                        <option {{!request()->input('t') || request()->input('t') === 'hcp' ? 'selected' : ''}} value="hcp">
+                            HCP Bills
+                        </option>
+                        <option {{request()->input('t') === 'na' ? 'selected' : ''}} value="na">NA Bills</option>
                     </select>
-                    @if(@$targetPro || count(array_filter(request()->all(), function($_x) { return !!$_x && $_x !== 'na' && $_x !== 'hcp';})))
-                        <a href="/practice-management/processing-bill-matrix" class="ml-4">Clear Filters</a>
-                    @endif
                 </div>
+                <div class="ml-4 d-inline-flex align-items-center">
+                    <span class="mr-2">Bal Post Date</span>
+                    <input type="date" value="{{request()->input('bs')}}" onchange="return billsFilter('bs', this.value)" class="form-control form-control-sm width-150px" name="bpdFrom">
+                    <span class="mx-2">to</span>
+                    <input type="date" value="{{request()->input('be')}}" onchange="return billsFilter('be', this.value)" class="form-control form-control-sm width-150px" name="bpdTo">
+                </div>
+                <button class="ml-auto btn btn-sm btn-primary pay-selected-pros px-3 font-weight-bold" disabled>Pay Selected</button>
             </div>
-            <div class="card-body p-0">
-                <table class="table table-sm table-condensed table-hover p-0 m-0">
+            <div class="d-flex align-items-center">
+                <select name="filter" class="form-control form-control-sm width-200px" onchange="return billsFilter('c', this.value)">
+                    <option {{!request()->input('c') ? 'selected' : ''}} value="">All Companies</option>
+                    @foreach($companies as $company)
+                    <option {{request()->input('c') == $company->id ? 'selected' : ''}} value="{{$company->id}}">
+                        {{$company->name}}
+                    </option>
+                    @endforeach
+                </select>
+                <select name="filter" class="form-control form-control-sm width-300px ml-2 " onchange="return billsFilter('s', this.value)">
+                    <option {{!request()->input('s') ? 'selected' : ''}} value="">All Services</option>
+                    @foreach($codes as $code)
+                    <option {{request()->input('s') == $code->code ? 'selected' : ''}} value="{{$code->code}}">
+                        {{$code->code}}
+                    </option>
+                    @endforeach
+                </select>
+                @if(@$targetPro || count(array_filter(request()->all(), function($_x) { return !!$_x && $_x !== 'na' && $_x !== 'hcp';})))
+                <a href="/practice-management/processing-bill-matrix" class="ml-4">Clear Filters</a>
+                @endif
+            </div>
+        </div>
+        <div class="card-body p-0">
+            <div class="table-responsive">
+                <table class="table table-sm table-striped table-hover p-0 m-0">
                     <thead class="bg-light">
-                    <tr>
-                        <th class="border-bottom-0 border-top-0">
-                            <label class="d-flex align-items-center m-0">
-                                <input type="checkbox" class="chk-all-bills" /> <span class="ml-2">All</span>
-                            </label>
-                        </th>
-                        <th class="border-bottom-0 border-top-0">Context</th>
-                        <th class="border-bottom-0 border-top-0">Effective Date</th>
-                        <th class="border-bottom-0 border-top-0">Bal Post Date</th>
-                        @if(!request()->input('t') || request()->input('t') === 'hcp')
+                        <tr>
+                            <th class="border-bottom-0 border-top-0">
+                                <label class="d-flex align-items-center m-0">
+                                    <input type="checkbox" class="chk-all-bills" /> <span class="ml-2">All</span>
+                                </label>
+                            </th>
+                            <th class="border-bottom-0 border-top-0">Context</th>
+                            <th class="border-bottom-0 border-top-0">Effective Date</th>
+                            <th class="border-bottom-0 border-top-0">Bal Post Date</th>
+                            @if(!request()->input('t') || request()->input('t') === 'hcp')
                             <th class="border-bottom-0 border-top-0">HCP Pro</th>
-                        @elseif(request()->input('t') === 'na')
+                            @elseif(request()->input('t') === 'na')
                             <th class="border-bottom-0 border-top-0">NA Pro</th>
-                        @endif
-                        <th class="border-bottom-0 border-top-0">Client</th>
-                        <th class="border-bottom-0 border-top-0">Code</th>
-                        <th class="border-bottom-0 border-top-0">Units</th>
-                        <th class="border-bottom-0 border-top-0">Verified?</th>
-                        @if(!request()->input('t') || request()->input('t') === 'hcp')
+                            @endif
+                            <th class="border-bottom-0 border-top-0">Client</th>
+                            <th class="border-bottom-0 border-top-0">Code</th>
+                            <th class="border-bottom-0 border-top-0">Units</th>
+                            <th class="border-bottom-0 border-top-0">Verified?</th>
+                            @if(!request()->input('t') || request()->input('t') === 'hcp')
                             <th class="border-bottom-0 border-top-0">HCP Expected Amount</th>
-                        @elseif(request()->input('t') === 'na')
+                            @elseif(request()->input('t') === 'na')
                             <th class="border-bottom-0 border-top-0">NA Expected Amount</th>
-                        @endif
-                        <th class="border-bottom-0 border-top-0">Pro Signed?</th>
-                        <th class="border-bottom-0 border-top-0"></th>
-                    </tr>
+                            @endif
+                            <th class="border-bottom-0 border-top-0">Pro Signed?</th>
+                            <th class="border-bottom-0 border-top-0"></th>
+                        </tr>
                     </thead>
                     <tbody>
-                    @foreach ($bills as $row)
+                        @foreach ($bills as $row)
                         <tr>
                             <td class="align-top">
                                 @if($row->is_verified)
-                                    <input type="checkbox" data-uid="{{$row->uid}}" class="chk-bill align-middle" />
+                                <input type="checkbox" data-uid="{{$row->uid}}" class="chk-bill align-middle" />
                                 @endif
                             </td>
                             <td>
                                 @if($row->note)
-                                    <a href="/patients/view/{{ $row->client->uid }}/notes/view/{{ $row->note->uid }}">
-                                        Note
-                                    </a>
+                                <a href="/patients/view/{{ $row->client->uid }}/notes/view/{{ $row->note->uid }}">
+                                    Note
+                                </a>
                                 @elseif($row->careMonth)
-                                    <a href="/patients/view/{{$row->client->uid}}/care-months/view/{{$row->careMonth->uid}}">
-                                        Care Month
-                                    </a>
+                                <a href="/patients/view/{{$row->client->uid}}/care-months/view/{{$row->careMonth->uid}}">
+                                    Care Month
+                                </a>
                                 @elseif($row->client)
-                                    <a href="/patients/view/{{ $row->client->uid }}">
-                                        Chart
-                                    </a>
+                                <a href="/patients/view/{{ $row->client->uid }}">
+                                    Chart
+                                </a>
                                 @else
-                                    Generic
+                                Generic
                                 @endif
                             </td>
                             <td>{{friendly_date($row->effective_date)}}</td>
                             <td>{{friendly_date($row->balance_post_date)}}</td>
                             <td>
                                 @if(!request()->input('t') || request()->input('t') === 'hcp')
-                                    {{$row->hcp->name_last}}, {{$row->hcp->name_first}}
-                                    <div class="mt-1 text-sm text-secondary font-weight-bold">
-                                        <i class="fa fa-hospital mr-1"></i>
-                                        {{$row->hcpCompany? $row->hcpCompanyPro->company->name:''}}
-                                    </div>
+                                {{$row->hcp->name_last}}, {{$row->hcp->name_first}}
+                                <div class="mt-1 text-sm text-secondary">
+                                    <i class="fa fa-hospital mr-1"></i>
+                                    {{$row->hcpCompany? $row->hcpCompanyPro->company->name:''}}
+                                </div>
                                 @elseif(request()->input('t') === 'na')
-                                    {{$row->genericPro->name_last}}, {{$row->genericPro->name_first}}
-                                    <div class="mt-1 text-sm text-secondary font-weight-bold">
-                                        <i class="fa fa-hospital mr-1"></i>
-                                        {{$row->genericCompanyPro->company->name}}
-                                    </div>
+                                {{$row->genericPro->name_last}}, {{$row->genericPro->name_first}}
+                                <div class="mt-1 text-sm text-secondary">
+                                    <i class="fa fa-hospital mr-1"></i>
+                                    {{$row->genericCompanyPro->company->name}}
+                                </div>
                                 @endif
 
                             </td>
                             <td>
                                 @if($row->client)
-                                    {{$row->client->name_last}}, {{$row->client->name_first}}
+                                {{$row->client->name_last}}, {{$row->client->name_first}}
                                 @endif
                             </td>
                             <td>{{$row->code}}
                                 @if($row->generic_target_entity_type && $row->generic_target_entity_uid)
-                                    <div class="mt-1 text-sm text-secondary font-weight-bold">{{$row->generic_target_entity_type}}</div>
+                                <div class="mt-1 text-sm text-secondary">{{$row->generic_target_entity_type}}</div>
                                 @endif
                             </td>
                             <td>{{str_contains($row->code, 'Treatment Services') || str_contains($row->code, 'Administrative Services') ? ceil((float) $row->number_of_units * 60) . ' mins' : $row->number_of_units}}</td>
                             <td>{!! $row->is_verified ? 'Yes<br>' . friendly_date($row->marked_verified_at, true) : 'No' !!} </td>
                             @if(!request()->input('t') || request()->input('t') === 'hcp')
-                                <td><b>${{$row->hcp_expected_payment_amount}}</b></td>
+                            <td>${{$row->hcp_expected_payment_amount}}</td>
                             @elseif(request()->input('t') === 'na')
-                                <td><b>${{number_format($row->generic_pro_expected_payment_amount, 2)}}</b></td>
+                            <td>${{number_format($row->generic_pro_expected_payment_amount, 2)}}</td>
                             @endif
                             @if(!request()->input('t') || request()->input('t') === 'hcp')
-                                <td>{{$row->is_signed_by_hcp ? 'Yes' : 'No'}}</td>
+                            <td>{{$row->is_signed_by_hcp ? 'Yes' : 'No'}}</td>
                             @elseif(request()->input('t') === 'na')
-                                <td>{{$row->is_signed_by_generic_pro ? 'Yes' : 'No'}}</td>
+                            <td>{{$row->is_signed_by_generic_pro ? 'Yes' : 'No'}}</td>
                             @endif
                             <td>
                                 @if($row->is_verified)
-                                    <a href="#" data-uid="{{$row->uid}}" class="pay-bill font-weight-bold">Pay</a>
+                                <a href="#" data-uid="{{$row->uid}}" class="pay-bill">Pay</a>
                                 @endif
                             </td>
                         </tr>
-                    @endforeach
+                        @endforeach
                     </tbody>
                 </table>
             </div>
         </div>
-        <div class="mt-3">
-            {{$bills->withQueryString()->links()}}
-        </div>
     </div>
-    <script>
-        (function() {
-            window.billsFilter = function(_key, _value, _isClient = false) {
+    <div class="mt-3">
+        {{$bills->withQueryString()->links()}}
+    </div>
+</div>
+<script>
+    (function() {
+        window.billsFilter = function(_key, _value, _isClient = false) {
 
-                <?php
-                $keys = ['f', 'bs', 'be', 't', 'c', 's'];
-                $currentParams = [];
-                for($i = 0; $i < count($keys); $i++) {
-                    if(!!request()->input($keys[$i])) {
-                        $currentParams[$keys[$i]] = request()->input($keys[$i]);
-                    }
+            <?php
+            $keys = ['f', 'bs', 'be', 't', 'c', 's'];
+            $currentParams = [];
+            for ($i = 0; $i < count($keys); $i++) {
+                if (!!request()->input($keys[$i])) {
+                    $currentParams[$keys[$i]] = request()->input($keys[$i]);
                 }
-                ?>
+            }
+            ?>
 
-                let targetProUid = _isClient ? _value : $('[provider-search]').attr('data-pro-uid'),
-                    base = '/practice-management/processing-bill-matrix' + (targetProUid ? '/' + targetProUid : ''),
-                    keys = ['f', 'bs', 'be', 't', 'c', 's'].filter(_x => _x !== _key),
-                    currentParams = {!! json_encode($currentParams) !!},
-                    url = [];
+            let targetProUid = _isClient ? _value : $('[provider-search]').attr('data-pro-uid'),
+                base = '/practice-management/processing-bill-matrix' + (targetProUid ? '/' + targetProUid : ''),
+                keys = ['f', 'bs', 'be', 't', 'c', 's'].filter(_x => _x !== _key),
+                currentParams = {
+                    !!json_encode($currentParams) !!
+                },
+                url = [];
 
-                // base
-                url.push(base);
-                url.push('?');
+            // base
+            url.push(base);
+            url.push('?');
 
-                // params
-                let getParams = [];
-                for (let i = 0; i < keys.length; i++) {
-                    if(currentParams[keys[i]]) {
-                        getParams.push(keys[i] + '=' + encodeURIComponent(currentParams[keys[i]]));
-                    }
+            // params
+            let getParams = [];
+            for (let i = 0; i < keys.length; i++) {
+                if (currentParams[keys[i]]) {
+                    getParams.push(keys[i] + '=' + encodeURIComponent(currentParams[keys[i]]));
                 }
+            }
 
-                // new params
-                getParams.push(_key + '=' + encodeURIComponent(_value));
+            // new params
+            getParams.push(_key + '=' + encodeURIComponent(_value));
 
-                // generate url
-                url.push(getParams.join('&'));
+            // generate url
+            url.push(getParams.join('&'));
 
-                // go
-                fastLoad(url.join(''));
+            // go
+            fastLoad(url.join(''));
 
-                return false;
-            };
+            return false;
+        };
 
-            function init() {
-                $('.pay-bill')
-                    .off('click')
-                    .on('click', function () {
-                        showMask();
-                        $.post('/api/bill/payUnpaidProsOnBillExpectedAmount', {
-                            uid: $(this).attr('data-uid')
-                        }, _data => {
-                            if(!hasResponseError(_data)) {
-                                toastr.success('Bill paid successfully');
-                                fastReload();
-                            }
-                        }).then(function() {
-                            hideMask();
-                        });
-                        return false;
-                    });
-                $('.pay-selected-pros')
-                    .off('click')
-                    .on('click', function () {
-                        if(!$('.chk-bill:checked').length) return false;
-                        showMask();
-                        let uids = [];
-                        $('.chk-bill:checked').each(function() {
-                            uids.push($(this).attr('data-uid'));
-                        });
-                        $.post('/api/bill/bulkPayUnpaidProsOnBillExpectedAmount', {
-                            billUids: uids.join('|')
-                        }, _data => {
-                            if(!hasResponseError(_data)) {
-                                toastr.success('Selected bills paid successfully');
-                                fastReload();
-                            }
-                        }).then(function() {
-                            hideMask();
-                        });
-                        return false;
+        function init() {
+            $('.pay-bill')
+                .off('click')
+                .on('click', function() {
+                    showMask();
+                    $.post('/api/bill/payUnpaidProsOnBillExpectedAmount', {
+                        uid: $(this).attr('data-uid')
+                    }, _data => {
+                        if (!hasResponseError(_data)) {
+                            toastr.success('Bill paid successfully');
+                            fastReload();
+                        }
+                    }).then(function() {
+                        hideMask();
                     });
-                $('.chk-bill')
-                    .off('change')
-                    .on('change', function() {
-                        console.log('123')
-                         $('.pay-selected-pros').prop('disabled', !$('.chk-bill:checked').length);
-                         $('.chk-all-bills').prop('checked', ($('.chk-bill:checked').length === $('.chk-bill').length));
-                         return false;
+                    return false;
+                });
+            $('.pay-selected-pros')
+                .off('click')
+                .on('click', function() {
+                    if (!$('.chk-bill:checked').length) return false;
+                    showMask();
+                    let uids = [];
+                    $('.chk-bill:checked').each(function() {
+                        uids.push($(this).attr('data-uid'));
                     });
-                $('.chk-all-bills')
-                    .off('change')
-                    .on('change', function() {
-                        console.log('12')
-                        $('.chk-bill')
-                            .prop('checked', this.checked)
-                            .first()
-                                .trigger('change');
-                        return false;
+                    $.post('/api/bill/bulkPayUnpaidProsOnBillExpectedAmount', {
+                        billUids: uids.join('|')
+                    }, _data => {
+                        if (!hasResponseError(_data)) {
+                            toastr.success('Selected bills paid successfully');
+                            fastReload();
+                        }
+                    }).then(function() {
+                        hideMask();
                     });
-            }
-            addMCInitializer('processing-bill-matrix', init, '#processing-bill-matrix');
-        }).call(window);
-    </script>
-@endsection
+                    return false;
+                });
+            $('.chk-bill')
+                .off('change')
+                .on('change', function() {
+                    console.log('123')
+                    $('.pay-selected-pros').prop('disabled', !$('.chk-bill:checked').length);
+                    $('.chk-all-bills').prop('checked', ($('.chk-bill:checked').length === $('.chk-bill').length));
+                    return false;
+                });
+            $('.chk-all-bills')
+                .off('change')
+                .on('change', function() {
+                    console.log('12')
+                    $('.chk-bill')
+                        .prop('checked', this.checked)
+                        .first()
+                        .trigger('change');
+                    return false;
+                });
+        }
+        addMCInitializer('processing-bill-matrix', init, '#processing-bill-matrix');
+    }).call(window);
+</script>
+@endsection

resources/views/app/practice-management/rates.blade.php

@@ -5,7 +5,7 @@
     <div class="p-3 mcp-theme-1">
         <div class="card">
 
-            <div class="card-header px-3 py-2 d-flex align-items-center">
+            <div class="card-header px-2 py-1 d-flex align-items-center">
                 <strong class="text-nowrap">
                     <i class="fas fa-user"></i>
                     Payment Rates
@@ -22,7 +22,7 @@
             </div>
             <div class="card-body p-0">
 
-                <table class="table table-sm table-condensed p-0 m-0">
+                <table class="table table-sm table-striped p-0 m-0">
                     <thead class="bg-light">
                     <tr>
                         <th class="w-25 px-3 border-0">Pro</th>
@@ -34,16 +34,16 @@
                     <tbody>
                     @foreach ($rates as $rate)
                         <tr>
-                            <td class="px-3">
+                            <td>
                                 {{ isset($rate->pro) ? $rate->pro->name_display : 'No Pro' }}
                             </td>
-                            <td class="px-3">
+                            <td>
                                 {{ $rate->responsibility }}
                             </td>
-                            <td class="font-weight-bold">
+                            <td>
                                 {{ $rate->code }}
                             </td>
-                            <td class="font-weight-bold">
+                            <td>
                                 ${{ $rate->amount }}
                             </td>
                         </tr>

resources/views/app/practice-management/remote-monitoring-report.blade.php

@@ -1,160 +1,163 @@
 @extends ('layouts/template')
 
 @section('content')
-    <div class="p-3 mcp-theme-1">
-        <div class="card">
-            <div class="card-header p-3 d-flex align-items-center">
-                <strong class="mr-4">
-                    <i class="fas fa-chart-bar"></i>
-                    Remote Monitoring Report
-                </strong>
-            </div>
+<div class="p-3 mcp-theme-1">
+    <div class="card">
+        <div class="card-header px-2 py-1 d-flex align-items-center">
+            <strong class="mr-4">
+                <i class="fas fa-chart-bar"></i>
+                Remote Monitoring Report
+            </strong>
+        </div>
 
-            <div class="card-body p-0">
-                <div class="d-flex_ d-none flex-row">
-                    <div class="ml-2 mt-2">
-                        <div>Patient</div>
-                        <input type="text"  class="form-control input-sm" name="patient">
-                    </div>
-                    <div class="ml-2 mt-2">
-                        <div>HCP</div>
-                        <input type="text"  class="form-control input-sm" name="hcp">
-                    </div>
-                    <div class="ml-2 mt-2">
-                        <div>Care Month Start Date</div>
-                        <select name="" id="" class="form-control input-sm mb-2">
-                            <option>all</option>
-                            <option>on</option>
-                            <option>on-or-before</option>
-                            <option>on-or-after</option>
-                            <option>between</option>
-                            <option>not-on</option>
-                            <option>not-in-between</option>
-                        </select>
-                        <input type="date1" class="form-control input-sm mb-2">
-                        <input type="date1" class="form-control input-sm mb-2">
-                    </div>
-                    <div class="ml-2 mt-2">
-                        <div>Number Of Days With Measurements</div>
-                        <select name="" id="" class="form-control input-sm mb-2">
-                            <option>all</option>
-                            <option>less-than</option>
-                            <option>greater-than</option>
-                            <option>equal-to</option>
-                            <option>between</option>
-                            <option>not-equal-to</option>
-                            <option>not-in-between</option>
-                        </select>
-                        <input type="date1" class="form-control form-control input-sm mb-2">
-                        <input type="date1" class="form-control form-control input-sm mb-2">
-                    </div>
-                    <div class="ml-2 mt-2">
-                        <div>Most Recent Mcp Note Date</div>
-                        <select name="" id="" class="form-control  form-control input-sm mb-2">
-                            <option>all</option>
-                            <option>on</option>
-                            <option>on-or-before</option>
-                            <option>on-or-after</option>
-                            <option>between</option>
-                            <option>not-on</option>
-                            <option>not-in-between</option>
-                        </select>
-                        <input type="date1" class="form-control input-sm mb-2">
-                        <input type="date1" class="form-control input-sm mb-2">
-                    </div>
-                    <div class="ml-2 mt-2">
-                        <div>Days Between Most Recent Mcp Note Date And End Of Care Month</div>
-                        <select name="" id="" class="form-control input-sm mb-2">
-                            <option>all</option>
-                            <option>less-than</option>
-                            <option>greater-than</option>
-                            <option>equal-to</option>
-                            <option>between</option>
-                            <option>not-equal-to</option>
-                            <option>not-in-between</option>
-                        </select>
-                        <input type="date1" class="form-control  input-sm mb-2">
-                        <input type="date1" class="form-control  input-sm mb-2">
-                    </div>
-                    <div class="ml-2 mt-2">
-                        <button class="btn btn-primary"><i class="fa fa-filter"></i> Filter</button>
-                    </div>
+        <div class="card-body p-0">
+            <div class="d-flex_ d-none flex-row">
+                <div class="ml-2 mt-2">
+                    <div>Patient</div>
+                    <input type="text" class="form-control input-sm" name="patient">
+                </div>
+                <div class="ml-2 mt-2">
+                    <div>HCP</div>
+                    <input type="text" class="form-control input-sm" name="hcp">
+                </div>
+                <div class="ml-2 mt-2">
+                    <div>Care Month Start Date</div>
+                    <select name="" id="" class="form-control input-sm mb-2">
+                        <option>all</option>
+                        <option>on</option>
+                        <option>on-or-before</option>
+                        <option>on-or-after</option>
+                        <option>between</option>
+                        <option>not-on</option>
+                        <option>not-in-between</option>
+                    </select>
+                    <input type="date1" class="form-control input-sm mb-2">
+                    <input type="date1" class="form-control input-sm mb-2">
+                </div>
+                <div class="ml-2 mt-2">
+                    <div>Number Of Days With Measurements</div>
+                    <select name="" id="" class="form-control input-sm mb-2">
+                        <option>all</option>
+                        <option>less-than</option>
+                        <option>greater-than</option>
+                        <option>equal-to</option>
+                        <option>between</option>
+                        <option>not-equal-to</option>
+                        <option>not-in-between</option>
+                    </select>
+                    <input type="date1" class="form-control form-control input-sm mb-2">
+                    <input type="date1" class="form-control form-control input-sm mb-2">
                 </div>
-                <table class="table table-sm table-condensed p-0 m-0" style="">
-                    <thead class="bg-light">
+                <div class="ml-2 mt-2">
+                    <div>Most Recent Mcp Note Date</div>
+                    <select name="" id="" class="form-control  form-control input-sm mb-2">
+                        <option>all</option>
+                        <option>on</option>
+                        <option>on-or-before</option>
+                        <option>on-or-after</option>
+                        <option>between</option>
+                        <option>not-on</option>
+                        <option>not-in-between</option>
+                    </select>
+                    <input type="date1" class="form-control input-sm mb-2">
+                    <input type="date1" class="form-control input-sm mb-2">
+                </div>
+                <div class="ml-2 mt-2">
+                    <div>Days Between Most Recent Mcp Note Date And End Of Care Month</div>
+                    <select name="" id="" class="form-control input-sm mb-2">
+                        <option>all</option>
+                        <option>less-than</option>
+                        <option>greater-than</option>
+                        <option>equal-to</option>
+                        <option>between</option>
+                        <option>not-equal-to</option>
+                        <option>not-in-between</option>
+                    </select>
+                    <input type="date1" class="form-control  input-sm mb-2">
+                    <input type="date1" class="form-control  input-sm mb-2">
+                </div>
+                <div class="ml-2 mt-2">
+                    <button class="btn btn-primary"><i class="fa fa-filter"></i> Filter</button>
+                </div>
+            </div>
+            <div class="table-responsive">
+                <table class="table table-sm table-striped p-0 m-0" style="">
+                    <thead class="bg-light text-nowrap">
                         <tr>
-				@if($isAdmin)
-			    <th class="border-0">MCP</th>
-				@endif
+                            @if($isAdmin)
+                            <th class="border-0">MCP</th>
+                            @endif
                             <th class="border-0">Patient</th>
                             <th class="border-0">Month/Year</th>
                             <th class="border-0"># Days w/ Meas.</th>
                             <th class="border-0">Most Recent MCP Note</th>
                             <th class="border-0">Days Between Note and EOM</th>
                             @if($isAdmin)
-			    <th class="border-0">RM Bill</th>
+                            <th class="border-0">RM Bill</th>
                             <th class="border-0">Is Bill Closed</th>
                             <th class="border-0">Bill Closed At</th>
                             <th class="border-0">Is Claim Closed</th>
-			    @endif
+                            @endif
                         </tr>
                     </thead>
 
                     <tbody>
                         @foreach($rows as $row)
-                            <tr>
-				@if($isAdmin)
-                                <td>
-                                    @if($row->mcp)
-                                        <b>{{ implode(", ", [$row->mcp->name_display]) }}</b>
-                                    @else
-                                        --
-                                    @endif
-                                </td>
-				@endif
-                                <td>
-                                    <a href="/patients/view/{{ $row->patient->uid }}">
-                                        <b>{{ implode(", ", [$row->patient->name_last,$row->patient->name_first]) }}</b>
-                                    </a>
-                                </td>
-                                <td>
-                                    <a href="{{route('patients.view.care-months.view.dashboard', ['patient'=>$row->patient, 'careMonth'=>$row])}}">
-                                        {{ friendly_date_month_year($row->start_date) }}
-                                    </a>
-                                </td>
-                                <td>
-                                	{{ $row->number_of_days_with_remote_measurements }}
-				                </td>
-                                <td>
-                                    @if($row->mostRecentMcpNote)
-                                        <a href="{{route('patients.view.notes.view.dashboard',['patient'=>$row->patient, 'note'=>$row->mostRecentMcpNote])}}">
-                                            {{friendly_date($row->most_recent_mcp_note_date)}}
-                                        </a>
-                                    @else
-                                        --
-                                    @endif
-                                </td>
-                                <td>{{$row->days_between_most_recent_mcp_note_date_and_end_of_care_month}}</td>
-                                @if($isAdmin)
-				<td>
-                                    @if($row->rmBill)
-                                        <a href="{{route('patients.view.care-months.view.dashboard', ['patient'=>$row->patient, 'careMonth'=>$row])}}">{{ $row->rmBill->code  }}</a>
-                                    @else
-                                        --
-                                    @endif
-                                </td>
-                                <td>{{$row->is_bill_closed? 'Yes':'No'}}</td>
-                                <td>{{friendly_date_time($row->bill_closed_at)}}</td>
-                                <td>{{$row->is_claim_closed? 'Yes':'No'}}</td>
-				@endif
-                            </tr>
+                        <tr>
+                            @if($isAdmin)
+                            <td>
+                                @if($row->mcp)
+                                {{ implode(", ", [$row->mcp->name_display]) }}
+                                @else
+                                --
+                                @endif
+                            </td>
+                            @endif
+                            <td>
+                                <a href="/patients/view/{{ $row->patient->uid }}">
+                                    {{ implode(", ", [$row->patient->name_last,$row->patient->name_first]) }}
+                                </a>
+                            </td>
+                            <td>
+                                <a href="{{route('patients.view.care-months.view.dashboard', ['patient'=>$row->patient, 'careMonth'=>$row])}}">
+                                    {{ friendly_date_month_year($row->start_date) }}
+                                </a>
+                            </td>
+                            <td>
+                                {{ $row->number_of_days_with_remote_measurements }}
+                            </td>
+                            <td>
+                                @if($row->mostRecentMcpNote)
+                                <a href="{{route('patients.view.notes.view.dashboard',['patient'=>$row->patient, 'note'=>$row->mostRecentMcpNote])}}">
+                                    {{friendly_date($row->most_recent_mcp_note_date)}}
+                                </a>
+                                @else
+                                --
+                                @endif
+                            </td>
+                            <td>{{$row->days_between_most_recent_mcp_note_date_and_end_of_care_month}}</td>
+                            @if($isAdmin)
+                            <td>
+                                @if($row->rmBill)
+                                <a href="{{route('patients.view.care-months.view.dashboard', ['patient'=>$row->patient, 'careMonth'=>$row])}}">{{ $row->rmBill->code  }}</a>
+                                @else
+                                --
+                                @endif
+                            </td>
+                            <td>{{$row->is_bill_closed? 'Yes':'No'}}</td>
+                            <td>{{friendly_date_time($row->bill_closed_at)}}</td>
+                            <td>{{$row->is_claim_closed? 'Yes':'No'}}</td>
+                            @endif
+                        </tr>
                         @endforeach
                     </tbody>
                 </table>
-                <div>
-                    {{$rows->links()}}
-                </div>
             </div>
+
         </div>
     </div>
-@endsection
+    <div class="mt-3">
+        {{$rows->links()}}
+    </div>
+</div>
+@endsection

resources/views/app/practice-management/remote-monitoring.blade.php

@@ -6,11 +6,11 @@
 
         <div class="card">
 
-            <div class="card-header px-3 py-2 d-flex align-items-center">
+            <div class="card-header px-2 py-1 d-flex align-items-center">
                 <span class="mr-4">
-                    <span class="font-size-16">Remote Monitoring</span>
+                    <span class="font-size-14">Remote Monitoring</span>
                     <i class="fas fa-arrow-right text-sm mx-1"></i>
-                    <b class="font-size-16">{{friendly_month(date((request()->input('y') ?: 'Y') . '-' . (request()->input('m') ?: 'm') . '-d'))}}</b>
+                    <b class="font-size-14">{{friendly_month(date((request()->input('y') ?: 'Y') . '-' . (request()->input('m') ?: 'm') . '-d'))}}</b>
                 </span>
                 <?php
                 $dateInput = [];
@@ -32,7 +32,7 @@
                 </select>
             </div>
             <div class="card-body p-0">
-                <table class="table table-sm table-condensed table-hover p-0 m-0">
+                <table class="table table-sm table-striped table-hover p-0 m-0">
                     <thead class="bg-light">
                     <tr>
                         <th class="border-0">Patient</th>

resources/views/app/practice-management/rm-bills-to-sign.blade.php

@@ -5,7 +5,7 @@
     <div class="p-3 mcp-theme-1">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center">
+        <div class="card-header px-2 py-1 d-flex align-items-center">
             <strong class="mr-4">
                 <i class="fas fa-user"></i>
                 RM Bills to Sign
@@ -25,7 +25,7 @@
         </div>
         <div class="card-body p-0">
 
-            <table class="table table-sm table-condensed table-hover p-0 m-0">
+            <table class="table table-sm table-striped table-hover p-0 m-0">
                 <thead class="bg-light">
                 <tr>
                     <th class="px-3 border-0">Eff. Date</th>

resources/views/app/practice-management/rm-launch-and-clean.blade.php

@@ -2,242 +2,232 @@
 
 <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.10.23/css/jquery.dataTables.css">
 <script type="text/javascript" charset="utf8" src="https://cdn.datatables.net/1.10.23/js/jquery.dataTables.js"></script>
-   
+
 
 @section('content')
-    <div id="rm-launch-and-clean" class="p-3 mcp-theme-1">
-        <div class="d-flex align-items-end mb-3">
-            <div class="font-weight-bold font-size-14 text-secondary">
-                RM - Launch &amp; Clean
-            </div>
+<div id="rm-launch-and-clean" class="p-3 mcp-theme-1">
+    <div class="d-flex align-items-end mb-3">
+        <div class="font-weight-bold font-size-14 text-secondary">
+            RM - Launch &amp; Clean
         </div>
+    </div>
+    <div class="border p-2 mb-2 rounded">
         <table class="table table-striped table-condensed table-bordered table-sm width-300px">
             <tbody>
-            <tr>
-                <td class="text-nowrap">Care Months Eligible For <b>RM30 HCP + 40 EXTRA</b></td>
-                <td class="text-success font-weight-bold text-right">{{$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP_PLUS_40']}}</td>
-            </tr>
-          
-            <tr>
-                <td class="text-nowrap">Care Months Eligible For <b>RM30 HCP + 20 EXTRA</b></td>
-                <td class="text-success font-weight-bold text-right">{{$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP_PLUS_20']}}</td>
-            </tr>
-          
-            <tr>
-                <td class="text-nowrap">Care Months Eligible For <b>RM30 HCP Only</b></td>
-                <td class="text-success font-weight-bold text-right">{{$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP']}}</td>
-            </tr>
+                <tr>
+                    <td class="text-nowrap">Care Months Eligible For <b>RM30 HCP + 40 EXTRA</b></td>
+                    <td class="text-success font-weight-bold text-right">{{$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP_PLUS_40']}}</td>
+                </tr>
+
+                <tr>
+                    <td class="text-nowrap">Care Months Eligible For <b>RM30 HCP + 20 EXTRA</b></td>
+                    <td class="text-success font-weight-bold text-right">{{$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP_PLUS_20']}}</td>
+                </tr>
+
+                <tr>
+                    <td class="text-nowrap">Care Months Eligible For <b>RM30 HCP Only</b></td>
+                    <td class="text-success font-weight-bold text-right">{{$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP']}}</td>
+                </tr>
 
-            <tr>
-                <td class="text-nowrap">Care Months Eligible For <b>RMB</b></td>
-                <td class="text-success font-weight-bold text-right">{{$keyNumbers['careMonthsEligibleForBillGeneration_RMB']}}</td>
-            </tr>
+                <tr>
+                    <td class="text-nowrap">Care Months Eligible For <b>RMB</b></td>
+                    <td class="text-success font-weight-bold text-right">{{$keyNumbers['careMonthsEligibleForBillGeneration_RMB']}}</td>
+                </tr>
 
-            <tr>
-                <td class="text-nowrap">Care Months Eligible For <b>RM30 HCP + 40 EXTRA IF HAD INTERACTION</b></td>
-                <td class="text-success font-weight-bold text-right">{{$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP_PLUS_40_ifHadInteraction']}}</td>
-            </tr>
-            <tr>
-                <td class="text-nowrap">Care Months Eligible For <b>RM30 HCP + 20 EXTRA IF HAD INTERACTION</b></td>
-                <td class="text-success font-weight-bold text-right">{{$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP_PLUS_20_ifHadInteraction']}}</td>
-            </tr>
+                <tr>
+                    <td class="text-nowrap">Care Months Eligible For <b>RM30 HCP + 40 EXTRA IF HAD INTERACTION</b></td>
+                    <td class="text-success font-weight-bold text-right">{{$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP_PLUS_40_ifHadInteraction']}}</td>
+                </tr>
+                <tr>
+                    <td class="text-nowrap">Care Months Eligible For <b>RM30 HCP + 20 EXTRA IF HAD INTERACTION</b></td>
+                    <td class="text-success font-weight-bold text-right">{{$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP_PLUS_20_ifHadInteraction']}}</td>
+                </tr>
+
+                <tr>
+                    <td class="text-nowrap">Care Months With <b>16+ Measurement Days</b></td>
+                    <td class="text-success font-weight-bold text-right">{{$keyNumbers['careMonthsWith16OrMoreMeasurementDays']}}</td>
+                </tr>
 
-            <tr>
-                <td class="text-nowrap">Care Months With <b>16+ Measurement Days</b></td>
-                <td class="text-success font-weight-bold text-right">{{$keyNumbers['careMonthsWith16OrMoreMeasurementDays']}}</td>
-            </tr>
 
 
-        
             </tbody>
         </table>
-        <div class="d-flex align-items-center">
-            <button class="btn btn-sm btn-primary btn-launch px-3 font-weight-bold mr-3"
-                    {{@$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP_PLUS_40'] ? '' : 'disabled'}}
-                    {{@$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP_PLUS_40'] ? '' : 'perm-disabled'}}
-                    data-ep="rm-admin-launcher-rm30-hcp-plus-40">Generate RM-30 HCP PLUS 40 ({{@$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP_PLUS_40']}})
-            </button>
-            <button class="btn btn-sm btn-primary btn-launch px-3 font-weight-bold mr-3"
-                    {{@$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP_PLUS_20'] ? '' : 'disabled'}}
-                    {{@$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP_PLUS_20'] ? '' : 'perm-disabled'}}
-                    data-ep="rm-admin-launcher-rm30-hcp-plus-20">Generate RM-30 HCP PLUS 20 ({{@$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP_PLUS_20']}})
-            </button>
-            <button class="btn btn-sm btn-primary btn-launch px-3 font-weight-bold mr-3"
-                    {{@$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP'] ? '' : 'disabled'}}
-                    {{@$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP'] ? '' : 'perm-disabled'}}
-                    data-ep="rm-admin-launch-rm30-hcp">Generate RM-30 HCP ({{@$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP']}})
-            </button>
-            <button class="btn btn-sm btn-primary btn-launch px-3 font-weight-bold mr-3"
-                    {{@$keyNumbers['careMonthsEligibleForBillGeneration_RMB'] ? '' : 'disabled'}}
-                    {{@$keyNumbers['careMonthsEligibleForBillGeneration_RMB'] ? '' : 'perm-disabled'}}
-                    data-ep="rm-admin-launch-rmb">Generate RMB ({{@$keyNumbers['careMonthsEligibleForBillGeneration_RMB']}})
-            </button>
+    </div>
+    <div class="d-flex align-items-center">
+        <button class="btn btn-sm btn-primary btn-launch px-3 font-weight-bold mr-3" {{@$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP_PLUS_40'] ? '' : 'disabled'}} {{@$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP_PLUS_40'] ? '' : 'perm-disabled'}} data-ep="rm-admin-launcher-rm30-hcp-plus-40">Generate RM-30 HCP PLUS 40 ({{@$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP_PLUS_40']}})
+        </button>
+        <button class="btn btn-sm btn-primary btn-launch px-3 font-weight-bold mr-3" {{@$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP_PLUS_20'] ? '' : 'disabled'}} {{@$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP_PLUS_20'] ? '' : 'perm-disabled'}} data-ep="rm-admin-launcher-rm30-hcp-plus-20">Generate RM-30 HCP PLUS 20 ({{@$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP_PLUS_20']}})
+        </button>
+        <button class="btn btn-sm btn-primary btn-launch px-3 font-weight-bold mr-3" {{@$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP'] ? '' : 'disabled'}} {{@$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP'] ? '' : 'perm-disabled'}} data-ep="rm-admin-launch-rm30-hcp">Generate RM-30 HCP ({{@$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP']}})
+        </button>
+        <button class="btn btn-sm btn-primary btn-launch px-3 font-weight-bold mr-3" {{@$keyNumbers['careMonthsEligibleForBillGeneration_RMB'] ? '' : 'disabled'}} {{@$keyNumbers['careMonthsEligibleForBillGeneration_RMB'] ? '' : 'perm-disabled'}} data-ep="rm-admin-launch-rmb">Generate RMB ({{@$keyNumbers['careMonthsEligibleForBillGeneration_RMB']}})
+        </button>
 
-            <button class="btn btn-sm btn-primary btn-launch px-3 font-weight-bold mr-3"
-                    data-ep="rm-admin-launch-counts">Get counts
-            </button>
+        <button class="btn btn-sm btn-primary btn-launch px-3 font-weight-bold mr-3" data-ep="rm-admin-launch-counts">Get counts
+        </button>
 
-           
-        </div>
-        <div class="my-3 text-secondary text-sm text-monospace launch-result" style="white-space: pre;">
-        </div>
 
-        <div>
-            <table class="table" id="careMonthsTable">
-                <thead>
-                    <tr>
-                        <th>Created At</th>
-                        <th>Uid</th>
-                        <th>Cm Total Time In Seconds</th>
-                        <th>Cm Total Time In Seconds By Cm Pro</th>
-                        <th>Cm Total Time In Seconds By Mcp</th>
-                        <th>Has Mcp Done Em Visit</th>
-                        <th>Is Client Enrolled In Cm</th>
-                        <th>Is Client Enrolled In Rm</th>
-                        <th>Is Cm Canceled This Month</th>
-                        <th>Is Rm Canceled This Month</th>
-                        <th>Is Tm This Month</th>
-                        <th>Rm Total Time In Seconds</th>
-                        <th>Rm Total Time In Seconds By Mcp</th>
-                        <th>Rm Total Time In Seconds By Rme Pro</th>
-                        <th>Rm Total Time In Seconds By Rmm Pro</th>
-                        <th>Start Date</th>
-                        <th>Why Is Cm Canceled This Month</th>
-                        <th>Why Is Rm Canceled This Month</th>
-                        <th>Why Not Enrolled In Cm Category</th>
-                        <th>Why Not Enrolled In Cm Memo</th>
-                        <th>Why Not Enrolled In Rm Category</th>
-                        <th>Why Not Enrolled In Rm Memo</th>
-                        <th>Created By Session Id</th>
-                        <th>Client Id</th>
-                        <th>Cm Bill Id</th>
-                        <th>Cm Pro Id</th>
-                        <th>Mcp Pro Id</th>
-                        <th>Rm Bill Id</th>
-                        <th>Rme Pro Id</th>
-                        <th>Rmm Pro Id</th>
-                        <th>Rms Pro Id</th>
-                        <th>Rmg Pro Id</th>
-                        <th>Rm Total Time In Seconds By Rms Pro</th>
-                        <th>Rm Total Time In Seconds By Rmg Pro</th>
-                        <th>Number Of Days With Remote Measurements</th>
-                        <th>Is Bill Closed</th>
-                        <th>Bill Closed At</th>
-                        <th>Bill Closed By Session Id</th>
-                        <th>Bill Closed By Pro Id</th>
-                        <th>Is Billing Marked Done</th>
-                        <th>Billing Marked Done By Session Id</th>
-                        <th>Billing Marked Done By Pro Id</th>
-                        <th>Billing Marked Done At</th>
-                        <th>Claim Total Expected</th>
-                        <th>Is Claim Closed</th>
-                        <th>Claim Closed At</th>
-                        <th>Claim Closed By Session Id</th>
-                        <th>Claim Closed By Pro Id</th>
-                        <th>Claim Summary</th>
-                        <th>Claim Total Paid</th>
-                        <th>Company Pro Payer Id</th>
-                        <th>Company Pro Id</th>
-                        <th>Company Id</th>
-                        <th>Company Location Id</th>
-                        <th>Has Anyone Interacted With Client About Rm Outside Note</th>
-                        <th>Rm Num Measurements Not Stamped By Mcp</th>
-                        <th>Rm Num Measurements Not Stamped By Non Hcp</th>
-                        <th>Rm Num Measurements Not Stamped By Rmm</th>
-                        <th>Rm Num Measurements Not Stamped By Rme</th>
-                        <th>Has Mcp Rm Interacted By Note</th>
-                        <th>Mcp Rm Interaction Note Id</th>
-                        <th>Is Rm Interaction Waived</th>
-                    </tr>
-                </thead>
+    </div>
+    <div class="my-3 text-secondary text-sm text-monospace launch-result" style="white-space: pre;">
+    </div>
+<div class="border rounded p-2">
+    <div class="table-responsive">
+        <table class="table table-sm table-striped text-nowrap" id="careMonthsTable">
+            <thead>
+                <tr>
+                    <th>Created At</th>
+                    <th>Uid</th>
+                    <th>Cm Total Time In Seconds</th>
+                    <th>Cm Total Time In Seconds By Cm Pro</th>
+                    <th>Cm Total Time In Seconds By Mcp</th>
+                    <th>Has Mcp Done Em Visit</th>
+                    <th>Is Client Enrolled In Cm</th>
+                    <th>Is Client Enrolled In Rm</th>
+                    <th>Is Cm Canceled This Month</th>
+                    <th>Is Rm Canceled This Month</th>
+                    <th>Is Tm This Month</th>
+                    <th>Rm Total Time In Seconds</th>
+                    <th>Rm Total Time In Seconds By Mcp</th>
+                    <th>Rm Total Time In Seconds By Rme Pro</th>
+                    <th>Rm Total Time In Seconds By Rmm Pro</th>
+                    <th>Start Date</th>
+                    <th>Why Is Cm Canceled This Month</th>
+                    <th>Why Is Rm Canceled This Month</th>
+                    <th>Why Not Enrolled In Cm Category</th>
+                    <th>Why Not Enrolled In Cm Memo</th>
+                    <th>Why Not Enrolled In Rm Category</th>
+                    <th>Why Not Enrolled In Rm Memo</th>
+                    <th>Created By Session Id</th>
+                    <th>Client Id</th>
+                    <th>Cm Bill Id</th>
+                    <th>Cm Pro Id</th>
+                    <th>Mcp Pro Id</th>
+                    <th>Rm Bill Id</th>
+                    <th>Rme Pro Id</th>
+                    <th>Rmm Pro Id</th>
+                    <th>Rms Pro Id</th>
+                    <th>Rmg Pro Id</th>
+                    <th>Rm Total Time In Seconds By Rms Pro</th>
+                    <th>Rm Total Time In Seconds By Rmg Pro</th>
+                    <th>Number Of Days With Remote Measurements</th>
+                    <th>Is Bill Closed</th>
+                    <th>Bill Closed At</th>
+                    <th>Bill Closed By Session Id</th>
+                    <th>Bill Closed By Pro Id</th>
+                    <th>Is Billing Marked Done</th>
+                    <th>Billing Marked Done By Session Id</th>
+                    <th>Billing Marked Done By Pro Id</th>
+                    <th>Billing Marked Done At</th>
+                    <th>Claim Total Expected</th>
+                    <th>Is Claim Closed</th>
+                    <th>Claim Closed At</th>
+                    <th>Claim Closed By Session Id</th>
+                    <th>Claim Closed By Pro Id</th>
+                    <th>Claim Summary</th>
+                    <th>Claim Total Paid</th>
+                    <th>Company Pro Payer Id</th>
+                    <th>Company Pro Id</th>
+                    <th>Company Id</th>
+                    <th>Company Location Id</th>
+                    <th>Has Anyone Interacted With Client About Rm Outside Note</th>
+                    <th>Rm Num Measurements Not Stamped By Mcp</th>
+                    <th>Rm Num Measurements Not Stamped By Non Hcp</th>
+                    <th>Rm Num Measurements Not Stamped By Rmm</th>
+                    <th>Rm Num Measurements Not Stamped By Rme</th>
+                    <th>Has Mcp Rm Interacted By Note</th>
+                    <th>Mcp Rm Interaction Note Id</th>
+                    <th>Is Rm Interaction Waived</th>
+                </tr>
+            </thead>
 
-                <tbody>
-                    @foreach($careMonthsWith16PlusMeasurements as $careMonth)
-                    <tr>
-                        <td>{{$careMonth->created_at}}</td>
-                        <td>{{$careMonth->uid}}</td>
-                        <td>{{$careMonth->cm_total_time_in_seconds}}</td>
-                        <td>{{$careMonth->cm_total_time_in_seconds_by_cm_pro}}</td>
-                        <td>{{$careMonth->cm_total_time_in_seconds_by_mcp}}</td>
-                        <td>{{$careMonth->has_mcp_done_em_visit}}</td>
-                        <td>{{$careMonth->is_client_enrolled_in_cm}}</td>
-                        <td>{{$careMonth->is_client_enrolled_in_rm}}</td>
-                        <td>{{$careMonth->is_cm_canceled_this_month}}</td>
-                        <td>{{$careMonth->is_rm_canceled_this_month}}</td>
-                        <td>{{$careMonth->is_tm_this_month}}</td>
-                        <td>{{$careMonth->rm_total_time_in_seconds}}</td>
-                        <td>{{$careMonth->rm_total_time_in_seconds_by_mcp}}</td>
-                        <td>{{$careMonth->rm_total_time_in_seconds_by_rme_pro}}</td>
-                        <td>{{$careMonth->rm_total_time_in_seconds_by_rmm_pro}}</td>
-                        <td>{{$careMonth->start_date}}</td>
-                        <td>{{$careMonth->why_is_cm_canceled_this_month}}</td>
-                        <td>{{$careMonth->why_is_rm_canceled_this_month}}</td>
-                        <td>{{$careMonth->why_not_enrolled_in_cm_category}}</td>
-                        <td>{{$careMonth->why_not_enrolled_in_cm_memo}}</td>
-                        <td>{{$careMonth->why_not_enrolled_in_rm_category}}</td>
-                        <td>{{$careMonth->why_not_enrolled_in_rm_memo}}</td>
-                        <td>{{$careMonth->created_by_session_id}}</td>
-                        <td>{{$careMonth->client_id}}</td>
-                        <td>{{$careMonth->cm_bill_id}}</td>
-                        <td>{{$careMonth->cm_pro_id}}</td>
-                        <td>{{$careMonth->mcp_pro_id}}</td>
-                        <td>{{$careMonth->rm_bill_id}}</td>
-                        <td>{{$careMonth->rme_pro_id}}</td>
-                        <td>{{$careMonth->rmm_pro_id}}</td>
-                        <td>{{$careMonth->rms_pro_id}}</td>
-                        <td>{{$careMonth->rmg_pro_id}}</td>
-                        <td>{{$careMonth->rm_total_time_in_seconds_by_rms_pro}}</td>
-                        <td>{{$careMonth->rm_total_time_in_seconds_by_rmg_pro}}</td>
-                        <td>{{$careMonth->number_of_days_with_remote_measurements}}</td>
-                        <td>{{$careMonth->is_bill_closed}}</td>
-                        <td>{{$careMonth->bill_closed_at}}</td>
-                        <td>{{$careMonth->bill_closed_by_session_id}}</td>
-                        <td>{{$careMonth->bill_closed_by_pro_id}}</td>
-                        <td>{{$careMonth->is_billing_marked_done}}</td>
-                        <td>{{$careMonth->billing_marked_done_by_session_id}}</td>
-                        <td>{{$careMonth->billing_marked_done_by_pro_id}}</td>
-                        <td>{{$careMonth->billing_marked_done_at}}</td>
-                        <td>{{$careMonth->claim_total_expected}}</td>
-                        <td>{{$careMonth->is_claim_closed}}</td>
-                        <td>{{$careMonth->claim_closed_at}}</td>
-                        <td>{{$careMonth->claim_closed_by_session_id}}</td>
-                        <td>{{$careMonth->claim_closed_by_pro_id}}</td>
-                        <td>{{$careMonth->claim_summary}}</td>
-                        <td>{{$careMonth->claim_total_paid}}</td>
-                        <td>{{$careMonth->company_pro_payer_id}}</td>
-                        <td>{{$careMonth->company_pro_id}}</td>
-                        <td>{{$careMonth->company_id}}</td>
-                        <td>{{$careMonth->company_location_id}}</td>
-                        <td>{{$careMonth->has_anyone_interacted_with_client_about_rm_outside_note}}</td>
-                        <td>{{$careMonth->rm_num_measurements_not_stamped_by_mcp}}</td>
-                        <td>{{$careMonth->rm_num_measurements_not_stamped_by_non_hcp}}</td>
-                        <td>{{$careMonth->rm_num_measurements_not_stamped_by_rmm}}</td>
-                        <td>{{$careMonth->rm_num_measurements_not_stamped_by_rme}}</td>
-                        <td>{{$careMonth->has_mcp_rm_interacted_by_note}}</td>
-                        <td>{{$careMonth->mcp_rm_interaction_note_id}}</td>
-                        <td>{{$careMonth->is_rm_interaction_waived}}</td>
-                    </tr>
-                    @endforeach
-                </tbody>
-            </table>
-        </div>
+            <tbody>
+                @foreach($careMonthsWith16PlusMeasurements as $careMonth)
+                <tr>
+                    <td>{{$careMonth->created_at}}</td>
+                    <td>{{$careMonth->uid}}</td>
+                    <td>{{$careMonth->cm_total_time_in_seconds}}</td>
+                    <td>{{$careMonth->cm_total_time_in_seconds_by_cm_pro}}</td>
+                    <td>{{$careMonth->cm_total_time_in_seconds_by_mcp}}</td>
+                    <td>{{$careMonth->has_mcp_done_em_visit}}</td>
+                    <td>{{$careMonth->is_client_enrolled_in_cm}}</td>
+                    <td>{{$careMonth->is_client_enrolled_in_rm}}</td>
+                    <td>{{$careMonth->is_cm_canceled_this_month}}</td>
+                    <td>{{$careMonth->is_rm_canceled_this_month}}</td>
+                    <td>{{$careMonth->is_tm_this_month}}</td>
+                    <td>{{$careMonth->rm_total_time_in_seconds}}</td>
+                    <td>{{$careMonth->rm_total_time_in_seconds_by_mcp}}</td>
+                    <td>{{$careMonth->rm_total_time_in_seconds_by_rme_pro}}</td>
+                    <td>{{$careMonth->rm_total_time_in_seconds_by_rmm_pro}}</td>
+                    <td>{{$careMonth->start_date}}</td>
+                    <td>{{$careMonth->why_is_cm_canceled_this_month}}</td>
+                    <td>{{$careMonth->why_is_rm_canceled_this_month}}</td>
+                    <td>{{$careMonth->why_not_enrolled_in_cm_category}}</td>
+                    <td>{{$careMonth->why_not_enrolled_in_cm_memo}}</td>
+                    <td>{{$careMonth->why_not_enrolled_in_rm_category}}</td>
+                    <td>{{$careMonth->why_not_enrolled_in_rm_memo}}</td>
+                    <td>{{$careMonth->created_by_session_id}}</td>
+                    <td>{{$careMonth->client_id}}</td>
+                    <td>{{$careMonth->cm_bill_id}}</td>
+                    <td>{{$careMonth->cm_pro_id}}</td>
+                    <td>{{$careMonth->mcp_pro_id}}</td>
+                    <td>{{$careMonth->rm_bill_id}}</td>
+                    <td>{{$careMonth->rme_pro_id}}</td>
+                    <td>{{$careMonth->rmm_pro_id}}</td>
+                    <td>{{$careMonth->rms_pro_id}}</td>
+                    <td>{{$careMonth->rmg_pro_id}}</td>
+                    <td>{{$careMonth->rm_total_time_in_seconds_by_rms_pro}}</td>
+                    <td>{{$careMonth->rm_total_time_in_seconds_by_rmg_pro}}</td>
+                    <td>{{$careMonth->number_of_days_with_remote_measurements}}</td>
+                    <td>{{$careMonth->is_bill_closed}}</td>
+                    <td>{{$careMonth->bill_closed_at}}</td>
+                    <td>{{$careMonth->bill_closed_by_session_id}}</td>
+                    <td>{{$careMonth->bill_closed_by_pro_id}}</td>
+                    <td>{{$careMonth->is_billing_marked_done}}</td>
+                    <td>{{$careMonth->billing_marked_done_by_session_id}}</td>
+                    <td>{{$careMonth->billing_marked_done_by_pro_id}}</td>
+                    <td>{{$careMonth->billing_marked_done_at}}</td>
+                    <td>{{$careMonth->claim_total_expected}}</td>
+                    <td>{{$careMonth->is_claim_closed}}</td>
+                    <td>{{$careMonth->claim_closed_at}}</td>
+                    <td>{{$careMonth->claim_closed_by_session_id}}</td>
+                    <td>{{$careMonth->claim_closed_by_pro_id}}</td>
+                    <td>{{$careMonth->claim_summary}}</td>
+                    <td>{{$careMonth->claim_total_paid}}</td>
+                    <td>{{$careMonth->company_pro_payer_id}}</td>
+                    <td>{{$careMonth->company_pro_id}}</td>
+                    <td>{{$careMonth->company_id}}</td>
+                    <td>{{$careMonth->company_location_id}}</td>
+                    <td>{{$careMonth->has_anyone_interacted_with_client_about_rm_outside_note}}</td>
+                    <td>{{$careMonth->rm_num_measurements_not_stamped_by_mcp}}</td>
+                    <td>{{$careMonth->rm_num_measurements_not_stamped_by_non_hcp}}</td>
+                    <td>{{$careMonth->rm_num_measurements_not_stamped_by_rmm}}</td>
+                    <td>{{$careMonth->rm_num_measurements_not_stamped_by_rme}}</td>
+                    <td>{{$careMonth->has_mcp_rm_interacted_by_note}}</td>
+                    <td>{{$careMonth->mcp_rm_interaction_note_id}}</td>
+                    <td>{{$careMonth->is_rm_interaction_waived}}</td>
+                </tr>
+                @endforeach
+            </tbody>
+        </table>
+    </div>
     </div>
-    <script>
-        $(document).ready( function () {
-            $('#careMonthsTable').DataTable();
-        } );
-    </script>
-    <script>
-        (function() {
-            function init() {
-                $('.btn-launch')
-                    .off('click')
-                    .on('click', function () {
-                        $('.launch-result').text('Please wait...');
-                        $('.btn-launch').prop('disabled', true);
-                        $.get('/api/careMonth/' + $(this).attr('data-ep'), _data => {
-                            if(!hasResponseError(_data)) {
-                                if(_data.data && _data.data.length) {
+</div>
+<script>
+    $(document).ready(function() {
+        $('#careMonthsTable').DataTable();
+    });
+</script>
+<script>
+    (function() {
+        function init() {
+            $('.btn-launch')
+                .off('click')
+                .on('click', function() {
+                    $('.launch-result').text('Please wait...');
+                    $('.btn-launch').prop('disabled', true);
+                    $.get('/api/careMonth/' + $(this).attr('data-ep'), _data => {
+                            if (!hasResponseError(_data)) {
+                                if (_data.data && _data.data.length) {
                                     $('.launch-result').text(_data.data.join("\n"));
                                 }
                             }
@@ -245,9 +235,9 @@
                         .then(() => {
                             $('.btn-launch:not([perm-disabled])').prop('disabled', false);
                         });
-                    });
-            }
-            addMCInitializer('rm-launch-and-clean', init, '#rm-launch-and-clean');
-        }).call(window);
-    </script>
-@endsection
+                });
+        }
+        addMCInitializer('rm-launch-and-clean', init, '#rm-launch-and-clean');
+    }).call(window);
+</script>
+@endsection

resources/views/app/practice-management/rpm-matrix.blade.php

@@ -7,8 +7,8 @@
         }
     </style>
     <div class="p-3 mcp-theme-1">
-        <div class="card">
-            <div class="card-header p-3 d-flex align-items-center">
+        <div class="card border-left-0 border-right-0 border-bottom-0">
+            <div class="card-header border-left border-right border-bottom-0 py-1 px-2 d-flex align-items-center">
                 <strong class="mr-4">
                     <i class="fas fa-chart-bar"></i>
                     RPM Matrix
@@ -16,25 +16,25 @@
             </div>
 
             <div class="card-body p-0">
-                <table class="table table-bordered table-sm table-condensed p-0 m-0" style="">
+                <table class="table table-bordered table-sm table-striped p-0 m-0">
                     <thead class="bg-light">
                         <tr>
-                            <th>Chart #</th>
-                            <th>Name</th>
-                            <th>DOB</th>
+                            <th class="border-0">Chart #</th>
+                            <th class="border-0">Name</th>
+                            <th class="border-0">DOB</th>
                             @if($pro->pro_type == 'ADMIN')
-                            <th>MCP</th>
+                            <th class="border-0">MCP</th>
                             @endif
-                            <th>BP</th>
-                            <th> <i class="fa fa-heartbeat"></i> </th>
-                            <th>Pulse</th>
-                            <th>BP/Pulse Timestamp</th>
-                            <th>BP <i class="fa fa-car-battery"></i></th>
-                            <th>BP <i class="fa fa-broadcast-tower"></i></th>
-                            <th>Weight</th>
-                            <th>Weight Timestamp</th>
-                            <th>Scale <i class="fa fa-battery"></i></th>
-                            <th>Scale <i class="fa fa-broadcast-tower"></i></th>
+                            <th class="border-0">BP</th>
+                            <th class="border-0"> <i class="fa fa-heartbeat"></i> </th>
+                            <th class="border-0">Pulse</th>
+                            <th class="border-0">BP/Pulse Timestamp</th>
+                            <th class="border-0">BP <i class="fa fa-car-battery"></i></th>
+                            <th class="border-0">BP <i class="fa fa-broadcast-tower"></i></th>
+                            <th class="border-0">Weight</th>
+                            <th class="border-0">Weight Timestamp</th>
+                            <th class="border-0">Scale <i class="fa fa-battery"></i></th>
+                            <th class="border-0">Scale <i class="fa fa-broadcast-tower"></i></th>
                         </tr>
                     </thead>
                     <tbody>

resources/views/app/practice-management/shipments.blade.php

@@ -2,16 +2,16 @@
 
 @section('content')
 
-    <?php
-    function cleanStatus($_status)
-    {
-        return ucwords(strtolower(str_replace("_", " ", $_status)));
-    }
-    ?>
+<?php
+function cleanStatus($_status)
+{
+    return ucwords(strtolower(str_replace("_", " ", $_status)));
+}
+?>
 
-    <div id="practice-shipments" class="p-3 mcp-theme-1">
+<div id="practice-shipments" class="p-3 mcp-theme-1">
     <div class="card">
-        <div class="card-header px-3 py-3 d-flex align-items-center bg-white">
+        <div class="card-header px-2 py-1 d-flex align-items-center bg-white">
             <strong class="font-size-14">
                 Shipments ({{@$counts['shipments']}})
             </strong>
@@ -20,7 +20,7 @@
             <span class="mx-3 text-secondary">|</span>
             <a href="{{route('practice-management.shipments-waiting-for-picker')}}">Printed &amp; Waiting for Picker ({{@$counts['shipmentsWaitingForPicker']}})</a>
             @if(count(request()->all()))
-                <a href="{{route('practice-management.shipments')}}" class="ml-auto">Clear Filters</a>
+            <a href="{{route('practice-management.shipments')}}" class="ml-auto">Clear Filters</a>
             @endif
             <div class="ml-auto">
                 @include('app.practice-management.shipment-scan')
@@ -28,173 +28,168 @@
         </div>
 
         <div class="card-body p-0">
-            <table class="table table-sm table-condensed p-0 m-0">
-                <thead class="bg-light">
-                <tr>
-                    <th class="border-0"></th>
-                    <th class="border-0">Client</th>
-                    <th class="border-0 w-25">Supply Orders</th>
-                    <th class="border-0">Courier</th>
-                    <th class="border-0">Tracking #</th>
-                    <th class="border-0">Label File</th>
-                    <th class="border-0">Status</th>
-                    <th class="border-0">Created At</th>
-                    <th class="border-0">Cancelled?</th>
-                </tr>
-                <tr>
-                    <th class="p-0 border-bottom-0 border-right"></th>
-                    <th class="p-0 border-bottom-0 border-right">
-                        <select class="form-control form-control-sm bg-aliceblue min-width-unset rounded-0 shadow-none border-0"
-                                data-filter="client">
-                            <option value="">All</option>
-                            @foreach($shClients as $shClient)
-                                <option value="{{$shClient->id}}"
-                                    {{$filters['client'] == $shClient->id ? 'selected' : ''}}>{{$shClient->displayName()}}</option>
-                            @endforeach
-                        </select>
-                    </th>
-                    <th class="p-0 border-bottom-0 border-right"></th>
-                    <th class="p-0 border-bottom-0 border-right">
-                        <input type="text" class="form-control form-control-sm bg-aliceblue min-width-unset rounded-0 shadow-none border-0"
-                               data-filter="courier"
-                               value="{{$filters['courier']}}" placeholder="Any">
-                    </th>
-                    <th class="p-0 border-bottom-0 border-right">
-                        <input type="text" class="form-control form-control-sm bg-aliceblue min-width-unset rounded-0 shadow-none border-0"
-                               data-filter="tracking_num"
-                               value="{{$filters['tracking_num']}}" placeholder="Any">
-                    </th>
-                    <th class="p-0 border-bottom-0 border-right">
-                        <select class="form-control form-control-sm bg-aliceblue min-width-unset rounded-0 shadow-none border-0"
-                                data-filter="label">
-                            <option value="">All</option>
-                            <option {{$filters['label'] == 'yes' ? 'selected' : ''}} value="yes">Present</option>
-                            <option {{$filters['label'] == 'no' ? 'selected' : ''}} value="no">Absent</option>
-                        </select>
-                    </th>
-                    <th class="p-0 border-bottom-0 border-right">
-                        <select class="form-control form-control-sm bg-aliceblue min-width-unset rounded-0 shadow-none border-0"
-                                data-filter="status">
-                            <option value="">All</option>
-                            <?php $statuses = ['CREATED', 'PRINTED', 'BEING_PICKED', 'PICKED', 'READY_FOR_FULFILMENT', 'READY_FOR_DISPATCH', 'DISPATCHED']; ?>
-                            @foreach($statuses as $iStatus)
-                                <option {{$filters['status'] == $iStatus ? 'selected' : ''}} value="{{$iStatus}}">{{cleanStatus($iStatus)}}</option>
-                            @endforeach
-                        </select>
-                    </th>
-                    <th class="p-0 border-bottom-0 border-right"></th>
-                    <th class="p-0 border-bottom-0 border-right">
-                        <select class="form-control form-control-sm bg-aliceblue min-width-unset rounded-0 shadow-none border-0"
-                                data-filter="cancelled">
-                            <option value="">All</option>
-                            <option {{$filters['cancelled'] == 'not_cancelled' ? 'selected' : ''}} value="not_cancelled">Not Cancelled</option>
-                            <option {{$filters['cancelled'] == 'cancelled' ? 'selected' : ''}} value="cancelled">Cancelled</option>
-                        </select>
-                    </th>
-                </tr>
-                </thead>
-                <tbody>
-                @foreach ($shipments as $shipment)
-                    <tr class="{{$shipment->is_cancelled ? 'bg-light' : ''}}">
-                        <td class="border-right"><a href="{{route('practice-management.shipment', $shipment->uid)}}">Open</a></td>
-                        <td>{{$shipment->client->displayName()}}</a></td>
-                        <td>
-                            @if($shipment->supplyOrders && count($shipment->supplyOrders))
+            <div class="table-responsive">
+                <table class="table table-sm table-striped p-0 m-0">
+                    <thead class="bg-light text-nowrap">
+                        <tr>
+                            <th class="border-0"></th>
+                            <th class="border-0">Client</th>
+                            <th class="border-0 w-25">Supply Orders</th>
+                            <th class="border-0">Courier</th>
+                            <th class="border-0">Tracking #</th>
+                            <th class="border-0">Label File</th>
+                            <th class="border-0">Status</th>
+                            <th class="border-0">Created At</th>
+                            <th class="border-0">Cancelled?</th>
+                        </tr>
+                        <tr>
+                            <th class="p-0 border-bottom-0 border-right"></th>
+                            <th class="p-0 border-bottom-0 border-right">
+                                <select class="form-control form-control-sm bg-aliceblue min-width-unset rounded-0 shadow-none border-0" data-filter="client">
+                                    <option value="">All</option>
+                                    @foreach($shClients as $shClient)
+                                    <option value="{{$shClient->id}}" {{$filters['client'] == $shClient->id ? 'selected' : ''}}>{{$shClient->displayName()}}</option>
+                                    @endforeach
+                                </select>
+                            </th>
+                            <th class="p-0 border-bottom-0 border-right"></th>
+                            <th class="p-0 border-bottom-0 border-right">
+                                <input type="text" class="form-control form-control-sm bg-aliceblue min-width-unset rounded-0 shadow-none border-0" data-filter="courier" value="{{$filters['courier']}}" placeholder="Any">
+                            </th>
+                            <th class="p-0 border-bottom-0 border-right">
+                                <input type="text" class="form-control form-control-sm bg-aliceblue min-width-unset rounded-0 shadow-none border-0" data-filter="tracking_num" value="{{$filters['tracking_num']}}" placeholder="Any">
+                            </th>
+                            <th class="p-0 border-bottom-0 border-right">
+                                <select class="form-control form-control-sm bg-aliceblue min-width-unset rounded-0 shadow-none border-0" data-filter="label">
+                                    <option value="">All</option>
+                                    <option {{$filters['label'] == 'yes' ? 'selected' : ''}} value="yes">Present</option>
+                                    <option {{$filters['label'] == 'no' ? 'selected' : ''}} value="no">Absent</option>
+                                </select>
+                            </th>
+                            <th class="p-0 border-bottom-0 border-right">
+                                <select class="form-control form-control-sm bg-aliceblue min-width-unset rounded-0 shadow-none border-0" data-filter="status">
+                                    <option value="">All</option>
+                                    <?php $statuses = ['CREATED', 'PRINTED', 'BEING_PICKED', 'PICKED', 'READY_FOR_FULFILMENT', 'READY_FOR_DISPATCH', 'DISPATCHED']; ?>
+                                    @foreach($statuses as $iStatus)
+                                    <option {{$filters['status'] == $iStatus ? 'selected' : ''}} value="{{$iStatus}}">{{cleanStatus($iStatus)}}</option>
+                                    @endforeach
+                                </select>
+                            </th>
+                            <th class="p-0 border-bottom-0 border-right"></th>
+                            <th class="p-0 border-bottom-0 border-right">
+                                <select class="form-control form-control-sm bg-aliceblue min-width-unset rounded-0 shadow-none border-0" data-filter="cancelled">
+                                    <option value="">All</option>
+                                    <option {{$filters['cancelled'] == 'not_cancelled' ? 'selected' : ''}} value="not_cancelled">Not Cancelled</option>
+                                    <option {{$filters['cancelled'] == 'cancelled' ? 'selected' : ''}} value="cancelled">Cancelled</option>
+                                </select>
+                            </th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach ($shipments as $shipment)
+                        <tr class="{{$shipment->is_cancelled ? 'bg-light' : ''}}">
+                            <td class="border-right"><a href="{{route('practice-management.shipment', $shipment->uid)}}">Open</a></td>
+                            <td>{{$shipment->client->displayName()}}</a></td>
+                            <td>
+                                @if($shipment->supplyOrders && count($shipment->supplyOrders))
                                 <table class="table table-sm table-striped table-bordered mb-0 bg-white">
                                     <thead>
-                                    <tr class="">
-                                        <th class="text-nowrap text-secondary border-bottom-0">Supply Order</th>
-                                        <th class="text-nowrap text-secondary border-bottom-0">IMEI</th>
-                                        <th class="text-nowrap text-secondary border-bottom-0">Lot #</th>
-                                    </tr>
+                                        <tr class="">
+                                            <th class="text-nowrap text-secondary border-bottom-0">Supply Order</th>
+                                            <th class="text-nowrap text-secondary border-bottom-0">IMEI</th>
+                                            <th class="text-nowrap text-secondary border-bottom-0">Lot #</th>
+                                        </tr>
                                     </thead>
                                     <tbody>
-                                    @foreach($shipment->supplyOrders as $iSupplyOrder)
+                                        @foreach($shipment->supplyOrders as $iSupplyOrder)
                                         <tr class="">
                                             <td class="">{{ $iSupplyOrder->product->title }}</td>
                                             <td class="">{{ $iSupplyOrder->imei }}</td>
                                             <td class="">{{ $iSupplyOrder->lot_number }}</td>
                                         </tr>
-                                    @endforeach
+                                        @endforeach
                                     </tbody>
                                 </table>
-                            @else
+                                @else
                                 None
-                            @endif
-                        </td>
-                        <td>{{$shipment->courier}}</td>
-                        <td>{{$shipment->tracking_number}}</td>
-                        <td>
-                            @if($shipment->label_system_file_id)
-                            <a class="pdf-viewer-trigger" native="" target="_blank"
-                               href="/api/shipment/downloadLabel/{{$shipment->uid}}" title="View">
-                                <i class="fa fa-file-pdf text-danger on-hover-opaque"></i>
-                                View
-                            </a>
-                            @endif
-                        </td>
-                        <td>
-                            {{$shipment->status}}
-                            @if($shipment->status === 'DELIVERED' && $shipment->delivered_date)
+                                @endif
+                            </td>
+                            <td>{{$shipment->courier}}</td>
+                            <td>{{$shipment->tracking_number}}</td>
+                            <td>
+                                @if($shipment->label_system_file_id)
+                                <a class="pdf-viewer-trigger" native="" target="_blank" href="/api/shipment/downloadLabel/{{$shipment->uid}}" title="View">
+                                    <i class="fa fa-file-pdf text-danger on-hover-opaque"></i>
+                                    View
+                                </a>
+                                @endif
+                            </td>
+                            <td>
+                                {{$shipment->status}}
+                                @if($shipment->status === 'DELIVERED' && $shipment->delivered_date)
                                 <div class="text-secondary text-sm mt-1">
                                     on {{friendlier_date_time($shipment->delivered_date)}}
                                 </div>
-                            @endif
-                        </td>
-                        <td>
-                            {{friendlier_date_time($shipment->created_at)}}
-                            <div class="text-secondary text-sm mt-1">
-                                By {{$shipment->createdSession->pro->displayName()}}
-                            </div>
-                        </td>
-                        <td>{!! $shipment->is_cancelled ? '<b class="text-warning-mellow">Yes</b>' : 'No' !!}</td>
-                    </tr>
-                @endforeach
-                </tbody>
-            </table>
-            <div>
-                {{$shipments->links()}}
+                                @endif
+                            </td>
+                            <td>
+                                {{friendlier_date_time($shipment->created_at)}}
+                                <div class="text-secondary text-sm mt-1">
+                                    By {{$shipment->createdSession->pro->displayName()}}
+                                </div>
+                            </td>
+                            <td>{!! $shipment->is_cancelled ? '<b class="text-warning-mellow">Yes</b>' : 'No' !!}</td>
+                        </tr>
+                        @endforeach
+                    </tbody>
+                </table>
             </div>
+
         </div>
     </div>
+    <div class="mt-3">
+        {{$shipments->links()}}
     </div>
 
-    <script>
-        (function() {
+</div>
 
-            function applyFilters() {
-                let params = {}, queryLine = [];
-                $('[data-filter]').each(function() {
-                    if($.trim($(this).val())) {
-                        params[$(this).attr('data-filter')] = $.trim($(this).val());
-                    }
-                });
-                for(let x in params) {
-                    if(params.hasOwnProperty(x)) {
-                        queryLine.push(x + '=' + encodeURIComponent(params[x]));
-                    }
-                }
-                queryLine = queryLine.join('&');
+<script>
+    (function() {
 
-                fastLoad('/practice-management/shipments?' + queryLine);
+        function applyFilters() {
+            let params = {},
+                queryLine = [];
+            $('[data-filter]').each(function() {
+                if ($.trim($(this).val())) {
+                    params[$(this).attr('data-filter')] = $.trim($(this).val());
+                }
+            });
+            for (let x in params) {
+                if (params.hasOwnProperty(x)) {
+                    queryLine.push(x + '=' + encodeURIComponent(params[x]));
+                }
             }
+            queryLine = queryLine.join('&');
 
-            function init() {
-                $('select[data-filter]')
-                    .off('change')
-                    .on('change', applyFilters);
-                $('input[data-filter]')
-                    .off('keyup')
-                    .on('keyup', function(_event) {
-                        if(_event.which === 13) {
-                            applyFilters();
-                            return false;
-                        }
-                    });
-            }
+            fastLoad('/practice-management/shipments?' + queryLine);
+        }
+
+        function init() {
+            $('select[data-filter]')
+                .off('change')
+                .on('change', applyFilters);
+            $('input[data-filter]')
+                .off('keyup')
+                .on('keyup', function(_event) {
+                    if (_event.which === 13) {
+                        applyFilters();
+                        return false;
+                    }
+                });
+        }
 
-            addMCInitializer('practice-shipments', init, '#practice-shipments')
+        addMCInitializer('practice-shipments', init, '#practice-shipments')
 
-        }).call(window);
-    </script>
-@endsection
+    }).call(window);
+</script>
+@endsection

resources/views/app/practice-management/supply-orders.blade.php

@@ -2,7 +2,7 @@
 
 @section('content')
 
-    <div id="practice-supply-orders" class="p-3 mcp-theme-1">
+<div id="practice-supply-orders" class="p-3 mcp-theme-1">
     <div class="card">
 
         <div class="card-header px-3 py-3 d-flex align-items-center bg-white">
@@ -14,229 +14,218 @@
             <span class="mx-3 text-secondary">|</span>
             <a href="{{route('practice-management.supply-orders-shipment-underway')}}">Shipment Underway ({{$counts['supplyOrdersShipmentUnderway']}})</a>
             @if($counts['supplyOrdersHanging'])
-                <span class="mx-3 text-secondary">|</span>
-                <a href="{{route('practice-management.supply-orders-hanging')}}" class="text-warning-mellow font-weight-bold"><i class="fa fa-exclamation-triangle"></i>&nbsp;Hanging ({{$counts['supplyOrdersHanging']}})</a>
+            <span class="mx-3 text-secondary">|</span>
+            <a href="{{route('practice-management.supply-orders-hanging')}}" class="text-warning-mellow font-weight-bold"><i class="fa fa-exclamation-triangle"></i>&nbsp;Hanging ({{$counts['supplyOrdersHanging']}})</a>
             @endif
             @if(count(request()->all()))
-                <a href="{{route('practice-management.supply-orders')}}" class="ml-auto">Clear Filters</a>
+            <a href="{{route('practice-management.supply-orders')}}" class="ml-auto">Clear Filters</a>
             @endif
         </div>
         <div class="card-body p-0">
-            <table class="table table-sm table-condensed p-0 m-0">
-                <thead class="bg-light">
-                <tr>
-                    <th class="border-0">Client</th>
-                    <th class="border-0">Product</th>
-                    <th class="border-0">Reason</th>
-                    <th class="border-0">Client Understanding Memo</th>
-                    <th class="border-0">Pro Sign</th>
-                    <th class="border-0">Client Sign</th>
-                    <th class="border-0">Shipment</th>
-                    <th class="border-0">Lot #</th>
-                    <th class="border-0">IMEI</th>
-                    <th class="border-0">Created At</th>
-                    <th class="border-0">Cancelled?</th>
-                </tr>
-                <tr>
-                    <th class="p-0 border-bottom-0 border-right">
-                        <select class="form-control form-control-sm bg-aliceblue min-width-unset rounded-0 shadow-none border-0"
-                                data-filter="client">
-                            <option value="">All</option>
-                            @foreach($soClients as $soClient)
-                                <option value="{{$soClient->id}}"
-                                    {{$filters['client'] == $soClient->id ? 'selected' : ''}}>{{$soClient->displayName()}}</option>
-                            @endforeach
-                        </select>
-                    </th>
-                    <th class="p-0 border-bottom-0 border-right">
-                        <select class="form-control form-control-sm bg-aliceblue min-width-unset rounded-0 shadow-none border-0"
-                                data-filter="product">
-                            <option value="">All</option>
-                            @foreach($soProducts as $soProduct)
-                                <option value="{{$soProduct->id}}"
-                                    {{$filters['product'] == $soProduct->id ? 'selected' : ''}}>{{$soProduct->title}}</option>
-                            @endforeach
-                        </select>
-                    </th>
-                    <th class="p-0 border-bottom-0 border-right">
-                        <input type="text" class="form-control form-control-sm bg-aliceblue min-width-unset rounded-0 shadow-none border-0"
-                               data-filter="reason"
-                               value="{{$filters['reason']}}" placeholder="Any">
-                    </th>
-                    <th class="p-0 border-bottom-0 border-right">
-                        <input type="text" class="form-control form-control-sm bg-aliceblue min-width-unset rounded-0 shadow-none border-0"
-                               data-filter="cu_memo"
-                               value="{{$filters['cu_memo']}}" placeholder="Any">
-                    </th>
-                    <th class="p-0 border-bottom-0 border-right">
-                        <select class="form-control form-control-sm bg-aliceblue min-width-unset rounded-0 shadow-none border-0"
-                                data-filter="pro_sign">
-                            <option value="">All</option>
-                            <option {{$filters['pro_sign'] == 'not_signed' ? 'selected' : ''}} value="not_signed">Not Signed</option>
-                            <option {{$filters['pro_sign'] == 'signed' ? 'selected' : ''}} value="signed">Signed</option>
-                        </select>
-                    </th>
-                    <th class="p-0 border-bottom-0 border-right">
-                        <select class="form-control form-control-sm bg-aliceblue min-width-unset rounded-0 shadow-none border-0"
-                                data-filter="client_sign">
-                            <option value="">All</option>
-                            <option {{$filters['client_sign'] == 'not_signed' ? 'selected' : ''}} value="not_signed">Not Signed</option>
-                            <option {{$filters['client_sign'] == 'signed' ? 'selected' : ''}} value="signed">Signed</option>
-                            <option {{$filters['client_sign'] == 'waived' ? 'selected' : ''}} value="waived">Waived</option>
-                        </select>
-                    </th>
-                    <th class="p-0 border-bottom-0 border-right">
-                        <select class="form-control form-control-sm bg-aliceblue min-width-unset rounded-0 shadow-none border-0"
-                                data-filter="shipment">
-                            <option value="">All</option>
-                            <optgroup label="Pro">
-                                <option {{$filters['shipment'] == 'not_cleared_for_shipment' ? 'selected' : ''}} value="not_cleared_for_shipment">Not Cleared for Shipment</option>
-                                <option {{$filters['shipment'] == 'cleared_for_shipment' ? 'selected' : ''}} value="cleared_for_shipment">Cleared for Shipment</option>
-                            </optgroup>
-                            <optgroup label="Warehouse">
-                                <option {{$filters['shipment'] == 'CREATED' ? 'selected' : ''}} value="CREATED">Created</option>
-                                <option {{$filters['shipment'] == 'SHIPPED' ? 'selected' : ''}} value="SHIPPED">Shipped</option>
-                                <option {{$filters['shipment'] == 'DELIVERED' ? 'selected' : ''}} value="DELIVERED">Delivered</option>
-                                <option {{$filters['shipment'] == 'RETURNED_TO_SENDER' ? 'selected' : ''}} value="RETURNED_TO_SENDER">Returned to Sender</option>
-                                <option {{$filters['shipment'] == 'CANCELLED' ? 'selected' : ''}} value="CANCELLED">Cancelled</option>
-                            </optgroup>
-                        </select>
-                    </th>
-                    <th class="p-0 border-bottom-0 border-right">
-                        <input type="text" class="form-control form-control-sm bg-aliceblue min-width-unset rounded-0 shadow-none border-0"
-                               data-filter="lot_number"
-                               value="{{$filters['lot_number']}}" placeholder="Any">
-                    </th>
-                    <th class="p-0 border-bottom-0 border-right">
-                        <input type="text" class="form-control form-control-sm bg-aliceblue min-width-unset rounded-0 shadow-none border-0"
-                               data-filter="imei"
-                               value="{{$filters['imei']}}" placeholder="Any">
-                    </th>
-                    <th class="p-0 border-bottom-0 border-right">
+            <div class="table-responsive">
+                <table class="table table-sm table-striped p-0 m-0">
+                    <thead class="bg-light text-nowrap">
+                        <tr>
+                            <th class="border-0">Client</th>
+                            <th class="border-0">Product</th>
+                            <th class="border-0">Reason</th>
+                            <th class="border-0">Client Understanding Memo</th>
+                            <th class="border-0">Pro Sign</th>
+                            <th class="border-0">Client Sign</th>
+                            <th class="border-0">Shipment</th>
+                            <th class="border-0">Lot #</th>
+                            <th class="border-0">IMEI</th>
+                            <th class="border-0">Created At</th>
+                            <th class="border-0">Cancelled?</th>
+                        </tr>
+                        <tr>
+                            <th class="p-0 border-bottom-0 border-right">
+                                <select class="form-control form-control-sm bg-aliceblue min-width-unset rounded-0 shadow-none border-0" data-filter="client">
+                                    <option value="">All</option>
+                                    @foreach($soClients as $soClient)
+                                    <option value="{{$soClient->id}}" {{$filters['client'] == $soClient->id ? 'selected' : ''}}>{{$soClient->displayName()}}</option>
+                                    @endforeach
+                                </select>
+                            </th>
+                            <th class="p-0 border-bottom-0 border-right">
+                                <select class="form-control form-control-sm bg-aliceblue min-width-unset rounded-0 shadow-none border-0" data-filter="product">
+                                    <option value="">All</option>
+                                    @foreach($soProducts as $soProduct)
+                                    <option value="{{$soProduct->id}}" {{$filters['product'] == $soProduct->id ? 'selected' : ''}}>{{$soProduct->title}}</option>
+                                    @endforeach
+                                </select>
+                            </th>
+                            <th class="p-0 border-bottom-0 border-right">
+                                <input type="text" class="form-control form-control-sm bg-aliceblue min-width-unset rounded-0 shadow-none border-0" data-filter="reason" value="{{$filters['reason']}}" placeholder="Any">
+                            </th>
+                            <th class="p-0 border-bottom-0 border-right">
+                                <input type="text" class="form-control form-control-sm bg-aliceblue min-width-unset rounded-0 shadow-none border-0" data-filter="cu_memo" value="{{$filters['cu_memo']}}" placeholder="Any">
+                            </th>
+                            <th class="p-0 border-bottom-0 border-right">
+                                <select class="form-control form-control-sm bg-aliceblue min-width-unset rounded-0 shadow-none border-0" data-filter="pro_sign">
+                                    <option value="">All</option>
+                                    <option {{$filters['pro_sign'] == 'not_signed' ? 'selected' : ''}} value="not_signed">Not Signed</option>
+                                    <option {{$filters['pro_sign'] == 'signed' ? 'selected' : ''}} value="signed">Signed</option>
+                                </select>
+                            </th>
+                            <th class="p-0 border-bottom-0 border-right">
+                                <select class="form-control form-control-sm bg-aliceblue min-width-unset rounded-0 shadow-none border-0" data-filter="client_sign">
+                                    <option value="">All</option>
+                                    <option {{$filters['client_sign'] == 'not_signed' ? 'selected' : ''}} value="not_signed">Not Signed</option>
+                                    <option {{$filters['client_sign'] == 'signed' ? 'selected' : ''}} value="signed">Signed</option>
+                                    <option {{$filters['client_sign'] == 'waived' ? 'selected' : ''}} value="waived">Waived</option>
+                                </select>
+                            </th>
+                            <th class="p-0 border-bottom-0 border-right">
+                                <select class="form-control form-control-sm bg-aliceblue min-width-unset rounded-0 shadow-none border-0" data-filter="shipment">
+                                    <option value="">All</option>
+                                    <optgroup label="Pro">
+                                        <option {{$filters['shipment'] == 'not_cleared_for_shipment' ? 'selected' : ''}} value="not_cleared_for_shipment">Not Cleared for Shipment</option>
+                                        <option {{$filters['shipment'] == 'cleared_for_shipment' ? 'selected' : ''}} value="cleared_for_shipment">Cleared for Shipment</option>
+                                    </optgroup>
+                                    <optgroup label="Warehouse">
+                                        <option {{$filters['shipment'] == 'CREATED' ? 'selected' : ''}} value="CREATED">Created</option>
+                                        <option {{$filters['shipment'] == 'SHIPPED' ? 'selected' : ''}} value="SHIPPED">Shipped</option>
+                                        <option {{$filters['shipment'] == 'DELIVERED' ? 'selected' : ''}} value="DELIVERED">Delivered</option>
+                                        <option {{$filters['shipment'] == 'RETURNED_TO_SENDER' ? 'selected' : ''}} value="RETURNED_TO_SENDER">Returned to Sender</option>
+                                        <option {{$filters['shipment'] == 'CANCELLED' ? 'selected' : ''}} value="CANCELLED">Cancelled</option>
+                                    </optgroup>
+                                </select>
+                            </th>
+                            <th class="p-0 border-bottom-0 border-right">
+                                <input type="text" class="form-control form-control-sm bg-aliceblue min-width-unset rounded-0 shadow-none border-0" data-filter="lot_number" value="{{$filters['lot_number']}}" placeholder="Any">
+                            </th>
+                            <th class="p-0 border-bottom-0 border-right">
+                                <input type="text" class="form-control form-control-sm bg-aliceblue min-width-unset rounded-0 shadow-none border-0" data-filter="imei" value="{{$filters['imei']}}" placeholder="Any">
+                            </th>
+                            <th class="p-0 border-bottom-0 border-right">
 
-                    </th>
-                    <th class="p-0 border-bottom-0 border-right">
-                        <select class="form-control form-control-sm bg-aliceblue min-width-unset rounded-0 shadow-none border-0"
-                                data-filter="cancelled">
-                            <option value="">All</option>
-                            <option {{$filters['cancelled'] == 'not_cancelled' ? 'selected' : ''}} value="not_cancelled">Not Cancelled</option>
-                            <option {{$filters['cancelled'] == 'cancelled' ? 'selected' : ''}} value="cancelled">Cancelled</option>
-                        </select>
-                    </th>
-                </tr>
-                </thead>
-                <tbody>
-                @foreach ($supplyOrders as $supplyOrder)
-                    <tr class="{{$supplyOrder->is_cancelled ? 'bg-light' : ''}}">
-                        <td><a href="{{route('patients.view.supply-orders',['patient'=>$supplyOrder->client, 'supplyOrder'=>$supplyOrder])}}">{{$supplyOrder->client->displayName()}}</a></td>
-                        <td>{{$supplyOrder->product->title}}</td>
-                        <td>{{$supplyOrder->reason}}</td>
-                        <td>{{$supplyOrder->client_understanding_memo}}</td>
-                        <td>
-                            @if($supplyOrder->is_signed_by_pro)
+                            </th>
+                            <th class="p-0 border-bottom-0 border-right">
+                                <select class="form-control form-control-sm bg-aliceblue min-width-unset rounded-0 shadow-none border-0" data-filter="cancelled">
+                                    <option value="">All</option>
+                                    <option {{$filters['cancelled'] == 'not_cancelled' ? 'selected' : ''}} value="not_cancelled">Not Cancelled</option>
+                                    <option {{$filters['cancelled'] == 'cancelled' ? 'selected' : ''}} value="cancelled">Cancelled</option>
+                                </select>
+                            </th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach ($supplyOrders as $supplyOrder)
+                        <tr class="{{$supplyOrder->is_cancelled ? 'bg-light' : ''}}">
+                            <td><a href="{{route('patients.view.supply-orders',['patient'=>$supplyOrder->client, 'supplyOrder'=>$supplyOrder])}}">{{$supplyOrder->client->displayName()}}</a></td>
+                            <td>{{$supplyOrder->product->title}}</td>
+                            <td>{{$supplyOrder->reason}}</td>
+                            <td>{{$supplyOrder->client_understanding_memo}}</td>
+                            <td>
+                                @if($supplyOrder->is_signed_by_pro)
                                 <b>Signed</b>
                                 <div class="text-secondary text-sm mt-1">
                                     By {{$supplyOrder->signedPro->displayName()}}<br>
                                     {{friendlier_date_time($supplyOrder->pro_signed_at)}}
                                 </div>
-                            @else
+                                @else
                                 Not Signed
-                            @endif
-                        </td>
-                        <td>
-                            @if($supplyOrder->is_signed_by_client)
+                                @endif
+                            </td>
+                            <td>
+                                @if($supplyOrder->is_signed_by_client)
                                 <b>Signed</b>
                                 <div class="text-secondary text-sm mt-1">
                                     By {{$patient->displayName()}}<br>
                                     On {{friendlier_date_time($supplyOrder->client_signed_at)}}
                                 </div>
-                            @elseif($supplyOrder->is_client_signature_waived)
+                                @elseif($supplyOrder->is_client_signature_waived)
                                 <b>Waived</b>
                                 <div class="text-secondary text-sm mt-1">
                                     By {{$supplyOrder->waiverPro->displayName()}}<br>
                                     on {{friendlier_date_time($supplyOrder->client_signature_waived_at)}}
                                 </div>
-                            @else
+                                @else
                                 Not Signed
-                            @endif
-                        </td>
-                        <td>
-                            @if($supplyOrder->shipment_id)
+                                @endif
+                            </td>
+                            <td>
+                                @if($supplyOrder->shipment_id)
                                 <i class="fa fa-building"></i>
                                 {{$supplyOrder->shipment->status}}
                                 @if($supplyOrder->shipment && $supplyOrder->shipment->status === 'DELIVERED' && $supplyOrder->shipment->delivered_date)
-                                    <div class="text-secondary text-sm mt-1">
+                                <div class="text-secondary text-sm mt-1">
                                     on {{friendlier_date_time($supplyOrder->shipment->delivered_date)}}
-                                    </div>
+                                </div>
                                 @endif
-                            @elseif($supplyOrder->is_cleared_for_shipment)
+                                @elseif($supplyOrder->is_cleared_for_shipment)
                                 <i class="fa fa-user-nurse"></i>
                                 Cleared for shipment
                                 <div class="text-secondary text-sm mt-1">
                                     By {{$supplyOrder->clearedForShipmentPro->displayName()}}<br>
                                     on {{friendlier_date_time($supplyOrder->cleared_for_shipment_at)}}
                                 </div>
-                            @else
+                                @else
                                 <i class="fa fa-user-nurse"></i>
                                 Not cleared for shipment
-                            @endif
-                        </td>
-                        <td>{{$supplyOrder->lot_number}}</td>
-                        <td>{{$supplyOrder->imei}}</td>
-                        <td>
-                            {{friendlier_date_time($supplyOrder->created_at)}}
-                            <div class="text-secondary text-sm mt-1">
-                                By {{$supplyOrder->createdSession->pro->displayName()}}
-                            </div>
-                        </td>
-                        <td>{!! $supplyOrder->is_cancelled ? '<b class="text-warning-mellow">Yes</b>' : 'No' !!}</td>
-                    </tr>
-                @endforeach
-                </tbody>
-            </table>
-            <div>
-                {{$supplyOrders->withQueryString()->links()}}
+                                @endif
+                            </td>
+                            <td>{{$supplyOrder->lot_number}}</td>
+                            <td>{{$supplyOrder->imei}}</td>
+                            <td>
+                                {{friendlier_date_time($supplyOrder->created_at)}}
+                                <div class="text-secondary text-sm mt-1">
+                                    By {{$supplyOrder->createdSession->pro->displayName()}}
+                                </div>
+                            </td>
+                            <td>{!! $supplyOrder->is_cancelled ? '<b class="text-warning-mellow">Yes</b>' : 'No' !!}</td>
+                        </tr>
+                        @endforeach
+                    </tbody>
+                </table>
             </div>
+
         </div>
     </div>
+    <div class="mt-3">
+        {{$supplyOrders->withQueryString()->links()}}
     </div>
 
-    <script>
-        (function() {
+</div>
 
-            function applyFilters() {
-                let params = {}, queryLine = [];
-                $('[data-filter]').each(function() {
-                    if($.trim($(this).val())) {
-                        params[$(this).attr('data-filter')] = $.trim($(this).val());
-                    }
-                });
-                for(let x in params) {
-                    if(params.hasOwnProperty(x)) {
-                        queryLine.push(x + '=' + encodeURIComponent(params[x]));
-                    }
-                }
-                queryLine = queryLine.join('&');
+<script>
+    (function() {
 
-                fastLoad('/practice-management/supply-orders?' + queryLine);
+        function applyFilters() {
+            let params = {},
+                queryLine = [];
+            $('[data-filter]').each(function() {
+                if ($.trim($(this).val())) {
+                    params[$(this).attr('data-filter')] = $.trim($(this).val());
+                }
+            });
+            for (let x in params) {
+                if (params.hasOwnProperty(x)) {
+                    queryLine.push(x + '=' + encodeURIComponent(params[x]));
+                }
             }
+            queryLine = queryLine.join('&');
 
-            function init() {
-                $('select[data-filter]')
-                    .off('change')
-                    .on('change', applyFilters);
-                $('input[data-filter]')
-                    .off('keyup')
-                    .on('keyup', function(_event) {
-                        if(_event.which === 13) {
-                            applyFilters();
-                            return false;
-                        }
-                    });
-            }
+            fastLoad('/practice-management/supply-orders?' + queryLine);
+        }
+
+        function init() {
+            $('select[data-filter]')
+                .off('change')
+                .on('change', applyFilters);
+            $('input[data-filter]')
+                .off('keyup')
+                .on('keyup', function(_event) {
+                    if (_event.which === 13) {
+                        applyFilters();
+                        return false;
+                    }
+                });
+        }
 
-            addMCInitializer('practice-supply-orders', init, '#practice-supply-orders')
+        addMCInitializer('practice-supply-orders', init, '#practice-supply-orders')
 
-        }).call(window);
-    </script>
-@endsection
+    }).call(window);
+</script>
+@endsection

resources/views/app/practice-management/tickets.blade.php

@@ -2,60 +2,63 @@
 
 @section('content')
 
-    <div class="p-3 mcp-theme-1">
+<div class="p-3 mcp-theme-1">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center">
+        <div class="card-header px-2 py-1 d-flex align-items-center">
             <strong class="mr-4">
                 <i class="fas fa-user"></i>
                 Tickets
             </strong>
-            
+
         </div>
         <div class="card-body p-0">
-            <table class="table table-sm table-condensed p-0 m-0">
-                <thead class="bg-light">
-                <tr>
-                    <th>Category</th>
-                    <th>Status</th>
-                    <th>Status Memo</th>
-                    <th>Initiating Pro</th>
-                    <th>Assigned Pro</th>
-                    <th>Manager Pro</th>
-                    <th>Ordering Pro</th>
-                    <th>Has Assigned Pro Signed</th>
-                    <th>Has Initiating Pro Signed</th>
-                    <th>Has Manager Pro Signed</th>
-                    <th>Has Ordering Pro Signed</th>
-                    <th>Is Open</th>
-                    <th>Is Entry Error</th>
-                </tr>
-                </thead>
-                <tbody>
-                @foreach ($tickets as $ticket)
-                    <tr>
-                        <td><a href="/patients/view/{{$ticket->patient->uid}}/action-items-{{$ticket->category}}">{{$ticket->category}}</a></td>
-                        <td>{{$ticket->data_status}}</td>
-                        <td>{{$ticket->data_status_memo}}</td>
-                        <td>{{$ticket->initiatingPro->name_first ?? ''}} {{$ticket->initiatingPro->name_last ?? ''}}</td>
-                        <td>{{$ticket->assignedPro->name_first ?? ''}} {{$ticket->assignedPro->name_last ?? ''}}</td>
-                        <td>{{$ticket->managerPro->name_first ?? ''}} {{$ticket->managerPro->name_last ?? ''}}</td>
-                        <td>{{$ticket->orderingPro->name_first ?? ''}} {{$ticket->orderingPro->name_last ?? ''}}</td>
-                        <td>{{$ticket->has_assigned_pro_signed ?'Yes':'No'}}</td>
-                        <td>{{$ticket->has_initiating_pro_signed ?'Yes':'No'}}</td>
-                        <td>{{$ticket->has_manager_pro_signed ?'Yes':'No'}}</td>
-                        <td>{{$ticket->has_ordering_pro_signed ?'Yes':'No'}}</td>
-                        <td>{{$ticket->is_open ?'Yes':'No'}}</td>
-                        <td>{{$ticket->is_entry_error ?'Yes':'No'}}</td>
-                    </tr>
-                @endforeach
-                </tbody>
-            </table>
-            <div>
-                {{$tickets->links()}}
+            <div class="table-responsive">
+                <table class="table table-sm table-striped p-0 m-0">
+                    <thead class="bg-light text-nowrap">
+                        <tr>
+                            <th>Category</th>
+                            <th>Status</th>
+                            <th>Status Memo</th>
+                            <th>Initiating Pro</th>
+                            <th>Assigned Pro</th>
+                            <th>Manager Pro</th>
+                            <th>Ordering Pro</th>
+                            <th>Has Assigned Pro Signed</th>
+                            <th>Has Initiating Pro Signed</th>
+                            <th>Has Manager Pro Signed</th>
+                            <th>Has Ordering Pro Signed</th>
+                            <th>Is Open</th>
+                            <th>Is Entry Error</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach ($tickets as $ticket)
+                        <tr>
+                            <td><a href="/patients/view/{{$ticket->patient->uid}}/action-items-{{$ticket->category}}">{{$ticket->category}}</a></td>
+                            <td>{{$ticket->data_status}}</td>
+                            <td>{{$ticket->data_status_memo}}</td>
+                            <td>{{$ticket->initiatingPro->name_first ?? ''}} {{$ticket->initiatingPro->name_last ?? ''}}</td>
+                            <td>{{$ticket->assignedPro->name_first ?? ''}} {{$ticket->assignedPro->name_last ?? ''}}</td>
+                            <td>{{$ticket->managerPro->name_first ?? ''}} {{$ticket->managerPro->name_last ?? ''}}</td>
+                            <td>{{$ticket->orderingPro->name_first ?? ''}} {{$ticket->orderingPro->name_last ?? ''}}</td>
+                            <td>{{$ticket->has_assigned_pro_signed ?'Yes':'No'}}</td>
+                            <td>{{$ticket->has_initiating_pro_signed ?'Yes':'No'}}</td>
+                            <td>{{$ticket->has_manager_pro_signed ?'Yes':'No'}}</td>
+                            <td>{{$ticket->has_ordering_pro_signed ?'Yes':'No'}}</td>
+                            <td>{{$ticket->is_open ?'Yes':'No'}}</td>
+                            <td>{{$ticket->is_entry_error ?'Yes':'No'}}</td>
+                        </tr>
+                        @endforeach
+                    </tbody>
+                </table>
             </div>
+
         </div>
     </div>
+    <div class="mt-3">
+        {{$tickets->links()}}
     </div>
+</div>
 
-@endsection
+@endsection

resources/views/app/practice-management/treatment-services-util.blade.php

@@ -12,10 +12,10 @@
     <div class="p-3 mcp-theme-1">
 
         <div class="card">
-            <div class="card-body">
-                <h1 class="report-table-header">Treatment Service Utilization - Org.</h1>
-                <table class="table table-bordered table-striped table-sm" id="table0">
-                    <thead>
+            <div class="card-body p-0">
+                <h1 class="report-table-header pt-2 px-2">Treatment Service Utilization - Org.</h1>
+                <table class="table table-striped table-sm" id="table0">
+                    <thead class="bg-light">
                     <tr>
                         <th>Date</th>
                         <th>Total hrs.</th>

resources/views/app/stat-tree/clauses/list.blade.php

@@ -4,7 +4,7 @@
         <div class="row">
             <div class="col-12">
                 <div class="card">
-                    <div class="card-header">
+                    <div class="card-header py-2 px-1">
                         <div class="d-flex align-items-center justify-content-between">
                             <div>
                                 <h6 class="font-weight-bold mb-0"><i class="far fa-file-code"></i> Clauses</h6>
@@ -18,7 +18,7 @@
                         <div class="row">
                             <div class="col-md-12">
                                 <div class="table-responsive">
-                                    <table class="table table-condensed p-0 m-0">
+                                    <table class="table table-sm table-striped p-0 m-0">
                                         <thead class="bg-light">
                                             <tr>
                                                 <th class="border-0">Position Index</th>

resources/views/app/unmapped-sms.blade.php

@@ -5,7 +5,7 @@
     <div class="p-3 mcp-theme-1">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center">
+        <div class="card-header px-2 py-1 d-flex align-items-center">
             <strong class="mr-4">
                 <i class="fas fa-user"></i>
                 Unmapped SMS
@@ -16,7 +16,7 @@
             </select>--}}
         </div>
         <div class="card-body p-0">
-            <table class="table table-condensed p-0 m-0">
+            <table class="table table-sm table-striped p-0 m-0">
                 <thead class="bg-light">
                 <tr>
                     <th class="px-3 border-0 w-25">Date &amp; Time</th>
@@ -55,11 +55,11 @@
                 @endforeach
                 </tbody>
             </table>
-            <div>
-                {{$unmappedSMS->links()}}
-            </div>
         </div>
     </div>
+    <div class="mt-2">
+        {{$unmappedSMS->links()}}
+    </div>
     </div>
 
 @endsection

resources/views/layouts/patient.blade.php

@@ -3,6 +3,7 @@
 /** @var \App\Models\Client $patient */
 ?>
 <?php
+$trimLayout = false;
 $routeName = request()->route()->getName();
 $isVisitNote = ($routeName === 'patients.view.notes.view.dashboard' && @$note && !!$note->visitTemplate);
 ?>
@@ -275,7 +276,7 @@ $isVisitNote = ($routeName === 'patients.view.notes.view.dashboard' && @$note &&
 				</div>
 			</nav>
 			@endif
-			<main role="main" class="w-100 {{$isVisitNote ? 'p-0' : ''}}">
+			<main role="main" class="w-100 {{$trimLayout || $isVisitNote ? 'p-0' : ''}}">
 				@if($pro->is_enrolled_as_mcp && !$patient->mcp)
 					<div class="alert alert-info bg-white mt-3 mcp-theme-1 p-3 hide-inside-ticket-popup">
 						<div class="font-size-16">
@@ -317,7 +318,7 @@ $isVisitNote = ($routeName === 'patients.view.notes.view.dashboard' && @$note &&
 						</div>
 					</div>
 				@endif
-				<div class="card {{$isVisitNote ? 'card m-0 border-0 rounded-0' : 'my-3'}}" id="patient-header">
+				<div class="card {{$trimLayout || $isVisitNote ? 'card m-0 border-0 rounded-0' : 'my-3'}}" id="patient-header">
 					<div id="patient-header-content">
 					<div class="card-header @if($patient->client_engagement_status_category == 'DUMMY') alert-warning @endif py-1 hide-inside-ticket-popup">
 						<?php

resources/views/layouts/template.blade.php

@@ -433,6 +433,8 @@
     <script src="/js/option-list.js?v={{config('app.asset_version')}}"></script>
     <script src="/js/show-on-click.js?v={{config('app.asset_version')}}"></script>
     <script src="/js/dq.js?v={{config('app.asset_version')}}"></script>
+    <script src="/js/icd-autocomplete.js?v={{config('app.asset_version')}}"></script>
+    <script src="/js/stag-collapsible-card.js?v={{config('app.asset_version')}}"></script>
     @include('app/pdf/viewer')
     @if(config('app.enableSockets'))
     <script>

routes/web.php

@@ -90,6 +90,7 @@ Route::middleware('pro.auth')->group(function () {
         Route::get('new-patients-awaiting-visit', 'McpController@new_patients_awaiting_visit')->name('new_patients_awaiting_visit');
         Route::get('notes-pending-signature', 'McpController@notes_pending_signature')->name('notes_pending_signature');
         Route::get('notes-pending-billing', 'McpController@notes_pending_billing')->name('notes_pending_billing');
+        Route::get('bills-pending-signature', 'McpController@bills_pending_signature')->name('bills_pending_signature');
         Route::get('reports-pending-signature', 'McpController@reports_pending_signature')->name('reports_pending_signature');
         Route::get('patients-without-appointments', 'McpController@patients_without_appointments')->name('patients_without_appointments');
         Route::get('patients-overdue-for-visit', 'McpController@patients_overdue_for_visit')->name('patients_overdue_for_visit');