浏览代码

added home address state filter

= 3 年之前
父节点
当前提交
69176e4765

+ 10 - 0
app/Http/Controllers/AdminController.php

@@ -102,6 +102,16 @@ class AdminController extends Controller
             }
         }
 
+        if ($request->input('home_address_state')) {
+            if($request->input('home_address_state') == 'NONE'){
+                $patients = $patients->whereNull('home_address_state');
+            }else if($request->input('home_address_state') == 'NOT_MD'){
+                $patients = $patients->where('home_address_state', '<>' , 'MD');
+            }else{
+                $patients = $patients->where('home_address_state', '=' , $request->input('home_address_state'));
+            }
+        }
+
         $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');

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

@@ -43,6 +43,7 @@
                 <th class="border-0">Source</th>
             @endif
             <th class="border-0">Email Address</th>
+            <th class="border-0">Home Address State</th>
         </tr>
         </thead>
         <tbody>
@@ -315,6 +316,7 @@
                     <td>{{$patient->source}}</td>
                 @endif
                 <td>{{$patient->email_address}}</td>
+                <td>{{$patient->home_address_state}}</td>
             </tr>
         @endforeach
 

+ 63 - 1
resources/views/app/admin/patients_filters.blade.php

@@ -229,6 +229,66 @@
 			</div>
 		</div>
 	</div>
+	<div class="sm-section">
+		<div class="">
+			<label>Home Address State:</label>
+			<select name="home_address_state" class="form-control input-sm" v-model="filters.home_address_state">
+				<option value="">All</option>
+				<option value="NONE">Not Available</option>
+				<option value="NOT_MD">Not MD</option>
+				<option value="AL">Alabama</option>	
+				<option value="AK">Alaska</option>	
+				<option value="AZ">Arizona</option>	
+				<option value="AR">Arkansas</option>	
+				<option value="CA">California</option>	
+				<option value="CO">Colorado</option>	
+				<option value="CT">Connecticut</option>	
+				<option value="DE">Delaware</option>	
+				<option value="FL">Florida</option>	
+				<option value="GA">Georgia</option>	
+				<option value="HI">Hawaii</option>	
+				<option value="ID">Idaho</option>	
+				<option value="IL">Illinois</option>	
+				<option value="IN">Indiana</option>	
+				<option value="IA">Iowa</option>	
+				<option value="KS">Kansas</option>	
+				<option value="KY">Kentucky</option>	
+				<option value="LA">Louisiana</option>	
+				<option value="ME">Maine</option>	
+				<option value="MD">Maryland</option>	
+				<option value="MA">Massachusetts</option>	
+				<option value="MI">Michigan</option>	
+				<option value="MN">Minnesota</option>	
+				<option value="MS">Mississippi</option>	
+				<option value="MO">Missouri</option>	
+				<option value="MT">Montana</option>	
+				<option value="NE">Nebraska</option>	
+				<option value="NV">Nevada</option>	
+				<option value="NH">New Hampshire</option>	
+				<option value="NJ">New Jersey</option>	
+				<option value="NM">NewMexico</option>	
+				<option value="NY">New York</option>	
+				<option value="NC">North Carolina</option>	
+				<option value="ND">North Dakota</option>	
+				<option value="OH">Ohio</option>	
+				<option value="OK">Oklahoma</option>	
+				<option value="OR">Oregon</option>	
+				<option value="PA">Pennsylvania</option>	
+				<option value="RI">RhodeIsland</option>	
+				<option value="SC">South Carolina</option>	
+				<option value="SD">South Dakota</option>	
+				<option value="TN">Tennessee</option>	
+				<option value="TX">Texas</option>	
+				<option value="UT">Utah</option>	
+				<option value="VT">Vermont</option>	
+				<option value="VA">Virginia</option>	
+				<option value="WA">Washington</option>	
+				<option value="WV">West Virginia</option>	
+				<option value="WI">Wisconsin</option>	
+				<option value="WY">Wyoming</option>	
+			</select>
+		</div>
+	</div>
 
 	@if($performer->pro->pro_type == 'ADMIN')
 	<div class="sm-section">
@@ -243,6 +303,7 @@
 	</div>
 	@endif
 
+
 	<!-- LAST WEIGHED-IN -->
 	<!-- <div class="col-md-2 d-none">
 		<div class="">
@@ -327,7 +388,8 @@ $allFilterKeys = [
 	'include_test_records',
 	'number_of_measurements',
 	'number_of_measurements_value_1',
-	'number_of_measurements_value_2'
+	'number_of_measurements_value_2',
+	'home_address_state'
 ];
 for ($i=0; $i < count($allFilterKeys); $i++) {
 	if (!isset($loadedFilters[$allFilterKeys[$i]]) || !$loadedFilters[$allFilterKeys[$i]]) {