From 9625674f79f0e387e3934374592d68a687ee35e7 Mon Sep 17 00:00:00 2001
From: "zeinab.ashrafi" <ashrafisokout@gmail.com>
Date: Sun, 30 Mar 2025 11:56:46 +0330
Subject: [PATCH] fix : style & resposive

---
 src/components/index.js            |  8 +--
 src/components/material/Cards.vue  | 70 +++++++++++++++++-----
 src/views/Cycle/List.vue           | 94 +++++++++++-------------------
 src/views/Dashboard.vue            | 81 +++++++++++++++++++------
 src/views/Label/List.vue           | 53 +++++------------
 src/views/MyItem/List.vue          | 37 ++----------
 src/views/MyPackage/List.vue       | 46 +++------------
 src/views/NotWorking/TableList.vue | 22 ++-----
 src/views/Package/List.vue         | 43 +++-----------
 9 files changed, 194 insertions(+), 260 deletions(-)

diff --git a/src/components/index.js b/src/components/index.js
index 3276ece..4916194 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -2,15 +2,11 @@ import Vue from 'vue'
 import upperFirst from 'lodash/upperFirst'
 import camelCase from 'lodash/camelCase'
 
-const requireComponent = require.context(
-  '@/components', true, /\.vue$/
-)
+const requireComponent = require.context('@/components', true, /\.vue$/)
 
 requireComponent.keys().forEach(fileName => {
   const componentConfig = requireComponent(fileName)
 
-  const componentName = upperFirst(
-    camelCase(fileName.replace(/^\.\//, '').replace(/\.\w+$/, ''))
-  )
+  const componentName = upperFirst(camelCase(fileName.replace(/^\.\//, '').replace(/\.\w+$/, '')))
   Vue.component(componentName, componentConfig.default || componentConfig)
 })
diff --git a/src/components/material/Cards.vue b/src/components/material/Cards.vue
index 65fbb7b..00a7e53 100644
--- a/src/components/material/Cards.vue
+++ b/src/components/material/Cards.vue
@@ -1,9 +1,10 @@
 <template>
     <v-card :class="color" class="tile-section">
-        <v-container class="py-1">
+        <v-container class="py-0">
             <v-layout row wrap>
                 <v-flex xs12>
                     <v-card-text primary-text :class="aligntext" class="d-flex align-center">
+                        <div v-if="svg" v-html="svg" class="svg-container"></div>
                         <v-icon v-if="icon" size="20" class="mr-2" style="max-width: 30px;">{{ icon }}</v-icon>
                         <v-img v-if="image" src="image"/>
                         <div>
@@ -34,6 +35,10 @@ export default {
             type: String,
             default: () => ''
         },
+        svg: {
+            type: String,
+            default: () => ''
+        },
         icon: {
             type: String,
             default: () => ''
@@ -66,22 +71,55 @@ export default {
     computed: {}
 }
 </script>
-<style scoped>
-.headline {
-    font-size: 22px !important;
-    text-transform: uppercase !important;
-    font-family: 'Montserrat-Regular' !important;
-    line-height: 23px !important;
-}
-
-.subheading {
-    font-size: 14px !important;
-    color: #7b7b7b;
-    font-family: 'Montserrat-Regular' !important;
-
-}
-
+<style scoped lang="scss">
 .tile-section {
     border-radius: 10px;
+
+    .headline {
+        font-size: 22px !important;
+        text-transform: uppercase !important;
+        font-family: 'Montserrat-Regular' !important;
+        line-height: 23px !important;
+    }
+
+    .subheading {
+        font-size: 14px !important;
+        color: #7b7b7b;
+        font-family: 'Montserrat-Regular' !important;
+
+    }
+
+    .svg-container {
+        max-width: fit-content;
+        margin: 0 15px 0 0;
+    }
+}
+
+@media screen and (max-width: 1598px) {
+    .tile-section {
+        > .container {
+            padding: 0;
+        }
+    }
+}
+
+@media screen and (max-width: 1440px) {
+    .tile-section {
+        > .container {
+            padding: 0;
+        }
+
+        .headline {
+            font-family: 'Montserrat-Light' !important;
+            font-size: 20px !important;
+            letter-spacing: 1px !important;
+        }
+
+        .subheading {
+            font-size: 12px !important;
+            font-family: 'Montserrat-Light' !important;
+        }
+    }
+
 }
 </style>
\ No newline at end of file
diff --git a/src/views/Cycle/List.vue b/src/views/Cycle/List.vue
index 44da63e..1e2b2d6 100644
--- a/src/views/Cycle/List.vue
+++ b/src/views/Cycle/List.vue
@@ -6,33 +6,33 @@
                     <v-flex xs12 sm6 md6 lg3 xl2 class="WM-FlexCenter">
                         <v-icon class="fa fa-align-left mr-2 WM-Margin-B-8"/>
                         <v-text-field class="py-3 pr-3" v-model="filter.cycle_id" label="Cycle ID"
-                            color="black"/>
+                                      color="black"/>
                     </v-flex>
                     <v-flex xs12 sm6 md6 lg3 xl2 class="WM-FlexCenter pl-3">
                         <v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"/>
                         <v-text-field class="py-3 pr-3" v-model="filter.sterilizer_id" label="Sterilizer ID"
-                            color="black"/>
+                                      color="black"/>
                     </v-flex>
                     <v-flex xs12 sm6 md6 lg3 xl2 class="WM-FlexCenter pl-3">
                         <v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"/>
                         <v-text-field class="py-3 pr-3" v-model="filter.cycle_number" label="Cycle Number"
-                            color="black"/>
+                                      color="black"/>
                     </v-flex>
                     <v-flex xs12 sm6 md6 lg3 xl2 class="WM-FlexCenter pl-3" v-if="$hasRole('Admin')">
                         <v-icon class="fa fa-hospital-o mr-2 WM-Margin-B-8"/>
                         <v-autocomplete class="py-3 pr-3" v-model="filter.medical_center_id" item-text="name"
-                            item-value="id" label="Hospital" color="black" :items="medicalCenters"
-                            :clearable="true"/>
+                                        item-value="id" label="Hospital" color="black" :items="medicalCenters"
+                                        :clearable="true"/>
                     </v-flex>
                     <v-flex xs12 sm6 md6 lg3 xl2 class="WM-FlexCenter pl-3">
                         <v-icon class="far fa-calendar-alt mr-2 WM-Margin-B-8"/>
                         <v-menu lazy :close-on-content-click="true" transition="v-scale-transition" offset-y
-                            v-model="Menu">
+                                v-model="Menu">
                             <v-text-field style="padding-top:0 !important" required slot="activator" label="Date"
-                                color="black" class="" v-model="filter.date">
+                                          color="black" class="" v-model="filter.date">
                             </v-text-field>
                             <v-date-picker color="pink" no-title v-model="filter.date"
-                                :date-format="date => new Date(date).toDateString()"/>
+                                           :date-format="date => new Date(date).toDateString()"/>
                         </v-menu>
                     </v-flex>
                     <v-spacer/>
@@ -59,10 +59,10 @@
                         <v-data-table :headers="headers" :items="packages" hide-actions>
                             <template slot="headerCell" slot-scope="{ header }">
                                 <span class="subheading font-weight-light text-white text--darken-3"
-                                    v-text="header.text" />
+                                      v-text="header.text"/>
                             </template>
                             <template slot="items" slot-scope="{ item }">
-                                <td class="headline font-weight-light">{{ item.id }}</td>
+                                <td class="title font-weight-light">{{ item.id }}</td>
                                 <td class="title font-weight-light">
                                     {{ (item.user && item.user.medical_center) ? item.user.medical_center.name : '' }}
                                 </td>
@@ -73,7 +73,7 @@
                                     <v-tooltip bottom open-on-hover>
                                         <template v-slot:activator="{ on, attrs }">
                                             <v-btn v-bind="attrs" v-on="on" color="cyan" class="mr-2"
-                                                @click="show(item.id)">
+                                                   @click="show(item.id)">
                                                 <v-icon class="white--text mr-1 caption">fas fa-eye</v-icon>
                                                 <span>Show</span>
                                             </v-btn>
@@ -83,8 +83,8 @@
                                     <v-tooltip bottom open-on-hover>
                                         <template v-slot:activator="{ on, attrs }">
                                             <router-link class="LinkBtn"
-                                                v-if="$hasRole('Admin') || item.user_id == $store.state.user.id"
-                                                :to="{ name: 'EditCycle', params: { cycle: item.id } }">
+                                                         v-if="$hasRole('Admin') || item.user_id == $store.state.user.id"
+                                                         :to="{ name: 'EditCycle', params: { cycle: item.id } }">
                                                 <v-btn v-bind="attrs" v-on="on" color="orange" class="mr-2">
                                                     <v-icon class="white--text mr-1 caption">fas fa-pen</v-icon>
                                                     <span>Edit</span>
@@ -96,8 +96,8 @@
                                     <v-tooltip bottom open-on-hover>
                                         <template v-slot:activator="{ on, attrs }">
                                             <v-btn v-bind="attrs" v-on="on" color="pink" class="WM-ActionButton mr-2"
-                                                @click="remove(item.id)"
-                                                v-if="$hasRole('Admin') || item.user_id == $store.state.user.id">
+                                                   @click="remove(item.id)"
+                                                   v-if="$hasRole('Admin') || item.user_id == $store.state.user.id">
                                                 <v-icon class="white--text mr-2 caption">fas fa-times</v-icon>
                                                 <span>Remove</span>
                                             </v-btn>
@@ -107,7 +107,7 @@
                                     <v-tooltip bottom open-on-hover>
                                         <template v-slot:activator="{ on, attrs }">
                                             <v-btn v-bind="attrs" v-on="on" color="orange darken-1"
-                                                @click="generateBarcode(item.id, 'Cycle')">
+                                                   @click="generateBarcode(item.id, 'Cycle')">
                                                 <v-icon class="white--text mr-1 caption">fas fa-barcode</v-icon>
                                                 <span>Generate Barcode</span>
                                             </v-btn>
@@ -122,7 +122,7 @@
                 <v-divider/>
                 <div class="text-xs-center mt-2" v-if="lastPage > 1">
                     <v-pagination color="black" v-model="currentPage" :length="lastPage"
-                        :total-visible="6"/>
+                                  :total-visible="6"/>
                 </div>
                 <v-layout row wrap align-center justify-center class="mt-3">
                     <router-link to="/dashboard">
@@ -138,43 +138,19 @@
 </template>
 
 <script>
-import { ApiService } from "@/services";
-import { urls } from "@/config/urls";
-import { mapMutations, mapGetters } from "vuex";
+import {ApiService} from "@/services";
+import {urls} from "@/config/urls";
+import {mapMutations, mapGetters} from "vuex";
+
 export default {
     data: () => ({
         headers: [
-            {
-                sortable: true,
-                text: "Cycle ID",
-                value: "Cycle ID"
-            },
-            {
-                sortable: true,
-                text: "Hospital",
-                value: "Hospital"
-            },
-            {
-                sortable: true,
-                text: "Sterilizer ID",
-                value: "Sterilizer ID"
-            },
-            {
-                sortable: false,
-                text: "Cycle Number",
-                value: "Cycle Number"
-            },
-            {
-                sortable: false,
-                text: "Date",
-                value: "date"
-            },
-            {
-                sortable: false,
-                text: "Action",
-                value: "action",
-                align: "left"
-            }
+            {sortable: false, text: "Cycle ID", value: "Cycle ID"},
+            {sortable: false, text: "Hospital", value: "Hospital"},
+            {sortable: false, text: "Sterilizer ID", value: "Sterilizer ID"},
+            {sortable: false, text: "Cycle Number", value: "Cycle Number"},
+            {sortable: false, text: "Date", value: "date"},
+            {sortable: false, text: "Action", value: "action", align: "left"}
         ],
         filter: {},
         Menu: false,
@@ -197,10 +173,10 @@ export default {
             }
             filter += (page) ? `page=${page}` : `page=1`;
             const result = await ApiService.get(
-                urls.listCycle(filter)
+                    urls.listCycle(filter)
             );
             if (result && result.status == 200) {
-                const { data, meta } = result.data;
+                const {data, meta} = result.data;
                 this.packages = data;
                 this.currentPage = meta.current_page;
                 this.lastPage = meta.last_page;
@@ -209,12 +185,12 @@ export default {
         },
         async show(testResultId) {
             const result = await ApiService.get(
-                urls.showCycle(testResultId)
+                    urls.showCycle(testResultId)
             );
             if (result && result.status == 200) {
                 this.changeCurrentModal({
                     modal: "modal-cycle-show",
-                    properties: { result }
+                    properties: {result}
                 });
             }
         },
@@ -223,19 +199,19 @@ export default {
             if (result && result.status == 200) {
                 this.changeCurrentModal({
                     modal: "modal-barcode-barcode",
-                    properties: { result }
+                    properties: {result}
                 });
             }
         },
         async remove(testResultId) {
             const result = await ApiService.delete(
-                urls.removeCycle(testResultId)
+                    urls.removeCycle(testResultId)
             );
             if (result && result.status == 200) {
                 for (const key in this.packages) {
                     if (
-                        this.packages.hasOwnProperty(key) &&
-                        this.packages[key].id == testResultId
+                            this.packages.hasOwnProperty(key) &&
+                            this.packages[key].id == testResultId
                     ) {
                         this.packages.splice(key, 1);
                     }
diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
index 093b218..db9ac84 100644
--- a/src/views/Dashboard.vue
+++ b/src/views/Dashboard.vue
@@ -7,9 +7,9 @@
                     <v-flex v-if="!AdminCard.role || $hasRole(AdminCard.role)" :class="[AdminCard.column, 'pa-2']"
                             :key="Key">
                         <router-link :to="AdminCard.route" style="height: 100%;display: grid;">
-                            <material-cards :title="AdminCard.title" :icon="AdminCard.icon" :color="AdminCard.color"
-                                            :text="AdminCard.text" :aligntext="AdminCard.aligntext"
-                                            :alignimg="AdminCard.alignimg"/>
+                            <material-cards :title="AdminCard.title" :icon="AdminCard.icon" :svg="AdminCard.svg"
+                                            :image="AdminCard.image" :color="AdminCard.color" :text="AdminCard.text"
+                                            :aligntext="AdminCard.aligntext" :alignimg="AdminCard.alignimg"/>
                         </router-link>
                     </v-flex>
                 </template>
@@ -24,9 +24,9 @@
                             :key="Key">
                         <router-link :to="SupervisorCard.route" style="height: 100%;display:grid;">
                             <material-cards :title="SupervisorCard.title" :icon="SupervisorCard.icon"
-                                            :color="SupervisorCard.color"
-                                            :text="SupervisorCard.text" :aligntext="SupervisorCard.aligntext"
-                                            :alignimg="SupervisorCard.alignimg"/>
+                                            :color="SupervisorCard.color" :svg="SupervisorCard.svg"
+                                            :image="SupervisorCard.image" :text="SupervisorCard.text"
+                                            :aligntext="SupervisorCard.aligntext" :alignimg="SupervisorCard.alignimg"/>
                         </router-link>
                     </v-flex>
                 </template>
@@ -40,8 +40,8 @@
                             :key="Key">
                         <router-link :to="UsersCard.route" style="height: 100%;display:grid;">
                             <material-cards :title="UsersCard.title" :icon="UsersCard.icon" :color="UsersCard.color"
-                                            :text="UsersCard.text" :aligntext="UsersCard.aligntext"
-                                            :alignimg="UsersCard.alignimg"/>
+                                            :text="UsersCard.text" :aligntext="UsersCard.aligntext" :svg="UsersCard.svg"
+                                            :image="UsersCard.image" :alignimg="UsersCard.alignimg"/>
                         </router-link>
                     </v-flex>
                 </template>
@@ -140,8 +140,17 @@ export default {
                 },
                 {
                     title: `<span>Add A </span><br/><span>Test Result</span>`,
-                    icon: 'fas fa-plus',
-                    // image:'https://cdn.willaspace.com/cssd/static/image/svg/Plus-white.svg',
+                    svg: `  <svg width="40" height="40" viewBox="0 0 777 777" fill="none" xmlns="http://www.w3.org/2000/svg">
+                            <g clip-path="url(#clip0_93_57)">
+                                <path d="M17.5938 388.5H759.406" stroke="white" stroke-width="30" stroke-linecap="round" stroke-linejoin="round"/>
+                                <path d="M388.5 17.5938V759.406" stroke="white" stroke-width="30" stroke-linecap="round" stroke-linejoin="round"/>
+                            </g>
+                            <defs>
+                                <clipPath id="clip0_93_57">
+                                    <rect width="777" height="777" fill="white"/>
+                                </clipPath>
+                            </defs>
+                        </svg>`,
                     color: 'black text-white',
                     route: {name: 'SubmitTestResult'},
                     aligntext: 'text-md-left',
@@ -173,8 +182,17 @@ export default {
                 },
                 {
                     title: `<span>Add new </span><br/><span>item</span>`,
-                    icon: 'fas fa-plus',
-                    // image:'https://cdn.willaspace.com/cssd/static/image/svg/Plus-white.svg',
+                    svg: `  <svg width="40" height="40" viewBox="0 0 777 777" fill="none" xmlns="http://www.w3.org/2000/svg">
+                            <g clip-path="url(#clip0_93_57)">
+                                <path d="M17.5938 388.5H759.406" stroke="white" stroke-width="30" stroke-linecap="round" stroke-linejoin="round"/>
+                                <path d="M388.5 17.5938V759.406" stroke="white" stroke-width="30" stroke-linecap="round" stroke-linejoin="round"/>
+                            </g>
+                            <defs>
+                                <clipPath id="clip0_93_57">
+                                    <rect width="777" height="777" fill="white"/>
+                                </clipPath>
+                            </defs>
+                        </svg>`,
                     color: 'WM-CyanGradient-BG text-white',
                     route: {name: 'AddItem'},
                     aligntext: 'text-md-left',
@@ -206,8 +224,17 @@ export default {
                 },
                 {
                     title: `<span>Add new </span><br/><span>Package</span>`,
-                    icon: 'fas fa-plus',
-                    // image:'https://cdn.willaspace.com/cssd/static/image/svg/Plus-white.svg',
+                    svg: `  <svg width="40" height="40" viewBox="0 0 777 777" fill="none" xmlns="http://www.w3.org/2000/svg">
+                            <g clip-path="url(#clip0_93_57)">
+                                <path d="M17.5938 388.5H759.406" stroke="white" stroke-width="30" stroke-linecap="round" stroke-linejoin="round"/>
+                                <path d="M388.5 17.5938V759.406" stroke="white" stroke-width="30" stroke-linecap="round" stroke-linejoin="round"/>
+                            </g>
+                            <defs>
+                                <clipPath id="clip0_93_57">
+                                    <rect width="777" height="777" fill="white"/>
+                                </clipPath>
+                            </defs>
+                        </svg>`,
                     color: 'WM-DeepBlueGradient-BG text-white',
                     route: {name: 'AddPackage'},
                     aligntext: 'text-md-left',
@@ -229,8 +256,17 @@ export default {
                 },
                 {
                     title: `<span>Add new </span><br/><span> label</span>`,
-                    icon: 'fas fa-plus',
-                    // image:'https://cdn.willaspace.com/cssd/static/image/svg/Plus-white.svg',
+                    svg: `  <svg width="40" height="40" viewBox="0 0 777 777" fill="none" xmlns="http://www.w3.org/2000/svg">
+                            <g clip-path="url(#clip0_93_57)">
+                                <path d="M17.5938 388.5H759.406" stroke="white" stroke-width="30" stroke-linecap="round" stroke-linejoin="round"/>
+                                <path d="M388.5 17.5938V759.406" stroke="white" stroke-width="30" stroke-linecap="round" stroke-linejoin="round"/>
+                            </g>
+                            <defs>
+                                <clipPath id="clip0_93_57">
+                                    <rect width="777" height="777" fill="white"/>
+                                </clipPath>
+                            </defs>
+                        </svg>`,
                     color: 'WM-PurpleGradient-BG text-white',
                     route: {name: 'AddLabel'},
                     aligntext: 'text-md-left',
@@ -252,8 +288,17 @@ export default {
                 },
                 {
                     title: `<span>Add new </span><br/><span>cycle</span>`,
-                    icon: 'fas fa-plus',
-                    // image:'https://cdn.willaspace.com/cssd/static/image/svg/Plus-white.svg',
+                    svg: `  <svg width="40" height="40" viewBox="0 0 777 777" fill="none" xmlns="http://www.w3.org/2000/svg">
+                            <g clip-path="url(#clip0_93_57)">
+                                <path d="M17.5938 388.5H759.406" stroke="white" stroke-width="30" stroke-linecap="round" stroke-linejoin="round"/>
+                                <path d="M388.5 17.5938V759.406" stroke="white" stroke-width="30" stroke-linecap="round" stroke-linejoin="round"/>
+                            </g>
+                            <defs>
+                                <clipPath id="clip0_93_57">
+                                    <rect width="777" height="777" fill="white"/>
+                                </clipPath>
+                            </defs>
+                        </svg>`,
                     color: 'WM-RedGradient-BG text-white',
                     route: {name: 'AddCycle'},
                     aligntext: 'text-md-left',
diff --git a/src/views/Label/List.vue b/src/views/Label/List.vue
index 641b731..d805c97 100644
--- a/src/views/Label/List.vue
+++ b/src/views/Label/List.vue
@@ -4,13 +4,13 @@
             <material-card class color="black" title="All Labels" text>
                 <v-layout align-center wrap class="px-5 my-3">
                     <v-flex xs12 sm6 md6 lg3 xl2 class="WM-FlexCenter">
-                        <v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"></v-icon>
+                        <v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"/>
                         <v-text-field class="py-3" v-model="filter.label_id" label="Label ID"
-                                      color="black"></v-text-field>
+                                      color="black"/>
                     </v-flex>
 
                     <v-flex xs12 sm6 md6 lg3 xl2 class="WM-FlexCenter pl-3" v-if="$hasRole('Admin')">
-                        <v-icon class="fa fa-hospital-o mr-2 WM-Margin-B-8"></v-icon>
+                        <v-icon class="fa fa-hospital-o mr-2 WM-Margin-B-8"/>
                         <v-autocomplete
                                 class="py-3 pr-3"
                                 v-model="filter.medical_center_id"
@@ -21,17 +21,17 @@
                                 color="black"
                                 :items="medicalCenters"
                                 :clearable="true"
-                        ></v-autocomplete>
+                        />
                     </v-flex>
                     <v-flex xs12 sm6 md6 lg3 xl2 class="WM-FlexCenter pl-3">
-                        <v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"></v-icon>
+                        <v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"/>
                         <v-text-field class="py-3" v-model="filter.sterilizer_id" label="Sterilizer ID"
-                                      color="black"></v-text-field>
+                                      color="black"/>
                     </v-flex>
                     <v-flex xs12 sm6 md6 lg3 xl2 class="WM-FlexCenter pl-3">
-                        <v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"></v-icon>
+                        <v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"/>
                         <v-text-field class="py-3" v-model="filter.cycle_number" label="Cycle Number"
-                                      color="black"></v-text-field>
+                                      color="black"/>
                     </v-flex>
                     <v-spacer/>
                     <v-flex xs12 sm6 md6 lg2 xl1 class="">
@@ -147,37 +147,12 @@ import {mapMutations, mapGetters} from "vuex";
 export default {
     data: () => ({
         headers: [
-            {
-                sortable: true,
-                text: "Label ID",
-                value: "Label ID"
-            },
-            {
-                sortable: true,
-                text: "Hospital",
-                value: "Hospital"
-            },
-            {
-                sortable: false,
-                text: "Owner",
-                value: "User"
-            },
-            {
-                sortable: false,
-                text: "Cycle Number",
-                value: "Cycle Number"
-            },
-            {
-                sortable: false,
-                text: "SterilizerID",
-                value: "SterilizerID"
-            },
-            {
-                sortable: false,
-                text: "Action",
-                value: "action",
-                align: "left"
-            }
+            {sortable: false, text: "Label ID", value: "Label ID"},
+            {sortable: false, text: "Hospital", value: "Hospital"},
+            {sortable: false, text: "Owner", value: "User"},
+            {sortable: false, text: "Cycle Number", value: "Cycle Number"},
+            {sortable: false, text: "SterilizerID", value: "SterilizerID"},
+            {sortable: false, text: "Action", value: "action", align: "left"}
         ],
         filter: {},
         items: [],
diff --git a/src/views/MyItem/List.vue b/src/views/MyItem/List.vue
index fbfff4f..c85d2f1 100644
--- a/src/views/MyItem/List.vue
+++ b/src/views/MyItem/List.vue
@@ -125,37 +125,12 @@ import toast from "@/services/global/toast.service";
 export default {
     data: () => ({
         headers: [
-            // {
-            //     sortable: true,
-            //     text: "ID",
-            //     value: "id"
-            // },
-            {
-                sortable: true,
-                text: "Item ID",
-                value: "id"
-            },
-            {
-                sortable: false,
-                text: "Name",
-                value: "name"
-            },
-            {
-                sortable: false,
-                text: "UDI",
-                value: "udi"
-            },
-            {
-                sortable: false,
-                text: "Size",
-                value: "size"
-            },
-            {
-                sortable: false,
-                text: "Action",
-                value: "action",
-                align: "left"
-            }
+            // {sortable: true,text: "ID",value: "id"},
+            {sortable: false, text: "Item ID", value: "id"},
+            {sortable: false, text: "Name", value: "name"},
+            {sortable: false, text: "UDI", value: "udi"},
+            {sortable: false, text: "Size", value: "size"},
+            {sortable: false, text: "Action", value: "action", align: "left"}
         ],
         filter: {
             name: '',
diff --git a/src/views/MyPackage/List.vue b/src/views/MyPackage/List.vue
index 7513fcb..f47686e 100644
--- a/src/views/MyPackage/List.vue
+++ b/src/views/MyPackage/List.vue
@@ -52,9 +52,6 @@
                                 <td class="title font-weight-light">
                                     {{ (item.user && item.user.medical_center) ? item.user.medical_center.name : '' }}
                                 </td>
-                                <td class="title font-weight-light">
-                                    {{ item.user ? item.user.name : '' | text_20_letter }}
-                                </td>
                                 <td class="title font-weight-light">{{ item.description }}</td>
                                 <td class="title font-weight-light">{{ item.status }}</td>
                                 <td class="text-xs-right FlexBtn Height-MD-60 justify-self-end">
@@ -134,7 +131,7 @@
                 <v-divider/>
                 <div class="text-xs-center" v-if="lastPage > 1">
                     <v-pagination color="black" v-model="currentPage" :length="lastPage"
-                                  :total-visible="6"></v-pagination>
+                                  :total-visible="6"/>
                 </div>
                 <v-layout row wrap align-center justify-center class="mt-3">
                     <router-link to="/dashboard">
@@ -158,37 +155,12 @@ import toast from "@/services/global/toast.service";
 export default {
     data: () => ({
         headers: [
-            {
-                sortable: true,
-                text: "Package ID",
-                value: "Package ID"
-            },
-            {
-                sortable: true,
-                text: "Name",
-                value: "name"
-            },
-            {
-                sortable: true,
-                text: "Hospital",
-                value: "Hospital"
-            },
-            {
-                sortable: true,
-                text: "Description",
-                value: "description"
-            },
-            {
-                sortable: true,
-                text: "Status",
-                value: "status"
-            },
-            {
-                sortable: false,
-                text: "Action",
-                value: "action",
-                align: "left"
-            }
+            {sortable: false, text: "Package ID", value: "Package ID"},
+            {sortable: false, text: "Name", value: "name"},
+            {sortable: false, text: "Hospital", value: "Hospital"},
+            {sortable: false, text: "Description", value: "description"},
+            {sortable: false, text: "Status", value: "status"},
+            {sortable: false, text: "Action", value: "action", align: "center"}
         ],
         filter: {
             name: '',
@@ -218,8 +190,8 @@ export default {
             if (result && result.status == 200) {
                 const {data, meta} = result.data;
                 this.items = data;
-                this.currentPage = meta.current_page;
-                this.lastPage = meta.last_page;
+                this.currentPage = meta? meta.current_page : 1;
+                this.lastPage =meta? meta.last_page : 1;
             }
             this.loadMedicalCenters();
         },
diff --git a/src/views/NotWorking/TableList.vue b/src/views/NotWorking/TableList.vue
index 2c6bf48..b5fcfad 100644
--- a/src/views/NotWorking/TableList.vue
+++ b/src/views/NotWorking/TableList.vue
@@ -16,15 +16,8 @@
           title="Simple Table"
           text="Here is a subtitle for this table"
         >
-          <v-data-table
-            :headers="headers"
-            :items="items"
-            hide-actions
-          >
-            <template
-              slot="headerCell"
-              slot-scope="{ header }"
-            >
+          <v-data-table :headers="headers" :items="items" hide-actions>
+            <template slot="headerCell" slot-scope="{ header }">
               <span
                 class="subheading font-weight-light text-success text--darken-3"
                 v-text="header.text"
@@ -52,15 +45,8 @@
           title="Table on Plain Background"
           text="Here is a subtitle for this table"
         >
-          <v-data-table
-            :headers="headers"
-            :items="items.slice(0, 7)"
-            hide-actions
-          >
-            <template
-              slot="headerCell"
-              slot-scope="{ header }"
-            >
+          <v-data-table :headers="headers" :items="items.slice(0, 7)" hide-actions>
+            <template slot="headerCell" slot-scope="{ header }">
               <span
                 class="subheading font-weight-light text--darken-3"
                 v-text="header.text"
diff --git a/src/views/Package/List.vue b/src/views/Package/List.vue
index 45b916f..832060d 100644
--- a/src/views/Package/List.vue
+++ b/src/views/Package/List.vue
@@ -156,42 +156,13 @@ import toast from "@/services/global/toast.service";
 export default {
     data: () => ({
         headers: [
-            {
-                sortable: true,
-                text: "Package ID",
-                value: "Package ID"
-            },
-            {
-                sortable: true,
-                text: "Name",
-                value: "name"
-            },
-            {
-                sortable: true,
-                text: "Hospital",
-                value: "Hospital"
-            },
-            {
-                sortable: true,
-                text: "Owner",
-                value: "User"
-            },
-            {
-                sortable: true,
-                text: "Description",
-                value: "description"
-            },
-            {
-                sortable: true,
-                text: "Status",
-                value: "status"
-            },
-            {
-                sortable: false,
-                text: "Action",
-                value: "action",
-                align: "left"
-            }
+            {sortable: false, text: "Package ID", value: "Package ID"},
+            {sortable: false, text: "Name", value: "name"},
+            {sortable: false, text: "Hospital", value: "Hospital"},
+            {sortable: false, text: "Owner", value: "User"},
+            {sortable: false, text: "Description", value: "description"},
+            {sortable: false, text: "Status", value: "status"},
+            {sortable: false, text: "Action", value: "action", align: "left"}
         ],
         filter: {
             name: '',