Cleaned up NA dashboard

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

@@ -161,7 +161,7 @@
                                     </strong>
                                 </div>
                                 <div class="card-body p-0">
-                                    @include('app.dna.dashboard.encounters_pending_my_review')
+                                    @include('app.dna.dashboard.encounters_pending_my_review_dashboard')
                                 </div>
                             </div>
 
@@ -173,7 +173,7 @@
                                     </strong>
                                 </div>
                                 <div class="card-body p-0">
-                                    @include('app.dna.dashboard.encounters_in_progress')
+                                    @include('app.dna.dashboard.encounters_in_progress_dashboard')
                                 </div>
                             </div>
 
@@ -185,7 +185,7 @@
                                     </strong>
                                 </div>
                                 <div class="card-body p-0">
-                                    @include('app.dna.dashboard.patients_without_appointment')
+                                    @include('app.dna.dashboard.patients_without_appointment_dashboard')
                                 </div>
                             </div>
 

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

@@ -1,118 +1,118 @@
-@php 
-    $appointmentPendingConfirmation = $performer->pro->appointmentsPendingConfirmationRecordsAsDna();
-@endphp 
-<div class="card">
-    <div class="card-body p-0">
-        @if(@$appointmentPendingConfirmation && count($appointmentPendingConfirmation))
-            <table class="mb-0 table table-sm appointments border-top-0">
+@php
+$appointmentPendingConfirmation = $performer->pro->appointmentsPendingConfirmationRecordsAsDna();
+@endphp
+<div class="p-3">
+    <div class="card">
+        <div class="card-body p-0">
+            @if(@$appointmentPendingConfirmation && count($appointmentPendingConfirmation))
+            <table class="mb-0 table table-sm table-striped appointments">
+                <thead class="bg-light">
+                    <tr>
+                        <th class="border-0">Patient</th>
+                        <th class="border-0">Status</th>
+                        <th class="border-0">Coverage</th>
+                    </tr>
+                </thead>
                 @foreach($appointmentPendingConfirmation as $appointment)
-                    <tr class="{{$appointment->bgColor}}">
-                        <td>
-                            <a href="/patients/view/{{$appointment->clientUid}}" class="font-weight-bold d-block">
-                                {{$appointment->client->name_first }} {{$appointment->client->name_last }}
-                            </a>
-                            <div class="mt-1">
-                                <a href="/patients/view/{{$appointment->clientUid}}/calendar/{{$appointment->uid}}">
-                                    {{ friendly_date_time($appointment->start_time) }} - {{ friendly_date_time($appointment->end_time) }}</a>
-                                <span class="text-secondary">{{ friendly_timezone($appointment->timezone) }}</span>
-                            </div>
-                            @if($appointment->title)
-                                <span class="d-inline-block mt-1 text-secondary text-sm">
+                <tr class="{{$appointment->bgColor}}">
+                    <td>
+                        <a href="/patients/view/{{$appointment->clientUid}}" class="font-weight-bold d-block">
+                            {{$appointment->client->name_first }} {{$appointment->client->name_last }}
+                        </a>
+                        <div class="mt-1">
+                            <a href="/patients/view/{{$appointment->clientUid}}/calendar/{{$appointment->uid}}">
+                                {{ friendly_date_time($appointment->start_time) }} - {{ friendly_date_time($appointment->end_time) }}</a>
+                            <span class="text-secondary">{{ friendly_timezone($appointment->timezone) }}</span>
+                        </div>
+                        @if($appointment->title)
+                        <span class="d-inline-block mt-1 text-secondary text-sm">
                             {{ $appointment->title }}
                         </span>
-                            @endif
-                        </td>
-                        <td>
-                            <div class="d-flex flex-column">
-                                <div class="d-flex align-items-baseline flex-nowrap">
-                                    @if($appointment->status === 'PENDING')
-                                        <div class="text-warning-mellow font-weight-bold text-nowrap">
-                                            <i class="fa fa-exclamation-triangle"></i>
-                                            Pending
-                                        </div>
-                                    @elseif($appointment->status === 'CONFIRMED')
-                                        <div class="text-success font-weight-bold text-nowrap">
-                                            <i class="fa fa-check"></i>
-                                            Confirmed
-                                        </div>
-                                    @elseif($appointment->status === 'CANCELLED')
-                                        <div class="text-danger font-weight-bold text-nowrap">
-                                            <i class="fa fa-stop"></i>
-                                            Cancelled
-                                        </div>
-                                    @elseif($appointment->status === 'COMPLETED')
-                                        <div class="text-success font-weight-bold text-nowrap">
-                                            <i class="far fa-calendar-check"></i>
-                                            Completed
-                                        </div>
-                                    @endif
-                                    <div class="ml-2" moe relative center>
-                                        <a href="#" start show><i class="fa fa-edit"></i></a>
-                                        <form url="/api/appointment/updateStatus" hook="refreshDashboardAppointments" center>
-                                            <input type="hidden" name="uid" value="{{$appointment->uid}}">
-                                            <p class="text-nowrap mb-3 font-weight-bold text-secondary">Change appointment status</p>
-                                            <div class="mb-3 border bg-light p-2">
-                                                <div class="d-flex align-items-baseline mb-1">
-                                                    <span class="width-70px">Patient</span>
-                                                    <b>{{$appointment->clientName }}</b>
-                                                </div>
-                                                <div class="d-flex align-items-baseline mb-1">
-                                                    <span class="width-70px">Pro</span>
-                                                    <b>{{$appointment->proName}}</b>
-                                                </div>
-                                                <div class="d-flex align-items-baseline mb-1">
-                                                    <span class="width-70px">Date</span>
-                                                    <b>{{friendly_date($appointment->raw_date)}}</b>
-                                                </div>
-                                                <div class="d-flex align-items-baseline mb-1">
-                                                    <span class="width-70px">Time</span>
-                                                    <span>
-                                                        <b>{{ $appointment->friendlyStartTime }}</b> - <b>{{ $appointment->friendlyEndTime }}</b>
-                                                        <span class="text-secondary">{{ friendly_timezone($appointment->timezone) }}</span>
-                                                    </span>
-                                                </div>
-                                                <div class="d-flex align-items-baseline ">
-                                                    <span class="width-70px">Status</span>
-                                                    <b>{{ucwords(strtolower($appointment->status))}}</b>
-                                                </div>
+                        @endif
+                    </td>
+                    <td>
+                        <div class="d-flex flex-column">
+                            <div class="d-flex align-items-baseline flex-nowrap">
+                                @if($appointment->status === 'PENDING')
+                                <div class="text-warning-mellow font-weight-bold text-nowrap">
+                                    <i class="fa fa-exclamation-triangle"></i>
+                                    Pending
+                                </div>
+                                @elseif($appointment->status === 'CONFIRMED')
+                                <div class="text-success font-weight-bold text-nowrap">
+                                    <i class="fa fa-check"></i>
+                                    Confirmed
+                                </div>
+                                @elseif($appointment->status === 'CANCELLED')
+                                <div class="text-danger font-weight-bold text-nowrap">
+                                    <i class="fa fa-stop"></i>
+                                    Cancelled
+                                </div>
+                                @elseif($appointment->status === 'COMPLETED')
+                                <div class="text-success font-weight-bold text-nowrap">
+                                    <i class="far fa-calendar-check"></i>
+                                    Completed
+                                </div>
+                                @endif
+                                <div class="ml-2" moe relative center>
+                                    <a href="#" start show><i class="fa fa-edit"></i></a>
+                                    <form url="/api/appointment/updateStatus" hook="refreshDashboardAppointments" center>
+                                        <input type="hidden" name="uid" value="{{$appointment->uid}}">
+                                        <p class="text-nowrap mb-3 font-weight-bold text-secondary">Change appointment status</p>
+                                        <div class="mb-3 border bg-light p-2">
+                                            <div class="d-flex align-items-baseline mb-1">
+                                                <span class="width-70px">Patient</span>
+                                                <b>{{$appointment->clientName }}</b>
                                             </div>
-                                            <label for="" class="mb-2">New Status</label>
-                                            <select name="status" class="form-control form-control-sm input-sm bg-light mb-2">
-                                                <option value="PENDING" {{$appointment->status === 'PENDING' ? 'selected' : ''}}>PENDING</option>
-                                                <option value="CONFIRMED" {{$appointment->status === 'CONFIRMED' ? 'selected' : ''}}>CONFIRMED</option>
-                                                <option value="CANCELLED" {{$appointment->status === 'CANCELLED' ? 'selected' : ''}}>CANCELLED</option>
-                                                <option value="COMPLETED" {{$appointment->status === 'COMPLETED' ? 'selected' : ''}}>COMPLETED</option>
-                                            </select>
-                                            <div class="mb-0">
-                                                <button class="btn btn-primary btn-sm" submit>Submit</button>
-                                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                            <div class="d-flex align-items-baseline mb-1">
+                                                <span class="width-70px">Pro</span>
+                                                <b>{{$appointment->proName}}</b>
                                             </div>
-                                        </form>
-                                    </div>
+                                            <div class="d-flex align-items-baseline mb-1">
+                                                <span class="width-70px">Date</span>
+                                                <b>{{friendly_date($appointment->raw_date)}}</b>
+                                            </div>
+                                            <div class="d-flex align-items-baseline mb-1">
+                                                <span class="width-70px">Time</span>
+                                                <span>
+                                                    <b>{{ $appointment->friendlyStartTime }}</b> - <b>{{ $appointment->friendlyEndTime }}</b>
+                                                    <span class="text-secondary">{{ friendly_timezone($appointment->timezone) }}</span>
+                                                </span>
+                                            </div>
+                                            <div class="d-flex align-items-baseline ">
+                                                <span class="width-70px">Status</span>
+                                                <b>{{ucwords(strtolower($appointment->status))}}</b>
+                                            </div>
+                                        </div>
+                                        <label for="" class="mb-2">New Status</label>
+                                        <select name="status" class="form-control form-control-sm input-sm bg-light mb-2">
+                                            <option value="PENDING" {{$appointment->status === 'PENDING' ? 'selected' : ''}}>PENDING</option>
+                                            <option value="CONFIRMED" {{$appointment->status === 'CONFIRMED' ? 'selected' : ''}}>CONFIRMED</option>
+                                            <option value="CANCELLED" {{$appointment->status === 'CANCELLED' ? 'selected' : ''}}>CANCELLED</option>
+                                            <option value="COMPLETED" {{$appointment->status === 'COMPLETED' ? 'selected' : ''}}>COMPLETED</option>
+                                        </select>
+                                        <div class="mb-0">
+                                            <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                        </div>
+                                    </form>
                                 </div>
-                                
                             </div>
-                        </td>
-                        <td>
-                            <div>
-                                @if($appointment->coverage === 'YES')
-                                    <b class="text-success">Covered</b>
-                                @elseif($appointment->coverage === 'NO')
-                                    <b class="text-danger">Not Covered</b>
-                                @else
-                                    <b v-else class="text-warning-mellow">Pending</b>
-                                @endif
-                            </div>
-                        </td>
-                    </tr>
+
+                        </div>
+                    </td>
+                    <td>
+                        @include('app.patient.coverage_column_renderer', ['patient'=>$appointment->client])
+                    </td>
+                </tr>
                 @endforeach
             </table>
-        @else
+            @else
             <div class="bg-light p-3 text-secondary">
                 <span>You have no appointments pending confirmation.</span>
             </div>
-            
-        @endif
-    </div>
-</div>
 
+            @endif
+        </div>
+    </div>
+</div>

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

@@ -1,118 +1,118 @@
-@php 
-    $cancelledApptsPendingAck = $performer->pro->cancelledAppointmentsPendingAckRecordsAsDna();
-@endphp 
-<div class="card">
-    <div class="card-body p-0">
-        @if(@$cancelledApptsPendingAck && count($cancelledApptsPendingAck))
-            <table class="mb-0 table table-sm appointments border-top-0">
+@php
+$cancelledApptsPendingAck = $performer->pro->cancelledAppointmentsPendingAckRecordsAsDna();
+@endphp
+<div class="p-3">
+    <div class="card">
+        <div class="card-body p-0">
+            @if(@$cancelledApptsPendingAck && count($cancelledApptsPendingAck))
+            <table class="mb-0 table table-sm table-striped appointments">
+                <thead class="bg-light">
+                    <tr>
+                        <th class="border-0">Patient</th>
+                        <th class="border-0">Status</th>
+                        <th class="border-0">Coverage</th>
+                    </tr>
+                </thead>
                 @foreach($cancelledApptsPendingAck as $appointment)
-                    <tr class="{{$appointment->bgColor}}">
-                        <td>
-                            <a href="/patients/view/{{$appointment->clientUid}}" class="font-weight-bold d-block">
-                                {{$appointment->client->name_first }} {{$appointment->client->name_last }}
-                            </a>
-                            <div class="mt-1">
-                                <a href="/patients/view/{{$appointment->clientUid}}/calendar/{{$appointment->uid}}">
-                                    {{ friendly_date_time($appointment->start_time) }} - {{ friendly_date_time($appointment->end_time) }}</a>
-                                <span class="text-secondary">{{ friendly_timezone($appointment->timezone) }}</span>
-                            </div>
-                            @if($appointment->title)
-                                <span class="d-inline-block mt-1 text-secondary text-sm">
+                <tr class="{{$appointment->bgColor}}">
+                    <td>
+                        <a href="/patients/view/{{$appointment->clientUid}}" class="font-weight-bold d-block">
+                            {{$appointment->client->name_first }} {{$appointment->client->name_last }}
+                        </a>
+                        <div class="mt-1">
+                            <a href="/patients/view/{{$appointment->clientUid}}/calendar/{{$appointment->uid}}">
+                                {{ friendly_date_time($appointment->start_time) }} - {{ friendly_date_time($appointment->end_time) }}</a>
+                            <span class="text-secondary">{{ friendly_timezone($appointment->timezone) }}</span>
+                        </div>
+                        @if($appointment->title)
+                        <span class="d-inline-block mt-1 text-secondary text-sm">
                             {{ $appointment->title }}
                         </span>
-                            @endif
-                        </td>
-                        <td>
-                            <div class="d-flex flex-column">
-                                <div class="d-flex align-items-baseline flex-nowrap">
-                                    @if($appointment->status === 'PENDING')
-                                        <div class="text-warning-mellow font-weight-bold text-nowrap">
-                                            <i class="fa fa-exclamation-triangle"></i>
-                                            Pending
-                                        </div>
-                                    @elseif($appointment->status === 'CONFIRMED')
-                                        <div class="text-success font-weight-bold text-nowrap">
-                                            <i class="fa fa-check"></i>
-                                            Confirmed
-                                        </div>
-                                    @elseif($appointment->status === 'CANCELLED')
-                                        <div class="text-danger font-weight-bold text-nowrap">
-                                            <i class="fa fa-stop"></i>
-                                            Cancelled
-                                        </div>
-                                    @elseif($appointment->status === 'COMPLETED')
-                                        <div class="text-success font-weight-bold text-nowrap">
-                                            <i class="far fa-calendar-check"></i>
-                                            Completed
-                                        </div>
-                                    @endif
-                                    <div class="ml-2" moe relative center>
-                                        <a href="#" start show><i class="fa fa-edit"></i></a>
-                                        <form url="/api/appointment/updateStatus" hook="refreshDashboardAppointments" center>
-                                            <input type="hidden" name="uid" value="{{$appointment->uid}}">
-                                            <p class="text-nowrap mb-3 font-weight-bold text-secondary">Change appointment status</p>
-                                            <div class="mb-3 border bg-light p-2">
-                                                <div class="d-flex align-items-baseline mb-1">
-                                                    <span class="width-70px">Patient</span>
-                                                    <b>{{$appointment->clientName }}</b>
-                                                </div>
-                                                <div class="d-flex align-items-baseline mb-1">
-                                                    <span class="width-70px">Pro</span>
-                                                    <b>{{$appointment->proName}}</b>
-                                                </div>
-                                                <div class="d-flex align-items-baseline mb-1">
-                                                    <span class="width-70px">Date</span>
-                                                    <b>{{friendly_date($appointment->raw_date)}}</b>
-                                                </div>
-                                                <div class="d-flex align-items-baseline mb-1">
-                                                    <span class="width-70px">Time</span>
-                                                    <span>
-                                                        <b>{{ $appointment->friendlyStartTime }}</b> - <b>{{ $appointment->friendlyEndTime }}</b>
-                                                        <span class="text-secondary">{{ friendly_timezone($appointment->timezone) }}</span>
-                                                    </span>
-                                                </div>
-                                                <div class="d-flex align-items-baseline ">
-                                                    <span class="width-70px">Status</span>
-                                                    <b>{{ucwords(strtolower($appointment->status))}}</b>
-                                                </div>
+                        @endif
+                    </td>
+                    <td>
+                        <div class="d-flex flex-column">
+                            <div class="d-flex align-items-baseline flex-nowrap">
+                                @if($appointment->status === 'PENDING')
+                                <div class="text-warning-mellow font-weight-bold text-nowrap">
+                                    <i class="fa fa-exclamation-triangle"></i>
+                                    Pending
+                                </div>
+                                @elseif($appointment->status === 'CONFIRMED')
+                                <div class="text-success font-weight-bold text-nowrap">
+                                    <i class="fa fa-check"></i>
+                                    Confirmed
+                                </div>
+                                @elseif($appointment->status === 'CANCELLED')
+                                <div class="text-danger font-weight-bold text-nowrap">
+                                    <i class="fa fa-stop"></i>
+                                    Cancelled
+                                </div>
+                                @elseif($appointment->status === 'COMPLETED')
+                                <div class="text-success font-weight-bold text-nowrap">
+                                    <i class="far fa-calendar-check"></i>
+                                    Completed
+                                </div>
+                                @endif
+                                <div class="ml-2" moe relative center>
+                                    <a href="#" start show><i class="fa fa-edit"></i></a>
+                                    <form url="/api/appointment/updateStatus" hook="refreshDashboardAppointments" center>
+                                        <input type="hidden" name="uid" value="{{$appointment->uid}}">
+                                        <p class="text-nowrap mb-3 font-weight-bold text-secondary">Change appointment status</p>
+                                        <div class="mb-3 border bg-light p-2">
+                                            <div class="d-flex align-items-baseline mb-1">
+                                                <span class="width-70px">Patient</span>
+                                                <b>{{$appointment->clientName }}</b>
                                             </div>
-                                            <label for="" class="mb-2">New Status</label>
-                                            <select name="status" class="form-control form-control-sm input-sm bg-light mb-2">
-                                                <option value="PENDING" {{$appointment->status === 'PENDING' ? 'selected' : ''}}>PENDING</option>
-                                                <option value="CONFIRMED" {{$appointment->status === 'CONFIRMED' ? 'selected' : ''}}>CONFIRMED</option>
-                                                <option value="CANCELLED" {{$appointment->status === 'CANCELLED' ? 'selected' : ''}}>CANCELLED</option>
-                                                <option value="COMPLETED" {{$appointment->status === 'COMPLETED' ? 'selected' : ''}}>COMPLETED</option>
-                                            </select>
-                                            <div class="mb-0">
-                                                <button class="btn btn-primary btn-sm" submit>Submit</button>
-                                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                            <div class="d-flex align-items-baseline mb-1">
+                                                <span class="width-70px">Pro</span>
+                                                <b>{{$appointment->proName}}</b>
                                             </div>
-                                        </form>
-                                    </div>
+                                            <div class="d-flex align-items-baseline mb-1">
+                                                <span class="width-70px">Date</span>
+                                                <b>{{friendly_date($appointment->raw_date)}}</b>
+                                            </div>
+                                            <div class="d-flex align-items-baseline mb-1">
+                                                <span class="width-70px">Time</span>
+                                                <span>
+                                                    <b>{{ $appointment->friendlyStartTime }}</b> - <b>{{ $appointment->friendlyEndTime }}</b>
+                                                    <span class="text-secondary">{{ friendly_timezone($appointment->timezone) }}</span>
+                                                </span>
+                                            </div>
+                                            <div class="d-flex align-items-baseline ">
+                                                <span class="width-70px">Status</span>
+                                                <b>{{ucwords(strtolower($appointment->status))}}</b>
+                                            </div>
+                                        </div>
+                                        <label for="" class="mb-2">New Status</label>
+                                        <select name="status" class="form-control form-control-sm input-sm bg-light mb-2">
+                                            <option value="PENDING" {{$appointment->status === 'PENDING' ? 'selected' : ''}}>PENDING</option>
+                                            <option value="CONFIRMED" {{$appointment->status === 'CONFIRMED' ? 'selected' : ''}}>CONFIRMED</option>
+                                            <option value="CANCELLED" {{$appointment->status === 'CANCELLED' ? 'selected' : ''}}>CANCELLED</option>
+                                            <option value="COMPLETED" {{$appointment->status === 'COMPLETED' ? 'selected' : ''}}>COMPLETED</option>
+                                        </select>
+                                        <div class="mb-0">
+                                            <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                        </div>
+                                    </form>
                                 </div>
-                                
                             </div>
-                        </td>
-                        <td>
-                            <div>
-                                @if($appointment->coverage === 'YES')
-                                    <b class="text-success">Covered</b>
-                                @elseif($appointment->coverage === 'NO')
-                                    <b class="text-danger">Not Covered</b>
-                                @else
-                                    <b v-else class="text-warning-mellow">Pending</b>
-                                @endif
-                            </div>
-                        </td>
-                    </tr>
+
+                        </div>
+                    </td>
+                    <td>
+                    @include('app.patient.coverage_column_renderer', ['patient'=>$appointment->client])
+                    </td>
+                </tr>
                 @endforeach
             </table>
-        @else
+            @else
             <div class="bg-light p-3 text-secondary">
                 <span>You have no cancelled appointments.</span>
             </div>
-            
-        @endif
-    </div>
-</div>
 
+            @endif
+        </div>
+    </div>
+</div>

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

@@ -1,56 +1,64 @@
-<div>
-@php 
+<div class="p-3">
+    @php
     $encountersInProgress = $performer->pro->encountersInProgressRecordsAsDna();
-@endphp 
-@if($encountersInProgress && count($encountersInProgress))
-    <table class="table table-sm table-striped mb-0">
-        <thead>
-        <tr>
-            <th class="border-bottom-0 border-top-0 text-secondary">Chart #</th>
-            <th class="border-bottom-0 border-top-0 text-secondary">Name</th>
-            <th class="border-bottom-0 border-top-0 text-secondary">DOB</th>
-            <th class="border-bottom-0 border-top-0 text-secondary">Gender</th>
-            <th class="border-bottom-0 border-top-0 text-secondary">Insurance</th>
-            <th class="border-bottom-0 border-top-0 text-secondary">HCP</th>
-            <th class="border-bottom-0 border-top-0 text-secondary">Visit Date</th>
-        </tr>
-        </thead>
-        <tbody>
-        @foreach($encountersInProgress as $row)
-            <tr>
-                <td class="text-nowrap">
-                    {{$row->client->chart_number}}
-                </td>
-                <td class="pl-2">
-                    <a href="{{ route('patients.view.dashboard', $row->client) }}">
-                        {{$row->client->displayName()}}
-                    </a>
-                </td>
-                <td class="text-nowrap">
-                    {{friendly_date($row->client->dob)}}
-                </td>
-                <td class="text-nowrap">
-                    {{$row->client->sex}}
-                </td>
-                <td class="text-nowrap">
-                    @include('app.dna.dashboard.coverage_renderer', ['patient'=>$row->client])
-                </td>
-                <td class="text-nowrap">
-                    {{$row->client->mcp->name_display ?? '' }}
-                </td>
-                <td class="text-nowrap">
-                    {{friendly_date($row->effective_dateest)}}
-                </td>
-            </tr>
-        @endforeach
-        </tbody>
-    </table>
-    <div class="m-2">
-        {{ $encountersInProgress->onEachSide(0)->withQueryString()->links() }}
+    @endphp
+    <div class="card">
+        <div class="card-body p-0">
+            @if($encountersInProgress && count($encountersInProgress))
+            <div class="table-responsive">
+                <table class="table table-sm table-striped mb-0">
+                    <thead class="bg-light">
+                        <tr>
+                            <th class="border-0">Chart #</th>
+                            <th class="border-0">Name</th>
+                            <th class="border-0">DOB</th>
+                            <th class="border-0">Gender</th>
+                            <th class="border-0">Insurance</th>
+                            <th class="border-0">HCP</th>
+                            <th class="border-0">Visit Date</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach($encountersInProgress as $row)
+                        <tr>
+                            <td class="text-nowrap">
+                                {{$row->client->chart_number}}
+                            </td>
+                            <td>
+                                <a href="{{ route('patients.view.dashboard', $row->client) }}">
+                                    {{$row->client->displayName()}}
+                                </a>
+                            </td>
+                            <td class="text-nowrap">
+                                {{friendly_date($row->client->dob)}}
+                            </td>
+                            <td class="text-nowrap">
+                                {{$row->client->sex}}
+                            </td>
+                            <td class="text-nowrap">
+                                @include('app.patient.coverage_column_renderer', ['patient'=>$row->client])
+                            </td>
+                            <td class="text-nowrap">
+                                {{$row->client->mcp->name_display ?? '' }}
+                            </td>
+                            <td class="text-nowrap">
+                                {{friendly_date($row->effective_dateest)}}
+                            </td>
+                        </tr>
+                        @endforeach
+                    </tbody>
+                </table>
+            </div>
+            @if($encountersInProgress->hasPages())
+            <div class="m-2">
+                {{ $encountersInProgress->onEachSide(0)->withQueryString()->links() }}
+            </div>
+            @endif
+            @else
+            <div class="p-3">
+                No encounters in progress
+            </div>
+            @endif
+        </div>
     </div>
-@else
-    <div class="p-3">
-        No encounters in progress
-    </div>
-@endif
 </div>

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

@@ -0,0 +1,64 @@
+<div class="">
+    @php
+    $encountersInProgress = $performer->pro->encountersInProgressRecordsAsDna();
+    @endphp
+    <div class="card">
+        <div class="card-body p-0">
+            @if($encountersInProgress && count($encountersInProgress))
+            <div class="table-responsive">
+                <table class="table table-sm table-striped mb-0">
+                    <thead class="bg-light">
+                        <tr>
+                            <th class="border-0">Chart #</th>
+                            <th class="border-0">Name</th>
+                            <th class="border-0">DOB</th>
+                            <th class="border-0">Gender</th>
+                            <th class="border-0">Insurance</th>
+                            <th class="border-0">HCP</th>
+                            <th class="border-0">Visit Date</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach($encountersInProgress as $row)
+                        <tr>
+                            <td class="text-nowrap">
+                                {{$row->client->chart_number}}
+                            </td>
+                            <td>
+                                <a href="{{ route('patients.view.dashboard', $row->client) }}">
+                                    {{$row->client->displayName()}}
+                                </a>
+                            </td>
+                            <td class="text-nowrap">
+                                {{friendly_date($row->client->dob)}}
+                            </td>
+                            <td class="text-nowrap">
+                                {{$row->client->sex}}
+                            </td>
+                            <td class="text-nowrap">
+                                @include('app.patient.coverage_column_renderer', ['patient'=>$row->client])
+                            </td>
+                            <td class="text-nowrap">
+                                {{$row->client->mcp->name_display ?? '' }}
+                            </td>
+                            <td class="text-nowrap">
+                                {{friendly_date($row->effective_dateest)}}
+                            </td>
+                        </tr>
+                        @endforeach
+                    </tbody>
+                </table>
+            </div>
+            @if($encountersInProgress->hasPages())
+            <div class="m-2">
+                {{ $encountersInProgress->onEachSide(0)->withQueryString()->links() }}
+            </div>
+            @endif
+            @else
+            <div class="p-3">
+                No encounters in progress
+            </div>
+            @endif
+        </div>
+    </div>
+</div>

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

@@ -1,55 +1,61 @@
-<div>
+<div class="p-3">
     @php
     $encountersPendingMyReview = $performer->pro->encountersPendingMyReviewRecordsAsDna();
     @endphp
-    @if($encountersPendingMyReview && count($encountersPendingMyReview))
-    <div class="table-responsive">
-        <table class="table table-sm table-striped mb-0">
-            <thead>
-                <tr>
-                    <th class="border-bottom-0 border-top-0 text-secondary">Patient</th>
-                    <th class="border-bottom-0 border-top-0 text-secondary">Type</th>
-                    <th class="border-bottom-0 border-top-0 text-secondary">Value</th>
-                    <th class="border-bottom-0 border-top-0 text-secondary">Timestamp</th>
-                </tr>
-            </thead>
-            <tbody>
-                @foreach($encountersPendingMyReview as $row)
-                <tr>
-                    <td class="text-nowrap">
-                        {{$row->client->chart_number}}
-                    </td>
-                    <td class="pl-2">
-                        <a href="{{ route('patients.view.dashboard', $row->client) }}">
-                            {{$row->client->displayName()}}
-                        </a>
-                    </td>
-                    <td class="text-nowrap">
-                        {{friendly_date($row->client->dob)}}
-                    </td>
-                    <td class="text-nowrap">
-                        {{$row->client->sex}}
-                    </td>
-                    <td class="text-nowrap">
-                        @include('app.dna.dashboard.coverage_renderer', ['patient'=>$row->client])
-                    </td>
-                    <td class="text-nowrap">
-                        {{$row->client->mcp->name_display ?? '' }}
-                    </td>
-                    <td class="text-nowrap">
-                        {{friendly_date($row->effective_dateest)}}
-                    </td>
-                </tr>
-                @endforeach
-            </tbody>
-        </table>
+    <div class="card">
+        <div class="card-body p-0">
+        @if($encountersPendingMyReview && count($encountersPendingMyReview))
+        <div class="table-responsive">
+            <table class="table table-sm table-striped mb-0">
+                <thead class="bg-light">
+                    <tr>
+                        <th class="border-0">Patient</th>
+                        <th class="border-0">Type</th>
+                        <th class="border-0">Value</th>
+                        <th class="border-0">Timestamp</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    @foreach($encountersPendingMyReview as $row)
+                    <tr>
+                        <td class="text-nowrap">
+                            {{$row->client->chart_number}}
+                        </td>
+                        <td>
+                            <a href="{{ route('patients.view.dashboard', $row->client) }}">
+                                {{$row->client->displayName()}}
+                            </a>
+                        </td>
+                        <td class="text-nowrap">
+                            {{friendly_date($row->client->dob)}}
+                        </td>
+                        <td class="text-nowrap">
+                            {{$row->client->sex}}
+                        </td>
+                        <td class="text-nowrap">
+                            @include('app.patient.coverage_column_renderer', ['patient'=>$row->client])
+                        </td>
+                        <td class="text-nowrap">
+                            {{$row->client->mcp->name_display ?? '' }}
+                        </td>
+                        <td class="text-nowrap">
+                            {{friendly_date($row->effective_dateest)}}
+                        </td>
+                    </tr>
+                    @endforeach
+                </tbody>
+            </table>
+        </div>
+        @if($encountersPendingMyReview->hasPages())
+            <div class="m-2">
+                {{ $encountersPendingMyReview->onEachSide(0)->withQueryString()->links() }}
+            </div>
+        @endif
+        @else
+        <div class="p-3">
+            No encounters pending review
+        </div>
+        @endif
+        </div>
     </div>
-    <div class="m-2">
-        {{ $encountersPendingMyReview->onEachSide(0)->withQueryString()->links() }}
-    </div>
-    @else
-    <div class="p-3">
-        No encounters pending review
-    </div>
-    @endif
 </div>

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

@@ -0,0 +1,61 @@
+<div class="">
+    @php
+    $encountersPendingMyReview = $performer->pro->encountersPendingMyReviewRecordsAsDna();
+    @endphp
+    <div class="card">
+        <div class="card-body p-0">
+        @if($encountersPendingMyReview && count($encountersPendingMyReview))
+        <div class="table-responsive">
+            <table class="table table-sm table-striped mb-0">
+                <thead class="bg-light">
+                    <tr>
+                        <th class="border-0">Patient</th>
+                        <th class="border-0">Type</th>
+                        <th class="border-0">Value</th>
+                        <th class="border-0">Timestamp</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    @foreach($encountersPendingMyReview as $row)
+                    <tr>
+                        <td class="text-nowrap">
+                            {{$row->client->chart_number}}
+                        </td>
+                        <td>
+                            <a href="{{ route('patients.view.dashboard', $row->client) }}">
+                                {{$row->client->displayName()}}
+                            </a>
+                        </td>
+                        <td class="text-nowrap">
+                            {{friendly_date($row->client->dob)}}
+                        </td>
+                        <td class="text-nowrap">
+                            {{$row->client->sex}}
+                        </td>
+                        <td class="text-nowrap">
+                            @include('app.patient.coverage_column_renderer', ['patient'=>$row->client])
+                        </td>
+                        <td class="text-nowrap">
+                            {{$row->client->mcp->name_display ?? '' }}
+                        </td>
+                        <td class="text-nowrap">
+                            {{friendly_date($row->effective_dateest)}}
+                        </td>
+                    </tr>
+                    @endforeach
+                </tbody>
+            </table>
+        </div>
+        @if($encountersPendingMyReview->hasPages())
+            <div class="m-2">
+                {{ $encountersPendingMyReview->onEachSide(0)->withQueryString()->links() }}
+            </div>
+        @endif
+        @else
+        <div class="p-3">
+            No encounters pending review
+        </div>
+        @endif
+        </div>
+    </div>
+</div>

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

@@ -34,7 +34,7 @@
                         {{$row->sex}}
                     </td>
                     <td class="text-nowrap">
-                        @include('app.dna.dashboard.coverage_renderer', ['patient'=>$row])
+                        @include('app.patient.coverage_column_renderer', ['patient'=>$row])
                     </td>
                     <td class="text-nowrap">
                         {{$row->mcp->name_display ?? '' }}

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

@@ -34,7 +34,7 @@
                         {{$row->sex}}
                     </td>
                     <td class="text-nowrap">
-                        @include('app.dna.dashboard.coverage_renderer', ['patient'=>$row])
+                        @include('app.patient.coverage_column_renderer', ['patient'=>$row])
                     </td>
                     <td class="text-nowrap">
                         {{$row->mcp->name_display ?? '' }}

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

@@ -4,56 +4,58 @@
     @endphp
     <div class="card">
         <div class="card-body p-0">
-        @if($patientsWithoutAppointments && count($patientsWithoutAppointments))
-        <table class="table table-sm table-striped mb-0">
-            <thead class="bg-light">
-            <tr>
-                <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>
-            </tr>
-            </thead>
-            <tbody>
-            @foreach($patientsWithoutAppointments as $row)
-                <tr>
-                    <td class="text-nowrap">
-                        {{$row->chart_number}}
-                    </td>
-                    <td>
-                        <a href="{{ route('patients.view.dashboard', $row) }}">
-                            {{$row->displayName()}}
-                        </a>
-                    </td>
-                    <td class="text-nowrap">
-                        {{friendly_date($row->dob)}}
-                    </td>
-                    <td class="text-nowrap">
-                        {{$row->sex}}
-                    </td>
-                    <td class="text-nowrap">
-                        @include('app.dna.dashboard.coverage_renderer', ['patient'=>$row])
-                    </td>
-                    <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>
-        </table>
-        @if($patientsWithoutAppointments->hasPages())
+            @if($patientsWithoutAppointments && count($patientsWithoutAppointments))
+            <div class="table-responsive">
+                <table class="table table-sm table-striped mb-0">
+                    <thead class="bg-light">
+                        <tr>
+                            <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>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach($patientsWithoutAppointments as $row)
+                        <tr>
+                            <td class="text-nowrap">
+                                {{$row->chart_number}}
+                            </td>
+                            <td>
+                                <a href="{{ route('patients.view.dashboard', $row) }}">
+                                    {{$row->displayName()}}
+                                </a>
+                            </td>
+                            <td class="text-nowrap">
+                                {{friendly_date($row->dob)}}
+                            </td>
+                            <td class="text-nowrap">
+                                {{$row->sex}}
+                            </td>
+                            <td class="text-nowrap">
+                                @include('app.patient.coverage_column_renderer', ['patient'=>$row])
+                            </td>
+                            <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>
+                </table>
+            </div>
+            @if($patientsWithoutAppointments->hasPages())
             <div class="m-2">
                 {{ $patientsWithoutAppointments->onEachSide(0)->withQueryString()->links() }}
             </div>
-        @endif
-    @else
-        <div class="p-3">
-            No patients without appointments
-        </div>
-    @endif
+            @endif
+            @else
+            <div class="p-3">
+                No patients without appointments
+            </div>
+            @endif
         </div>
     </div>
 </div>

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

@@ -0,0 +1,61 @@
+<div class="">
+    @php
+    $patientsWithoutAppointments = $performer->pro->patientsWithoutAppointmentRecordsAsDna();
+    @endphp
+    <div class="card">
+        <div class="card-body p-0">
+            @if($patientsWithoutAppointments && count($patientsWithoutAppointments))
+            <div class="table-responsive">
+                <table class="table table-sm table-striped mb-0">
+                    <thead class="bg-light">
+                        <tr>
+                            <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>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach($patientsWithoutAppointments as $row)
+                        <tr>
+                            <td class="text-nowrap">
+                                {{$row->chart_number}}
+                            </td>
+                            <td>
+                                <a href="{{ route('patients.view.dashboard', $row) }}">
+                                    {{$row->displayName()}}
+                                </a>
+                            </td>
+                            <td class="text-nowrap">
+                                {{friendly_date($row->dob)}}
+                            </td>
+                            <td class="text-nowrap">
+                                {{$row->sex}}
+                            </td>
+                            <td class="text-nowrap">
+                                @include('app.patient.coverage_column_renderer', ['patient'=>$row])
+                            </td>
+                            <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>
+                </table>
+            </div>
+            @if($patientsWithoutAppointments->hasPages())
+            <div class="m-2">
+                {{ $patientsWithoutAppointments->onEachSide(0)->withQueryString()->links() }}
+            </div>
+            @endif
+            @else
+            <div class="p-3">
+                No patients without appointments
+            </div>
+            @endif
+        </div>
+    </div>
+</div>

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

@@ -1,26 +1,17 @@
 @php 
     $reportsPendingAck = $performer->pro->reportsPendingAckRecordsAsDna();
 @endphp 
-<div class="p-3 mcp-theme-1" id="patients-list">
+<div class="p-3" id="patients-list">
     <div class="card">
-
-        <div class="card-header px-3 py-2 d-flex align-items-center">
-            <strong class="mr-4">
-                <i class="fas fa-file-invoice-dollar"></i>
-                Reports Pending Acknowledgement
-            </strong>
-        </div>
-
-        <div class="card-body p-0">
-            
-            <table class="table table-condensed p-0 m-0">
+        <div class="card-body p-0">            
+            <table class="table table-sm table-striped 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>
@@ -61,9 +52,11 @@
                 </tbody>
 
             </table>
-            <div class="ml-2 mt-2">
-                {{ $reportsPendingAck->appends(request()->input())->links() }}
-            </div>
+            @if($reportsPendingAck->hasPages())
+                <div class="ml-2 mt-2">
+                    {{ $reportsPendingAck->appends(request()->input())->links() }}
+                </div>
+            @endif
         </div>
     </div>
 </div>

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

@@ -1,27 +1,19 @@
-@php 
-    $supplyOrdersPendingHcpApproval = $performer->pro->supplyOrdersPendingHcpApprovalRecordsAsDna();
+@php
+$supplyOrdersPendingHcpApproval = $performer->pro->supplyOrdersPendingHcpApprovalRecordsAsDna();
 @endphp
-<div class="p-3 mcp-theme-1" id="patients-list">
+<div class="p-3" id="patients-list">
     <div class="card">
-
-        <div class="card-header px-3 py-2 d-flex align-items-center">
-            <strong class="mr-4">
-                <i class="fas fa-file-invoice-dollar"></i>
-                Supply Orders
-            </strong>
-        </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">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>
@@ -32,7 +24,7 @@
                         <td>{{ $supplyOrder->product->title }}</td>
                         <td style="width: 300px;">{{ $supplyOrder->reason }}</td>
                         <td>{{ $supplyOrder->is_cancelled ? 'Yes' : 'No' }}</td>
-                        <td class="px-2">
+                        <td>
                             @if($supplyOrder->shipment_id)
                             <i class="fa fa-building"></i>
                             {{$supplyOrder->shipment->status ? $supplyOrder->shipment->status : 'CREATED'}}
@@ -59,9 +51,11 @@
                 </tbody>
 
             </table>
+            @if($supplyOrdersPendingHcpApproval->hasPages())
             <div class="ml-2 mt-2">
                 {{ $supplyOrdersPendingHcpApproval->appends(request()->input())->links() }}
             </div>
+            @endif
         </div>
     </div>
 </div>

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

@@ -1,26 +1,18 @@
 @php 
     $supplyOrdersPendingMyAck = $performer->pro->supplyOrdersPendingMyAckRecordsAsDna();
 @endphp
-<div class="p-3 mcp-theme-1" id="patients-list">
+<div class="p-3" id="patients-list">
     <div class="card">
-
-        <div class="card-header px-3 py-2 d-flex align-items-center">
-            <strong class="mr-4">
-                <i class="fas fa-file-invoice-dollar"></i>
-                Supply Orders
-            </strong>
-        </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">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>
@@ -31,7 +23,7 @@
                         <td>{{ $supplyOrder->product->title }}</td>
                         <td style="width: 300px;">{{ $supplyOrder->reason }}</td>
                         <td>{{ $supplyOrder->is_cancelled ? 'Yes' : 'No' }}</td>
-                        <td class="px-2">
+                        <td>
                             @if($supplyOrder->shipment_id)
                             <i class="fa fa-building"></i>
                             {{$supplyOrder->shipment->status ? $supplyOrder->shipment->status : 'CREATED'}}
@@ -58,9 +50,11 @@
                 </tbody>
 
             </table>
-            <div class="ml-2 mt-2">
-                {{ $supplyOrdersPendingMyAck->appends(request()->input())->links() }}
-            </div>
+            @if($supplyOrdersPendingMyAck->hasPages())
+                <div class="ml-2 mt-2">
+                    {{ $supplyOrdersPendingMyAck->appends(request()->input())->links() }}
+                </div>
+            @endif
         </div>
     </div>
 </div>

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

@@ -0,0 +1,14 @@
+<div class="d-flex align-items-center">
+<?php $coverageStatus = $patient->getPrimaryCoverageStatus(); ?>
+@if($coverageStatus === 'YES')
+<i class="fa fa-check-circle text-success"></i>
+@elseif($coverageStatus === 'NO')
+<i class="fa fa-times text-danger"></i>
+@else
+    <i class="fa fa-exclamation-triangle text-warning-mellow"></i>
+@endif
+<?php $coverage = $patient->getPrimaryCoverage(); ?>
+@if($coverage)
+    <span class="ml-2">{{$coverage->insuranceDisplayName()}}</span>
+@endif
+</div>