From bce39baae517ae5e77f2473700e47a89c2b63ef9 Mon Sep 17 00:00:00 2001
From: Tang <Michael.Tang@gov.bc.ca>
Date: Tue, 6 Feb 2024 13:38:20 -0800
Subject: [PATCH 1/4] changes for grad2 2499

---
 .../src/components/Codes/CareerPrograms.vue    | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/Codes/CareerPrograms.vue b/frontend/src/components/Codes/CareerPrograms.vue
index e357dd28..b60b4bd2 100644
--- a/frontend/src/components/Codes/CareerPrograms.vue
+++ b/frontend/src/components/Codes/CareerPrograms.vue
@@ -8,7 +8,7 @@
     </p>
     <DisplayTable
       title="Career Programs"
-      v-bind:items="careerPrograms"
+      v-bind:items="sortedCareerPrograms"
       v-bind:fields="careerProgramFields"
       id="code"
       showFilter="true"
@@ -36,6 +36,9 @@ export default {
     ProgramManagementService.getCareerPrograms()
       .then((response) => {
         this.careerPrograms = response.data;
+        this.sortedCareerPrograms = this.careerPrograms.sort(
+          (a, b) => a.displayOrder - b.displayOrder
+        );
       })
       // eslint-disable-next-line
       .catch((error) => {
@@ -49,7 +52,16 @@ export default {
   data: function () {
     return {
       careerPrograms: [],
+      sortedCareerPrograms: [],
       careerProgramFields: [
+        {
+          key: "displayOrder",
+          label: "Display Order",
+          sortable: true,
+          sortDirection: "asc",
+          thClass: "d-none",
+          tdClass: "d-none",
+        },
         {
           key: "code",
           label: "Code",
@@ -64,12 +76,12 @@ export default {
         },
         {
           key: "startDate",
-          label: "Start Date",
+          label: "Effective Date",
           sortable: true,
         },
         {
           key: "endDate",
-          label: "End Date",
+          label: "Expiry Date",
           sortable: true,
         },
       ],

From c23667797018e0782badae0309c94c3264ce930b Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Wed, 21 Feb 2024 09:19:50 -0800
Subject: [PATCH 2/4] Added wroteFlag to student assessment table

---
 .../src/components/StudentProfile/StudentAssessments.vue    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/frontend/src/components/StudentProfile/StudentAssessments.vue b/frontend/src/components/StudentProfile/StudentAssessments.vue
index 2c5eade1..ce9617cb 100644
--- a/frontend/src/components/StudentProfile/StudentAssessments.vue
+++ b/frontend/src/components/StudentProfile/StudentAssessments.vue
@@ -136,6 +136,12 @@ export default {
           sortable: true,
           sortDirection: "desc",
         },
+        {
+          key: "wroteFlag",
+          label: "Wrote Flag",
+          sortable: true,
+          sortDirection: "desc",
+        },
         {
           key: "exceededWriteFlag",
           label: "Exceeded Writes",

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 3/4] 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 4/4] 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"