Production

public/mix-manifest.json

@@ -1,3 +1,3 @@
 {
-    "/vue/js/app.js": "/vue/js/app.js?id=93b6154ab75a3df72f5e"
+    "/vue/js/app.js": "/vue/js/app.js?id=98d2bd6c25c0af6de40b"
 }

resources/js/vue/config/urls.js

@@ -1,18 +1,13 @@
 const urls = {
-    storeTestType : "/TestTypes",
     updateInfo : "/UpdateInfo",
     getInfo : "/GetInfo",
     login : "/login",
     logout : "/logout",
     storeMedicalCenter : "/MedicalCenters",
     storeTestResult : "/TestResults",
-    listTestResult : "/TestResults",
+    storeTestType : "/TestTypes",
     listTestTypeName : "/TestTypes/ListNames",
     getInputs : `/GetInputs`,
-    listOpertor : "/Users",
-    listMedicalCenter : function(page) {
-        return "/MedicalCenters?page=" + page;
-    },
     listTestType : function(page) {
         return "/TestTypes?page=" + page;
     },
@@ -25,6 +20,9 @@ const urls = {
     updateTestType : function(id) {
         return `/TestTypes/${id}`;
     },
+    listTestResult : function(page) {
+        return "/TestResults?page=" + page;
+    },
     editTestResult : function(id) {
         return `/TestResults/${id}/edit`;
     },
@@ -34,6 +32,9 @@ const urls = {
     removeTestResult : function(id) {
         return `/TestResults/${id}`;
     },
+    listMedicalCenter : function(page) {
+        return "/MedicalCenters?page=" + page;
+    },
     updateMedicalCenter : function(id) {
         return `/MedicalCenters/${id}`;
     },
@@ -46,6 +47,9 @@ const urls = {
     listOpertorMedicalCenter: function(id) {
         return  `/Users/MedicalCenter/${id}`;
     },
+    listOpertor : function(page) {
+        return "/Users?page=" + page;
+    },
     changeStatusUser: function(userId) {
         return  `Users/ChangeStatus/${userId}`;
     },

resources/js/vue/views/MedicalCenter/List.vue

@@ -64,7 +64,7 @@
         <v-pagination v-model="currentPage" :length="lastPage" :total-visible="6"></v-pagination>
       </div>
       <v-layout row wrap align-center justify-center class="mt-3">
-        <router-link to="/dashboard">
+        <router-link :to="{name: 'Dashboard'}">
           <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>

resources/js/vue/views/TestResult/List.vue

@@ -139,16 +139,8 @@ export default {
     this.load();
   },
   methods: {
-    async load() {
+    async load(page = 1) {
-      const result = await ApiService.get(urls.listTestResult);
+      const result = await ApiService.get(urls.listTestResult(page));
-      if (result && result.status == 200) {
-        this.items = result.data.data.data;
-        this.currentPage = result.data.data.current_page;
-        this.lastPage = result.data.data.last_page;
-      }
-    },
-    async load() {
-      const result = await ApiService.get(urls.listTestResult);
       if (result && result.status == 200) {
         this.items = result.data.data.data;
         this.currentPage = result.data.data.current_page;
@@ -165,6 +157,11 @@ export default {
         }
       }
     },
+  },
+  watch: {
+    currentPage(page) {
+      this.load(page);
+    }
   }
 }
 </script>

resources/js/vue/views/User/List.vue

@@ -97,6 +97,9 @@
       <v-layout class="px-4 my-3">
         <v-divider></v-divider>
       </v-layout>
+      <div class="text-xs-center" v-if="lastPage > 1">
+        <v-pagination v-model="currentPage" :length="lastPage" :total-visible="6"></v-pagination>
+      </div>
       <v-layout row wrap align-center justify-center class="mt-3">
         <router-link :to="{name: 'Dashboard'}">
           <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black ml-5">
@@ -143,16 +146,20 @@ export default {
         align: 'right'
       },
     ],
-    items: []
+    items: [],
+    currentPage: 1,
+    lastPage: 1
   }),
   created() {
     this.load();
   },
   methods: {
-    async load() {
+    async load(page = 1) {
-      const result = await ApiService.get(urls.listOpertor );
+      const result = await ApiService.get(urls.listOpertor(page) );
       if (result && result.status == 200) {
         this.items = result.data.data.data;
+        this.currentPage = result.data.data.current_page;
+        this.lastPage = result.data.data.last_page;
       } else {
         this.$router.push({name:`Dashboard`});
       }
@@ -197,6 +204,9 @@ export default {
           userList.roles = user.roles;
         }
       }
+    },
+    currentPage(page) {
+      this.load(page);
     }
   }
 }