Peter Muturi 3 yıl önce
ebeveyn
işleme
e3e96061fc

+ 11 - 15
resources/views/app/mcp/appointments_filters.blade.php

@@ -20,18 +20,14 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</select>
-		</div>
-	</div>
-	<div v-if="filters.date_category" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="date_value_1" value="{{ $date_value_1 ?? '' }}" type="date" class="form-control input-sm" :placeholder="(filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN') ? 'From' : 'Date'" />
-		</div>
-	</div>
-	<div v-if="filters.date_category && (filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN')" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="date_value_2" value="{{ $date_value_2 ?? '' }}" type="date" class="form-control input-sm" placeholder="To" />
+			<div v-show="filters.date_category" class="row mt-2">
+				<div :class="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN' ? 'col-md-6' : 'col-md-12'">
+					<input  name="date_value_1" v-model="filters.date_value_1" type="number" class="form-control input-sm" :placeholder="(filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN') ? 'From' : 'Age'" />
+				</div>
+				<div v-show="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN'" class="col-md-6">
+					<input name="date_value_2" v-model="filters.date_value_2" type="number" class="form-control input-sm" placeholder="To" />
+				</div>
+			</div>
 		</div>
 	</div>
 	<!-- STATUS -->
@@ -48,7 +44,7 @@
 			</select>
 		</div>
 	</div>
-	
+
 	<!-- NEW/FU -->
 	<div class="col-md-2">
 		<div class="form-group">
@@ -85,7 +81,7 @@
 				},
 				methods: {
 					init: function() {
-						
+
 					}
 				},
 				mounted: function() {
@@ -97,4 +93,4 @@
 		}
 		addMCInitializer('mcp-appointments-filters', init, '#mcp-appointments-filters');
 	})();
-</script>
+</script>

+ 9 - 13
resources/views/app/mcp/bills_filters.blade.php

@@ -20,18 +20,14 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</select>
-		</div>
-	</div>
-	<div v-if="filters.date_category" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="date_value_1" value="{{ $date_value_1 ?? '' }}" type="date" class="form-control input-sm" :placeholder="(filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN') ? 'From' : 'Date'" />
-		</div>
-	</div>
-	<div v-if="filters.date_category && (filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN')" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="date_value_2" value="{{ $date_value_2 ?? '' }}" type="date" class="form-control input-sm" placeholder="To" />
+			<div v-show="filters.date_category" class="row mt-2">
+				<div :class="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN' ? 'col-md-6' : 'col-md-12'">
+					<input  name="date_value_1" v-model="filters.date_value_1" type="number" class="form-control input-sm" :placeholder="(filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN') ? 'From' : 'Age'" />
+				</div>
+				<div v-show="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN'" class="col-md-6">
+					<input name="date_value_2" v-model="filters.date_value_2" type="number" class="form-control input-sm" placeholder="To" />
+				</div>
+			</div>
 		</div>
 	</div>
 	<!-- STATUS -->
@@ -84,4 +80,4 @@
 		}
 		addMCInitializer('mcp-bills-filters', init, '#mcp-bills-filters');
 	})();
-</script>
+</script>

+ 9 - 13
resources/views/app/mcp/client_messages_filters.blade.php

@@ -20,18 +20,14 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</select>
-		</div>
-	</div>
-	<div v-if="filters.date_category" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="date_value_1" v-model="filters.date_value_1" type="date" class="form-control input-sm" :placeholder="(filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN') ? 'From' : 'Date'" />
-		</div>
-	</div>
-	<div v-if="filters.date_category && (filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN')" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="date_value_2" v-model="filters.date_value_2" type="date" class="form-control input-sm" placeholder="To" />
+			<div v-show="filters.date_category" class="row mt-2">
+				<div :class="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN' ? 'col-md-6' : 'col-md-12'">
+					<input  name="date_value_1" v-model="filters.date_value_1" type="number" class="form-control input-sm" :placeholder="(filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN') ? 'From' : 'Age'" />
+				</div>
+				<div v-show="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN'" class="col-md-6">
+					<input name="date_value_2" v-model="filters.date_value_2" type="number" class="form-control input-sm" placeholder="To" />
+				</div>
+			</div>
 		</div>
 	</div>
 	<!-- TO OR FROM ME -->
@@ -107,4 +103,4 @@ for ($i=0; $i < count($allFilterKeys); $i++) {
 		}
 		addMCInitializer('mcp-client-messages-filters', init, '#mcp-client-messages-filters');
 	})();
-</script>
+</script>

+ 12 - 16
resources/views/app/mcp/notes_filters.blade.php

@@ -20,18 +20,14 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</select>
-		</div>
-	</div>
-	<div v-if="filters.date_category" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="date_value_1" value="{{ $date_value_1 ?? '' }}" type="date" class="form-control input-sm" :placeholder="(filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN') ? 'From' : 'Date'" />
-		</div>
-	</div>
-	<div v-if="filters.date_category && (filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN')" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="date_value_2" value="{{ $date_value_2 ?? '' }}" type="date" class="form-control input-sm" placeholder="To" />
+			<div v-show="filters.date_category" class="row mt-2">
+				<div :class="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN' ? 'col-md-6' : 'col-md-12'">
+					<input  name="date_value_1" v-model="filters.date_value_1" type="number" class="form-control input-sm" :placeholder="(filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN') ? 'From' : 'Age'" />
+				</div>
+				<div v-show="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN'" class="col-md-6">
+					<input name="date_value_2" v-model="filters.date_value_2" type="number" class="form-control input-sm" placeholder="To" />
+				</div>
+			</div>
 		</div>
 	</div>
 	<!-- STATUS -->
@@ -47,7 +43,7 @@
 				<option value="CANCELLED">Cancelled</option>
 			</select>
 		</div>
-	</div>	
+	</div>
 
 	<div class="col-md-2">
 		<div class="form-group d-flex">
@@ -66,13 +62,13 @@
 				delimiters: ['@{{', '}}'],
 				data: {
 					filters: {
-						date_category: "<?= $date_category ?? '' ?>",						
+						date_category: "<?= $date_category ?? '' ?>",
 						status: "<?= $status ?? '' ?>"
 					}
 				},
 				methods: {
 					init: function() {
-						
+
 					}
 				},
 				mounted: function() {
@@ -84,4 +80,4 @@
 		}
 		addMCInitializer('mcp-notes-filters', init, '#mcp-notes-filters');
 	})();
-</script>
+</script>

+ 9 - 13
resources/views/app/mcp/supply_orders_filters.blade.php

@@ -20,18 +20,14 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</select>
-		</div>
-	</div>
-	<div v-if="filters.date_category" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="date_value_1" value="{{ $date_value_1 ?? '' }}" type="date" class="form-control input-sm" :placeholder="(filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN') ? 'From' : 'Date'" />
-		</div>
-	</div>
-	<div v-if="filters.date_category && (filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN')" class="col-md-2">
-		<div class="form-group">
-			<label>&nbsp;</label>
-			<input name="date_value_2" value="{{ $date_value_2 ?? '' }}" type="date" class="form-control input-sm" placeholder="To" />
+			<div v-show="filters.date_category" class="row mt-2">
+				<div :class="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN' ? 'col-md-6' : 'col-md-12'">
+					<input  name="date_value_1" v-model="filters.date_value_1" type="number" class="form-control input-sm" :placeholder="(filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN') ? 'From' : 'Age'" />
+				</div>
+				<div v-show="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN'" class="col-md-6">
+					<input name="date_value_2" v-model="filters.date_value_2" type="number" class="form-control input-sm" placeholder="To" />
+				</div>
+			</div>
 		</div>
 	</div>
 	<!-- STATUS -->
@@ -108,4 +104,4 @@ for ($i=0; $i < count($allFilterKeys); $i++) {
 		}
 		addMCInitializer('mcp-supply-orders-filters', init, '#mcp-supply-orders-filters');
 	})();
-</script>
+</script>