updated the district list to sort by active and district number

bcgov · Jan 15, 2025 · 3f53490 · 3f53490
1 parent 863da4c
commit 3f53490
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/frontend/src/sharedMethods.js b/frontend/src/sharedMethods.js
@@ -132,6 +132,25 @@ export default {
   jobLabel(jobId) {
     return this.jobId.replace("job-", "");
   },
+  sortDistrictListByActiveAndDistrictNumber(districtsList) {
+    if (!districtsList) return [];
+
+    return districtsList.sort((a, b) => {
+      // First, prioritize districts with districtStatusCode "ACTIVE"
+      if (a.districtStatusCode === "ACTIVE" && b.districtStatusCode !== "ACTIVE") {
+        return -1; // "ACTIVE" comes first
+      }
+      if (a.districtStatusCode !== "ACTIVE" && b.districtStatusCode === "ACTIVE") {
+        return 1; // "ACTIVE" comes first
+      }
+
+      // Second, sort by districtNumber (as numeric, handling strings like "103", "005", etc.)
+      const aNumber = parseInt(a.districtNumber, 10);
+      const bNumber = parseInt(b.districtNumber, 10);
+
+      return aNumber - bNumber; // Numeric sorting
+    });
+  },
   sortSchoolListByTranscriptsAndMincode(schoolsList) {
     if (!schoolsList) return [];
     //remove special characters from displayname by overwriting with displayNameNoSpecialChars

diff --git a/frontend/src/store/modules/app.js b/frontend/src/store/modules/app.js
@@ -100,6 +100,10 @@ export const useAppStore = defineStore("app", {
         InstituteService.getDistrictsList().then((response) => {
           try {
             this.districtsList = response.data;
+            this.districtList =
+            sharedMethods.sortDistrictListByActiveAndDistrictNumber(
+              this.districtsList
+            );
           } catch (error) {
             console.error(error);
           }