Merge branch 'dev' of rav.triplestart.com:jmudaka/stagfe2

app/Http/Controllers/AdminController.php

@@ -75,17 +75,26 @@ 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);
+            if($request->input('mcp') == 'NO_MCP'){
+                $patients = $patients->whereNull('mcp_pro_id');
+            }else{
+                $mcp = Pro::where('uid', trim($request->input('mcp')))->first();
+                if ($mcp) {
+                    $patients = $patients->where('mcp_pro_id', $mcp->id);
+                }
             }
         }
 
         if ($request->input('na')) {
-            $na = Pro::where('uid', trim($request->input('na')))->first();
-            if ($na) {
-                $patients = $patients->where('default_na_pro_id', $na->id);
+            if($request->input('na') == 'NO_NA'){
+                $patients = $patients->whereNull('default_na_pro_id');
+            }else{
+                $na = Pro::where('uid', trim($request->input('na')))->first();
+                if ($na) {
+                    $patients = $patients->where('default_na_pro_id', $na->id);
+                }
             }
+           
         }
 
         if ($request->input('next_appointment_category')) {

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

@@ -34,6 +34,7 @@
 			<label>MCP:</label>
 			<select name="mcp" class="form-control min-width-unset" v-model="filters.mcp">
 				<option value="">--select--</option>
+				<option value="NO_MCP">No MCP</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>
@@ -47,7 +48,8 @@
 			<label>NA:</label>
 			<select name="na" class="form-control min-width-unset" v-model="filters.na">
 				<option value="">--select--</option>
-				<?php $naPros = \App\Models\Pro::where('is_active', true)->where('is_considered_for_dna', true)->orderBy('name_display')->get(); ?>
+				<option value="NO_NA">No NA</option>
+				<?php $naPros = \App\Models\Pro::where('is_active', true)->where('is_considered_for_dna', true)->orWhere('pro_type', '=', 'ADMIN')->orderBy('name_display')->get(); ?>
 				@foreach($naPros as $naPro)
 					<option value="{{$naPro->uid}}">{{$naPro->name_display}}</option>
 				@endforeach