From 2b0a68fae79d185a182e7218e35b89195839f52d Mon Sep 17 00:00:00 2001
From: Saeid <saeidkhakbazan@gmail.com>
Date: Sun, 15 Sep 2019 19:29:43 +0430
Subject: [PATCH] debug 6_98

---
 app/Http/Controllers/UserController.php       |  4 +++-
 resources/js/vue/components/core/Drawer.vue   |  3 +++
 resources/js/vue/components/core/Toolbar.vue  |  4 ++--
 resources/js/vue/config/urls.js               |  1 +
 resources/js/vue/router/paths.js              |  6 +++---
 resources/js/vue/views/Item/AddEdit.vue       |  4 ++--
 resources/js/vue/views/Pack/AddEdit.vue       | 12 +++++------
 resources/js/vue/views/TestResult/AddEdit.vue | 20 ++++++++++++++++---
 resources/js/vue/views/TestResult/List.vue    |  4 ++--
 9 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 862f0254..87b15882 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -155,7 +155,9 @@ class UserController extends Controller
 
     public function getInfo()
     {
-        return \MessageResponse::data([ 'user' => auth('api')->user(), 'roles' => auth('api')->user()->getRoleNames() ]);
+        $user = auth('api')->user();
+        $user->load('medical_center');
+        return \MessageResponse::data([ 'user' => $user, 'roles' => auth('api')->user()->getRoleNames() ]);
     }
     public function getMessages()
     {
diff --git a/resources/js/vue/components/core/Drawer.vue b/resources/js/vue/components/core/Drawer.vue
index f702beb5..e6f9cd76 100644
--- a/resources/js/vue/components/core/Drawer.vue
+++ b/resources/js/vue/components/core/Drawer.vue
@@ -30,7 +30,10 @@
           </v-list-tile-avatar>
           <v-list-tile-title class="title">
             {{ $store.state.user.name }}
+            <br />
+            {{ $store.state.user.medical_center.name }}
           </v-list-tile-title>
+          
         </v-list-tile>
         <v-divider/>
         <v-list-tile
diff --git a/resources/js/vue/components/core/Toolbar.vue b/resources/js/vue/components/core/Toolbar.vue
index 32010850..996ccba2 100644
--- a/resources/js/vue/components/core/Toolbar.vue
+++ b/resources/js/vue/components/core/Toolbar.vue
@@ -57,9 +57,9 @@
       <v-card>
         <v-list>
           <v-list-tile avatar>
-            <v-list-tile-avatar>
+            <!-- <v-list-tile-avatar>
               <img src="https://cdn.vuetifyjs.com/images/john.jpg" :alt="name">
-            </v-list-tile-avatar>
+            </v-list-tile-avatar> -->
 
             <v-list-tile-content>
               <v-list-tile-title>{{ name }}</v-list-tile-title>
diff --git a/resources/js/vue/config/urls.js b/resources/js/vue/config/urls.js
index ec842cd5..102515e1 100644
--- a/resources/js/vue/config/urls.js
+++ b/resources/js/vue/config/urls.js
@@ -9,6 +9,7 @@ const urls = {
     statistics: `/TestResults/chart`,
     storeTestType: "/TestTypes",
     storePackage: "/Packages",
+    storePack: "/Packs",
     storeCycle: "/Cycles",
     storeItem: "/Items",
     listTestTypeName: "/TestTypes/ListNames",
diff --git a/resources/js/vue/router/paths.js b/resources/js/vue/router/paths.js
index 0b3c6110..05b4a1a4 100644
--- a/resources/js/vue/router/paths.js
+++ b/resources/js/vue/router/paths.js
@@ -155,9 +155,9 @@ export default [
     view: 'Package/List'
   },
   {
-    path: '/pack/:pack/edit',
-    name: 'EditPack',
-    view: 'Pack/AddEdit'
+    path: '/packages/:package/edit',
+    name: 'EditPackage',
+    view: 'Package/AddEdit'
   },
   {
     path: '/add-pack',
diff --git a/resources/js/vue/views/Item/AddEdit.vue b/resources/js/vue/views/Item/AddEdit.vue
index c19fb2b2..194f6201 100644
--- a/resources/js/vue/views/Item/AddEdit.vue
+++ b/resources/js/vue/views/Item/AddEdit.vue
@@ -15,10 +15,10 @@
           </v-flex>
           <v-flex xs12 sm6 md3>
             <v-text-field
-              name="id"
+              name="unique_id"
               label="ID"
               color="black"
-              v-model="formData.id"
+              v-model="formData.unique_id"
               :rules="[rules.required]"
               class="pa-2"
             ></v-text-field>
diff --git a/resources/js/vue/views/Pack/AddEdit.vue b/resources/js/vue/views/Pack/AddEdit.vue
index d4cde07c..8ba722eb 100644
--- a/resources/js/vue/views/Pack/AddEdit.vue
+++ b/resources/js/vue/views/Pack/AddEdit.vue
@@ -18,7 +18,7 @@
 							name="sterilizerId"
 							label="Sterilizer ID"
 							color="black"
-							v-model="formData.sterilizerId"
+							v-model="formData.sterilizer_id"
 							class="pa-2"
 						></v-text-field>
 					</v-flex>
@@ -36,7 +36,7 @@
 							name="lot_number"
 							label="Lot Number"
 							color="black"
-							v-model="formData.cycle_number"
+							v-model="formData.lot_number"
 							class="pa-2"
 						></v-text-field>
 					</v-flex>
@@ -45,7 +45,7 @@
 							multiple
 							:items="items"
 							item-text="name"
-							v-model="formData.items"
+							v-model="formData.packages"
 							item-value="id"
 							label="Select Package For Pack"
 						></v-autocomplete>
@@ -96,7 +96,7 @@
 				</v-layout>
 				<v-layout align-center justify-center wrap class="px-5 mb-3">
 					<v-flex xs12 sm12 md12>
-						<v-textarea color="black" v-model="formData.description" class="pa-2" name="address">
+						<v-textarea color="black" v-model="formData.note" class="pa-2" name="address">
 							<template v-slot:label>
 								<div>Description</div>
 							</template>
@@ -136,8 +136,8 @@ export default {
 			formData: {
 				name: "",
 				result: "",
-				description: "",
-				items: []
+				note: "",
+				packages: []
 			},
 			items: [],
 			rules: {
diff --git a/resources/js/vue/views/TestResult/AddEdit.vue b/resources/js/vue/views/TestResult/AddEdit.vue
index 8620c0a1..11533ce8 100644
--- a/resources/js/vue/views/TestResult/AddEdit.vue
+++ b/resources/js/vue/views/TestResult/AddEdit.vue
@@ -42,9 +42,9 @@
 					</v-flex>
 					<v-flex xs12 sm4 md4>
 						<v-text-field
-							name="autoclave"
+							name="id"
 							v-model="formData.device_id"
-							:label="formData.device_label"
+							:label="device_label[formData.device_label]"
 							color="black"
 							class="pa-2"
 						></v-text-field>
@@ -331,7 +331,21 @@ export default {
 			test_type_id: ""
 		},
 		images: [],
-		menu: ""
+		menu: "",
+		device_label: {
+			WasherID: "Washer ID",
+			AutoclaveID: "Autoclave ID",
+			SterilizerID: "Sterilizer ID",
+			WasherMachineID: "WasherMachine ID",
+			SealMachineID: "SealMachine ID",
+			PatientID: "Patient ID",
+			"Set/PackID": "Set/Pack ID",
+			MDID: "MD ID",
+			ORID: "OR ID",
+			PersonalID: "Personal ID",
+			InstrumentID: "Instrument ID",
+			ID: "ID"
+		}
 	}),
 	created() {
 		if (this.$route.params.testResult) {
diff --git a/resources/js/vue/views/TestResult/List.vue b/resources/js/vue/views/TestResult/List.vue
index 4ca4c05c..0040f9b1 100644
--- a/resources/js/vue/views/TestResult/List.vue
+++ b/resources/js/vue/views/TestResult/List.vue
@@ -7,7 +7,7 @@
                         <v-text-field
                             class="pa-2"
                             v-model="filter.device_id"
-                            label="AutoclaveID or WaherID"
+                            label="ID"
                             color="black"
                         ></v-text-field>
                     </v-flex>
@@ -181,7 +181,7 @@ export default {
         headers: [
             {
                 sortable: false,
-                text: "AutoClave Or Washer Id",
+                text: "ID",
                 value: "name"
             },
             {