ソースを参照

Patient pages cleanup

Samson Mutunga 3 年 前
コミット
8a0bdb8d6f

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

@@ -23,36 +23,36 @@
         </div>
         <table class="table table-striped table-sm table-bordered mb-0">
             @if($appointments && count($appointments))
-                <thead>
+                <thead class="bg-light">
                 <tr>
-                    <th class="px-2 text-secondary border-bottom-0">Date & Time</th>
-                    <th class="px-2 text-secondary border-bottom-0">Pro</th>
-                    <th class="px-2 text-secondary border-bottom-0">Title</th>
-                    <th class="px-2 text-secondary border-bottom-0">Description</th>
-                    <th class="px-2 text-secondary border-bottom-0">Status</th>
-                    <th class="px-2 text-secondary border-bottom-0">Confirmation</th>
-                    <th class="px-2 text-secondary border-bottom-0"></th>
+                    <th class="text-secondary border-bottom-0">Date & Time</th>
+                    <th class="text-secondary border-bottom-0">Pro</th>
+                    <th class="text-secondary border-bottom-0">Title</th>
+                    <th class="text-secondary border-bottom-0">Description</th>
+                    <th class="text-secondary border-bottom-0">Status</th>
+                    <th class="text-secondary border-bottom-0">Confirmation</th>
+                    <th class="text-secondary border-bottom-0"></th>
                 </tr>
                 </thead>
                 <tbody>
                 @foreach($appointments as $appointment)
                     <tr>
-                        <td class="px-2">
-                            <a href="/patients/view/{{$patient->uid}}/calendar/{{$appointment->uid}}" class="font-weight-bold">
+                        <td>
+                            <a href="/patients/view/{{$patient->uid}}/calendar/{{$appointment->uid}}">
                                 {{friendlier_date_time($appointment->raw_date . ' ' . $appointment->raw_start_time)}}
                             </a>
                         </td>
-                        <td class="px-2">{{ $appointment->pro->displayName() }}</pre></td>
-                        <td class="px-2">{{ $appointment->title }}</td>
-                        <td class="px-2">{{ $appointment->description }}</td>
-                        <td class="px-2">
+                        <td>{{ $appointment->pro->displayName() }}</pre></td>
+                        <td>{{ $appointment->title }}</td>
+                        <td>{{ $appointment->description }}</td>
+                        <td>
                             {{ $appointment->status }}
                             @if($appointment->status_memo)
                                 <hr>
                                 {{$appointment->status_memo}}
                             @endif
                         </td>
-                        <td class="px-2">
+                        <td>
                             @include('app.patient.partials.appointment-confirmation')
                         </td>
                         <td>

+ 4 - 4
resources/views/app/patient/canvas-migrate.blade.php

@@ -11,10 +11,10 @@
         #patient-canvas-migrate .rhs .point-content #frm-add-care-team-member>.row>.col-4.border-left {
           display: none;
         }
-        #patient-canvas-migrate .rhs .point-content #allergies-center-{{$patient->coreNote->id}},
-        #patient-canvas-migrate .rhs .point-content #problems-center-{{$patient->coreNote->id}},
-        #patient-canvas-migrate .rhs .point-content #medications-center-{{$patient->coreNote->id}},
-        #patient-canvas-migrate .rhs .point-content #careteam-center-{{$patient->coreNote->id}} {
+        #patient-canvas-migrate .rhs .point-content #allergies-center-{{@$patient->coreNote->id}},
+        #patient-canvas-migrate .rhs .point-content #problems-center-{{@$patient->coreNote->id}},
+        #patient-canvas-migrate .rhs .point-content #medications-center-{{@$patient->coreNote->id}},
+        #patient-canvas-migrate .rhs .point-content #careteam-center-{{@$patient->coreNote->id}} {
           border: 0 !important;
           padding: 0 !important;
           margin: 0 !important;

+ 16 - 16
resources/views/app/patient/care-months.blade.php

@@ -62,7 +62,7 @@
 
     <div class="">
         <div class="d-flex align-items-center pt-2">
-            <h6 class="my-0 font-weight-bold text-secondary">Care Months</h6>
+            <h6 class="my-0 font-weight-bold font-size-16">Care Months</h6>
             <span class="mx-2 text-secondary">|</span>
             <div moe>
                 <a start show class="py-0 mb-3">Add</a>
@@ -104,37 +104,37 @@
             </div>
         </div>
         <table class="table table-striped table-sm table-bordered mt-2 mb-0">
-            <thead>
+            <thead class="bg-light">
             <tr>
-                <th class="px-2 text-secondary border-bottom-0">Start Date</th>
-                <th class="px-2 text-secondary border-bottom-0">Total Time</th>
-                <th class="px-2 text-secondary border-bottom-0">Bill</th>
-                <th class="px-2 text-secondary border-bottom-0">MCP</th>
-                <th class="px-2 text-secondary border-bottom-0">RMM</th>
-                <th class="px-2 text-secondary border-bottom-0">RME</th>
-                <th class="px-2 text-secondary border-bottom-0">Matrix</th>
+                <th class="text-secondary border-bottom-0">Start Date</th>
+                <th class="text-secondary border-bottom-0">Total Time</th>
+                <th class="text-secondary border-bottom-0">Bill</th>
+                <th class="text-secondary border-bottom-0">MCP</th>
+                <th class="text-secondary border-bottom-0">RMM</th>
+                <th class="text-secondary border-bottom-0">RME</th>
+                <th class="text-secondary border-bottom-0">Matrix</th>
             </tr>
             </thead>
             <tbody>
             @foreach($careMonths as $careMonth)
                 <tr>
-                    <td class="px-2">
+                    <td>
                         <a href="/patients/view/{{ $patient->uid }}/care-months/view/{{ $careMonth->uid }}">
                             {{friendly_month($careMonth->start_date)}}
                         </a>
                     </td>
-                    <td class="px-2">{{time_in_hrminsec($careMonth->rm_total_time_in_seconds)}}</td>
-                    <td class="px-2">
+                    <td>{{time_in_hrminsec($careMonth->rm_total_time_in_seconds)}}</td>
+                    <td>
                         @if($careMonth->rmBill)
                             {{ $careMonth->rmBill->code }}
                         @else
                             -
                         @endif
                     </td>
-                    <td class="px-2">{{$careMonth->mcp ? $careMonth->mcp->name_display : '-'}}</td>
-                    <td class="px-2">{{$careMonth->rmmPro ? $careMonth->rmmPro->name_display : '-'}}</td>
-                    <td class="px-2">{{$careMonth->rmePro ? $careMonth->rmePro->name_display : '-'}}</td>
-                    <td class="px-2">
+                    <td>{{$careMonth->mcp ? $careMonth->mcp->name_display : '-'}}</td>
+                    <td>{{$careMonth->rmmPro ? $careMonth->rmmPro->name_display : '-'}}</td>
+                    <td>{{$careMonth->rmePro ? $careMonth->rmePro->name_display : '-'}}</td>
+                    <td>
                         <a native target="_blank"
                            open-in-stag-popup
                            mc-initer="cm-matrix-{{$patient->id}}"

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

@@ -541,7 +541,7 @@
                         </div>
                         <table class="table table-striped table-sm table-bordered mb-0">
                             @if($patient->memos && count($patient->memos))
-                                <thead>
+                                <thead class="bg-light">
                                 <tr class="text-nowrap">
                                     <th class="px-2 text-secondary">Category</th>
                                     <th class="px-2 text-secondary w-50">Summary</th>

+ 21 - 21
resources/views/app/patient/devices.blade.php

@@ -3,8 +3,8 @@
     <link href="/select2/select2.min.css" rel="stylesheet" />
     <script src="/select2/select2.min.js"></script>
     <div id="patient-devices">
-        <div class="d-flex align-items-start pb-2">
-            <div class="font-weight-bold m-0">Devices</div>
+        <div class="d-flex align-items-center pb-2">
+            <div class="font-weight-bold m-0 font-size-16">Devices</div>
             @if(count($devices))
             <span class="mx-2 text-secondary">|</span>
             <div moe>
@@ -48,23 +48,23 @@
         </div>
         <table class="table table-striped table-sm table-bordered mb-0">
             @if($patient->devices && count($patient->devices))
-                <thead>
+                <thead class="bg-light">
                 <tr>
-                    <th class="px-2 text-secondary">Created</th>
-                    <th class="px-2 text-secondary">Category</th>
-                    <th class="px-2 text-secondary">IMEI</th>
-                    <th class="px-2 text-secondary">Last Measurement</th>
-                    <th class="px-2 text-secondary"></th>
-                    <th class="px-2 text-secondary"></th>
+                    <th class="border-0 text-secondary">Created</th>
+                    <th class="border-0 text-secondary">Category</th>
+                    <th class="border-0 text-secondary">IMEI</th>
+                    <th class="border-0 text-secondary">Last Measurement</th>
+                    <th class="border-0 text-secondary"></th>
+                    <th class="border-0 text-secondary"></th>
                 </tr>
                 </thead>
                 <tbody>
                 @foreach($patient->devices as $device)
                     <tr>
-                        <td class="px-2 text-nowrap">{{ friendly_date_time($device->device->created_at) }}</td>
-                        <td class="px-2">{{ $device->device->category }}</td>
-                        <td class="px-2"><pre class="m-0">{{ $device->device->imei }}</pre></td>
-                        <td class="px-2">
+                        <td class="text-nowrap">{{ friendly_date_time($device->device->created_at) }}</td>
+                        <td>{{ $device->device->category }}</td>
+                        <td><pre class="m-0">{{ $device->device->imei }}</pre></td>
+                        <td>
                             <?php $lastMeasurement = $device->lastDeviceMeasurement(); ?>
                             @if($lastMeasurement)
                                 @if($lastMeasurement->is_cellular_zero)
@@ -114,20 +114,20 @@
         <h2>Deactivated Devices</h2>
         <table class="table table-striped table-sm table-bordered mb-0">
             @if($patient->deactivatedDevices && count($patient->deactivatedDevices))
-                <thead>
+                <thead class="bg-light">
                 <tr>
-                    <th class="px-2 text-secondary">Created</th>
-                    <th class="px-2 text-secondary w-25">Category</th>
-                    <th class="px-2 text-secondary w-50">IMEI</th>
-                    <th class="px-2 text-secondary"></th>
+                    <th class="border-0 text-secondary">Created</th>
+                    <th class="border-0 text-secondary w-25">Category</th>
+                    <th class="border-0 text-secondary w-50">IMEI</th>
+                    <th class="border-0 text-secondary"></th>
                 </tr>
                 </thead>
                 <tbody>
                 @foreach($patient->deactivatedDevices as $deactivatedDevice)
                     <tr>
-                        <td class="px-2">{{ friendly_date_time($deactivatedDevice->device->created_at) }}</td>
-                        <td class="px-2">{{ $deactivatedDevice->device->category }}</td>
-                        <td class="px-2"><pre class="m-0">{{ $deactivatedDevice->device->imei }}</pre></td>
+                        <td>{{ friendly_date_time($deactivatedDevice->device->created_at) }}</td>
+                        <td>{{ $deactivatedDevice->device->category }}</td>
+                        <td><pre class="m-0">{{ $deactivatedDevice->device->imei }}</pre></td>
                         <td>
                             <div moe relative>
                                 <a start show class="on-hover-opaque">Reactivate</a>

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

@@ -4,7 +4,7 @@
     <div class="">
         <div class="mt-0 pb-1">
             <div class="d-flex align-items-center mb-2">
-                <h6 class="my-0 font-weight-bold text-dark">Measurements</h6>
+                <h6 class="my-0 font-weight-bold text-dark font-size-16">Measurements</h6>
                 {{--
                 <span class="mx-2 text-secondary">|</span>
                 <div moe>
@@ -68,15 +68,15 @@
 {{--                @endif--}}
             </div>
             <table class="table table-striped table-sm table-bordered mt-2 mb-0">
-                <thead>
+                <thead class="bg-light">
                 <tr>
-                    <th class="px-2 text-secondary w-25">Effective Date</th>
-                    <th class="px-2 text-secondary w-25">Category</th>
-                    <th class="px-2 text-secondary w-25">Value</th>
-                    <th class="px-2 text-secondary">Source</th>
-                    <th class="px-2 text-secondary">Stamp</th>
-                    <th class="px-2 text-secondary"></th>
-                    <th class="px-2 text-secondary"></th>
+                    <th class="border-0 text-secondary w-25">Effective Date</th>
+                    <th class="border-0 text-secondary w-25">Category</th>
+                    <th class="border-0 text-secondary w-25">Value</th>
+                    <th class="border-0 text-secondary">Source</th>
+                    <th class="border-0 text-secondary">Stamp</th>
+                    <th class="border-0 text-secondary"></th>
+                    <th class="border-0 text-secondary"></th>
                 </tr>
                 </thead>
                 <tbody>
@@ -84,7 +84,7 @@
                     @if(!empty($measurement->label))
                         @if(!in_array($measurement->label, ["SBP", "DBP"]))
                         <tr>
-                            <td class="px-2">
+                            <td>
                                 @if($measurement->ts)
                                     <?php $timestampInSec = floor($measurement->ts/1000); ?>
                                     {{ friendly_date_time_short_with_tz_from_timestamp($timestampInSec, 'EASTERN') }}
@@ -93,8 +93,8 @@
                                 @endif
                                 EST
                             </td>
-                            <td class="px-2">{{ $measurement->label }}</td>
-                            <td class="px-2">
+                            <td>{{ $measurement->label }}</td>
+                            <td>
                                 @if($measurement->is_cellular_zero)
                                     <i class="font-size-11 fa fa-rss"></i>
                                 @elseif($measurement->label === 'BP')
@@ -105,7 +105,7 @@
                                     {{ $measurement->value }}
                                 @endif
                             </td>
-                            <td class="px-2">{{$measurement->source}}</td>
+                            <td>{{$measurement->source}}</td>
                             <td>
                                 @if($measurement->is_cellular_zero || !$measurement->ts)
                                     -
@@ -176,9 +176,9 @@
                         @endif
                     @endif
                 @endforeach
-                @if(!$patient->measurements || !count($patient->measurements) === 0)
+                @if(!$patient->measurements || count($patient->measurements) == 0)
                     <tr>
-                        <td class="text-secondary p-0 border-0">
+                        <td colspan="7" class="text-secondary">
                             No items to show
                         </td>
                     </tr>

+ 21 - 21
resources/views/app/patient/notes.blade.php

@@ -6,8 +6,8 @@
 
     <div id="notes-list-{{$patient->id}}">
     <div class="pt-2 d-flex align-items-start">
-        <h6 class="my-0 text-secondary d-flex align-items-center w-100">
-            <span class="font-weight-bold text-secondary">Notes</span>
+        <h6 class="my-0 d-flex align-items-center w-100">
+            <span class="font-weight-bold font-size-16">Notes</span>
             @if(true || $patient->latestClientPrimaryCoverage->is_covered == 'YES')
                 @if($isOldClient)
                 <span class="mx-2 text-secondary">|</span>
@@ -148,21 +148,21 @@
     </div>
 
     <table class="table table-sm table-striped table-bordered mb-0 mt-2 notes-list">
-        <thead>
+        <thead class="bg-light">
         <tr>
-            <th class="px-2 text-secondary border-bottom-0">Effective Date</th>
-            <th class="px-2 text-secondary border-bottom-0">New Patient / FU</th>
+            <th class="border-0 text-secondary">Effective Date</th>
+            <th class="border-0 text-secondary">New Patient / FU</th>
             @if($pro->pro_type == 'ADMIN')
-                <th class="px-2 text-secondary border-bottom-0">Method</th>
+                <th class="border-0 text-secondary">Method</th>
             @endif
-            <th class="px-2 text-secondary border-bottom-0">HCP</th>
+            <th class="border-0 text-secondary">HCP</th>
             @if($pro->pro_type == 'ADMIN')
-                <th class="px-2 text-secondary border-bottom-0">NA</th>
+                <th class="border-0 text-secondary">NA</th>
             @endif
-            <th class="px-2 text-secondary border-bottom-0">HCP Signed</th>
-            <!-- <th class="px-2 text-secondary border-bottom-0 w-50">Content</th> -->
-            <th class="px-2 text-secondary border-bottom-0">&nbsp;</th>
-            <th class="px-2 text-secondary border-bottom-0">Actions</th>
+            <th class="border-0 text-secondary">HCP Signed</th>
+            <!-- <th class="border-0 text-secondary w-50">Content</th> -->
+            <th class="border-0 text-secondary">&nbsp;</th>
+            <th class="border-0 text-secondary">Actions</th>
         </tr>
         </thead>
         <tbody>
@@ -182,8 +182,8 @@
         ?>
         @foreach ($records as $note)
             <tr class="{{ $note->is_cancelled ? 'cancelled-item always-clickable' : '' }}">
-                <td class="px-2">
-                    <a href="/patients/view/{{ $patient->uid }}/notes/view/{{ $note->uid }}" class="font-weight-bold">
+                <td>
+                    <a href="/patients/view/{{ $patient->uid }}/notes/view/{{ $note->uid }}">
                         {{ friendly_date_time($note->effective_dateest, false) }}
                     </a>
                     @if(!!$note->visitTemplate)
@@ -191,23 +191,23 @@
                     @endif
                     <span class="ml-1">{{ $note->is_cancelled ? '[cancelled]' : '' }}</span>
                 </td>
-                <td class="px-2">
+                <td>
                     {{ $note->new_or_fu_or_na === 'NEW' ? 'New Patient' : $note->new_or_fu_or_na }}
                 </td>
                 @if($pro->pro_type == 'ADMIN')
-                    <td class="px-2">
+                    <td>
                         {{ noteMethodDisplay($note->method) }}
                     </td>
                 @endif
-                <td class="px-2">
+                <td>
                     {{$note->hcpPro ? $note->hcpPro->name_display: '-'}}
                 </td>
                 @if($pro->pro_type == 'ADMIN')
-                <td class="px-2">
+                <td>
                     {{$note->allyPro ? $note->allyPro->name_display: '-'}}
                 </td>
                 @endif
-                <td class="px-2">
+                <td>
                     {!! $note->hcpPro && $note->is_signed_by_hcp ? '<b class="text-success">Yes</b>' : 'No' !!}
                 </td>
 <?php /*
@@ -216,7 +216,7 @@
                         {!! $note->summary() !!}
                     </div>
                 </td> */ ?>
-                <td class="px-2">
+                <td>
                     <div class="position-relative c-pointer text-center stag-tooltip">
                         <i class="fa fa-info-circle"></i>
                         <div class="position-absolute bg-white border rounded p-2 stag-tooltip-content">
@@ -225,7 +225,7 @@
                         </div>
                     </div>
                 </td>
-                <td class="px-2">
+                <td>
                     <div class="d-flex align-items-center">
                         <a href="/patients/view/{{ $patient->uid }}/notes/view/{{ $note->uid }}" class="font-weight-bold">Open</a>
                         @if($note->new_or_fu_or_na !== 'NEW')

+ 1 - 1
resources/views/app/patient/vitals-graph.blade.php

@@ -6,7 +6,7 @@
     <script src="/c3/c3.min.js"></script>
 
     <div class="d-flex align-items-center">
-        <h4 class="font-weight-bold mb-0 text-secondary font-size-16">Vitals Graph</h4>
+        <h4 class="font-weight-bold mb-0 font-size-16">Vitals Graph</h4>
         <?php
         $months = [];
         $monthNames = [];

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

@@ -2,8 +2,7 @@
 
 @section('inner-content')
 
-    <h4 class="font-weight-bold mb-3 text-secondary font-size-16" id="rm-setup">Vitals Settings</h4>
-
+    <h4 class="font-weight-bold m-0 font-size-16" id="rm-setup">Vitals Settings</h4>
     <hr class="m-neg-4">
 
     <div class="row" id="vitals-settings-{{$patient->uid}}">