Merge branch 'dev' into dev-vj

app/Http/Controllers/AdminController.php

@@ -64,9 +64,19 @@ class AdminController extends Controller
         ]
         */
 
+        if ($request->input('name')) {
+            $name = trim($request->input('name'));
+            if ($name) {
+                $patients = $patients->where(function ($q) use ($name) {
+                    $q->where('name_first', 'ILIKE', '%' . $name . '%')
+                        ->orWhere('name_last', 'ILIKE', '%' . $name . '%');
+                });
+            }
+        }
+
         $this->filterMultiQuery($request, $patients, 'age_in_years', 'age_category', 'age_value_1', 'age_value_2');
         $this->filterSimpleQuery($request, $patients, 'sex', 'sex');
-        $this->filterMultiQuery($request, $patients, 'usual_bmi', 'bmi_category', 'bmi_value_1', 'bmi_value_2');
+        $this->filterMultiQuery($request, $patients, 'usual_bmi_max', 'bmi_category', 'bmi_value_1', 'bmi_value_2');
         $this->filterMultiQuery($request, $patients, 'most_recent_weight_at', 'last_weighed_in_category', 'last_weighed_in_value_1', 'last_weighed_in_value_2');
         $this->filterMultiQuery($request, $patients, 'most_recent_bp_at', 'last_bp_category', 'last_bp_value_1', 'last_bp_value_2');
 
@@ -90,10 +100,13 @@ class AdminController extends Controller
 
         $include_test_records = $request->input('include_test_records');
         if(!$include_test_records){
-            $patients->where('client_engagement_status_category', '<>', 'DUMMY');
+            $patients = $patients->where(function ($q) {
+                $q->whereNull('client_engagement_status_category')
+                    ->orWhere('client_engagement_status_category', '<>', 'DUMMY');
+            });
         }
 
-        $patients = $patients->orderBy('created_at', 'DESC')->paginate(20);
+        $patients = $patients->orderBy('created_at', 'DESC')->paginate(50);
         return view('app.mcp.patients', compact('patients', 'filters'));
     }
 

app/Http/Controllers/HomeController.php

@@ -1665,7 +1665,7 @@ WHERE measurement.label NOT IN ('SBP', 'DBP')
             default:
                 break;
         }
-        $patients = $query->orderBy('id', 'desc')->paginate(50);
+        $patients = $query->orderBy('created_at', 'desc')->paginate(50);
 
         // patient acquisition chart (admin only)
         $patientAcquisitionData = null;

resources/views/layouts/template.blade.php

@@ -102,6 +102,7 @@
                     <li class="nav-item"><a class="nav-link" href="{{ route('admin.patients') }}"><i class="mr-1 fas fa-user"></i> Patients</a> </li>
                 @elseif($pro->is_enrolled_as_mcp && $pro->is_considered_for_mcp_assignment)
                     <li class="nav-item"><a class="nav-link" href="{{ route('mcp.dashboard') }}"><i class="mr-1 fas fa-home"></i> Home</a> </li>
+                    <li class="nav-item"><a class="nav-link" href="{{ route('mcp.patients') }}"><i class="mr-1 fas fa-user"></i> Patients</a> </li>
 
                     <li class="nav-item"><a class="nav-link" href="{{ route('mcp.appointments') }}">
                             <i class="mr-1 fas fa-calendar-alt"></i> Appointments
@@ -109,19 +110,10 @@
                     </li>
                 @else
                     <li class="nav-item"><a class="nav-link" href="{{ route('dna.dashboard') }}"><i class="mr-1 fas fa-home"></i> Home</a> </li>
-                @endif
-
-
-                @if($pro)
-                    @if($pro->is_enrolled_as_mcp && $pro->is_considered_for_mcp_assignment)
-                    <li class="nav-item"><a class="nav-link" href="{{ route('mcp.patients') }}"><i class="mr-1 fas fa-user"></i> Patients</a> </li>
-                    @elseif($pro->pro_type == 'ADMIN')
-
-                    @else
                     <li class="nav-item"><a class="nav-link" href="{{ route('dna.patients') }}"><i class="mr-1 fas fa-user"></i> Patients</a> </li>
-                    @endif
                 @endif
 
+
                 @if($pro && ($pro->can_add_patients || $pro->pro_type== 'ADMIN'))
                   <li class="nav-item"><a class="nav-link" href="{{ route('new-patient') }}"><i class="mr-1 fas fa-user-plus"></i> New Patient</a> </li>
                 @endif