newchanges

resources/js/vue/views/TestResult/AddEdit.vue

@@ -2,7 +2,7 @@
 	<v-form ref="form">
 		<v-container grid-list-xs>
 			<material-card color="black" title="Submit Test Result">
-				<v-layout align-center justify-center wrap class="px-5 my-3" v-if="!$route.params.testResult">
+				<v-layout  wrap class="px-5 my-3" v-if="!$route.params.testResult">
 					<v-flex xs12 sm4 md4>
 						<v-autocomplete
 							:search-input.sync="searchInput"
@@ -13,7 +13,7 @@
 							class="pa-2"
 						></v-autocomplete>
 					</v-flex>
-					<v-flex xs12 sm3 md3>
+					<v-flex xs12 sm3 md3 class="mr-5">
 						<v-text-field
 							name="testcode"
 							v-model="filter.unique_code"
@@ -22,6 +22,7 @@
 							class="pa-2"
 						></v-text-field>
 					</v-flex>
+					<!-- <v-spacer></v-spacer> -->
 					<v-flex xs12 md2 sm2 class="text-xs-center text-sm-center text-md-center">
 						<v-btn
 							class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black"
@@ -40,7 +41,7 @@
 					<v-flex xs12 sm12 md12>
 						<h3>{{testTypeNameSelected}}</h3>
 					</v-flex>
-					<v-flex xs12 sm4 md4>
+					<v-flex xs12 sm3 md3>
 						<v-text-field
 							name="id"
 							v-model="formData.device_id"
@@ -49,20 +50,22 @@
 							class="pa-2"
 						></v-text-field>
 					</v-flex>
-					<v-flex xs12 sm4 md4>
+					<v-flex xs12 sm2 md2>
 						<v-menu
 							lazy
 							:close-on-content-click="true"
 							transition="v-scale-transition"
 							offset-y
 							v-model="menu"
+							class="pa-2"
 						>
-							<v-text-field
-								prepend-icon="far fa-clock"
+							<v-text-field style="padding-top:0 !important"
+								prepend-inner-icon="far fa-clock"
 								required
 								slot="activator"
 								label="Date"
 								v-model="formData.date"
+								color="black"
 							></v-text-field>
 							<v-date-picker
 								color="pink"
@@ -72,30 +75,36 @@
 							></v-date-picker>
 						</v-menu>
 					</v-flex>
-					<v-flex xs12 sm4 md4>
+					<v-flex xs12 sm2 md2>
 						<v-switch color="green" v-model="result" :label="'Result: ' + formData.result"></v-switch>
 					</v-flex>
-					<v-flex xs12 sm12 md12>
-						<div>
+					<v-spacer></v-spacer>
+					<v-flex xs12 sm2 md2>
+						<div  class="WM-Align-R">
 							<input type="file" class="inputfile" @change="onFileChange" multiple />
 							<label for="file">
 								<v-icon class="v-icon greylighten-3--text mr-2 caption IconHover">fas fa-chevron-right</v-icon>Choose a file
 							</label>
 						</div>
-						<v-layout>
-							<v-flex v-for="(img, key) in images" :key="key" xs12 sm6 md3>
-								<img :src="img" style="width:100%;" />
-								<v-btn class="black" @click.native.stop="removeImage(key)">Remove image</v-btn>
-							</v-flex>
-						</v-layout>
 					</v-flex>
+					<v-flex xs12 sm12 md12>
+					<v-layout class="mt-4">
+						<v-flex v-for="(img, key) in images" :key="key" xs12 sm6 md1>
+							<img :src="img" style="width:100%;" />
+							<!-- <v-btn fab class="black" @click.native.stop="removeImage(key)"></v-btn> -->
+							<v-btn class="mx-2" fab dark small color="primary">
+					      <v-icon dark>mdi-minus</v-icon>
+					    </v-btn>
+						</v-flex>
+					</v-layout>
+					</v-flex>
+					</v-layout>
+
+
+
+					<!-- start dynamic component -->
+					<v-layout align-center justify-center wrap class="px-5 my-3">
 					<v-flex :class="['pa-2', item.size]" v-for="(item, key) in form" :key="key">
-						<v-text-field
-							v-if="item.type == 'Text'"
-							v-model="formData[item.name+'_'+item.id]"
-							:label="item.name"
-							color="black"
-						></v-text-field>
 						<v-container fluid v-if="item.type == 'Temperature'">
 							<p>{{ item.name }}</p>
 							<v-flex xs12>
@@ -109,6 +118,25 @@
 								></v-slider>
 							</v-flex>
 						</v-container>
+						<v-text-field
+							v-if="item.type == 'Text'"
+							v-model="formData[item.name+'_'+item.id]"
+							:label="item.name"
+							color="black"
+						></v-text-field>
+						<!-- <v-container fluid v-if="item.type == 'Temperature'">
+							<p>{{ item.name }}</p>
+							<v-flex xs12>
+								<v-slider
+									step="0.1"
+									prepend-icon="fas fa-temperature-high"
+									v-model="formData[item.name+'_'+item.id]"
+									min="0"
+									max="200"
+									thumb-label="always"
+								></v-slider>
+							</v-flex>
+						</v-container> -->
 						<v-container fluid v-if="item.type == 'Pressure'">
 							<p>{{ item.name }}</p>
 							<v-flex xs12>
@@ -525,4 +553,4 @@ export default {
 .v-btn--icon:before {
 	border-radius: 50% !important;
 }
-</style>
+</style>