From 289d76acb9d9c2c49291109f5457e44ade6e0c95 Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Thu, 15 Feb 2024 10:45:44 -0800
Subject: [PATCH 1/3] Update grad-version

---
 grad-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grad-version b/grad-version
index 7c8f9831..5576b98d 100644
--- a/grad-version
+++ b/grad-version
@@ -2,6 +2,6 @@
   "version": {
     "dev": "1.14.1",
     "test": "1.14.1",
-    "prod": "1.13.1"
+    "prod": "1.14.1"
   }
 }

From 32317b8dad162479367797dca067e5a2562fca6d Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Wed, 21 Feb 2024 16:41:09 -0800
Subject: [PATCH 2/3] fixed pagination

---
 frontend/src/components/DisplayTable.vue | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/DisplayTable.vue b/frontend/src/components/DisplayTable.vue
index e7b14adf..43317a84 100644
--- a/frontend/src/components/DisplayTable.vue
+++ b/frontend/src/components/DisplayTable.vue
@@ -6,6 +6,7 @@
       aria-label="Toolbar with button groups"
       class="float-left"
     >
+      {{ filter }} {{ totalRows }}
       <b-button-group class="mx-1">
         <b-button
           v-if="allowUpdateGradStatus && updateAllowed"
@@ -197,6 +198,7 @@
     </b-table>
 
     <b-pagination
+      v-if="totalRows"
       v-model="currentPage"
       :total-rows="totalRows"
       :per-page="perPage"
@@ -245,7 +247,8 @@ export default {
   ],
   onMounted() {
     // Set the initial number of items
-    this.totalRows = this.items.length;
+    // this.totalRows = this.items.length;
+    // this.rows = this.items.length;
   },
   data() {
     return {
@@ -302,11 +305,11 @@ export default {
     editableFields() {
       return this.fields.filter((field) => field.editable);
     },
-    // totalRows: function () {
-    //   if (this.items?.length) {
-    //     return this.items.length;
-    //   } else return this.totalRows;
-    // },
+    totalRows: function () {
+      if (this.items?.length && !this.filter) {
+        return this.items.length;
+      } else return this.totalRows;
+    },
     sortOptions() {
       return this.fields
         .filter((f) => f.sortable)
@@ -344,8 +347,11 @@ export default {
     },
     onFiltered(filteredItems) {
       // Trigger pagination to update the number of buttons/pages due to filtering
-      this.totalRows = filteredItems.length;
-      this.currentPage = 1;
+      if (this.filter) {
+        this.totalRows = filteredItems.length;
+      }
+
+      this.currentPage = 0;
     },
   },
 };

From 57c3f3888dd270a6947ed495ce8edf4b142f8a0a Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Wed, 21 Feb 2024 16:45:31 -0800
Subject: [PATCH 3/3] removed output

---
 frontend/src/components/DisplayTable.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/components/DisplayTable.vue b/frontend/src/components/DisplayTable.vue
index 43317a84..ca64d81c 100644
--- a/frontend/src/components/DisplayTable.vue
+++ b/frontend/src/components/DisplayTable.vue
@@ -6,7 +6,6 @@
       aria-label="Toolbar with button groups"
       class="float-left"
     >
-      {{ filter }} {{ totalRows }}
       <b-button-group class="mx-1">
         <b-button
           v-if="allowUpdateGradStatus && updateAllowed"