Peter Muturi 3 anni fa
parent
commit
a80f2dc7e7

+ 24 - 7
resources/views/app/mcp/bills_filters.blade.php

@@ -6,10 +6,27 @@
 	#mcp-bills-filters .mw-100px {
 		min-width: 100px;
 	}
+	.filter-container, .filter-child-container {
+		display: flex;
+		align-items: flex-start;
+		flex-wrap: wrap;
+	}
+	.filter-container >div {
+		width: 180px;
+	}
+	.filter-container >div:not(:last-child) {
+		margin-right: 20px;
+	}
+	.filter-child-container >div {
+		width: 85px;
+	}
+	.filter-child-container >div:not(:last-child) {
+		margin-right: 10px;
+	}
 </style>
-<form id="mcp-bills-filters" method="GET" action="{{ route('mcp.bills') }}" class="row align-items-start" v-cloak>
+<form id="mcp-bills-filters" method="GET" action="{{ route('mcp.bills') }}" class="filter-container" v-cloak>
 	<!-- DATE	 -->
-	<div class="col">
+	<div>
 		<div class="form-group">
 			<label>Date:</label>
 			<select name="date_category" class="form-control input-sm" v-model="filters.date_category">
@@ -20,18 +37,18 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</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'">
+			<div v-show="filters.date_category" class="filter-child-container mt-2">
+				<div>
 					<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">
+				<div v-show="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN'">
 					<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 -->
-	<div class="col">
+	<div>
 		<div class="form-group">
 			<label>Status:</label>
 			<select name="status" class="form-control input-sm" v-model="filters.status">
@@ -42,7 +59,7 @@
 		</div>
 	</div>
 
-	<div class="col">
+	<div>
 		<div class="form-group">
 			<label>&nbsp;</label>
 			<div class="d-flex">

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

@@ -6,18 +6,27 @@
 	#mcp-client-messages-filters .mw-100px {
 		min-width: 100px;
 	}
-	.filter-container {
+	.filter-container, .filter-child-container {
 		display: flex;
 		align-items: flex-start;
 		flex-wrap: wrap;
 	}
 	.filter-container >div {
-		width: 30%;
+		width: 180px;
+	}
+	.filter-container >div:not(:last-child) {
+		margin-right: 20px;
+	}
+	.filter-child-container >div {
+		width: 85px;
+	}
+	.filter-child-container >div:not(:last-child) {
+		margin-right: 10px;
 	}
 </style>
 <form id="mcp-client-messages-filters" method="GET" action="{{ route('mcp.client_messages') }}" class="filter-container" v-cloak>
 	<!-- DATE	 -->
-	<div class="mx-3">
+	<div>
 		<div class="form-group">
 			<label>Date:</label>
 			<select name="date_category" class="form-control input-sm" v-model="filters.date_category">
@@ -28,18 +37,18 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</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'">
+			<div v-show="filters.date_category" class="filter-child-container mt-2">
+				<div>
 					<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">
+				<div v-show="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN'">
 					<input name="date_value_2" v-model="filters.date_value_2" type="date" class="form-control input-sm" placeholder="To" />
 				</div>
 			</div>
 		</div>
 	</div>
 	<!-- TO OR FROM ME -->
-	<!-- <div class="mx-3">
+	<!-- <div>
 		<div class="form-group">
 			<label>To or From Me:</label>
 			<select name="to_or_from_me" class="form-control input-sm" v-model="filters.to_or_from_me">
@@ -50,7 +59,7 @@
 		</div>
 	</div> -->
 	<!-- STATUS -->
-	<div class="mx-3">
+	<div>
 		<div class="form-group">
 			<label>Status:</label>
 			<select name="sms_status" class="form-control input-sm" v-model="filters.sms_status">
@@ -60,7 +69,7 @@
 		</div>
 	</div>
 
-	<div class="col-md-1">
+	<div>
 		<div class="form-group">
 			<label>&nbsp;</label>
 			<div class="d-flex">

+ 24 - 7
resources/views/app/mcp/erx_and_orders_filters.blade.php

@@ -6,10 +6,27 @@
 	#mcp-erx-and-orders-filters .mw-100px {
 		min-width: 100px;
 	}
+	.filter-container, .filter-child-container {
+		display: flex;
+		align-items: flex-start;
+		flex-wrap: wrap;
+	}
+	.filter-container >div {
+		width: 180px;
+	}
+	.filter-container >div:not(:last-child) {
+		margin-right: 20px;
+	}
+	.filter-child-container >div {
+		width: 85px;
+	}
+	.filter-child-container >div:not(:last-child) {
+		margin-right: 10px;
+	}
 </style>
-<form id="mcp-erx-and-orders-filters" method="GET" action="{{ route('mcp.notes') }}" class="row align-items-start" v-cloak>
+<form id="mcp-erx-and-orders-filters" method="GET" action="{{ route('mcp.notes') }}" class="filter-container" v-cloak>
 	<!-- DATE	 -->
-	<div class="col">
+	<div>
 		<div class="form-group">
 			<label>Date:</label>
 			<select name="date_category" class="form-control input-sm" v-model="filters.date_category">
@@ -20,18 +37,18 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</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'">
+			<div v-show="filters.date_category" class="filter-child-container mt-2">
+				<div>
 					<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">
+				<div v-show="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN'">
 					<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 -->
-	<div class="col">
+	<div>
 		<div class="form-group">
 			<label>Status:</label>
 			<select name="status" class="form-control input-sm" v-model="filters.status">
@@ -45,7 +62,7 @@
 		</div>
 	</div>
 
-	<div class="col">
+	<div>
 		<div class="form-group">
 			<label>&nbsp;</label>
 			<div class="d-flex">

+ 24 - 7
resources/views/app/mcp/notes_filters.blade.php

@@ -6,10 +6,27 @@
 	#mcp-notes-filters .mw-100px {
 		min-width: 100px;
 	}
+	.filter-container, .filter-child-container {
+		display: flex;
+		align-items: flex-start;
+		flex-wrap: wrap;
+	}
+	.filter-container >div {
+		width: 180px;
+	}
+	.filter-container >div:not(:last-child) {
+		margin-right: 20px;
+	}
+	.filter-child-container >div {
+		width: 85px;
+	}
+	.filter-child-container >div:not(:last-child) {
+		margin-right: 10px;
+	}
 </style>
-<form id="mcp-notes-filters" method="GET" action="{{ route('mcp.notes') }}" class="row align-items-start" v-cloak>
+<form id="mcp-notes-filters" method="GET" action="{{ route('mcp.notes') }}" class="filter-container" v-cloak>
 	<!-- DATE	 -->
-	<div class="col">
+	<div>
 		<div class="form-group">
 			<label>Date:</label>
 			<select name="date_category" class="form-control input-sm" v-model="filters.date_category">
@@ -20,18 +37,18 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</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'">
+			<div v-show="filters.date_category" class="filter-child-container mt-2">
+				<div>
 					<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">
+				<div v-show="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN'">
 					<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 -->
-	<div class="col">
+	<div>
 		<div class="form-group">
 			<label>New/FU:</label>
 			<select name="new_or_fu_or_na" class="form-control input-sm" v-model="filters.new_or_fu_or_na">
@@ -42,7 +59,7 @@
 		</div>
 	</div>
 
-	<div class="col">
+	<div>
 		<div class="form-group">
 			<label>&nbsp;</label>
 			<div class="d-flex">

+ 24 - 7
resources/views/app/mcp/reports_filters.blade.php

@@ -6,10 +6,27 @@
 	#mcp-reports-filters .mw-100px {
 		min-width: 100px;
 	}
+	.filter-container, .filter-child-container {
+		display: flex;
+		align-items: flex-start;
+		flex-wrap: wrap;
+	}
+	.filter-container >div {
+		width: 180px;
+	}
+	.filter-container >div:not(:last-child) {
+		margin-right: 20px;
+	}
+	.filter-child-container >div {
+		width: 85px;
+	}
+	.filter-child-container >div:not(:last-child) {
+		margin-right: 10px;
+	}
 </style>
-<form id="mcp-reports-filters" method="GET" action="{{ route('mcp.reports') }}" class="row align-items-start" v-cloak>
+<form id="mcp-reports-filters" method="GET" action="{{ route('mcp.reports') }}" class="filter-container" v-cloak>
 	<!-- DATE	 -->
-	<div class="col">
+	<div>
 		<div class="form-group">
 			<label>Date:</label>
 			<select name="date_category" class="form-control input-sm" v-model="filters.date_category">
@@ -20,18 +37,18 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</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'">
+			<div v-show="filters.date_category" class="filter-child-container mt-2">
+				<div>
 					<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">
+				<div v-show="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN'">
 					<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 -->
-	<div class="col">
+	<div>
 		<div class="form-group">
 			<label>Status:</label>
 			<select name="status" class="form-control input-sm" v-model="filters.status">
@@ -42,7 +59,7 @@
 		</div>
 	</div>
 
-	<div class="col">
+	<div>
 		<div class="form-group">
 			<label>&nbsp;</label>
 			<div class="d-flex">

+ 24 - 7
resources/views/app/mcp/supply_orders_filters.blade.php

@@ -6,10 +6,27 @@
 	#mcp-supply-orders-filters .mw-100px {
 		min-width: 100px;
 	}
+	.filter-container, .filter-child-container {
+		display: flex;
+		align-items: flex-start;
+		flex-wrap: wrap;
+	}
+	.filter-container >div {
+		width: 180px;
+	}
+	.filter-container >div:not(:last-child) {
+		margin-right: 20px;
+	}
+	.filter-child-container >div {
+		width: 85px;
+	}
+	.filter-child-container >div:not(:last-child) {
+		margin-right: 10px;
+	}
 </style>
-<form id="mcp-supply-orders-filters" method="GET" action="{{ route('mcp.supply_orders') }}" class="row align-items-start" v-cloak>
+<form id="mcp-supply-orders-filters" method="GET" action="{{ route('mcp.supply_orders') }}" class="filter-container" v-cloak>
 	<!-- DATE	 -->
-	<div class="col">
+	<div>
 		<div class="form-group">
 			<label>Date:</label>
 			<select name="date_category" class="form-control input-sm" v-model="filters.date_category">
@@ -20,18 +37,18 @@
 				<option value="BETWEEN">Between</option>
 				<option value="NOT_BETWEEN">Not Between</option>
 			</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'">
+			<div v-show="filters.date_category" class="filter-child-container mt-2">
+				<div>
 					<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">
+				<div v-show="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN'">
 					<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 -->
-	<div class="col">
+	<div>
 		<div class="form-group">
 			<label>Status:</label>
 			<select name="status" class="form-control input-sm" v-model="filters.status">
@@ -55,7 +72,7 @@
 		</div>
 	</div>
 
-	<div class="col">
+	<div>
 		<div class="form-group">
 			<label>&nbsp;</label>
 			<div class="d-flex">