From 904031017039cc70b57f88634c3ce42f160c45cc Mon Sep 17 00:00:00 2001
From: "zeinab.ashrafi" <ashrafisokout@gmail.com>
Date: Tue, 13 May 2025 11:16:04 +0330
Subject: [PATCH] fix : responsive

---
 resources/js/show/views/Cycle/ShowCycle.vue   | 305 +++++++++++-------
 resources/js/show/views/Item/ShowItem.vue     |   2 +-
 resources/js/show/views/Label/ShowLabel.vue   | 168 ++++++----
 .../js/show/views/Package/ShowPackage.vue     |  29 +-
 .../show/views/TestResult/ShowTestResult.vue  |   6 +-
 5 files changed, 308 insertions(+), 202 deletions(-)

diff --git a/resources/js/show/views/Cycle/ShowCycle.vue b/resources/js/show/views/Cycle/ShowCycle.vue
index 0c329b57..85c398c2 100644
--- a/resources/js/show/views/Cycle/ShowCycle.vue
+++ b/resources/js/show/views/Cycle/ShowCycle.vue
@@ -1,123 +1,184 @@
 <template>
     <v-container grid-list-xs>
-        <material-card  color="black" title="Show Cycle">
-            <v-layout id="printMe" align-left justify-left wrap class="px-5 my-3">
-                <h3 class="ml-3">Cycle - {{ MedicalCenter }}</h3>
+        <material-card color="black" title="Show Cycle">
+            <v-layout align-left justify-left wrap id="printMe" class="px-3 my-3">
+                <h3 class="mt-0">
+                    Cycle - {{ (data.user && data.user.medical_center) ? data.user.medical_center.name : "" }}
+                </h3>
                 <v-flex xs12>
                     <hr class="v-divider theme--light">
                 </v-flex>
-                <v-layout row wrap class="ml-4">
-                    <v-flex xs12 md6 sm6>
-                        <div class="WM-d-flex">
-                            <span class="title">Cycle ID :</span>
-                            <span class="headline ml-1" style="letter-spacing:0 !important">{{ data.id }}</span>
-                        </div>
-                    </v-flex>
-                    <v-flex xs12 md6 sm6>
-                        <div>
-                            <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>
-                        <div class="WM-d-flex">
-                            <v-icon class="WMi-user"></v-icon>
-                            <span class="headline ml-2" style="letter-spacing:0 !important">{{ data.user ? data.user.name : '' }}</span>
-                        </div>
-                    </v-flex>
-
-                    <v-flex xs12 md6 sm6>
-                        <div class="WM-d-flex">
-                            <span class="title">Cycle Number :</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="WM-d-flex">
-                            <v-icon class="WMi-Industry"></v-icon>
-                            <span class="headline ml-2" style="letter-spacing:0 !important">{{ data.date }}</span>
-                        </div>
-                    </v-flex>
-                    <v-flex xs12 md6 sm6>
-                        <div class="WM-d-flex">
-                            <v-icon class="WMi-pencil"></v-icon>
-                            <span class="headline ml-1" style="letter-spacing:0 !important">{{ data.note }}</span>
-                        </div>
-                    </v-flex>
-                </v-layout>
-                <v-layout align-left justify-left wrap class="px-5 my-3">
-                    <h3 class="ml-3">Barcode And QRCode Image</h3>
-                    <v-flex xs12>
-                        <hr class="v-divider theme--light">
-                    </v-flex>
-                    <v-layout row wrap class="ml-4 align-center mt-2">
-                        <v-flex xs12 md6 sm6 v-if="barcodeimg">
-                            <img :src="barcodeimg" class="barcode-container"><br/>
-                            <span class="CSSD-font">Cycle ID : {{ data.id }}</span>
+                <v-flex xs12>
+                    <v-layout row wrap class="">
+                        <v-flex xs12 sm6 md4>
+                            <div>
+                                <span class="title">Cycle ID :</span>
+                                <span class="headline ml-1" style="letter-spacing:0 !important">{{ data.id }}</span>
+                            </div>
                         </v-flex>
-                        <v-flex xs12 md6 sm6 v-if="QRCodeimg" class="WM-Align-C">
-                            <img :src="QRCodeimg" class="WM-Width-150">
+                        <v-flex xs12 sm6 md4>
+                            <div>
+                                <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 sm6 md4>
+                            <div class="WM-d-flex">
+                                <v-icon class="WMi-user"/>
+                                <span class="headline ml-2"
+                                      style="letter-spacing:0 !important">{{ data.user ? data.user.name : '' }}</span>
+                            </div>
+                        </v-flex>
+                        <v-flex xs12 sm6 md4>
+                            <div>
+                                <span class="title">Cycle Number :</span>
+                                <span class="headline ml-2"
+                                      style="letter-spacing:0 !important">{{ data.cycle_number }}</span>
+                            </div>
+                        </v-flex>
+                        <v-flex xs12 sm6 md4>
+                            <div class="WM-d-flex">
+                                <v-icon class="WMi-Industry"/>
+                                <span class="headline ml-2" style="letter-spacing:0 !important">{{ data.date }}</span>
+                            </div>
+                        </v-flex>
+                        <v-flex xs12 sm6 md4>
+                            <div class="WM-d-flex">
+                                <v-icon class="WMi-pencil"/>
+                                <span class="headline ml-1" style="letter-spacing:0 !important">{{ data.note }}</span>
+                            </div>
                         </v-flex>
                     </v-layout>
-                </v-layout>
-
-            </v-layout>
-            <v-layout align-left justify-left wrap class="px-5 my-3">
-                <h3 class="ml-3">Labels</h3>
-                <v-flex xs12>
-                    <hr class="v-divider theme--light">
                 </v-flex>
-            </v-layout>
-            <v-layout row wrap style="margin-left: 20px !important;">
+                <v-flex xs12>
+                    <v-layout row wrap class="my-3">
+                        <h3 class="mt-0">Barcode And QRCode Image</h3>
+                        <v-flex xs12>
+                            <hr class="v-divider theme--light">
+                        </v-flex>
+                        <v-layout row wrap class="align-center mt-3">
+                            <v-flex xs12 md6 sm6 v-if="barcodeimg">
+                                <img :src="barcodeimg" class="barcode-container"><br/>
+                                <span>Cycle ID : {{ data.id }}</span>
+                            </v-flex>
 
-                <template>
-                    <v-expansion-panel class="WM-Panel" v-for="(label, key) in data.labels" :key="key">
-                        <v-expansion-panel-content>
-                            <template v-slot:header>
-                                <div>{{ label.id }} ({{ label.pivot.count }})</div>
-                            </template>
-                            <v-card>
-                                <v-card-text> Package :
-                                    <v-expansion-panel class="WM-Panel">
-                                        <v-expansion-panel-content>
-                                            <template v-slot:header>
-                                                <div>{{ label.package.name }} </div>
-                                            </template>
-                                            <v-card>
-                                                <v-card-text>note : {{ label.package.note }}</v-card-text>
-                                                <v-card-text>
-                                                    Items :
-                                                    <v-expansion-panel class="WM-Panel" v-for="item in label.package.items" :key="item.key">
+                            <v-flex xs12 md6 sm6 v-if="QRCodeimg" class="WM-Align-R">
+                                <a :href="'https://www.cssd-doc.com/Show/Cycle/'+data.id+''" target="_blank">
+                                    <img :src="QRCodeimg" class="WM-Width-150">
+                                </a>
+                            </v-flex>
+                        </v-layout>
+                    </v-layout>
+                </v-flex>
+                <v-flex xs12 v-if="data.labels && data.labels.length">
+                    <v-layout row wrap class="my-3">
+                        <h3 class="mt-0">Labels</h3>
+                        <v-flex xs12>
+                            <hr class="v-divider theme--light">
+                        </v-flex>
+                        <v-layout row wrap>
+                            <template>
+                                <v-expansion-panel class="WM-Panel" v-for="(label, key) in data.labels" :key="key">
+                                    <v-expansion-panel-content>
+                                        <template v-slot:header>
+                                            <v-layout row wrap class="CSSD-font">
+                                                <span class="item-counter">{{ key + 1 }}</span>
+
+                                                <v-layout row wrap class="pl-2">
+                                                    <v-flex xs12 sm6 md6>
+                                                        <span class="sub-text">Label ID:</span>
+                                                        {{label.id}}
+                                                    </v-flex>
+                                                    <v-flex xs12 sm6 md6>
+                                                        <span class="sub-text">Label Pivot counter:</span>
+                                                        {{ label.pivot.count }}
+                                                    </v-flex>
+                                                </v-layout>
+                                            </v-layout>
+                                        </template>
+                                        <v-card>
+                                            <v-card-text class="pa-0 pl-sm-3" v-if="label.package">
+                                                Package :
+                                                <template>
+                                                    <v-expansion-panel class="WM-Panel">
                                                         <v-expansion-panel-content>
                                                             <template v-slot:header>
-                                                                <div>{{ item.name }} ({{ item.pivot.count }})</div>
+                                                                <v-layout row wrap class="CSSD-font">
+                                                                    <span class="item-counter">{{ key + 1 }}</span>
+
+                                                                    <v-layout row wrap class="pl-2">
+                                                                        <v-flex xs12 sm6 md6>
+                                                                            <span class="sub-text">Package ID:</span>
+                                                                            {{label.package.id}}
+                                                                        </v-flex>
+                                                                        <v-flex xs12 sm6 md6>
+                                                                            <span class="sub-text">Package Name:</span>
+                                                                            {{ label.package.name }}
+                                                                        </v-flex>
+                                                                    </v-layout>
+                                                                </v-layout>
                                                             </template>
                                                             <v-card>
-                                                                <v-card-text>note : {{ item.note }}</v-card-text>
+                                                                <v-card-text class="pa-0 pl-sm-3">
+                                                                    note : {{label.package.note }}
+                                                                </v-card-text>
+                                                                <v-card-text class="pa-0 pl-sm-3"
+                                                                             v-if="label.package && label.package.items && label.package.items.length">
+                                                                    Items :
+                                                                    <v-expansion-panel class="WM-Panel"
+                                                                                       v-for="(item, key) in label.package.items"
+                                                                                       :key="key">
+                                                                        <v-expansion-panel-content>
+                                                                            <template v-slot:header>
+                                                                                <v-layout row wrap class="CSSD-font">
+                                                                                    <span class="item-counter">{{ key + 1 }}</span>
+
+                                                                                    <v-layout row wrap class="pl-2">
+                                                                                        <v-flex xs12 sm4 md4>
+                                                                                            <span class="sub-text">Item ID:</span>
+                                                                                            {{ item.id }}
+                                                                                        </v-flex>
+                                                                                        <v-flex xs12 sm4 md4>
+                                                                                            <span class="sub-text">Item Name:</span>
+                                                                                            {{ item.name }}
+                                                                                        </v-flex>
+                                                                                        <v-flex xs12 sm4 md4 class="WM-Align-R">
+                                                                                            <span v-if="item.pivot">
+                                                                                                ({{ item.pivot.count }})
+                                                                                            </span>
+                                                                                        </v-flex>
+                                                                                    </v-layout>
+                                                                                </v-layout>
+                                                                            </template>
+                                                                            <v-card>
+                                                                                <v-card-text>note : {{ item.note }}
+                                                                                </v-card-text>
+                                                                            </v-card>
+                                                                        </v-expansion-panel-content>
+                                                                    </v-expansion-panel>
+                                                                </v-card-text>
                                                             </v-card>
                                                         </v-expansion-panel-content>
                                                     </v-expansion-panel>
-
-                                                </v-card-text>
-                                            </v-card>
-                                        </v-expansion-panel-content>
-                                    </v-expansion-panel>
-                                </v-card-text>
-                            </v-card>
-                        </v-expansion-panel-content>
-                    </v-expansion-panel>
-                </template>
-
+                                                </template>
+                                            </v-card-text>
+                                        </v-card>
+                                    </v-expansion-panel-content>
+                                </v-expansion-panel>
+                            </template>
+                        </v-layout>
+                    </v-layout>
+                </v-flex>
             </v-layout>
 
-
             <v-layout row wrap align-center justify-center style="text-align:center">
-                <v-flex class xs12 md12 sm12 >
+                <v-flex class xs12 md12 sm12>
                     <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black" @click="addCycle()">
                         <v-icon class="black--text">keyboard_arrow_left</v-icon>
                         <span class="black--text">Back</span>
                     </v-btn>
-                    <v-btn class="WM-CyanBlueGradient-BG" @click="print"  style="padding:10px 60px">
+                    <v-btn class="WM-CyanBlueGradient-BG" @click="print" style="padding:10px 60px">
                         <v-icon class="white--text mr-2 caption">fas fa-print</v-icon>
                         <span class="white--text">Print</span>
                     </v-btn>
@@ -134,35 +195,36 @@
 
 <script>
 import axios from "axios";
-import { urls } from "@show/config/urls";
+import {urls} from "@show/config/urls";
+
 export default {
     data: () => ({
-        data : {},
-        barcodeimg : '',
-        QRCodeimg : '',
-        MedicalCenter : ''
+        data: {},
+        barcodeimg: '',
+        QRCodeimg: '',
+        MedicalCenter: ''
     }),
     methods: {
         async load(id) {
-			const result = await axios.get(urls.showCycle(id));
-			if (result.status == 200) {
-				this.data = result.data.data;
+            const result = await axios.get(urls.showCycle(id));
+            if (result.status == 200) {
+                this.data = result.data.data;
                 this.generateBarcode(this.data.id);
                 this.MedicalCenter = this.data.user.medical_center.name;
-			}
-		},
+            }
+        },
 
         async generateBarcode(cycleId) {
             const result = await axios.post(urls.Barcode(cycleId, 'Cycle'));
             if (result && result.status == 200) {
-                this.QRCodeimg  = result.data.data.QRCode ? result.data.data.QRCode : null;
-                this.barcodeimg  = result.data.data.Barcode ? result.data.data.Barcode : null;
+                this.QRCodeimg = result.data.data.QRCode ? result.data.data.QRCode : null;
+                this.barcodeimg = result.data.data.Barcode ? result.data.data.Barcode : null;
             }
         },
-        editCycle(cycleId){
-            window.location.href = '/cycle/'+cycleId+'/edit';
+        editCycle(cycleId) {
+            window.location.href = '/cycle/' + cycleId + '/edit';
         },
-        addCycle(cycleId){
+        addCycle(cycleId) {
             window.location.href = '/add-cycle';
         },
         print() {
@@ -201,8 +263,8 @@ export default {
     },
     created() {
         if (this.$route.params.cycle) {
-			this.load(this.$route.params.cycle);
-		}
+            this.load(this.$route.params.cycle);
+        }
 
     },
 };
@@ -210,6 +272,21 @@ export default {
 <style scoped lang="scss">
 .barcode-container {
     width: 100%;
-    max-width: 350px;
+    max-width: 290px;
+}
+
+.item-counter {
+    font-size: 44px;
+    opacity: .3;
+    font-family: 'Montserrat-Bold';
+    line-height: 44px;
+    position: absolute;
+    left: 0;
+    top: 0;
+    color: #b7b7b7;
+}
+
+.sub-text {
+    font-size: 12px;
 }
 </style>
diff --git a/resources/js/show/views/Item/ShowItem.vue b/resources/js/show/views/Item/ShowItem.vue
index b131b3f3..ee3003fa 100644
--- a/resources/js/show/views/Item/ShowItem.vue
+++ b/resources/js/show/views/Item/ShowItem.vue
@@ -240,6 +240,6 @@ export default {
 <style scoped lang="scss">
 .barcode-container {
     width: 100%;
-    max-width: 350px;
+    max-width: 290px;
 }
 </style>
diff --git a/resources/js/show/views/Label/ShowLabel.vue b/resources/js/show/views/Label/ShowLabel.vue
index cd978049..0dbfaa47 100644
--- a/resources/js/show/views/Label/ShowLabel.vue
+++ b/resources/js/show/views/Label/ShowLabel.vue
@@ -11,68 +11,70 @@
                         <!-- ________ row1::Begin ________ -->
                         <v-layout row wrap>
                             <!-- ________ Column1::Begin ________ -->
-                            <v-flex xs6 md6 sm6>
-                                <v-layout row wrap class="ml-4">
+                            <v-flex xs12 md6 sm6>
+                                <v-layout row wrap class="">
                                     <v-flex xs12 md12 sm12>
                                         <div class="WM-d-flex">
-                                            <span class="headline ml-1 mb-1"
-                                                  style="letter-spacing:0 !important">{{ MedicalCenter }}</span>
+                                            <span class="headline ml-1 mb-1" style="letter-spacing:0 !important">
+                                                {{ MedicalCenter }}
+                                            </span>
                                         </div>
                                     </v-flex>
                                     <v-flex xs12 md12 sm12 class="">
                                         <div class="WM-d-flex">
-                                            <v-icon class="WMi-location"></v-icon>
+                                            <v-icon class="WMi-location"/>
                                             <span class="headline ml-1 mb-1" style="letter-spacing:0 !important"
                                                   v-if="dataLoaded">{{ data.package.name }}</span>
                                         </div>
                                     </v-flex>
                                     <v-flex xs12 md12 sm12>
                                         <div class="WM-d-flex">
-                                            <v-icon class="WMi-Industry"></v-icon>
+                                            <v-icon class="WMi-Industry"/>
                                             <span class="headline ml-2 mb-1"
                                                   style="letter-spacing:0 !important">{{ data.sterile_date }}</span>
                                         </div>
                                     </v-flex>
                                     <v-flex xs12 md12 sm12>
                                         <div class="WM-d-flex">
-                                            <v-icon class="WMi-hourglass"></v-icon>
+                                            <v-icon class="WMi-hourglass"/>
                                             <span class="headline ml-2 mb-1"
                                                   style="letter-spacing:0 !important">{{ data.expire_date }}</span>
                                         </div>
                                     </v-flex>
                                     <v-flex xs12 md12 sm12>
                                         <div class="WM-d-flex">
-                                            <v-icon class="WMi-user"></v-icon>
-                                            <span class="headline ml-2 mb-1" style="letter-spacing:0 !important">{{
-                                                    data.user ? data.user.name : ''
-                                                }}</span>
+                                            <v-icon class="WMi-user"/>
+                                            <span class="headline ml-2 mb-1" style="letter-spacing:0 !important">
+                                                {{ data.user ? data.user.name : '' }}
+                                            </span>
                                         </div>
                                     </v-flex>
                                 </v-layout>
                             </v-flex>
                             <!-- ________ Column1::End ________ -->
                             <!-- ________ Column2::Begin ________ -->
-                            <v-flex xs6 md6 sm6>
-                                <v-layout row wrap class="">
+                            <v-flex xs12 md6 sm6>
+                                <v-layout row wrap class="mt-4">
                                     <v-flex xs12 md12 sm12>
                                         <div>
                                             <v-flex xs6 md6 sm6 v-if="QRCodeimg">
-                                                <a :href="'/Show/Package/'+data.package.id+''" target="_blank"><img
-                                                    :src="QRCodeimg" class="WM-Width-120"></a>
+                                                <a :href="'/Show/Package/'+data.package.id+''" target="_blank">
+                                                    <img :src="QRCodeimg" class="WM-Width-120">
+                                                </a>
                                             </v-flex>
                                         </div>
                                     </v-flex>
                                     <v-flex xs12 md12 sm12>
                                         <div class>
-                                            <span class="title">Sterilizer ID :</span>
-                                            <span class="headline ml-1 mb-1"
+                                            <span class="headline">Sterilizer ID :</span>
+                                            <span class="title ml-1 mb-1"
                                                   style="letter-spacing:0 !important">{{ data.sterilizer_id }}</span>
                                         </div>
                                     </v-flex>
                                     <v-flex xs12 md12 sm12>
                                         <div class>
-                                            <span class="title">Cycle No :</span>
-                                            <span class="headline ml-2 mb-1"
+                                            <span class="headline">Cycle No :</span>
+                                            <span class="title ml-2 mb-1"
                                                   style="letter-spacing:0 !important">{{ data.cycle_number }}</span>
                                         </div>
                                     </v-flex>
@@ -81,15 +83,14 @@
                             <!-- ________ Column2::End ________ -->
                         </v-layout>
                         <!-- ________ row1::Begin ________ -->
-
-
                         <!-- ________ row2::Begin ________ -->
                         <v-layout row wrap>
                             <v-flex xs12 md12 sm12>
                                 <div class="mt-4" style="text-align:center">
                                     <v-layout row wrap>
-                                        <v-flex xs6 md12 sm12 v-if="barcodeimg">
+                                        <v-flex xs12 md12 sm12 v-if="barcodeimg">
                                             <img :src="barcodeimg" class="barcode-container"><br/>
+                                            <span class="WM-Font-14">Lebel ID :</span>
                                             <span>{{ data.id }}</span>
                                         </v-flex>
                                     </v-layout>
@@ -97,47 +98,77 @@
                             </v-flex>
                         </v-layout>
                         <!-- ________ row2::End ________ -->
+                        <v-layout wrap row v-if="dataLoaded">
+                            <h3 class="ml-3">Package</h3>
+                            <v-flex xs12>
+                                <hr class="v-divider theme--light">
+                            </v-flex>
+                            <v-layout row wrap class="mx-sm-3">
+                                <template>
+                                    <v-expansion-panel class="WM-Panel">
+                                        <v-expansion-panel-content>
+                                            <template v-slot:header>
+                                                <v-layout row wrap class="CSSD-font">
+                                                    <span class="item-counter">{{ key + 1 }}</span>
+
+                                                    <v-layout row wrap class="pl-2">
+                                                        <v-flex xs12 sm6 md6>
+                                                            <span class="sub-text">Package ID:</span>
+                                                            {{data.package.id}}
+                                                        </v-flex>
+                                                        <v-flex xs12 sm6 md6>
+                                                            <span class="sub-text">Package Name:</span>
+                                                            {{ data.package.name }}
+                                                        </v-flex>
+                                                    </v-layout>
+                                                </v-layout>
+                                            </template>
+                                            <v-card>
+                                                <v-card-text>note : {{ data.package.note }}</v-card-text>
+                                                <v-card-text class="pa-0 pl-sm-3"
+                                                             v-if="data.package && data.package.items && data.package.items.length">
+                                                    Items :
+                                                    <v-expansion-panel class="WM-Panel"
+                                                                       v-for="(item, key) in data.package.items"
+                                                                       :key="key">
+                                                        <v-expansion-panel-content>
+                                                            <template v-slot:header>
+                                                                <v-layout row wrap class="CSSD-font">
+                                                                    <span class="item-counter">{{ key + 1 }}</span>
+
+                                                                    <v-layout row wrap class="pl-2">
+                                                                        <v-flex xs12 sm4 md4>
+                                                                            <span class="sub-text">Item ID:</span>
+                                                                            {{ item.id }}
+                                                                        </v-flex>
+                                                                        <v-flex xs12 sm4 md4>
+                                                                            <span class="sub-text">Item Name:</span>
+                                                                            {{ item.name }}
+                                                                        </v-flex>
+                                                                        <v-flex xs12 sm4 md4 class="WM-Align-R">
+                                                                            <span v-if="item.pivot">
+                                                                                ({{ item.pivot.count }})
+                                                                            </span>
+                                                                        </v-flex>
+                                                                    </v-layout>
+                                                                </v-layout>
+                                                            </template>
+                                                            <v-card>
+                                                                <v-card-text>note : {{ item.note }}</v-card-text>
+                                                            </v-card>
+                                                        </v-expansion-panel-content>
+                                                    </v-expansion-panel>
+                                                </v-card-text>
+                                            </v-card>
+                                        </v-expansion-panel-content>
+                                    </v-expansion-panel>
+                                </template>
+                            </v-layout>
+                        </v-layout>
                     </v-flex>
                 </v-layout>
             </v-layout>
-            <v-layout align-left justify-left wrap class="px-2 my-3" v-if="dataLoaded">
-                <h3 class="ml-3">Package</h3>
-                <v-flex xs12>
-                    <hr class="v-divider theme--light">
-                </v-flex>
-                <v-layout row wrap class="mx-3">
-                    <template>
-                        <v-expansion-panel class="WM-Panel">
-                            <v-expansion-panel-content>
-                                <template v-slot:header>
-                                    <div>{{ data.package.name }}</div>
-                                </template>
-                                <v-card>
-                                    <v-card-text>note : {{ data.package.note }}</v-card-text>
-                                    <v-card-text> Items :
-                                        <v-expansion-panel class="WM-Panel" v-for="item in data.package.items"
-                                                           :key="item.key">
-                                            <v-expansion-panel-content>
-                                                <template v-slot:header>
-                                                    <div>
-                                                        {{ item.name }}
-                                                        <span v-if="item.pivot">
-                                                            ({{item.pivot.count}})
-                                                        </span>
-                                                    </div>
-                                                </template>
-                                                <v-card>
-                                                    <v-card-text>note : {{ item.note }}</v-card-text>
-                                                </v-card>
-                                            </v-expansion-panel-content>
-                                        </v-expansion-panel>
-                                    </v-card-text>
-                                </v-card>
-                            </v-expansion-panel-content>
-                        </v-expansion-panel>
-                    </template>
-                </v-layout>
-            </v-layout>
+
             <v-layout row wrap align-center justify-center style="text-align:center">
                 <v-flex class xs12 md12 sm12>
                     <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black" @click="goToAddLabel()">
@@ -252,6 +283,21 @@ export default {
 <style scoped lang="scss">
 .barcode-container {
     width: 100%;
-    max-width: 350px;
+    max-width: 290px;
+}
+
+.item-counter {
+    font-size: 44px;
+    opacity: .3;
+    font-family: 'Montserrat-Bold';
+    line-height: 44px;
+    position: absolute;
+    left: 0;
+    top: 0;
+    color: #b7b7b7;
+}
+
+.sub-text {
+    font-size: 12px;
 }
 </style>
diff --git a/resources/js/show/views/Package/ShowPackage.vue b/resources/js/show/views/Package/ShowPackage.vue
index 35add013..27b4f79d 100644
--- a/resources/js/show/views/Package/ShowPackage.vue
+++ b/resources/js/show/views/Package/ShowPackage.vue
@@ -53,7 +53,7 @@
                         </v-flex>
                         <v-layout row wrap class="align-center mt-2">
                             <v-flex xs12 md6 sm6 v-if="barcodeimg">
-                                <img :src="barcodeimg" class="WM-Width-350"><br/>
+                                <img :src="barcodeimg" class="barcode-container"><br/>
                                 <span class="CSSD-font">Package ID : {{ data.id }}</span>
                             </v-flex>
                             <v-flex xs12 md6 sm6 v-if="QRCodeimg" class="WM-Align-R">
@@ -77,7 +77,6 @@
                                         <template v-slot:header>
                                             <v-layout row wrap class="CSSD-font">
                                                 <span class="item-counter">{{ key + 1 }}</span>
-
                                                 <v-layout row wrap class="pl-2">
                                                     <v-flex xs12 sm4 md4>
                                                         <span class="sub-text">Item ID:</span> {{ item.id }}
@@ -87,14 +86,6 @@
                                                     </v-flex>
                                                     <v-flex xs12 sm4 md4 class="WM-Align-R">
                                                         <span v-if="item.pivot">({{ item.pivot.count }})</span>
-                                                        <v-spacer/>
-                                                        <a :href="'https://www.cssd-doc.com/Show/Item/' + item.id + ''" target="_blank">
-                                                            <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border mr-2 WM-Margin-BT-0 WM-Border-Black" @click.stop.native=""
-                                                                   style="padding: 10px 30px;">
-                                                                <v-icon class="black--text mr-2 caption">fas fa-search</v-icon>
-                                                                <span class="black--text">DETAILS</span>
-                                                            </v-btn>
-                                                        </a>
                                                     </v-flex>
                                                 </v-layout>
                                             </v-layout>
@@ -111,7 +102,6 @@
                         </v-layout>
                     </v-layout>
                 </v-flex>
-
             </v-layout>
 
             <v-layout row wrap align-center justify-center style="text-align:center">
@@ -189,15 +179,7 @@ export default {
                 "left=0,top=0,width=800,height=900,toolbar=0,scrollbars=0,status=0"
             );
 
-            WinPrint.document.write(`<!DOCTYPE html>
-            <html>
-            <head>
-                ${stylesHtml}
-            </head>
-            <body>
-                ${prtHtml}
-            </body>
-            </html>`);
+            WinPrint.document.write(`<!DOCTYPE html><html><head>${stylesHtml} </head> <body>${prtHtml}</body></html>`);
 
             WinPrint.document.close();
             WinPrint.focus();
@@ -216,12 +198,9 @@ export default {
 <style scoped lang="scss">
 .barcode-container {
     width: 100%;
-    max-width: 350px;
-}
-.WM-Width-350{
-    width: 100%;
-    max-width: 350px;
+    max-width: 290px;
 }
+
 .item-counter {
     font-size: 44px;
     opacity: .3;
diff --git a/resources/js/show/views/TestResult/ShowTestResult.vue b/resources/js/show/views/TestResult/ShowTestResult.vue
index 0e02b3a6..54caf768 100644
--- a/resources/js/show/views/TestResult/ShowTestResult.vue
+++ b/resources/js/show/views/TestResult/ShowTestResult.vue
@@ -2,7 +2,11 @@
     <v-container grid-list-xs>
         <material-card color="black" title="Show Test Result" id="printMe">
             <v-layout align-left justify-left wrap class="my-3">
-                <h3 class="ml-3 CSSD-font">Test Type : {{ TestType }}</h3>
+
+                 <h3 class="ml-4 CSSD-font" style="font-size: 18px!important;">
+                    <span class="WM-Font-16">Test Type  :</span>
+                     <span class="font-weight-bold">{{ TestType }}</span>
+                 </h3>
                 <v-flex xs12>
                     <hr class="v-divider theme--light"/>
                 </v-flex>