Merge pull request #546 from bcgov/release/v1.15.0

Release/v1.15.0
bcgov · Mar 4, 2024 · 35d0117 · 35d0117
2 parents 289d76a + d8e834b
commit 35d0117
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 11 deletions.
diff --git 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,
         },
       ],

diff --git a/frontend/src/components/DisplayTable.vue b/frontend/src/components/DisplayTable.vue
@@ -197,6 +197,7 @@
     </b-table>
 
     <b-pagination
+      v-if="totalRows"
       v-model="currentPage"
       :total-rows="totalRows"
       :per-page="perPage"
@@ -245,7 +246,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 +304,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 +346,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;
     },
   },
 };

diff --git 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",