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

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

@@ -22,10 +22,10 @@
 			</select>
 			<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'" />
+					<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 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" />
+					<input name="date_value_2" v-model="filters.date_value_2" type="date" class="form-control input-sm" placeholder="To" />
 				</div>
 			</div>
 		</div>

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

@@ -22,10 +22,10 @@
 			</select>
 			<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'" />
+					<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 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" />
+					<input name="date_value_2" v-model="filters.date_value_2" type="date" class="form-control input-sm" placeholder="To" />
 				</div>
 			</div>
 		</div>

resources/views/app/mcp/erx_and_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" 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="date" class="form-control input-sm" :placeholder="(filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN') ? 'From' : 'Date'" />
+				</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="date" class="form-control input-sm" placeholder="To" />
+				</div>
+			</div>
 		</div>
 	</div>
 	<!-- STATUS -->
@@ -98,4 +94,4 @@ for ($i=0; $i < count($allFilterKeys); $i++) {
 		}
 		addMCInitializer('mcp-erx-and-orders-filters', init, '#mcp-erx-and-orders-filters');
 	})();
-</script>
+</script>

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

@@ -22,10 +22,10 @@
 			</select>
 			<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'" />
+					<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 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" />
+					<input name="date_value_2" v-model="filters.date_value_2" type="date" class="form-control input-sm" placeholder="To" />
 				</div>
 			</div>
 		</div>

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

@@ -22,10 +22,10 @@
 			</select>
 			<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'" />
+					<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 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" />
+					<input name="date_value_2" v-model="filters.date_value_2" type="date" class="form-control input-sm" placeholder="To" />
 				</div>
 			</div>
 		</div>