diff --git a/resources/js/vue/views/TestResult/AddEdit.vue b/resources/js/vue/views/TestResult/AddEdit.vue
index cef21293..f26c1c72 100644
--- a/resources/js/vue/views/TestResult/AddEdit.vue
+++ b/resources/js/vue/views/TestResult/AddEdit.vue
@@ -47,14 +47,14 @@
                         <v-text-field
                             name="autoclave"
                             v-model="formData.device_id"
-                            :label="form.device_label"
+                            :label="formData.device_label"
                             color="black"
                             class="pa-2"
                         ></v-text-field>
                     </v-flex>
                     <v-flex xs12 sm4 md4>
                         <v-text-field
-                            v-model="formData.cycle_number "
+                            v-model="formData.cycle_number"
                             label="Cycle Number"
                             color="black"
                             class="pa-2"
@@ -343,6 +343,15 @@ export default {
                     );
                     if (result && result.status == 200) {
                         this.formData = result.data.data;
+                        for (const key in result.data.data.imagesPath) {
+                            if (result.data.data.imagesPath.hasOwnProperty(key)) {
+                                result.data.data.imagesPath[key] = '/' + result.data.data.imagesPath[key];
+                                
+                            }
+                        }
+                        
+                        this.formData.images =  result.data.data.imagesPath;
+                        this.images = result.data.data.imagesPath;
                     }
                 }
             }
@@ -399,6 +408,13 @@ export default {
             } else {
                 this.formData.result = "Reject";
             }
+        },
+        formData(value) {
+            if (value.result == "Accept") {
+                this.result = true;
+            } else {
+                this.result = false;
+            }
         }
     }
 };
diff --git a/resources/js/vue/views/TestResult/List.vue b/resources/js/vue/views/TestResult/List.vue
index 5be860d0..aa8ec66f 100644
--- a/resources/js/vue/views/TestResult/List.vue
+++ b/resources/js/vue/views/TestResult/List.vue
@@ -6,7 +6,7 @@
                     <v-flex xs12 md3 sm3>
                         <v-text-field
                             class="pa-2"
-                            v-model="filter.auto_clave_id"
+                            v-model="filter.device_id"
                             label="autoClaveId"
                             color="black"
                         ></v-text-field>
@@ -112,7 +112,7 @@
                                 />
                             </template>
                             <template slot="items" slot-scope="{ item }">
-                                <td class="headline font-weight-light">{{ item.autoclave_id }}</td>
+                                <td class="headline font-weight-light">{{ item.device_id }}</td>
                                 <td
                                     class="title font-weight-light"
                                 >{{ item.test_type ? item.test_type.name : 'Archived Test' }}</td>
@@ -181,7 +181,7 @@ export default {
         headers: [
             {
                 sortable: false,
-                text: "AutoClaveId",
+                text: "AutoClave Or Washer Id",
                 value: "name"
             },
             {
diff --git a/resources/js/vue/views/TestType/List.vue b/resources/js/vue/views/TestType/List.vue
index 3281d24f..c9189628 100644
--- a/resources/js/vue/views/TestType/List.vue
+++ b/resources/js/vue/views/TestType/List.vue
@@ -102,7 +102,7 @@
                                         <span>Edit</span>
                                     </v-btn>
                                 </router-link>
-                                <v-btn color="orange darken-1" @click="generateBarcode(item.id)">
+                                <v-btn color="orange darken-1" @click="generateBarcode(item.unique_code)">
                                     <v-icon class="white--text mr-1 caption">fas fa-barcode</v-icon>
                                     <span>Generate Barcode</span>
                                 </v-btn>
@@ -211,8 +211,8 @@ export default {
                 }
             }
         },
-        async generateBarcode(id) {
-            const result = await ApiService.post(urls.TestTypeBarcode(id));
+        async generateBarcode(code) {
+            const result = await ApiService.post(urls.Barcode(code));
             if (result && result.status == 200) {
                 this.changeCurrentModal({
                     modal: "modal-barcode-barcode",