minor

resources/views/app/mcp/patients.blade.php

@@ -6,7 +6,7 @@
 
         <div class="card-header px-3 py-2 d-flex align-items-center">
             <strong class="mr-4">
-                <i class="fas fa-user-injured"></i>
+                <i class="fas fa-user"></i>
                 Patients
             </strong>
         </div>
@@ -19,4 +19,4 @@
         </div>
     </div>
 </div>
-@endsection
+@endsection

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

@@ -7,7 +7,7 @@
 		min-width: 100px;
 	}
 </style>
-<form id="mcp-patients-filters" method="GET" action="{{ route('mcp.patients') }}" class="row align-items-end" v-cloak>
+<form id="mcp-patients-filters" method="GET" action="{{ route('mcp.patients') }}" class="row align-items-start" v-cloak>
 	<div class="col-md-2">
 		<div class="form-group">
 			<label>Name:</label>
@@ -26,18 +26,14 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</select>
-		</div>
-	</div>
-	<div v-show="filters.age_category" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="age_value_1" v-model="filters.age_value_1" type="number" class="form-control input-sm" :placeholder="(filters.age_category === 'BETWEEN' || filters.age_category === 'NOT_BETWEEN') ? 'From' : 'Age'" />
-		</div>
-	</div>
-	<div v-show="filters.age_category && (filters.age_category === 'BETWEEN' || filters.age_category === 'NOT_BETWEEN')" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="age_value_2" v-model="filters.age_value_2" type="number" class="form-control input-sm" placeholder="To" />
+			<div v-show="filters.age_category" class="row mt-2">
+				<div :class="filters.age_category === 'BETWEEN' || filters.age_category === 'NOT_BETWEEN' ? 'col-md-6' : 'col-md-12'">
+					<input  name="age_value_1" v-model="filters.age_value_1" type="number" class="form-control input-sm" :placeholder="(filters.age_category === 'BETWEEN' || filters.age_category === 'NOT_BETWEEN') ? 'From' : 'Age'" />
+				</div>
+				<div v-show="filters.age_category === 'BETWEEN' || filters.age_category === 'NOT_BETWEEN'" class="col-md-6">
+					<input name="age_value_2" v-model="filters.age_value_2" type="number" class="form-control input-sm" placeholder="To" />
+				</div>
+			</div>
 		</div>
 	</div>
 	<!-- SEX -->
@@ -63,18 +59,14 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</select>
-		</div>
-	</div>
-	<div v-show="filters.bmi_category" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="bmi_value_1" v-model="filters.bmi_value_1" type="number" class="form-control input-sm" :placeholder="(filters.bmi_category === 'BETWEEN' || filters.bmi_category === 'NOT_BETWEEN') ? 'From' : 'BMI'" />
-		</div>
-	</div>
-	<div v-show="filters.bmi_category && (filters.bmi_category === 'BETWEEN' || filters.bmi_category === 'NOT_BETWEEN')" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="bmi_value_2" v-model="filters.bmi_value_2" type="number" class="form-control input-sm" placeholder="To" />
+			<div v-show="filters.bmi_category" class="row mt-2">
+				<div :class="filters.bmi_category === 'BETWEEN' || filters.bmi_category === 'NOT_BETWEEN' ? 'col-md-6' : 'col-md-12'">
+					<input  name="bmi_value_1" v-model="filters.bmi_value_1" type="number" class="form-control input-sm" :placeholder="(filters.bmi_category === 'BETWEEN' || filters.bmi_category === 'NOT_BETWEEN') ? 'From' : 'BMI'" />
+				</div>
+				<div v-show="filters.bmi_category === 'BETWEEN' || filters.bmi_category === 'NOT_BETWEEN'" class="col-md-6">
+					<input name="bmi_value_2" v-model="filters.bmi_value_2" type="number" class="form-control input-sm" placeholder="To" />
+				</div>
+			</div>
 		</div>
 	</div>
 
@@ -90,18 +82,14 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</select>
-		</div>
-	</div>
-	<div v-show="filters.last_visit_category" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="last_visit_value_1" v-model="filters.last_visit_value_1" type="date" class="form-control input-sm" :placeholder="(filters.last_visit_category === 'BETWEEN' || filters.last_visit_category === 'NOT_BETWEEN') ? 'From' : 'Last Visit'" />
-		</div>
-	</div>
-	<div v-show="filters.last_visit_category && (filters.last_visit_category === 'BETWEEN' || filters.last_visit_category === 'NOT_BETWEEN')" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="last_visit_value_2" v-model="filters.last_visit_value_2" type="date" class="form-control input-sm" placeholder="To" />
+			<div v-show="filters.last_visit_category" class="row mt-2">
+				<div :class="filters.last_visit_category === 'BETWEEN' || filters.last_visit_category === 'NOT_BETWEEN' ? 'col-md-6' : 'col-md-12'">
+					<input  name="last_visit_value_1" v-model="filters.last_visit_value_1" type="number" class="form-control input-sm" :placeholder="(filters.last_visit_category === 'BETWEEN' || filters.last_visit_category === 'NOT_BETWEEN') ? 'From' : 'BMI'" />
+				</div>
+				<div v-show="filters.last_visit_category === 'BETWEEN' || filters.last_visit_category === 'NOT_BETWEEN'" class="col-md-6">
+					<input name="last_visit_value_2" v-model="filters.last_visit_value_2" type="number" class="form-control input-sm" placeholder="To" />
+				</div>
+			</div>
 		</div>
 	</div>
 
@@ -117,18 +105,14 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</select>
-		</div>
-	</div>
-	<div v-if="filters.next_appointment_category" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="next_appointment_value_1" v-model="filters.next_appointment_value_1" type="date" class="form-control input-sm" :placeholder="(filters.next_appointment_category === 'BETWEEN' || filters.next_appointment_category === 'NOT_BETWEEN') ? 'From' : 'Next Appointment'" />
-		</div>
-	</div>
-	<div v-if="filters.next_appointment_category && (filters.next_appointment_category === 'BETWEEN' || filters.next_appointment_category === 'NOT_BETWEEN')" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="next_appointment_value_2" v-model="filters.next_appointment_value_2" type="date" class="form-control input-sm" placeholder="To" />
+			<div v-show="filters.next_appointment_category" class="row mt-2">
+				<div :class="filters.next_appointment_category === 'BETWEEN' || filters.next_appointment_category === 'NOT_BETWEEN' ? 'col-md-6' : 'col-md-12'">
+					<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' : 'BMI'" />
+				</div>
+				<div v-show="filters.next_appointment_category === 'BETWEEN' || filters.next_appointment_category === 'NOT_BETWEEN'" class="col-md-6">
+					<input name="next_appointment_value_2" v-model="filters.next_appointment_value_2" type="number" class="form-control input-sm" placeholder="To" />
+				</div>
+			</div>
 		</div>
 	</div>
 
@@ -146,7 +130,7 @@
 	</div>
 
 	<!-- LAST WEIGHED-IN -->
-	<div class="col-md-2">
+	<div class="col-md-2 d-none">
 		<div class="form-group">
 			<label>Last Weighed-In:</label>
 			<select name="last_weighed_in_category" class="form-control input-sm" v-model="filters.last_weighed_in_category">
@@ -157,23 +141,19 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</select>
-		</div>
-	</div>
-	<div v-if="filters.last_weighed_in_category" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="last_weighed_in_value_1" v-model="filters.last_weighed_in_value_1" type="date" class="form-control input-sm" :placeholder="(filters.last_weighed_in_category === 'BETWEEN' || filters.last_weighed_in_category === 'NOT_BETWEEN') ? 'From' : 'Enter Date'" />
-		</div>
-	</div>
-	<div v-if="filters.last_weighed_in_category && (filters.last_weighed_in_category === 'BETWEEN' || filters.last_weighed_in_category === 'NOT_BETWEEN')" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="last_weighed_in_value_2" v-model="filters.last_weighed_in_value_2" type="date" class="form-control input-sm" placeholder="To" />
+			<div v-show="filters.last_weighed_in_category" class="row mt-2">
+				<div :class="filters.last_weighed_in_category === 'BETWEEN' || filters.last_weighed_in_category === 'NOT_BETWEEN' ? 'col-md-6' : 'col-md-12'">
+					<input  name="last_weighed_in_value_1" v-model="filters.last_weighed_in_value_1" type="number" class="form-control input-sm" :placeholder="(filters.last_weighed_in_category === 'BETWEEN' || filters.last_weighed_in_category === 'NOT_BETWEEN') ? 'From' : 'BMI'" />
+				</div>
+				<div v-show="filters.last_weighed_in_category === 'BETWEEN' || filters.last_weighed_in_category === 'NOT_BETWEEN'" class="col-md-6">
+					<input name="last_weighed_in_value_2" v-model="filters.last_weighed_in_value_2" type="number" class="form-control input-sm" placeholder="To" />
+				</div>
+			</div>
 		</div>
 	</div>
 
 	<!-- LAST BP -->
-	<div class="col-md-2">
+	<div class="col-md-2 d-none">
 		<div class="form-group">
 			<label>Last BP:</label>
 			<select name="last_bp_category" class="form-control input-sm" v-model="filters.last_bp_category">
@@ -184,26 +164,24 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</select>
-		</div>
-	</div>
-	<div v-if="filters.last_bp_category" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="last_bp_value_1" v-model="filters.last_bp_value_1" type="date" class="form-control input-sm" :placeholder="(filters.last_bp_category === 'BETWEEN' || filters.last_bp_category === 'NOT_BETWEEN') ? 'From' : 'Enter Date'" />
-		</div>
-	</div>
-	<div v-if="filters.last_bp_category && (filters.last_bp_category === 'BETWEEN' || filters.last_bp_category === 'NOT_BETWEEN')" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="last_bp_value_2" v-model="filters.last_bp_value_2" type="date" class="form-control input-sm" placeholder="To" />
+			<div v-show="filters.last_bp_category" class="row mt-2">
+				<div :class="filters.last_bp_category === 'BETWEEN' || filters.last_bp_category === 'NOT_BETWEEN' ? 'col-md-6' : 'col-md-12'">
+					<input  name="last_bp_value_1" v-model="filters.last_bp_value_1" type="number" class="form-control input-sm" :placeholder="(filters.last_bp_category === 'BETWEEN' || filters.last_bp_category === 'NOT_BETWEEN') ? 'From' : 'BMI'" />
+				</div>
+				<div v-show="filters.last_bp_category === 'BETWEEN' || filters.last_bp_category === 'NOT_BETWEEN'" class="col-md-6">
+					<input name="last_bp_value_2" v-model="filters.last_bp_value_2" type="number" class="form-control input-sm" placeholder="To" />
+				</div>
+			</div>
 		</div>
 	</div>
 
 	<div class="col-md-2">
-		<div class="form-group d-flex">
+		<div class="form-group">
 			<label>&nbsp;</label>
-			<button type="button" v-on:click.prevent="doSubmit()" class="btn btn-primary btn-sm mr-2 mw-100px">Apply Filters</button>
-			<a href="#" v-on:click.prevent="fastLoad('{{route('mcp.patients')}}')" class="btn btn-danger btn-sm text-white mw-100px">Clear Filters</a>
+			<div class=" d-flex">
+				<button type="button" v-on:click.prevent="doSubmit()" class="w-50 btn btn-primary btn-sm mr-2 mw-100px">Apply Filters</button>
+				<a href="#" v-on:click.prevent="fastLoad('{{route('mcp.patients')}}')" class="w-50 btn btn-danger btn-sm text-white mw-100px">Clear Filters</a>
+			</div>
 		</div>
 	</div>
 </form>
@@ -248,7 +226,7 @@ for ($i=0; $i < count($allFilterKeys); $i++) {
 				},
 				methods: {
 					init: function() {
-						
+
 					},
 					doSubmit: function() {
 						fastLoad('{{ route('mcp.patients') }}?' + $('#mcp-patients-filters').serialize());
@@ -265,4 +243,4 @@ for ($i=0; $i < count($allFilterKeys); $i++) {
 		}
 		addMCInitializer('mcp-patients-filters', init, '#mcp-patients-filters');
 	})();
-</script>
+</script>

resources/views/app/patients.blade.php

@@ -28,7 +28,7 @@
 
         <div class="card-header px-3 py-2 d-flex align-items-center">
             <strong class="mr-4">
-                <i class="fas fa-user-injured"></i>
+                <i class="fas fa-user"></i>
                 Patients
             </strong>
             <div class="ml-auto d-flex align-items-center search-form">