Эх сурвалжийг харах

Client dashboard 2-col, pre-table version

Vijayakrishnan 4 жил өмнө
parent
commit
64608b801e

+ 6 - 14
resources/views/app/patient/dashboard.blade.php

@@ -8,23 +8,12 @@
         <?php $infoLines = !$infoLines ? [] : $infoLines; ?>
         <?php $vitalLabels = ['Ht. (in.)','Wt. (lbs.)','Temp. (F)','Pulse','Resp.','Pulse Ox.','SBP','DBP','Smoking Status', 'BMI']; ?>
 
-        <div class="row mb-2">
-            <div class="col-12">
-                {{-- appointments --}}
-                @include('app/patient/partials/appointments')
-            </div>
-        </div>
-
-        <div class="row mb-3">
-            <div class="col-12">
-                {{-- dx --}}
-                @include('app/patient/partials/dx-table')
-            </div>
-        </div>
-
 	    <div class="row">
             <div class="col-6">
 
+                {{-- appointments --}}
+                @include('app/patient/partials/appointments')
+
                 {{-- rx --}}
                 @include('app/patient/partials/rx')
 
@@ -301,6 +290,9 @@
             </div>
             <div class="col-6">
 
+                {{-- dx --}}
+                @include('app/patient/partials/dx')
+
                 <div class="mt-2">
                     <div class="d-flex align-items-center mb-2 py-2 border-top border-bottom">
                         <h6 class="my-0 font-weight-bold text-secondary">History</h6>

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

@@ -69,21 +69,21 @@
         @foreach($patient->appointments as $appointment)
             <tr>
                 <td class="text-black p-0 border-0 pb-1">
-                    <div class="pb-0 d-flex align-items-center">
+                    <div class="pb-0 d-flex align-items-center flex-wrap">
                         <a class="on-hover-opaque mr-1"
                            href="/patients/view/{{$patient->uid}}/manage-appointment/{{$appointment->uid}}"
                            title="Update">
                             <i class="font-size-11 fa fa-edit text-primary"></i>
                         </a>
-                        <span class="mr-1">{{ $appointment->raw_date }}</span>
+                        <span class="mr-1 text-nowrap">{{ $appointment->raw_date }}</span>
                         @if($appointment->raw_start_time)
-                            <span class="mr-1">{{ friendly_time($appointment->raw_start_time, false) }}</span>
+                            <span class="mr-1 text-nowrap">{{ friendly_time($appointment->raw_start_time, false) }}</span>
                         @endif
                         @if($appointment->timezone)
-                            <span class="text-secondary text-sm mr-1">({{ str_replace("_", " ", $appointment->timezone) }})</span>
+                            <span class="text-secondary text-sm mr-1 text-nowrap">({{ str_replace("_", " ", $appointment->timezone) }})</span>
                         @endif
                         <span class="mr-1">/</span>
-                        <span class="font-weight-bold mr-1">{{$appointment->pro->displayName()}}</span>
+                        <span class="font-weight-bold mr-1 text-nowrap">{{$appointment->pro->displayName()}}</span>
                         <div moe>
                             <a href="#" start show class="text-sm">({{ $appointment->status }})</a>
                             <form url="/api/appointment/updateStatus">

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

@@ -24,7 +24,7 @@
                 <div class="mb-2">
                     <select name="Chronic or Acute" class="form-control form-control-sm pl-1" required>
                         <option value="">Chronic or Acute (select one)</option>
-                        <option value="Chronic">Chronic</option>
+                        <option value="Chronic" selected>Chronic</option>
                         <option value="Acute">Acute</option>
                     </select>
                 </div>