Admin patients > mcp filter

app/Http/Controllers/AdminController.php

@@ -74,6 +74,13 @@ class AdminController extends Controller
             }
         }
 
+        if ($request->input('mcp')) {
+            $mcp = Pro::where('uid', trim($request->input('mcp')))->first();
+            if ($mcp) {
+                $patients = $patients->where('mcp_pro_id', $mcp->id);
+            }
+        }
+
         $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_max', 'bmi_category', 'bmi_value_1', 'bmi_value_2');

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

@@ -10,6 +10,7 @@
         <tr>
             <th class="border-0 width-90px">#</th>
             <th class="border-0">Name</th>
+            <th class="border-0">Created</th>
             <th class="border-0">DOB</th>
             <th class="border-0">Age</th>
             <th class="border-0">Sex</th>
@@ -46,23 +47,18 @@
                     <a native target="_blank" href="{{route('patients.view.dashboard', $patient)}}">
                         {{$patient->chart_number}}
                     </a>
-                    <span class="on-hover-show left d-inline-block on-hover-opaque">
-						<i class="fa fa-info-circle ml-1"></i>
-						<div class="on-hover-content py-2 pl-3">
-							Created: <b class="m-0">{{friendly_date_time($patient->created_at)}}</b>
-                            @if($pro->pro_type === 'ADMIN')
-                                <div class="mt-1">
-                                    Created by <b>{{$patient->creator ? $patient->creator->displayName() : '-'}}</b>
-                                </div>
-                            @endif
-						</div>
-					</span>
                 </td>
                 <td>
                     <div class="d-flex align-items-center flex-nowrap">
                         <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>
                 <td>{{ friendly_date_time($patient->dob, false) }}</td>
                 <td>{{ $patient->age_in_years ?  $patient->age_in_years : '-' }}</td>
                 <td>{{ $patient->sex }}</td>

resources/views/app/admin/patients_filters.blade.php

@@ -28,6 +28,20 @@
 			<input name="name" class="form-control input-sm" v-model="filters.name">
 		</div>
 	</div>
+
+	<div class="sm-section">
+		<div class="">
+			<label>MCP:</label>
+			<select name="mcp" class="form-control min-width-unset" v-model="filters.mcp">
+				<option value="">--select--</option>
+				<?php $mcpPros = \App\Models\Pro::where('is_active', true)->where('is_enrolled_as_mcp', true)->orderBy('name_display')->get(); ?>
+				@foreach($mcpPros as $mcpPro)
+					<option value="{{$mcpPro->uid}}">{{$mcpPro->name_display}}</option>
+				@endforeach
+			</select>
+		</div>
+	</div>
+
 	<!-- AGE	 -->
 	<div class="sm-section">
 		<div class="">