From bb43c4f82486da7d443bbc2d8126833f37c3bb51 Mon Sep 17 00:00:00 2001
From: "f.shokouhi" <fhshokouhi@gmail.com>
Date: Thu, 9 Jan 2020 10:42:13 +0330
Subject: [PATCH] changes

---
 resources/js/vue/components/core/Modal.vue    |  2 +-
 .../js/vue/components/modal/label/Show.vue    | 52 ++++++++++---------
 resources/js/vue/views/Label/List.vue         |  2 +-
 resources/views/welcome.blade.php             |  2 +-
 4 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/resources/js/vue/components/core/Modal.vue b/resources/js/vue/components/core/Modal.vue
index 4469a4c6..2df31024 100644
--- a/resources/js/vue/components/core/Modal.vue
+++ b/resources/js/vue/components/core/Modal.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <modal-base :show="getCurrentModal" width="70%" @close="closeModal">
+        <modal-base :show="getCurrentModal" :width="getModalProperties.width ? getModalProperties.width + '%': '70%'" @close="closeModal">
             <component :is="getCurrentModal" v-bind="getModalProperties"></component>
         </modal-base>
     </div>
diff --git a/resources/js/vue/components/modal/label/Show.vue b/resources/js/vue/components/modal/label/Show.vue
index c39952b5..b9dda476 100644
--- a/resources/js/vue/components/modal/label/Show.vue
+++ b/resources/js/vue/components/modal/label/Show.vue
@@ -2,81 +2,85 @@
 <template>
     <v-container grid-list-xs>
         <material-card color="black" title="Show Label">
-            <v-layout  align-left justify-left wrap class="px-5 my-3">
+            <v-layout  align-left justify-left wrap class="px-2 my-3">
                 <h3 class="ml-3">Info</h3>
                 <v-flex xs12>
                     <hr class="v-divider theme--light">
                 </v-flex>
-                <v-layout id="printMe" row wrap class="ml-4">
+                <v-layout id="printMe">
+
+                  <v-flex xs10 md12 sm12>
+                    <v-layout row wrap class="ml-4">
                     <v-flex xs12 md12 sm12>
                         <div class="WM-d-flex">
                             <span class="title">Lot Number :</span>
                             <span class="headline ml-2" style="letter-spacing:0 !important">{{ data.lot_number }}</span>
                         </div>
                     </v-flex>
-                    <v-flex xs12 md6 sm6>
+                    <v-flex xs6 md7 sm7>
                         <div class="">
                             <!-- <v-icon class="WMi-location"></v-icon> -->
                             <span class="headline ml-1" style="letter-spacing:0 !important">{{ (data.user && data.user.medical_center) ? data.user.medical_center.name : "" }}</span>
                         </div>
                     </v-flex>
-                    <v-flex xs12 md6 sm6>
+                    <v-flex xs6 md5 sm5>
                         <div class="WM-d-flex">
                             <v-icon class="WMi-Industry"></v-icon>
                             <span class="headline ml-2" style="letter-spacing:0 !important">{{ data.sterile_date }}</span>
                         </div>
                     </v-flex>
-                    <v-flex xs12 md6 sm6>
+                    <v-flex xs6 md7 sm7>
                         <div class="WM-d-flex">
                             <v-icon class="WMi-user"></v-icon>
                             <span class="headline ml-2" style="letter-spacing:0 !important">{{ (typeof data.user != 'undefined') ? data.user.name : '' }}</span>
                         </div>
                     </v-flex>
-                    <v-flex xs12 md6 sm6>
+                    <v-flex xs6 md5 sm5>
                         <div class="WM-d-flex">
                             <v-icon class="WMi-hourglass"></v-icon>
                             <span class="headline ml-2" style="letter-spacing:0 !important">{{ data.expire_date }}</span>
                         </div>
                     </v-flex>
-                    <v-flex xs12 md12 sm12>
+                    <v-flex xs6 md7 sm7>
                         <div class>
                             <span class="title">Sterilizer ID :</span>
                             <span class="headline ml-1" style="letter-spacing:0 !important">{{ data.sterilizer_id}}</span>
                         </div>
                     </v-flex>
-                    <v-flex xs12 md6 sm6>
+                    <v-flex xs6 md5 sm5>
                         <div class>
                             <span class="title">Cycle No :</span>
                             <span class="headline ml-2" style="letter-spacing:0 !important">{{ data.cycle_number }}</span>
                         </div>
                     </v-flex>
-                    <v-flex xs12 md6 sm6>
-                        <div class>
-                            <v-flex xs12 md6 sm6 v-if="QRCodeimg">
-                                <img :src="QRCodeimg">
-                            </v-flex>
-                        </div>
-                    </v-flex>
-
-
-                    <v-flex xs12 md12 sm12>
-                        <div class>
-                            <v-layout row wrap align-center justify-center class="ml-4" style="text-align:center;margin-top:50px">
-                                <v-flex xs12 md12 sm12 v-if="barcodeimg">
+                    <!-- text-align:center;margin-top:50px ml-4 -->
+                    <v-flex xs6 md7 sm7>
+                        <div class="mt-5">
+                            <v-layout row wrap class="" style="">
+                                <v-flex xs6 md12 sm12 v-if="barcodeimg">
                                     <img :src="barcodeimg"><br />
                                     <span>{{data.id}}</span>
                                 </v-flex>
                             </v-layout>
                         </div>
                     </v-flex>
+                    <v-flex xs6 md5 sm5>
+                        <div class="mt-5">
+                            <v-flex xs6 md6 sm6 v-if="QRCodeimg">
+                                <img :src="QRCodeimg">
+                            </v-flex>
+                        </div>
+                    </v-flex>
+                    </v-layout>
+                  </v-flex>
                 </v-layout>
             </v-layout>
-            <v-layout align-left justify-left wrap class="px-5 my-3">
+            <v-layout align-left justify-left wrap class="px-2 my-3">
                 <h3 class="ml-3">Package</h3>
                 <v-flex xs12>
                     <hr class="v-divider theme--light">
                 </v-flex>
-                <v-layout row wrap class="ml-4">
+                <v-layout row wrap class="mx-3">
                     <template>
                       <v-expansion-panel class="WM-Panel">
                         <v-expansion-panel-content>
@@ -107,7 +111,7 @@
                 </v-layout>
             </v-layout>
 
-            <v-layout row wrap align-center justify-center>
+            <v-layout row wrap align-center justify-center style="margin-left: -15%;">
                 <v-flex class xs12 md2 sm2 @click="print" >
                     <v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px">
                         <v-icon class="white--text mr-2 caption">fas fa-print</v-icon>
diff --git a/resources/js/vue/views/Label/List.vue b/resources/js/vue/views/Label/List.vue
index ea245940..e55b55bc 100644
--- a/resources/js/vue/views/Label/List.vue
+++ b/resources/js/vue/views/Label/List.vue
@@ -202,7 +202,7 @@ export default {
 			if (result && result.status == 200) {
 				this.changeCurrentModal({
 					modal: "modal-label-show",
-					properties: { result }
+					properties: { result, width: 40 }
 				});
 			}
 		},
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
index ab891346..13dbcdee 100644
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php
@@ -7,7 +7,7 @@
         <title>CSSD-DOC</title>
 
         <!-- Fonts -->
-        <link href="https://fonts.googleapis.com/css?family=Nunito:200,600" rel="stylesheet">
+        {{-- <link href="https://fonts.googleapis.com/css?family=Nunito:200,600" rel="stylesheet"> --}}
 
         <!-- Styles -->
         <style>