Test Resault device_id

public/js/vue/app.js

@@ -43,7 +43,7 @@
 /******/
 /******/ 	// script path function
 /******/ 	function jsonpScriptSrc(chunkId) {
-/******/ 		return __webpack_require__.p + "js/vue/chunks/" + ({}[chunkId]||chunkId) + "." + {"0":"cee19c932dbc149a1cc9","1":"5281a63adedfa1ab604f","2":"743b89b9bb2dabfa3ffe","3":"a050b1a548ee0857d2f7","4":"7c6e05813e662d286d09","5":"8d7463d42653e02550f1","6":"68a5b0bbe6eb4c67723e","7":"440261d4999a3043dddc","8":"83ba6361372aac393521","9":"62c6f07e0e751126652d","10":"9603d5be0ae5c93d2b34","11":"423ddeaf58f54d25364b","12":"febbfeb844354a0cdbff","13":"7441ce1b806f3f78bcbb","14":"8da587ed5e5037bb178c","15":"dc3f54190c64738d2bee","16":"0283c44e44dbd778be39","17":"aeda8d2fe82355b16c66","18":"4c39b4598f53fc5610c2","19":"44988f4163efeba55699","20":"08150bc9a6df0102406e","21":"bc068c1d2ec99a9965de","22":"9aa5bdc2ef1c37f1d6f4","23":"99044b1527f8753dde51","24":"8e2e76e3b7f37492e02f","25":"b735a42cedd74022a9ee","26":"174e16952c4ab044e8bf","27":"bfdd4afc7d67ccd7ea27"}[chunkId] + ".js"
+/******/ 		return __webpack_require__.p + "js/vue/chunks/" + ({}[chunkId]||chunkId) + "." + {"0":"cee19c932dbc149a1cc9","1":"1a2ec2568db9e0d01036","2":"567342defd47adb4346e","3":"edff967a6e6d462943a1","4":"e565c025f6fe488409e8","5":"96bde56e75e96f96d773","6":"5a5158e2d37fea70c0ad","7":"dbafea224bf154513893","8":"973b0649ccc38b9bdade","9":"1b12af34e8e809cd2cc5","10":"1a0d4926180438b7d7dd","11":"6a1dd0825a7b78dd66b2","12":"2fbc698c12dd792658de","13":"2a534d941dedd3e2828b","14":"21ee580c8e59c779a80a","15":"b930000cc9d8f16779ae","16":"642ab7c8fa65b0639c84","17":"0cd7d9cfdd466475ba79","18":"17734129a0e2e4afdd89","19":"cfb8b7752ecb0c044cf9","20":"75f4f9028bacfd88dbae","21":"4756b5a7dd1daa6f2bb9","22":"fb95807ca2e8a3eee080","23":"0bd0fd4380524b2abc6e","24":"c24930cf7b1ec90bcb23","25":"54aae834b808b1d6c089","26":"e816ed8939bdeb632640","27":"54547f942de04358714d"}[chunkId] + ".js"
 /******/ 	}
 /******/
 /******/ 	// The require function
@@ -19122,7 +19122,9 @@ var render = function() {
                   _c("v-flex", { attrs: { xs12: "", md6: "", sm6: "" } }, [
                     _c("div", {}, [
                       _c("span", { staticClass: "title" }, [
-                        _vm._v("Auto Clave Id :")
+                        _vm._v(
+                          _vm._s(_vm.data.device_label || "AutoclaveID") + " :"
+                        )
                       ]),
                       _vm._v(" "),
                       _c(
@@ -19131,7 +19133,7 @@ var render = function() {
                           staticClass: "headline ml-2",
                           staticStyle: { "letter-spacing": "0 !important" }
                         },
-                        [_vm._v(_vm._s(_vm.data.autoclave_id))]
+                        [_vm._v(_vm._s(_vm.data.device_id))]
                       )
                     ])
                   ]),
@@ -19262,7 +19264,7 @@ var render = function() {
               _vm._v(" "),
               _c(
                 "v-layout",
-                { attrs: { row: "", wrap: "" } },
+                { staticClass: "ml-4", attrs: { row: "", wrap: "" } },
                 [
                   _vm.data.inputs
                     ? _vm._l(_vm.data.inputs, function(inputData, keyInputs) {
@@ -67512,7 +67514,7 @@ module.exports = webpackAsyncContext;
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = __webpack_require__(/*! D:\FYZ\CSSD\resources\js\vue\main.js */"./resources/js/vue/main.js");
+module.exports = __webpack_require__(/*! D:\Atom\Git\CSSD\resources\js\vue\main.js */"./resources/js/vue/main.js");
 
 
 /***/ })

resources/js/vue/components/modal/testresult/Show.vue

@@ -10,11 +10,11 @@
                 <v-layout row wrap class="ml-4">
                     <v-flex xs12 md6 sm6>
                         <div class>
-                            <span class="title">Auto Clave Id :</span>
+                            <span class="title">{{ data.device_label || 'AutoclaveID' }} :</span>
                             <span
                                 class="headline ml-2"
                                 style="letter-spacing:0 !important"
-                            >{{ data.autoclave_id }}</span>
+                            >{{ data.device_id }}</span>
                         </div>
                     </v-flex>
                     <v-flex xs12 md6 sm6>
@@ -71,7 +71,7 @@
                 <v-flex xs12>
                     <hr class="v-divider theme--light" />
                 </v-flex>
-                <v-layout row wrap>
+                <v-layout row wrap class="ml-4">
                     <template v-if="data.inputs">
                         <v-flex
                             xs12

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

@@ -370,7 +370,7 @@ export default {
 			}
 
 			if (result && result.status == 200) {
-				this.$router.push({ name: "Dashboard" });
+				this.$router.push({ name: "AllResultTest" });
 			}
 		},
 		onFileChange(e) {

resources/js/vue/views/TestResult/List.vue

@@ -7,7 +7,7 @@
                         <v-text-field
                             class="pa-2"
                             v-model="filter.device_id"
-                            label="autoClaveId"
+                            label="AutoclaveID or WaherID"
                             color="black"
                         ></v-text-field>
                     </v-flex>
@@ -222,7 +222,7 @@ export default {
             }
         ],
         filter: {
-            auto_clave_id: '',
+            device_id:'',
             testType_id: '',
             medicalCenter_id: '',
             user_name: '',