Merge branch 'master' into dev-vj

app/Http/Controllers/PatientController.php

@@ -27,6 +27,7 @@ use App\Models\Ticket;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\File;
+use App\Models\Measurement;
 
 use Illuminate\Support\Facades\Http;
 use PDF;
@@ -246,7 +247,8 @@ class PatientController extends Controller
 
     public function measurements(Request $request, Client $patient )
     {
-        return view('app.patient.measurements', compact('patient'));
+        $measurements = Measurement::where('client_id', $patient->id)->where('is_active', true)->orderByRaw('ts DESC NULLS LAST')->paginate(30);
+        return view('app.patient.measurements', compact('patient', 'measurements'));
     }
 
     public function labsAndStudies(Request $request, Client $patient )

app/Http/Controllers/PracticeManagementController.php

@@ -946,7 +946,7 @@ SELECT effective_date, count(*), sum(number_of_units) as units FROM bill WHERE c
         $allPros = [];
         $expectedForHcp = null;
         if ($performerPro->pro_type == 'ADMIN') {
-            $allPros = Pro::all();
+            $allPros = Pro::query()->orderBy('name_first', 'asc')->get();
             $targetPro = Pro::where('uid', $proUid)->first();
         } else {
             $targetPro = $performerPro;

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

@@ -80,7 +80,7 @@
                 </tr>
                 </thead>
                 <tbody>
-                @foreach($patient->measurements as $measurement)
+                @foreach($measurements as $measurement)
                     @if(!empty($measurement->label))
                         @if(!in_array($measurement->label, ["SBP", "DBP"]))
                         <tr>
@@ -100,7 +100,7 @@
                                 @elseif($measurement->label === 'BP')
                                     {{ $measurement->sbp_mm_hg }}/{{ $measurement->dbp_mm_hg }} mmHg  <span class="font-weight-normal d-inline-block pl-2">Pulse:</span> {{ $measurement->value_pulse }} {{ $measurement->value_irregular === 0?'Irregular':'' }} {{ $measurement->value_irregular === 1?'Regular':'' }}
                                 @elseif($measurement->label === 'Wt. (lbs.)')
-                                    {{ $measurement->numeric_value }} lbs
+                                    {{ round($measurement->numeric_value) }} lbs
                                 @else
                                     {{ $measurement->value }}
                                 @endif
@@ -176,7 +176,7 @@
                         @endif
                     @endif
                 @endforeach
-                @if(!$patient->measurements || count($patient->measurements) == 0)
+                @if(!$measurements || count($measurements) == 0)
                     <tr>
                         <td colspan="7" class="text-secondary">
                             No items to show
@@ -188,6 +188,10 @@
         </div>
     </div>
 
+    <div class="my-3">
+        {{ $measurements->appends(request()->input())->links() }}
+    </div>
+
 {{--    <hr class="m-negator mt-4 mb-3">--}}
 
 {{--    <div class="">--}}
@@ -195,7 +199,7 @@
 {{--            <h4 class="font-weight-bold m-0">Cellular Measurements</h4>--}}
 {{--        </div>--}}
 {{--        <table class="table table-striped table-sm table-bordered mb-0">--}}
-{{--            @if($patient->measurements && count($patient->measurements))--}}
+{{--            @if($measurements && count($measurements))--}}
 {{--                <thead>--}}
 {{--                <tr>--}}
 {{--                    <th class="px-2 text-secondary w-25">Created</th>--}}

resources/views/app/practice-management/billing-manager.blade.php

@@ -19,7 +19,7 @@
                         onchange="fastLoad('/practice-management/billing-manager/' + this.value, true, false, false)">
                     <option value="" {{ $proUid === '' ? 'selected' : '' }}>All Pros</option>
                     @foreach($allPros as $_pro)
-                        <option value="{{$_pro->uid}}" {{ $proUid === $_pro->uid ? 'selected' : '' }}>{{$_pro->displayName()}}</option>
+                        <option value="{{$_pro->uid}}" {{ $proUid === $_pro->uid ? 'selected' : '' }}>{{$_pro->name_first}} {{$_pro->name_last}}</option>
                     @endforeach
                 </select>
                 @endif