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

app/Http/Controllers/AdminController.php

@@ -81,6 +81,19 @@ class AdminController extends Controller
             }
         }
 
+        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('next_appointment_category')) {
+            if($request->input('next_appointment_category') == 'NONE'){
+                $patients = $patients->whereNull('next_mcp_appointment_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

@@ -36,6 +36,7 @@
 
             @if($pro->pro_type == 'ADMIN')
                 <th class="border-0">MCP</th>
+                <th class="border-0">NA</th>
                 <th class="border-0">Initiative</th>
             @endif
         </tr>
@@ -304,6 +305,7 @@
                 <td>{{$patient->getMcpAssignedOn()}}</td>
                 @if($pro->pro_type == 'ADMIN')
                     <td>{{@$patient->mcp ? $patient->mcp->displayName() : '--'}}</td>
+                    <td>{{@$patient->defaultNaPro ? $patient->defaultNaPro->displayName() : '--'}}</td>
                     <td>{{$patient->initiative}}</td>
                 @endif
             </tr>

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

@@ -42,6 +42,19 @@
 		</div>
 	</div>
 
+	<div class="sm-section">
+		<div class="">
+			<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(); ?>
+				@foreach($naPros as $naPro)
+					<option value="{{$naPro->uid}}">{{$naPro->name_display}}</option>
+				@endforeach
+			</select>
+		</div>
+	</div>
+
 	<!-- AGE	 -->
 	<div class="sm-section">
 		<div class="">
@@ -127,13 +140,14 @@
 			<label>Next Appt.:</label>
 			<select name="next_appointment_category" class="form-control input-sm" v-model="filters.next_appointment_category">
 				<option value="">All</option>
+				<option value="NONE">None</option>
 				<option value="EXACTLY">Exactly</option>
 				<option value="LESS_THAN">Less Than</option>
 				<option value="GREATER_THAN">Greater Than</option>
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</select>
-			<div v-show="filters.next_appointment_category" class="mt-2">
+			<div v-show="filters.next_appointment_category && filters.next_appointment_category !== 'NONE'" class="mt-2">
 				<div>
 					<input  name="next_appointment_value_1" v-model="filters.next_appointment_value_1" type="number" class="form-control input-sm" :placeholder="(filters.next_appointment_category === 'BETWEEN' || filters.next_appointment_category === 'NOT_BETWEEN') ? 'From' : 'Next Appt.'" />
 				</div>