Patients listing status sort order fix

app/Http/Controllers/AdminController.php

@@ -138,12 +138,12 @@ class AdminController extends Controller
 
         $status = $request->input('status');
         if($status){
-            if($status == 'ACTIVE'){
+            if($status === 'ACTIVE'){
                 $patients->where('is_active', true)->where(function($q) use ($status){
                     return $q->where('client_engagement_status_category', $status)
                     ->orWhereNull('client_engagement_status_category');
                 });    
-            }elseif($status = 'NONE'){
+            }elseif($status === 'NONE'){
                 $patients->whereNull('client_engagement_status_category');
             }else {
                 $patients->where('client_engagement_status_category', $status);
@@ -188,10 +188,13 @@ class AdminController extends Controller
         $sortBy = $request->input('sort_by') ?: 'created_at';
         $sortDir = $request->input('sort_dir') ?: 'DESC';
 
-        $patients = $patients->orderByRaw("$sortBy $sortDir NULLS LAST");
+        $sortBySQL = "$sortBy $sortDir NULLS LAST";
 
+        if($sortBy !== 'client_engagement_status_category' || $request->input('status')) {
+            $sortBySQL = "client_engagement_status_category DESC NULLS LAST";
+        }
 
-        $patients = $patients->orderBy('created_at', 'DESC')->paginate(25);
+        $patients = $patients->orderByRaw($sortBySQL)->paginate(25);
 
         $insurances = DB::select('SELECT DISTINCT commercial_payer_name, commercial_payer_id FROM client_primary_coverage WHERE commercial_payer_name IS NOT NULL ORDER BY commercial_payer_name ASC');
 

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

@@ -62,7 +62,7 @@
         <tbody>
         @foreach($patients as $patient)
             <tr>
-                <td style="background-color:<?= $patientEngagementColorCodes[$patient->client_engagement_status_category] ?? '' ?>;">{{$patient->client_engagement_status_category == 'DUMMY'? 'Test Record': $patient->client_engagement_status_category}}</td> 
+                <td style="background-color:<?= @$patientEngagementColorCodes[$patient->client_engagement_status_category] ?: '' ?>;">{{$patient->client_engagement_status_category == 'DUMMY'? 'Test Record': $patient->client_engagement_status_category}}</td>
                 <td>
                     <a native target="_blank" href="{{route('patients.view.dashboard', $patient)}}">
                         {{$patient->chart_number}}