Updates

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/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/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/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/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/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/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>