Merge branch 'dev' into dev-vj

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

@@ -5,17 +5,17 @@
     </div>
 </div>
 <div class="table-responsive border-top" style="height: calc(100vh - 280px)" id="admin-patients-list-extended">
-    <table class="table p-0 m-0 table-sm table-striped border-bottom text-nowrap">
+    <table class="table p-0 m-0 table-sm table-striped table-bordered border-bottom text-nowrap">
         <thead class="bg-light">
         <tr>
             <th class="border-0 width-90px">#</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-9">Status</th>
-                <th class="border-0">Source</th>
+                {{--<th class="border-0">NA</th>--}}
+                {{--<th class="border-0">Initiative</th>--}}
+                {{--<th class="border-9">Status</th>--}}
+                {{--<th class="border-0">Source</th>--}}
             @endif
             <th class="border-0">Mailing Address State</th>
             <th class="border-0">Insurance</th>
@@ -24,29 +24,29 @@
             <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">Assigned On</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">Weight</th>
-            <th class="border-0"># Cellular Measurements</th>
-
-            {{-- <th>Scale <i class="fa fa-battery"></i></th>--}}
-            {{-- <th class="border-0">RPM</th>--}}
-            {{-- <th class="border-0 d-none">Last Weight-In</th>--}}
-            {{-- <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">Temparature Gun Delivery Status</th>
             <th class="border-0">Pulse Oximeter Delivery Status</th>
             <th class="border-0">Cellular Bp Delivery Status</th>
             <th class="border-0">Weight Scale Delivery 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">Weight</th>--}}
+            {{--<th class="border-0"># Cellular Measurements</th>--}}
+            {{-- <th>Scale <i class="fa fa-battery"></i></th>--}}
+            {{-- <th class="border-0">RPM</th>--}}
+            {{-- <th class="border-0 d-none">Last Weight-In</th>--}}
+            {{-- <th class="border-0 d-none">Last BP</th>--}}                        
+	        {{--<th class="border-0">Email Address</th> --}}           
         </tr>
         </thead>
         <tbody>
@@ -64,10 +64,10 @@
                 </td>
 		        @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->client_engagement_status_category == 'DUMMY'? 'Test Record': $patient->client_engagement_status_category}}</td>
-                    <td>{{$patient->source}}</td>
+                    {{--<td>{{@$patient->defaultNaPro ? $patient->defaultNaPro->displayName() : '--'}}</td>--}}
+                    {{--<td>{{$patient->initiative}}</td>--}}
+                    {{--<td>{{$patient->client_engagement_status_category == 'DUMMY'? 'Test Record': $patient->client_engagement_status_category}}</td>--}}
+                    {{--<td>{{$patient->source}}</td>--}}
                 @endif
                 <td>{{$patient->mailing_address_state}}</td>
                 <td>
@@ -90,6 +90,7 @@
                         By <span>{{$patient->creator ? $patient->creator->displayName() : '-'}}</span>
                     </div>
                 </td>
+                <td>{{$patient->getMcpAssignedOn()}}</td>
                 <td class="p-0 pb-1">
                     <div if-details-view>
                     @if(count($patient->activeNotes))
@@ -281,11 +282,16 @@
                     @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>
+                </td>                
+                <td>{{$patient->temparatureGunDeliveryStatus()}}</td>
+                <td>{{$patient->pulseOximeterDeliveryStatus()}}</td>
+                <td>{{$patient->hasBPDevice()?'DELIVERED':''}}</td>
+                <td>{{$patient->hasWeightScaleDevice()?'DELIVERED':''}}</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):
@@ -297,39 +303,27 @@
                                 <b>{{ $patient->ideal_bmi }}</b> {{ $patient->ideal_bmi_category }}</small>
                         @endif
                     </div>
-                </td>
-
-                <td>
+                </td>--}}
+                {{--<td>
                     @if($patient->most_recent_cellular_bp_measurement_at)
                         {{ $patient->most_recent_cellular_bp_sbp_mm_hg }}
                         / {{ $patient->most_recent_cellular_bp_dbp_mm_hg }}
                     @endif
-                </td>
-
-                <td><?= $patient->most_recent_cellular_bp_value_irregular ? '<i class="fa fa-heartbeat"></i>' : '' ?></td>
-
-                <td>{{ $patient->most_recent_cellular_bp_value_pulse }}</td>
-
-                
-
-                <td>{{ $patient->most_recent_cellular_weight_value ? round($patient->most_recent_cellular_weight_value, 2) : '--' }}</td>
-
+                </td>--}}
+                {{--<td><?= $patient->most_recent_cellular_bp_value_irregular ? '<i class="fa fa-heartbeat"></i>' : '' ?></td>--}}
+                {{--<td>{{ $patient->most_recent_cellular_bp_value_pulse }}</td>--}}
+                {{--<td>{{ $patient->most_recent_cellular_weight_value ? round($patient->most_recent_cellular_weight_value, 2) : '--' }}</td>--}}
                 {{-- <td>{{$patient->is_enrolled_in_rm ? 'Yes' : 'No'}}</td>--}}
-                <td class="d-none text-nowrap">
+                {{--<td class="d-none text-nowrap">
                     <?php $m = $patient->lastMeasurementOfType('Wt. (lbs.)'); ?>
                     {{$m && $m->value ? round($m->value, 2) : '-'}}
-                </td>
-                <td class="d-none text-nowrap">
+                </td>--}}
+                {{--<td class="d-none text-nowrap">
                     <?php $m = $patient->lastMeasurementOfType('BP'); ?>
                     {{$m && $m->value ? $m->value : '-'}}
-                </td>
-                <td>{{count($patient->cellularMeasurements)}}</td>
-                <td>{{$patient->getMcpAssignedOn()}}</td>
-                <td>{{$patient->email_address}}</td>
-                <td>{{$patient->temparatureGunDeliveryStatus()}}</td>
-                <td>{{$patient->pulseOximeterDeliveryStatus()}}</td>
-                <td>{{$patient->hasBPDevice()?'DELIVERED':''}}</td>
-                <td>{{$patient->hasWeightScaleDevice()?'DELIVERED':''}}</td>
+                </td>--}}
+                {{--<td>{{count($patient->cellularMeasurements)}}</td>--}}          
+                {{--<td>{{$patient->email_address}}</td>--}}              
             </tr>
         @endforeach
 

resources/views/app/patient/note/dashboard.blade.php

@@ -279,13 +279,35 @@
                     @if($note->allyPro)
                         <span class="mr-2"><span class="text-secondary">NA:</span>  {{$note->allyPro->name_first}} {{$note->allyPro->name_last}}</span>
                         @if($performer->pro->pro_type == 'ADMIN')
+                            <span class="d-inline-block" moe>
+                                <a class="text-danger" href="" show start>
+                                    <i class="fa fa-edit"></i>
+                                </a>
+                                <form url="/api/note/putNa">
+                                    <input type="hidden" name="uid" value="{{$note->uid}}">
+                                    <div class="mb-2">
+                                        <select provider-search data-pro-uid="{{ @$note->allyPro->uid }}"
+                                                name="naProUid" class="form-control form-control-sm">
+                                            <option value="">-- Select Ally Pro --</option>
+                                        </select>
+                                    </div>
+                                    <div class="mb-2">
+                                        <textarea class="form-control" name="memo" placeholder="memo"></textarea>
+                                    </div>
+                                    <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>
+                            </span>
+                            <span class="inline-block ml-2"></span>
                             <span class="d-inline-block" moe>
                                 <a class="text-danger" href="" show start>
                                     <i class="fa fa-times"></i>
                                 </a>
                                 <form url="/api/note/removeNa">
                                     <input type="hidden" name="uid" value="{{$note->uid}}">
-                                    <p>Remove NA?</p>
+                                    <p>Remove NA ssss?</p>
                                     <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>