From 8cfb213b8157bae5988567169296f109f157fa85 Mon Sep 17 00:00:00 2001
From: Fayyazi <fatemefyz20@gmail.com>
Date: Tue, 17 Dec 2019 11:42:56 +0330
Subject: [PATCH] new update

---
 app/Http/Controllers/BarCodeController.php    |  11 +-
 app/Http/Controllers/LabelController.php      |   4 +-
 app/Http/Controllers/PackageController.php    |   2 +-
 app/Http/Requests/StorePackageRequest.php     |   7 +-
 resources/js/show/config/urls.js              |   5 +-
 resources/js/show/views/Cycle/ShowCycle.vue   | 114 ++++++++++--------
 resources/js/show/views/Item/ShowItem.vue     |  74 ++++++++++--
 resources/js/show/views/Label/ShowLabel.vue   |  85 ++++++++-----
 .../js/show/views/Package/ShowPackage.vue     |  62 +++++-----
 resources/js/vue/components/core/Modal.vue    |   2 +-
 .../vue/components/modal/barcode/Barcode.vue  |  13 +-
 .../js/vue/components/modal/cycle/Show.vue    |  10 +-
 .../js/vue/components/modal/item/show.vue     |  60 +++++++--
 .../js/vue/components/modal/label/Show.vue    |  53 ++++----
 .../js/vue/components/modal/package/Show.vue  |   6 +-
 .../vue/components/modal/testresult/Show.vue  |   4 +-
 resources/js/vue/config/urls.js               |   1 +
 resources/js/vue/views/Cycle/AddEdit.vue      |  12 +-
 resources/js/vue/views/Cycle/List.vue         |   2 +-
 resources/js/vue/views/Item/AddEdit.vue       |   2 +-
 resources/js/vue/views/Item/List.vue          |   7 +-
 resources/js/vue/views/Label/AddEdit.vue      |   2 +-
 resources/js/vue/views/Label/List.vue         |   2 +-
 .../js/vue/views/MedicalCenter/AddEdit.vue    |   4 +-
 resources/js/vue/views/Package/AddEdit.vue    |  11 ++
 resources/js/vue/views/Package/List.vue       |  12 +-
 resources/js/vue/views/TestResult/AddEdit.vue |   7 +-
 resources/js/vue/views/TestType/AddEdit.vue   |   2 +-
 routes/web.php                                |   2 +-
 29 files changed, 373 insertions(+), 205 deletions(-)

diff --git a/app/Http/Controllers/BarCodeController.php b/app/Http/Controllers/BarCodeController.php
index a898bcdc..6f591e81 100644
--- a/app/Http/Controllers/BarCodeController.php
+++ b/app/Http/Controllers/BarCodeController.php
@@ -14,12 +14,11 @@ class BarCodeController extends Controller
     {
         if($Number != "undefined")
         {
+            $URL = 'https://www.cssd-doc.com/Show/'.$Type.'/'.$Number;
+
             $Barcode = DNS1D::getBarcodePNG($Number, "C128");
-            $QRCode  = DNS2D::getBarcodePNG($Number, "QRCODE");
-            if ($Type == 'Cycle') {
-                $Cycle = Cycle::where('unique_id', $Number)->first();
-                $Number = $Cycle->id;
-            }
+            $QRCode  = DNS2D::getBarcodePNG($URL, "QRCODE");
+
             return \MessageResponse::data(['Barcode' => 'data:image/png;base64,' .$Barcode, 'QRCode' => 'data:image/png;base64,' .$QRCode, 'ShowLink' => 'Show/'.$Type.'/'.$Number]);
         }
     }
@@ -28,7 +27,7 @@ class BarCodeController extends Controller
         if($TestResult)
         {
             $URL = 'https://www.cssd-doc.com/ShowTestResult/'.$TestResult->id;
-            $QRCode  = DNS2D::getBarcodePNG($URL, "QRCODE");
+            $QRCode = DNS2D::getBarcodePNG($URL, "QRCODE");
             return \MessageResponse::data(['QRCode' => 'data:image/png;base64,' .$QRCode]);
         }
 
diff --git a/app/Http/Controllers/LabelController.php b/app/Http/Controllers/LabelController.php
index d4ab2c8e..5d33e0a0 100644
--- a/app/Http/Controllers/LabelController.php
+++ b/app/Http/Controllers/LabelController.php
@@ -70,7 +70,7 @@ class LabelController extends Controller
           'package_id' => $request->package_id
         ];
         $LabelObj = Label::create($LabelData);
-        return \MessageResponse::success(trans('messages.success'));
+        return \MessageResponse::success(trans('messages.success'), null, $LabelObj);
     }
     public function edit(Label $Label)
     {
@@ -81,7 +81,7 @@ class LabelController extends Controller
     public function update(Request $request, Label $Label)
     {
         $Label->update($request->all());
-        return \MessageResponse::success(trans('messages.success'));
+        return \MessageResponse::success(trans('messages.success'), null, $Label);
     }
     public function destroy(Label $Label)
     {
diff --git a/app/Http/Controllers/PackageController.php b/app/Http/Controllers/PackageController.php
index a4994fd9..f5afd6d9 100644
--- a/app/Http/Controllers/PackageController.php
+++ b/app/Http/Controllers/PackageController.php
@@ -52,7 +52,7 @@ class PackageController extends Controller
         $UniqueID = substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, 10);
         $PackageData = [
           'name' => $request->name,
-          'unique_id' => $UniqueID,
+          'unique_id' => $request->unique_id,
           'note' => $request->note,
           'user_id' => auth('api')->user()->id,
           'verified' => 'NotVerified',
diff --git a/app/Http/Requests/StorePackageRequest.php b/app/Http/Requests/StorePackageRequest.php
index 4c5d2607..02fac0ab 100644
--- a/app/Http/Requests/StorePackageRequest.php
+++ b/app/Http/Requests/StorePackageRequest.php
@@ -25,7 +25,8 @@ class StorePackageRequest extends FormRequest
         switch ($this->method()) {
             case 'POST': {
                 return [
-                    'name' => 'required|max:100|unique:packages',
+                    'name' => 'required|max:250|unique:packages',
+                    'unique_id' => 'required|max:250|unique:packages',
                     'note' => 'nullable',
                     'items' => 'required',
                 ];
@@ -35,8 +36,8 @@ class StorePackageRequest extends FormRequest
             case 'PATCH': {
                 $Package =  $this->route('Package');
                 return [
-                    'name' => 'required|max:100|unique:packages,id,'.$Package->id,
-                    'unique_id' => 'required|max:100|unique:packages,id,'.$Package->id,
+                    'name' => 'required|max:250|unique:packages,id,'.$Package->id,
+                    'unique_id' => 'required|max:250|unique:packages,id,'.$Package->id,
                     'note' => 'nullable',
                     'items' => 'required',
                 ];
diff --git a/resources/js/show/config/urls.js b/resources/js/show/config/urls.js
index 4edda861..05a55d93 100644
--- a/resources/js/show/config/urls.js
+++ b/resources/js/show/config/urls.js
@@ -12,8 +12,9 @@ const urls = {
     showCycle: function(id) {
         return `/ShowCycle/${id}`;
     },
-    Barcode: function(code) {
-        return `/BarCode/${code}`;
+    Barcode: function(code, type) {
+        console.log(code, type,'aaa');
+        return `/BarCode/${code}/${type}`;
     },
     packageBarcode: function(code) {
         return `/Package/Barcode/${code}`;
diff --git a/resources/js/show/views/Cycle/ShowCycle.vue b/resources/js/show/views/Cycle/ShowCycle.vue
index f34e0e3f..1e970a4f 100644
--- a/resources/js/show/views/Cycle/ShowCycle.vue
+++ b/resources/js/show/views/Cycle/ShowCycle.vue
@@ -1,15 +1,15 @@
 <template>
     <v-container grid-list-xs>
-        <material-card id="printMe" color="black" title="Show Cycle">
-            <v-layout  align-left justify-left wrap class="px-5 my-3">
-                <h3 class="ml-3">Cycle - {{ data.user.medical_center.name }}</h3>
+        <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>
                 <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">
-                            <v-icon class="WMi-sort-numeric-up"></v-icon>
+                            <span class="title">Cycle ID :</span>
                             <span class="headline ml-1" style="letter-spacing:0 !important">{{ data.id }}</span>
                         </div>
                     </v-flex>
@@ -53,7 +53,7 @@
                     <v-layout row wrap class="ml-4">
                         <v-flex xs12 md6 sm6 v-if="barcodeimg">
                             <img :src="barcodeimg"><br />
-                            <span>{{data.unique_id}}</span>
+                            <span>Cycle ID : {{data.id}}</span>
                         </v-flex>
                     </v-layout>
                     <v-layout row wrap class="ml-4">
@@ -69,56 +69,64 @@
                 <v-flex xs12>
                     <hr class="v-divider theme--light">
                 </v-flex>
-                <v-layout row wrap style="margin-left: 20px !important;">
+            </v-layout>
+            <v-layout row wrap style="margin-left: 20px !important;">
 
-                    <template>
-                      <v-expansion-panel class="WM-Panel" v-for="(label, key) in data.labels" :key="key">
+                <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-expansion-panel-content>
-                                              <template v-slot:header>
-                                                <div>{{ item.name }} ({{ item.pivot.count }})</div>
-                                              </template>
-                                              <v-card>
-                                                <v-card-text>note : {{ item.note }}</v-card-text>
-                                              </v-card>
-                                            </v-expansion-panel-content>
-                                          </v-expansion-panel>
+                            <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-expansion-panel-content>
+                                                            <template v-slot:header>
+                                                                <div>{{ item.name }} ({{ item.pivot.count }})</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>
-                            </v-card-text>
-                          </v-card>
-                      </v-expansion-panel-content>
-                      </v-expansion-panel>
-                    </template>
+                                                </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>
-                <v-flex class xs12 md2 sm2 @click="print" >
-                    <v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px">
+            <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="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-icon class="white--text mr-2 caption">fas fa-print</v-icon>
                         <span class="white--text">Print</span>
                     </v-btn>
+                    <v-btn color="orange" class="mr-2" style="padding:10px 60px" @click="editCycle(data.id)">
+                        <v-icon class="white--text mr-1 caption">fas fa-pen</v-icon>
+                        <span>Edit</span>
+                    </v-btn>
                 </v-flex>
             </v-layout>
 
@@ -133,24 +141,32 @@ export default {
     data: () => ({
         data : {},
         barcodeimg : '',
-        QRCodeimg : ''
+        QRCodeimg : '',
+        MedicalCenter : ''
     }),
     methods: {
         async load(id) {
 			const result = await axios.get(urls.showCycle(id));
 			if (result.status == 200) {
 				this.data = result.data.data;
-                this.generateBarcode(this.data.unique_id);
+                this.generateBarcode(this.data.id);
+                this.MedicalCenter = this.data.user.medical_center.name;
 			}
 		},
 
-        async generateBarcode(packageId) {
-            const result = await axios.post(urls.Barcode(packageId));
+        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;
             }
         },
+        editCycle(cycleId){
+            window.location.href = '/cycle/'+cycleId+'/edit';
+        },
+        addCycle(cycleId){
+            window.location.href = '/add-cycle';
+        },
         print() {
             const prtHtml = document.getElementById("printMe").innerHTML;
 
diff --git a/resources/js/show/views/Item/ShowItem.vue b/resources/js/show/views/Item/ShowItem.vue
index 1c4a71f4..080adc30 100644
--- a/resources/js/show/views/Item/ShowItem.vue
+++ b/resources/js/show/views/Item/ShowItem.vue
@@ -1,16 +1,15 @@
-
 <template>
     <v-container grid-list-xs>
         <material-card color="black" title="Show Item">
-            <v-layout align-left justify-left wrap class="px-5 my-3">
-                <h3 class="ml-3"> Item - {{ data.user.medical_center.name }}</h3>
+            <v-layout align-left id="printMe" justify-left wrap class="px-5 my-3">
+                <h3 class="ml-3"> Item - {{ MedicalCenter }}</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>
-                            <span class="title">ID :</span>
+                            <span class="title">Item ID :</span>
                             <span class="headline ml-1" style="letter-spacing:0 !important">{{ data.id }}</span>
                         </div>
                     </v-flex>
@@ -54,7 +53,7 @@
                     <v-layout row wrap class="ml-4">
                         <v-flex xs12 md6 sm6 v-if="barcodeimg">
                             <img :src="barcodeimg"><br />
-                            <span>{{data.unique_id}}</span>
+                            <span>Item ID : {{data.id}}</span>
                         </v-flex>
                     </v-layout>
                     <v-layout row wrap class="ml-4">
@@ -63,11 +62,27 @@
                         </v-flex>
                     </v-layout>
                 </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="addItem()">
+                        <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-icon class="white--text mr-2 caption">fas fa-print</v-icon>
+                        <span class="white--text">Print</span>
+                    </v-btn>
+                    <v-btn color="orange" class="mr-2" style="padding:10px 60px" @click="editItem(data.id)">
+                        <v-icon class="white--text mr-1 caption">fas fa-pen</v-icon>
+                        <span>Edit</span>
+                    </v-btn>
+                </v-flex>
             </v-layout>
         </material-card>
     </v-container>
 </template>
+
 <script>
 export default {
     data: () => ({
@@ -83,25 +98,66 @@ export default {
     data: () => ({
         data : {},
         QRCodeimg : '',
-        barcodeimg : ''
+        barcodeimg : '',
+        MedicalCenter : ''
     }),
     methods: {
         async load(id) {
 			const result = await axios.get(urls.showItem(id));
-            console.log(result,'re');
+
 			if (result.status == 200) {
 				this.data = result.data.data;
                 this.generateBarcode(this.data.id);
+                this.MedicalCenter = this.data.user.medical_center.name;
 			}
 		},
 
         async generateBarcode(itemId) {
-            const result = await axios.post(urls.Barcode(itemId));
+            const result = await axios.post(urls.Barcode(itemId, 'Item'));
             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;
             }
         },
+        editItem(itemId){
+            window.location.href = '/item/'+itemId+'/edit';
+        },
+        addItem(){
+            window.location.href = '/add-item';
+        },
+        print() {
+            const prtHtml = document.getElementById("printMe").innerHTML;
+
+            // Get all stylesheets HTML
+            let stylesHtml = "";
+            for (const node of [
+                ...document.querySelectorAll('link[rel="stylesheet"], style')
+            ]) {
+                stylesHtml += node.outerHTML;
+            }
+
+            // Open the print window
+            const WinPrint = window.open(
+                "",
+                "",
+                "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.close();
+            WinPrint.focus();
+            WinPrint.print();
+            WinPrint.close();
+        }
     },
     created() {
         if (this.$route.params.item) {
diff --git a/resources/js/show/views/Label/ShowLabel.vue b/resources/js/show/views/Label/ShowLabel.vue
index 053e15d4..9541ba7b 100644
--- a/resources/js/show/views/Label/ShowLabel.vue
+++ b/resources/js/show/views/Label/ShowLabel.vue
@@ -1,4 +1,3 @@
-
 <template>
     <v-container grid-list-xs>
         <material-card color="black" title="Show Label">
@@ -8,19 +7,24 @@
                     <hr class="v-divider theme--light">
                 </v-flex>
                 <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>
+                            <p class="headline ml-5" style="letter-spacing:0 !important">{{ MedicalCenter }}</p>
                         </div>
                     </v-flex>
-                    <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>
+                    <v-flex xs6 md6 sm6 class="mt-4">
+                        <div class="WM-d-flex">
+                            <v-icon class="WMi-location"></v-icon>
+                            <span class="headline ml-1" style="letter-spacing:0 !important" v-if="dataLoaded">{{data.package.name}}</span>
+                        </div>
+                    </v-flex>
+                    <v-flex xs6 md5 sm5>
+                        <div>
+                            <v-flex xs6 md6 sm6 v-if="QRCodeimg">
+                                <a :href="'/Show/Package/'+data.package.id+''" target="_blank"><img :src="QRCodeimg"></a>
+                            </v-flex>
                         </div>
                     </v-flex>
                     <v-flex xs6 md5 sm5>
@@ -30,10 +34,10 @@
                         </div>
                     </v-flex>
                     <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>
+                        <!-- <div class="WM-d-flex">
+                            <span class="title">Lot No :</span>
+                            <span class="headline ml-2" style="letter-spacing:0 !important">{{ data.lot_number }}</span>
+                        </div> -->
                     </v-flex>
                     <v-flex xs6 md5 sm5>
                         <div class="WM-d-flex">
@@ -48,34 +52,34 @@
                         </div>
                     </v-flex>
                     <v-flex xs6 md5 sm5>
+                        <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 xs6 md7 sm7>
                         <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>
                     <!-- 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 xs9 md9 sm9>
+                        <div class="mt-4" style="text-align:center">
+                            <v-layout row wrap class="" >
                                 <v-flex xs6 md12 sm12 v-if="barcodeimg">
-                                    <img :src="barcodeimg"><br />
+                                    <img :src="barcodeimg" style="width:200px"><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">
-                                <a :href="'/Show/Package/'+data.package.id+''" target="_blank"><img :src="QRCodeimg"></a>
-                            </v-flex>
-                        </div>
-                    </v-flex>
+
                     </v-layout>
                   </v-flex>
                 </v-layout>
             </v-layout>
-            <v-layout align-left justify-left wrap class="px-2 my-3">
+            <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">
@@ -111,12 +115,20 @@
                 </v-layout>
             </v-layout>
 
-            <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-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="addLabel()">
+                        <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-icon class="white--text mr-2 caption">fas fa-print</v-icon>
                         <span class="white--text">Print</span>
                     </v-btn>
+                    <v-btn color="orange" class="mr-2" style="padding:10px 60px" @click="editLabel(data.id)">
+                        <v-icon class="white--text mr-1 caption">fas fa-pen</v-icon>
+                        <span>Edit</span>
+                    </v-btn>
                 </v-flex>
             </v-layout>
 
@@ -135,17 +147,20 @@ export default {
     data: () => ({
         data : {},
         QRCodeimg : '',
-        barcodeimg : ''
-
+        barcodeimg : '',
+        MedicalCenter : '',
+        dataLoaded : false
     }),
     methods: {
         async load(id) {
 			const result = await axios.get(urls.showLabel(id));
-            console.log(result.data);
+
 			if (result.status == 200) {
 				this.data = result.data.data;
                 this.generateBarcode(this.data.id);
-                this.generateQRcodePackage(this.data.package.id)
+                this.generateQRcodePackage(this.data.package.id);
+                this.MedicalCenter = this.data.user.medical_center.name;
+                this.dataLoaded = true;
 			}
 		},
         async generateQRcodePackage(packageId) {
@@ -155,11 +170,17 @@ export default {
             }
         },
         async generateBarcode(labelId) {
-            const result = await axios.post(urls.Barcode(labelId));
+            const result = await axios.post(urls.Barcode(labelId, 'Label'));
             if (result && result.status == 200) {
                 this.barcodeimg  = result.data.data.Barcode ? result.data.data.Barcode : null;
             }
         },
+        editLabel(LabelId){
+            window.location.href = '/label/'+LabelId+'/edit';
+        },
+        addLabel(LabelId){
+            window.location.href = '/add-label';
+        },
         print() {
             const prtHtml = document.getElementById("printMe").innerHTML;
 
diff --git a/resources/js/show/views/Package/ShowPackage.vue b/resources/js/show/views/Package/ShowPackage.vue
index e88a886f..873516ec 100644
--- a/resources/js/show/views/Package/ShowPackage.vue
+++ b/resources/js/show/views/Package/ShowPackage.vue
@@ -1,42 +1,34 @@
-
 <template>
     <v-container grid-list-xs>
         <material-card color="black"  title="Show Package">
             <v-layout id="printMe" align-left justify-left wrap class="px-5 my-3">
-                <h3 class="ml-3">Package - {{ data.user.medical_center.name }}</h3>
+                <h3 class="ml-3">Package - {{ MedicalCenter }}</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>
-                            <v-flex xs12 md6 sm6 v-if="QRCodeimg">
-                                <img :src="QRCodeimg">
-                            </v-flex>
-                        </div>
-                    </v-flex> -->
                     <v-flex xs12 md6 sm6>
-                        <div class>
-                            <span class="title">Name :</span>
+                        <div class="WM-d-flex">
+                            <v-icon class="WMi-info"></v-icon>
                             <span class="headline ml-1" style="letter-spacing:0 !important">{{ data.name }}</span>
                         </div>
                     </v-flex>
                     <v-flex xs12 md6 sm6>
-                        <div class>
-                            <span class="title">Description :</span>
-                            <span class="headline ml-1" style="letter-spacing:0 !important">{{ data.note }}</span>
+                        <div class="WM-d-flex">
+                            <v-icon class="WMi-Industry"></v-icon>
+                            <span class="headline ml-2" style="letter-spacing:0 !important">{{ data.created_at }}</span>
                         </div>
                     </v-flex>
                     <v-flex xs12 md6 sm6>
-                        <div class>
-                            <span class="title">Register User :</span>
+                        <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>
-                        <div class>
-                            <span class="title">Date :</span>
-                            <span class="headline ml-2" style="letter-spacing:0 !important">{{ data.created_at }}</span>
+                        <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>
@@ -48,7 +40,7 @@
                     <v-layout row wrap class="ml-4">
                         <v-flex xs12 md6 sm6 v-if="barcodeimg">
                             <img :src="barcodeimg"><br />
-                            <span>{{data.unique_id}}</span>
+                            <span>Package ID : {{data.id}}</span>
                         </v-flex>
                     </v-layout>
                     <v-layout row wrap class="ml-4">
@@ -83,12 +75,20 @@
                 </v-layout>
             </v-layout>
 
-            <v-layout row wrap align-center justify-center>
-                <v-flex class xs12 md2 sm2 @click="print" >
-                    <v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px">
+            <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="addPackage()">
+                        <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-icon class="white--text mr-2 caption">fas fa-print</v-icon>
                         <span class="white--text">Print</span>
                     </v-btn>
+                    <v-btn color="orange" class="mr-2" style="padding:10px 60px" @click="editPackage(data.id)">
+                        <v-icon class="white--text mr-1 caption">fas fa-pen</v-icon>
+                        <span>Edit</span>
+                    </v-btn>
                 </v-flex>
             </v-layout>
 
@@ -103,25 +103,33 @@ export default {
     data: () => ({
         data : {},
         barcodeimg : '',
-        QRCodeimg : ''
+        QRCodeimg : '',
+        MedicalCenter : ''
     }),
     methods: {
         async load(id) {
 			const result = await axios.get(urls.showPackage(id));
-            console.log(result.data);
+
 			if (result.status == 200) {
 				this.data = result.data.data;
-                this.generateBarcode(this.data.unique_id);
+                this.generateBarcode(this.data.id);
+                this.MedicalCenter = this.data.user.medical_center.name;
 			}
 		},
 
         async generateBarcode(packageId) {
-            const result = await axios.post(urls.Barcode(packageId));
+            const result = await axios.post(urls.Barcode(packageId, 'Package'));
             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;
             }
         },
+        editPackage(packageId){
+            window.location.href = '/packages/'+packageId+'/edit';
+        },
+        addPackage(){
+            window.location.href = '/add-package';
+        },
         print() {
             const prtHtml = document.getElementById("printMe").innerHTML;
 
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/barcode/Barcode.vue b/resources/js/vue/components/modal/barcode/Barcode.vue
index 759ec8ed..9ef340c5 100644
--- a/resources/js/vue/components/modal/barcode/Barcode.vue
+++ b/resources/js/vue/components/modal/barcode/Barcode.vue
@@ -2,13 +2,14 @@
     <v-container grid-list-xs>
         <material-card color="black" title="Barcode Image">
             <v-layout id="printMe" align-left justify-left wrap class="px-5 my-3">
-                <h3 class="ml-3">Barcode And QRCode Image</h3>
+                <!-- <h3 class="ml-3">Barcode And QRCode Image</h3>
                 <v-flex xs12>
                     <hr class="v-divider theme--light">
-                </v-flex>
+                </v-flex> -->
                 <v-layout row wrap class="ml-4">
                     <v-flex xs12 md6 sm6 v-if="barcodeimg">
-                        <img :src="barcodeimg">
+                        <img :src="barcodeimg"><br />
+                        <span>{{ Type+ ' ID :' + ID }}</span>
                     </v-flex>
                 </v-layout>
                 <v-layout row wrap class="ml-4">
@@ -34,12 +35,16 @@ export default {
     data: () => ({
         barcodeimg : null,
         QRCodeimg : null,
-        ShowLink : ''
+        ShowLink : '',
+        Type : '',
+        ID : ''
     }),
     created() {
         this.barcodeimg = this.getModalProperties.result.data.data.Barcode ? this.getModalProperties.result.data.data.Barcode : null;
         this.QRCodeimg  = this.getModalProperties.result.data.data.QRCode ? this.getModalProperties.result.data.data.QRCode : null;
         this.ShowLink = this.getModalProperties.result.data.data.ShowLink ? this.getModalProperties.result.data.data.ShowLink : '#';
+        this.Type = this.ShowLink.split('/')[1];
+        this.ID = this.ShowLink.split('/')[2];
     },
     computed: {
         ...mapGetters("modal", ["getModalProperties", "getModalLink"])
diff --git a/resources/js/vue/components/modal/cycle/Show.vue b/resources/js/vue/components/modal/cycle/Show.vue
index f6c2ab16..e5ec9058 100644
--- a/resources/js/vue/components/modal/cycle/Show.vue
+++ b/resources/js/vue/components/modal/cycle/Show.vue
@@ -10,7 +10,7 @@
                 <v-layout row wrap class="ml-4">
                     <v-flex xs12 md6 sm6>
                         <div class="WM-d-flex">
-                            <v-icon class="WMi-sort-numeric-up"></v-icon>
+                            <span class="title">Cycle ID :</span>
                             <span class="headline ml-1" style="letter-spacing:0 !important">{{ data.id }}</span>
                         </div>
                     </v-flex>
@@ -55,7 +55,7 @@
                     <v-layout row wrap class="ml-4">
                         <v-flex xs12 md6 sm6 v-if="barcodeimg">
                             <img :src="barcodeimg"><br />
-                            <span>{{data.unique_id}}</span>
+                            <span>Cycle ID : {{data.id}}</span>
                         </v-flex>
                     </v-layout>
                     <v-layout row wrap class="ml-4">
@@ -146,8 +146,8 @@ export default {
     }),
     methods: {
         ...mapMutations("modal", ["closeModal", "setResultModal"]),
-        async generateBarcode(packageId) {
-            const result = await ApiService.post(urls.Barcode(packageId));
+        async generateBarcode(cycleId) {
+            const result = await ApiService.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;
@@ -189,7 +189,7 @@ export default {
     },
     created() {
         this.data = this.getModalProperties.result.data.data;
-        this.generateBarcode(this.data.unique_id);
+        this.generateBarcode(this.data.id);
     },
     computed: {
         ...mapGetters("modal", ["getModalProperties"])
diff --git a/resources/js/vue/components/modal/item/show.vue b/resources/js/vue/components/modal/item/show.vue
index c5163dbe..39ec3b5b 100644
--- a/resources/js/vue/components/modal/item/show.vue
+++ b/resources/js/vue/components/modal/item/show.vue
@@ -2,7 +2,7 @@
 <template>
     <v-container grid-list-xs>
         <material-card color="black" title="Show Item">
-            <v-layout align-left justify-left wrap class="px-5 my-3">
+            <v-layout align-left id="printMe" justify-left wrap class="px-5 my-3">
                 <h3 class="ml-3"> Item - {{ data.user.medical_center.name }}</h3>
                 <v-flex xs12>
                     <hr class="v-divider theme--light">
@@ -10,7 +10,7 @@
                 <v-layout row wrap class="ml-4">
                     <v-flex xs12 md6 sm6>
                         <div class>
-                            <span class="title">ID :</span>
+                            <span class="title">Item ID :</span>
                             <span class="headline ml-1" style="letter-spacing:0 !important">{{ data.id }}</span>
                         </div>
                     </v-flex>
@@ -54,7 +54,7 @@
                     <v-layout row wrap class="ml-4">
                         <v-flex xs12 md6 sm6 v-if="barcodeimg">
                             <img :src="barcodeimg"><br />
-                            <span>{{data.unique_id}}</span>
+                            <span>Item ID : {{data.id}}</span>
                         </v-flex>
                     </v-layout>
                     <v-layout row wrap class="ml-4">
@@ -63,18 +63,19 @@
                         </v-flex>
                     </v-layout>
                 </v-layout>
-
+            </v-layout>
+            <v-layout row wrap align-center justify-center>
+                <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>
+                        <span class="white--text">Print</span>
+                    </v-btn>
+                </v-flex>
             </v-layout>
         </material-card>
     </v-container>
 </template>
-<script>
-export default {
-    data: () => ({
-        data: {}
-    })
-};
-</script>
+
 <script>
 import { mapGetters, mapMutations } from "vuex";
 import { ApiService } from "@/services";
@@ -88,12 +89,45 @@ export default {
     methods: {
         ...mapMutations("modal", ["closeModal", "setResultModal"]),
         async generateBarcode(itemId) {
-            const result = await ApiService.post(urls.Barcode(itemId));
+            const result = await ApiService.post(urls.Barcode(itemId, 'Item'));
             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.barcodeimg = result.data.data.Barcode ? result.data.data.Barcode : null;
             }
         },
+        print() {
+            const prtHtml = document.getElementById("printMe").innerHTML;
+
+            // Get all stylesheets HTML
+            let stylesHtml = "";
+            for (const node of [
+                ...document.querySelectorAll('link[rel="stylesheet"], style')
+            ]) {
+                stylesHtml += node.outerHTML;
+            }
+
+            // Open the print window
+            const WinPrint = window.open(
+                "",
+                "",
+                "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.close();
+            WinPrint.focus();
+            WinPrint.print();
+            WinPrint.close();
+        }
     },
     created() {
         this.data = this.getModalProperties.result.data.data;
diff --git a/resources/js/vue/components/modal/label/Show.vue b/resources/js/vue/components/modal/label/Show.vue
index f71617bb..c9967102 100644
--- a/resources/js/vue/components/modal/label/Show.vue
+++ b/resources/js/vue/components/modal/label/Show.vue
@@ -8,19 +8,24 @@
                     <hr class="v-divider theme--light">
                 </v-flex>
                 <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>
+                            <p class="headline ml-5" style="letter-spacing:0 !important">{{ (data.user && data.user.medical_center) ? data.user.medical_center.name : "" }}</p>
                         </div>
                     </v-flex>
-                    <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>
+                    <v-flex xs6 md6 sm6 class="mt-4">
+                        <div class="WM-d-flex">
+                            <v-icon class="WMi-location"></v-icon>
+                            <span class="headline ml-1" style="letter-spacing:0 !important">{{data.package.name}}</span>
+                        </div>
+                    </v-flex>
+                    <v-flex xs6 md5 sm5>
+                        <div>
+                            <v-flex xs6 md6 sm6 v-if="QRCodeimg">
+                                <a :href="'/Show/Package/'+data.package.id+''" target="_blank"><img :src="QRCodeimg"></a>
+                            </v-flex>
                         </div>
                     </v-flex>
                     <v-flex xs6 md5 sm5>
@@ -30,10 +35,10 @@
                         </div>
                     </v-flex>
                     <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>
+                        <!-- <div class="WM-d-flex">
+                            <span class="title">Lot No :</span>
+                            <span class="headline ml-2" style="letter-spacing:0 !important">{{ data.lot_number }}</span>
+                        </div> -->
                     </v-flex>
                     <v-flex xs6 md5 sm5>
                         <div class="WM-d-flex">
@@ -48,29 +53,31 @@
                         </div>
                     </v-flex>
                     <v-flex xs6 md5 sm5>
+                        <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 xs6 md7 sm7>
                         <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>
                     <!-- 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 xs3 md3 sm3>
+                    </v-flex> -->
+                    <v-flex xs9 md9 sm9>
+                        <div class="mt-4" style="text-align:center">
+                            <v-layout row wrap class="" >
                                 <v-flex xs6 md12 sm12 v-if="barcodeimg">
-                                    <img :src="barcodeimg"><br />
+                                    <img :src="barcodeimg" style="width:30%"><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">
-                                <a :href="'/Show/Package/'+data.package.id+''" target="_blank"><img :src="QRCodeimg"></a>
-                            </v-flex>
-                        </div>
-                    </v-flex>
+
                     </v-layout>
                   </v-flex>
                 </v-layout>
@@ -155,7 +162,7 @@ export default {
             }
         },
         async generateBarcode(labelId) {
-            const result = await ApiService.post(urls.Barcode(labelId));
+            const result = await ApiService.post(urls.Barcode(labelId, 'Label'));
             if (result && result.status == 200) {
                 this.barcodeimg  = result.data.data.Barcode ? result.data.data.Barcode : null;
             }
diff --git a/resources/js/vue/components/modal/package/Show.vue b/resources/js/vue/components/modal/package/Show.vue
index 83d5b060..0b1196f0 100644
--- a/resources/js/vue/components/modal/package/Show.vue
+++ b/resources/js/vue/components/modal/package/Show.vue
@@ -41,7 +41,7 @@
                     <v-layout row wrap class="ml-4">
                         <v-flex xs12 md6 sm6 v-if="barcodeimg">
                             <img :src="barcodeimg"><br />
-                            <span>{{data.unique_id}}</span>
+                            <span>Package ID : {{data.id}}</span>
                         </v-flex>
                     </v-layout>
                     <v-layout row wrap class="ml-4">
@@ -109,7 +109,7 @@ export default {
             }
         },
         async generateBarcode(packageId) {
-            const result = await ApiService.post(urls.Barcode(packageId));
+            const result = await ApiService.post(urls.Barcode(packageId, 'Package'));
             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;
@@ -151,7 +151,7 @@ export default {
     },
     created() {
         this.data = this.getModalProperties.result.data.data;
-        this.generateBarcode(this.data.unique_id);
+        this.generateBarcode(this.data.id);
     },
     computed: {
         ...mapGetters("modal", ["getModalProperties"])
diff --git a/resources/js/vue/components/modal/testresult/Show.vue b/resources/js/vue/components/modal/testresult/Show.vue
index 434ea910..60e9319e 100644
--- a/resources/js/vue/components/modal/testresult/Show.vue
+++ b/resources/js/vue/components/modal/testresult/Show.vue
@@ -144,8 +144,8 @@
                     </v-flex>
                 </v-layout>
             </v-layout>
-        </material-card>
-        <material-card>
+        <!-- </material-card>
+        <material-card> -->
             <v-layout row wrap align-center justify-center v-if="$hasRole('Admin|Supervisor')">
                 <v-flex
                     class
diff --git a/resources/js/vue/config/urls.js b/resources/js/vue/config/urls.js
index 51e14ae7..88d25137 100644
--- a/resources/js/vue/config/urls.js
+++ b/resources/js/vue/config/urls.js
@@ -173,6 +173,7 @@ const urls = {
         return `/Item/Verify/${id}`;
     },
     Barcode: function(code, type) {
+        
         return `/BarCode/${code}/${type}`;
     },
     packageBarcode: function(code) {
diff --git a/resources/js/vue/views/Cycle/AddEdit.vue b/resources/js/vue/views/Cycle/AddEdit.vue
index b101b2ac..b4013d24 100644
--- a/resources/js/vue/views/Cycle/AddEdit.vue
+++ b/resources/js/vue/views/Cycle/AddEdit.vue
@@ -3,7 +3,7 @@
         <v-container grid-list-xs fluid>
             <material-card color="black" title="Add Cycle">
                 <v-layout wrap class="px-5 my-3">
-            
+
                     <v-flex xs12 sm6 md4 class="WM-FlexCenter pl-3">
                         <v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"></v-icon>
                         <v-text-field
@@ -53,21 +53,21 @@
                     <v-flex xs12 sm6 md4 class="WM-FlexCenter WM-DuplicateInput" style="position: relative" v-for="(label, key) in formData.labels" :key="key">
                       <div class="Inner">
                         <v-icon class="fa fa-check mr-2 WM-Margin-B-8"></v-icon>
-                        <!-- <v-autocomplete
+                        <v-autocomplete
                             color="black"
                             :items="labels"
-                            item-text="name"
+                            item-text="id"
                             item-value="id"
                             v-model="label.id"
                             label="Select Label For Cycle"
-                        ></v-autocomplete> -->
-                        <v-text-field
+                        ></v-autocomplete>
+                        <!-- <v-text-field
                             name="labels"
                             label="Label ID"
                             color="black"
                             v-model="label.id"
                             class="py-3 pr-3"
-                        ></v-text-field>
+                        ></v-text-field> -->
 
                         <v-btn
                         absolute
diff --git a/resources/js/vue/views/Cycle/List.vue b/resources/js/vue/views/Cycle/List.vue
index b6eba46a..7b197f15 100644
--- a/resources/js/vue/views/Cycle/List.vue
+++ b/resources/js/vue/views/Cycle/List.vue
@@ -109,7 +109,7 @@
                                         <v-icon class="white--text mr-2 caption">fas fa-times</v-icon>
                                         <span>Remove</span>
                                     </v-btn>
-                                    <v-btn color="orange darken-1" @click="generateBarcode(item.unique_id, 'Cycle')">
+                                    <v-btn color="orange darken-1" @click="generateBarcode(item.id, 'Cycle')">
                                         <v-icon class="white--text mr-1 caption">fas fa-barcode</v-icon>
                                         <span>Generate Barcode</span>
                                     </v-btn>
diff --git a/resources/js/vue/views/Item/AddEdit.vue b/resources/js/vue/views/Item/AddEdit.vue
index 7e8f5f5d..062eb41e 100644
--- a/resources/js/vue/views/Item/AddEdit.vue
+++ b/resources/js/vue/views/Item/AddEdit.vue
@@ -18,7 +18,7 @@
             <v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"></v-icon>
             <v-text-field
               name="unique_id"
-              label="ID"
+              label="Item ID"
               color="black"
               v-model="formData.unique_id"
               :rules="[rules.required]"
diff --git a/resources/js/vue/views/Item/List.vue b/resources/js/vue/views/Item/List.vue
index 0ba2446d..e742f62a 100644
--- a/resources/js/vue/views/Item/List.vue
+++ b/resources/js/vue/views/Item/List.vue
@@ -58,6 +58,7 @@
                             </template>
                             <template slot="items" slot-scope="{ item }">
                                 <td class="title font-weight-light">{{ item.id }}</td>
+                                <td class="title font-weight-light">{{ item.unique_id }}</td>
                                 <td class="title font-weight-light">{{ item.name }}</td>
                                 <td class="title font-weight-light">{{ item.size }}</td>
                                 <td class="text-xs-right">
@@ -116,6 +117,11 @@ import { mapMutations, mapGetters } from "vuex";
 export default {
     data: () => ({
         headers: [
+            {
+                sortable: true,
+                text: "ID",
+                value: "id"
+            },
             {
                 sortable: true,
                 text: "Item ID",
@@ -176,7 +182,6 @@ export default {
                 this.changeCurrentModal({
                     modal: "modal-barcode-barcode",
                     properties: { result },
-                    // link : 'Show/Item/'+code
                 });
             }
         },
diff --git a/resources/js/vue/views/Label/AddEdit.vue b/resources/js/vue/views/Label/AddEdit.vue
index 40a6fc4c..a2d61b9b 100644
--- a/resources/js/vue/views/Label/AddEdit.vue
+++ b/resources/js/vue/views/Label/AddEdit.vue
@@ -191,7 +191,7 @@ export default {
 			}
 
 			if (result && result.status == 200) {
-				this.$router.push({ name: "AllLabels" });
+				window.location.href = "/Show/Label/" + result.data.data.id;
 			}
 		}
 	}
diff --git a/resources/js/vue/views/Label/List.vue b/resources/js/vue/views/Label/List.vue
index 043eeb58..416326c9 100644
--- a/resources/js/vue/views/Label/List.vue
+++ b/resources/js/vue/views/Label/List.vue
@@ -204,7 +204,7 @@ export default {
 			if (result && result.status == 200) {
 				this.changeCurrentModal({
 					modal: "modal-label-show",
-					properties: { result }
+					properties: { result, width :40 }
 				});
 			}
 		},
diff --git a/resources/js/vue/views/MedicalCenter/AddEdit.vue b/resources/js/vue/views/MedicalCenter/AddEdit.vue
index e7693a41..f66731e8 100644
--- a/resources/js/vue/views/MedicalCenter/AddEdit.vue
+++ b/resources/js/vue/views/MedicalCenter/AddEdit.vue
@@ -13,13 +13,13 @@
             ></v-text-field>
           </v-flex>
           <v-flex xs12 md3 xs3>
-              <v-combobox
+              <v-select
                 :items="cities"
                 item-text="name_en"
                 item-value="id"
                 v-model="medicalCenter.city_id"
                 label="Select City"
-              ></v-combobox>
+              ></v-select>
           </v-flex>
           <v-flex xs12 md3 xs3>
             <v-text-field
diff --git a/resources/js/vue/views/Package/AddEdit.vue b/resources/js/vue/views/Package/AddEdit.vue
index 126d98dc..29172381 100644
--- a/resources/js/vue/views/Package/AddEdit.vue
+++ b/resources/js/vue/views/Package/AddEdit.vue
@@ -14,6 +14,17 @@
 								class="py-3 pr-3"
 							></v-text-field>
 					</v-flex>
+					<v-flex xs12 md3 sm3 class="WM-FlexCenter">
+							<v-icon class="fa fa-align-left mr-2 WM-Margin-B-8"></v-icon>
+							<v-text-field
+								name="unique_id"
+								label="Package ID"
+								color="black"
+								v-model="formData.unique_id"
+								:rules="[rules.required, rules.counter]"
+								class="py-3 pr-3"
+							></v-text-field>
+					</v-flex>
 					<v-flex xs12 md12 sm12></v-flex>
 					<!-- <v-row style="position: relative" v-for="(item, key) in formData.items" :key="key"> -->
 						<v-flex xs12 md3 sm3 class="WM-FlexCenter WM-DuplicateInput" style="position: relative" v-for="(item, key) in formData.items" :key="key">
diff --git a/resources/js/vue/views/Package/List.vue b/resources/js/vue/views/Package/List.vue
index 7bafe339..fc421497 100644
--- a/resources/js/vue/views/Package/List.vue
+++ b/resources/js/vue/views/Package/List.vue
@@ -85,7 +85,7 @@
                                         <v-icon class="white--text mr-2 caption">fas fa-times</v-icon>
                                         <span>Remove</span>
                                     </v-btn>
-                                    <v-btn color="orange darken-1" @click="generateBarcode(item.unique_id, 'Package')">
+                                    <v-btn color="orange darken-1" @click="generateBarcode(item.id, 'Package')">
                                         <v-icon class="white--text mr-1 caption">fas fa-barcode</v-icon>
                                         <span>Generate Barcode</span>
                                     </v-btn>
@@ -120,13 +120,13 @@ export default {
         headers: [
             {
                 sortable: true,
-                text: "Package ID",
-                value: "Package ID"
+                text: " ID",
+                value: " ID"
             },
             {
                 sortable: true,
-                text: "Unique ID",
-                value: "Unique ID"
+                text: "Package ID",
+                value: "Package ID"
             },
             {
                 sortable: true,
@@ -209,7 +209,7 @@ export default {
             }
         },
         async generateBarcode(code, type) {
-            const result = await ApiService.post(urls.packageBarcode(code, type));
+            const result = await ApiService.post(urls.Barcode(code, type));
             if (result && result.status == 200) {
                 this.changeCurrentModal({
                     modal: "modal-barcode-barcode",
diff --git a/resources/js/vue/views/TestResult/AddEdit.vue b/resources/js/vue/views/TestResult/AddEdit.vue
index c1d4a5a5..057f034c 100644
--- a/resources/js/vue/views/TestResult/AddEdit.vue
+++ b/resources/js/vue/views/TestResult/AddEdit.vue
@@ -68,9 +68,11 @@
 								slot="activator"
 								label="Date"
 								v-model="formData.date"
+
 								color="black"
 							></v-text-field>
 							<v-date-picker
+							min="2020-01-01"
 								color="pink"
 								no-title
 								v-model="formData.date"
@@ -407,7 +409,7 @@
 						<v-icon class="white--text mr-2 caption">fas fa-check</v-icon>
 						<span class="white--text">SAVE</span>
 					</v-btn>
-					<router-link :to="{name: 'Dashboard'}">
+					<router-link :to="{name: 'AllResultTest'}">
 						<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black ml-5">
 							<v-icon class="black--text mr-2 caption">fas fa-chevron-left</v-icon>
 							<span class="black--text">Back</span>
@@ -438,7 +440,8 @@ export default {
 			device_label: "ID",
 			result: "Reject",
 			img: null,
-			test_type_id: ""
+			test_type_id: "",
+			date : "2020-01-01"
 		},
 		images: [],
 		menu: "",
diff --git a/resources/js/vue/views/TestType/AddEdit.vue b/resources/js/vue/views/TestType/AddEdit.vue
index a6c34b73..6a9a8940 100644
--- a/resources/js/vue/views/TestType/AddEdit.vue
+++ b/resources/js/vue/views/TestType/AddEdit.vue
@@ -364,7 +364,7 @@
                         <v-icon class="white--text mr-2 caption">fas fa-check</v-icon>
                         <span class="white--text">Generate Form</span>
                     </v-btn>
-                    <router-link to="/dashboard">
+                    <router-link :to="{name : 'ListTestType'}">
                         <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black ml-5">
                             <v-icon class="black--text mr-2 caption">fas fa-chevron-left</v-icon>
                             <span class="black--text">Back</span>
diff --git a/routes/web.php b/routes/web.php
index 1036fc00..ede068d6 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -64,7 +64,7 @@ Route::get('ShowItem/{Item}', 'ItemController@showItem');
 Route::get('ShowPackage/{Package}', 'PackageController@showPackage');
 Route::get('ShowLabel/{Label}', 'LabelController@showLabel');
 Route::get('ShowCycle/{Cycle}', 'CycleController@showCycle');
-Route::post('/BarCode/{Code}', 'BarCodeController@generateBarcode');
+Route::post('/BarCode/{Code}/{Type?}', 'BarCodeController@generateBarcode');
 Route::post('Package/QRCode/{Package}', 'BarCodeController@generatePackageQRCode');
 
 Route::any('{all}', function(){