Merge branch 'dev' of rav.triplestart.com:jmudaka/stagfe2 into dev

resources/views/app/admin/patients-table-extended.blade.php

@@ -9,30 +9,30 @@
         <thead class="bg-light">
         <tr>
             <th class="border-0 width-90px">#</th>
-            <th class="border-0">Name</th>
-            <th class="border-0">Created</th>
+            <th class="border-0">Name</th>            
             @if($pro->pro_type == 'ADMIN')
                 <th class="border-0">MCP</th>
                 <th class="border-0">NA</th>
                 <th class="border-0">Initiative</th>
                 <th class="border-0">Source</th>
             @endif
-            <th class="border-0">DOB</th>
-            <th class="border-0">Age</th>
-            <th class="border-0">Sex</th>
-            <th class="border-0">BMI</th>
+            <th class="border-0">Mailing Address State</th>
             <th class="border-0">Insurance</th>
             <th class="border-0">Last Visit</th>
             <th class="border-0">Next Appt.</th>
+            <th class="border-0">BP/Pulse Timestamp</th>
+            <th class="border-0">Weight Timestamp</th>
+            <th class="border-0">Created</th>
             <th class="border-0">Notes</th>
-
+            <th class="border-0">Status</th>
+            <th class="border-0">DOB</th>
+            <th class="border-0">Age</th>
+            <th class="border-0">Sex</th>
+            <th class="border-0">BMI</th>
             <th class="border-0">BP</th>
             <th class="border-0"><i class="fa fa-heartbeat"></i></th>
-            <th class="border-0">Pulse</th>
-            <th class="border-0">BP/Pulse Timestamp</th>
+            <th class="border-0">Pulse</th>            
             <th class="border-0">Weight</th>
-            <th class="border-0">Weight Timestamp</th>
-
             <th class="border-0"># Cellular Measurements</th>
 
             {{-- <th>Scale <i class="fa fa-battery"></i></th>--}}
@@ -41,8 +41,7 @@
             {{-- <th class="border-0 d-none">Last BP</th>--}}
             <th class="border-0">Assigned On</th>
             
-	    <th class="border-0">Email Address</th>
-            <th class="border-0">Mailing Address State</th>
+	        <th class="border-0">Email Address</th>
         </tr>
         </thead>
         <tbody>
@@ -58,34 +57,13 @@
                         <span>{{$patient->displayName()}}</span>
                     </div>
                 </td>
-                <td>
-                    <div title="{{friendly_date_time($patient->created_at)}}">{{friendly_date_time($patient->created_at, false)}}</div>
-                    <div class="mt-1" if-details-view>
-                        By <span>{{$patient->creator ? $patient->creator->displayName() : '-'}}</span>
-                    </div>
-                </td>
-		@if($pro->pro_type == 'ADMIN')
+		        @if($pro->pro_type == 'ADMIN')
                     <td>{{@$patient->mcp ? $patient->mcp->displayName() : '--'}}</td>
                     <td>{{@$patient->defaultNaPro ? $patient->defaultNaPro->displayName() : '--'}}</td>
                     <td>{{$patient->initiative}}</td>
                     <td>{{$patient->source}}</td>
                 @endif
-                <td>{{ friendly_date_time($patient->dob, false) }}</td>
-                <td>{{ $patient->age_in_years ?  $patient->age_in_years : '-' }}</td>
-                <td>{{ $patient->sex }}</td>
-                <td>
-                    <div class="d-none d-dflex flex-column">
-                        @if($patient->usual_bmi_min && $patient->usual_bmi_max)
-                            <small class="text-muted">BMI (Usual):
-                                <b>{{ $patient->usual_bmi_min }}</b> {{ $patient->usual_bmi_min_category }} to
-                                <b>{{ $patient->usual_bmi_max }}</b> {{ $patient->usual_bmi_max_category }}</small>
-                        @endif
-                        @if($patient->ideal_bmi)
-                            <small class="text-muted">BMI (Ideal)
-                                <b>{{ $patient->ideal_bmi }}</b> {{ $patient->ideal_bmi_category }}</small>
-                        @endif
-                    </div>
-                </td>
+                <td>{{$patient->mailing_address_state}}</td>
                 <td>
                     @include('app.patient.coverage_column_renderer', ['patient'=>$patient])
                 </td>
@@ -98,7 +76,14 @@
                         {{$patient->nextMcpAppointment ? $patient->nextMcpAppointment->status : '-'}}
                     </div>
                 </td>
-
+                <td>{{ friendlier_date_time($patient->most_recent_cellular_bp_measurement_at, false) }}</td>
+                <td>{{ friendlier_date_time($patient->most_recent_cellular_weight_measurement_at, false) }}</td>
+                <td>
+                    <div title="{{friendly_date_time($patient->created_at)}}">{{friendly_date_time($patient->created_at, false)}}</div>
+                    <div class="mt-1" if-details-view>
+                        By <span>{{$patient->creator ? $patient->creator->displayName() : '-'}}</span>
+                    </div>
+                </td>
                 <td class="p-0 pb-1">
                     <div if-details-view>
                     @if(count($patient->activeNotes))
@@ -284,6 +269,29 @@
                         {{count($patient->activeNotes)}}
                     </div>
                 </td>
+                <td>
+                    @if($patient->is_active)
+                        <span class="text-success">Active</span>
+                    @else
+                        <span class="text-danger">Inactive</span>
+                    @endif
+                </td>
+                <td>{{ friendly_date_time($patient->dob, false) }}</td>
+                <td>{{ $patient->age_in_years ?  $patient->age_in_years : '-' }}</td>
+                <td>{{ $patient->sex }}</td>
+                <td>
+                    <div class="d-none d-dflex flex-column">
+                        @if($patient->usual_bmi_min && $patient->usual_bmi_max)
+                            <small class="text-muted">BMI (Usual):
+                                <b>{{ $patient->usual_bmi_min }}</b> {{ $patient->usual_bmi_min_category }} to
+                                <b>{{ $patient->usual_bmi_max }}</b> {{ $patient->usual_bmi_max_category }}</small>
+                        @endif
+                        @if($patient->ideal_bmi)
+                            <small class="text-muted">BMI (Ideal)
+                                <b>{{ $patient->ideal_bmi }}</b> {{ $patient->ideal_bmi_category }}</small>
+                        @endif
+                    </div>
+                </td>
 
                 <td>
                     @if($patient->most_recent_cellular_bp_measurement_at)
@@ -296,12 +304,10 @@
 
                 <td>{{ $patient->most_recent_cellular_bp_value_pulse }}</td>
 
-                <td>{{ friendlier_date_time($patient->most_recent_cellular_bp_measurement_at, false) }}</td>
+                
 
                 <td>{{ $patient->most_recent_cellular_weight_value ? round($patient->most_recent_cellular_weight_value, 2) : '--' }}</td>
 
-                <td>{{ friendlier_date_time($patient->most_recent_cellular_weight_measurement_at, false) }}</td>
-
                 {{-- <td>{{$patient->is_enrolled_in_rm ? 'Yes' : 'No'}}</td>--}}
                 <td class="d-none text-nowrap">
                     <?php $m = $patient->lastMeasurementOfType('Wt. (lbs.)'); ?>
@@ -314,7 +320,6 @@
                 <td>{{count($patient->cellularMeasurements)}}</td>
                 <td>{{$patient->getMcpAssignedOn()}}</td>
                 <td>{{$patient->email_address}}</td>
-                <td>{{$patient->mailing_address_state}}</td>
             </tr>
         @endforeach