From 7f92cc9afce21d74f688a5bcf3fcae638808d3e9 Mon Sep 17 00:00:00 2001
From: KentoHyono <keeeeento4649@icloud.com>
Date: Tue, 21 Jan 2025 11:39:26 -0800
Subject: [PATCH 1/5] Working on 3240

---
 .../src/components/Batch/Forms/FormInputs/SchoolInput.vue  | 2 +-
 frontend/src/components/Common/SchoolDetailsDialog.vue     | 7 +++----
 frontend/src/store/modules/app.js                          | 3 +++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/Batch/Forms/FormInputs/SchoolInput.vue b/frontend/src/components/Batch/Forms/FormInputs/SchoolInput.vue
index 96997989..207835b5 100644
--- a/frontend/src/components/Batch/Forms/FormInputs/SchoolInput.vue
+++ b/frontend/src/components/Batch/Forms/FormInputs/SchoolInput.vue
@@ -67,7 +67,7 @@
             </div>
             <div>
               <strong>School Category:</strong>
-              {{ item.info.schoolCategoryCode }}
+              {{ item.info.schoolCategoryCode }} <pre>{{ item }}</pre>
             </div>
           </template>
           <template #bottom> </template>
diff --git a/frontend/src/components/Common/SchoolDetailsDialog.vue b/frontend/src/components/Common/SchoolDetailsDialog.vue
index fb08db8a..989be01d 100644
--- a/frontend/src/components/Common/SchoolDetailsDialog.vue
+++ b/frontend/src/components/Common/SchoolDetailsDialog.vue
@@ -31,9 +31,8 @@
           </div>
           <div class="my-1">
             <strong>School Category </strong
-            >{{
-              getInstituteCategoryByCode(school.schoolCategoryCode)?.legacyCode
-            }}&nbsp;{{ school.schoolCategoryCode }}
+            >
+            {{ getCategoryNameByCode(school.schoolCategoryCode) }}
           </div>
           <div class="my-1">
             <strong>Issue Transcripts </strong
@@ -65,7 +64,7 @@ export default {
   computed: {
     ...mapState(useAppStore, {
       getDistrictById: "getDistrictById",
-      getInstituteCategoryByCode: "getInstituteCategoryByCode",
+      getCategoryNameByCode: "getCategoryNameByCode",
     }),
   },
   methods: {
diff --git a/frontend/src/store/modules/app.js b/frontend/src/store/modules/app.js
index 9ce88e14..4c398924 100644
--- a/frontend/src/store/modules/app.js
+++ b/frontend/src/store/modules/app.js
@@ -44,6 +44,9 @@ export const useAppStore = defineStore("app", {
           (categoryCode) => code === categoryCode.schoolCategoryCode
         );
     },
+    getCategoryNameByCode: (state) => {
+      return (code) => this.getInstituteAddressTypeCode(state) + " - " + code
+    },
     getInstituteFacilityCodes: (state) => state.instituteFacilityCodes,
     getInstituteFacilityCode: (state) => {
       return (code) =>

From b519d41e4375f0438825ba2c945ff71faf269e55 Mon Sep 17 00:00:00 2001
From: KentoHyono <keeeeento4649@icloud.com>
Date: Tue, 21 Jan 2025 12:13:20 -0800
Subject: [PATCH 2/5] Working on 3240

---
 frontend/src/components/Common/SchoolDetailsDialog.vue | 9 ++++++---
 frontend/src/store/modules/app.js                      | 7 +++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/Common/SchoolDetailsDialog.vue b/frontend/src/components/Common/SchoolDetailsDialog.vue
index 989be01d..8e65bf6e 100644
--- a/frontend/src/components/Common/SchoolDetailsDialog.vue
+++ b/frontend/src/components/Common/SchoolDetailsDialog.vue
@@ -31,8 +31,10 @@
           </div>
           <div class="my-1">
             <strong>School Category </strong
-            >
-            {{ getCategoryNameByCode(school.schoolCategoryCode) }}
+            >{{
+              getInstituteCategoryByCode(school.schoolCategoryCode)?.legacyCode
+            }}&nbsp;{{ school.schoolCategoryCode }}
+            {{ console.log(getSchoolCategoryDisplayByCode(school.schoolCategoryCode)) }}
           </div>
           <div class="my-1">
             <strong>Issue Transcripts </strong
@@ -64,7 +66,8 @@ export default {
   computed: {
     ...mapState(useAppStore, {
       getDistrictById: "getDistrictById",
-      getCategoryNameByCode: "getCategoryNameByCode",
+      getInstituteCategoryByCode: "getInstituteCategoryByCode",
+      getSchoolCategoryDisplayByCode: "getSchoolCategoryDisplayByCode"
     }),
   },
   methods: {
diff --git a/frontend/src/store/modules/app.js b/frontend/src/store/modules/app.js
index 4c398924..09e78127 100644
--- a/frontend/src/store/modules/app.js
+++ b/frontend/src/store/modules/app.js
@@ -44,8 +44,11 @@ export const useAppStore = defineStore("app", {
           (categoryCode) => code === categoryCode.schoolCategoryCode
         );
     },
-    getCategoryNameByCode: (state) => {
-      return (code) => this.getInstituteAddressTypeCode(state) + " - " + code
+    getSchoolCategoryDisplayByCode: (state) => {
+      return (code) =>
+        state.instituteCategoryCodes.find(
+          (categoryCode) => code === categoryCode.schoolCategoryCode
+        );
     },
     getInstituteFacilityCodes: (state) => state.instituteFacilityCodes,
     getInstituteFacilityCode: (state) => {

From 472a86038c51e4c6660bd8d9d601f3921667991c Mon Sep 17 00:00:00 2001
From: KentoHyono <keeeeento4649@icloud.com>
Date: Tue, 21 Jan 2025 12:27:02 -0800
Subject: [PATCH 3/5] Added school category legacy code to the display for
 batch jobs to make them consistent

---
 .../src/components/Batch/Forms/FormInputs/SchoolInput.vue | 4 ++--
 frontend/src/components/Common/SchoolDetailsDialog.vue    | 8 ++------
 frontend/src/store/modules/app.js                         | 6 ++++--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/frontend/src/components/Batch/Forms/FormInputs/SchoolInput.vue b/frontend/src/components/Batch/Forms/FormInputs/SchoolInput.vue
index 207835b5..16d6ca84 100644
--- a/frontend/src/components/Batch/Forms/FormInputs/SchoolInput.vue
+++ b/frontend/src/components/Batch/Forms/FormInputs/SchoolInput.vue
@@ -67,7 +67,7 @@
             </div>
             <div>
               <strong>School Category:</strong>
-              {{ item.info.schoolCategoryCode }} <pre>{{ item }}</pre>
+              {{ getInstituteCategoryDisplayByCode(item.info.schoolCategoryCode) }}
             </div>
           </template>
           <template #bottom> </template>
@@ -216,7 +216,7 @@ export default {
   },
 
   computed: {
-    ...mapState(useAppStore, ["getSchoolsList", "getSchoolById"]),
+    ...mapState(useAppStore, ["getSchoolsList", "getSchoolById", "getInstituteCategoryDisplayByCode"]),
     isEmpty() {
       return this.students.length > 0;
     },
diff --git a/frontend/src/components/Common/SchoolDetailsDialog.vue b/frontend/src/components/Common/SchoolDetailsDialog.vue
index 8e65bf6e..3ce0838f 100644
--- a/frontend/src/components/Common/SchoolDetailsDialog.vue
+++ b/frontend/src/components/Common/SchoolDetailsDialog.vue
@@ -31,10 +31,7 @@
           </div>
           <div class="my-1">
             <strong>School Category </strong
-            >{{
-              getInstituteCategoryByCode(school.schoolCategoryCode)?.legacyCode
-            }}&nbsp;{{ school.schoolCategoryCode }}
-            {{ console.log(getSchoolCategoryDisplayByCode(school.schoolCategoryCode)) }}
+            >{{ getInstituteCategoryDisplayByCode(school.schoolCategoryCode) }}
           </div>
           <div class="my-1">
             <strong>Issue Transcripts </strong
@@ -66,8 +63,7 @@ export default {
   computed: {
     ...mapState(useAppStore, {
       getDistrictById: "getDistrictById",
-      getInstituteCategoryByCode: "getInstituteCategoryByCode",
-      getSchoolCategoryDisplayByCode: "getSchoolCategoryDisplayByCode"
+      getInstituteCategoryDisplayByCode: "getInstituteCategoryDisplayByCode",
     }),
   },
   methods: {
diff --git a/frontend/src/store/modules/app.js b/frontend/src/store/modules/app.js
index 09e78127..41ff711b 100644
--- a/frontend/src/store/modules/app.js
+++ b/frontend/src/store/modules/app.js
@@ -44,11 +44,13 @@ export const useAppStore = defineStore("app", {
           (categoryCode) => code === categoryCode.schoolCategoryCode
         );
     },
-    getSchoolCategoryDisplayByCode: (state) => {
+    getInstituteCategoryDisplayByCode: (state) => {
       return (code) =>
         state.instituteCategoryCodes.find(
           (categoryCode) => code === categoryCode.schoolCategoryCode
-        );
+        )?.legacyCode
+        + " - " +
+        code;
     },
     getInstituteFacilityCodes: (state) => state.instituteFacilityCodes,
     getInstituteFacilityCode: (state) => {

From 6fb2a338a0760f37a1b6df20b24d0c50962f5a71 Mon Sep 17 00:00:00 2001
From: KentoHyono <keeeeento4649@icloud.com>
Date: Tue, 21 Jan 2025 16:02:12 -0800
Subject: [PATCH 4/5] Made it legacyCode - label instead of legacyCode - code

---
 .../src/components/Batch/Forms/FormInputs/SchoolInput.vue   | 4 ++--
 frontend/src/components/Common/SchoolDetailsDialog.vue      | 4 ++--
 frontend/src/store/modules/app.js                           | 6 ++++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/Batch/Forms/FormInputs/SchoolInput.vue b/frontend/src/components/Batch/Forms/FormInputs/SchoolInput.vue
index 16d6ca84..5d76b8b8 100644
--- a/frontend/src/components/Batch/Forms/FormInputs/SchoolInput.vue
+++ b/frontend/src/components/Batch/Forms/FormInputs/SchoolInput.vue
@@ -67,7 +67,7 @@
             </div>
             <div>
               <strong>School Category:</strong>
-              {{ getInstituteCategoryDisplayByCode(item.info.schoolCategoryCode) }}
+              {{ displaySchoolCategoryCode(item.info.schoolCategoryCode) }}
             </div>
           </template>
           <template #bottom> </template>
@@ -216,7 +216,7 @@ export default {
   },
 
   computed: {
-    ...mapState(useAppStore, ["getSchoolsList", "getSchoolById", "getInstituteCategoryDisplayByCode"]),
+    ...mapState(useAppStore, ["getSchoolsList", "getSchoolById", "displaySchoolCategoryCode"]),
     isEmpty() {
       return this.students.length > 0;
     },
diff --git a/frontend/src/components/Common/SchoolDetailsDialog.vue b/frontend/src/components/Common/SchoolDetailsDialog.vue
index 3ce0838f..01b1980c 100644
--- a/frontend/src/components/Common/SchoolDetailsDialog.vue
+++ b/frontend/src/components/Common/SchoolDetailsDialog.vue
@@ -31,7 +31,7 @@
           </div>
           <div class="my-1">
             <strong>School Category </strong
-            >{{ getInstituteCategoryDisplayByCode(school.schoolCategoryCode) }}
+            >{{ displaySchoolCategoryCode(school.schoolCategoryCode) }}
           </div>
           <div class="my-1">
             <strong>Issue Transcripts </strong
@@ -63,7 +63,7 @@ export default {
   computed: {
     ...mapState(useAppStore, {
       getDistrictById: "getDistrictById",
-      getInstituteCategoryDisplayByCode: "getInstituteCategoryDisplayByCode",
+      displaySchoolCategoryCode: "displaySchoolCategoryCode",
     }),
   },
   methods: {
diff --git a/frontend/src/store/modules/app.js b/frontend/src/store/modules/app.js
index 41ff711b..f784e370 100644
--- a/frontend/src/store/modules/app.js
+++ b/frontend/src/store/modules/app.js
@@ -44,13 +44,15 @@ export const useAppStore = defineStore("app", {
           (categoryCode) => code === categoryCode.schoolCategoryCode
         );
     },
-    getInstituteCategoryDisplayByCode: (state) => {
+    displaySchoolCategoryCode: (state) => {
       return (code) =>
         state.instituteCategoryCodes.find(
           (categoryCode) => code === categoryCode.schoolCategoryCode
         )?.legacyCode
         + " - " +
-        code;
+        state.instituteCategoryCodes.find(
+          (categoryCode) => code === categoryCode.schoolCategoryCode
+        )?.label
     },
     getInstituteFacilityCodes: (state) => state.instituteFacilityCodes,
     getInstituteFacilityCode: (state) => {

From f1ec3f325defc2ecc216fb33473e0d906c5a9b55 Mon Sep 17 00:00:00 2001
From: KentoHyono <keeeeento4649@icloud.com>
Date: Tue, 21 Jan 2025 16:11:57 -0800
Subject: [PATCH 5/5] Simplified function

---
 frontend/src/store/modules/app.js | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/frontend/src/store/modules/app.js b/frontend/src/store/modules/app.js
index f784e370..29edfc15 100644
--- a/frontend/src/store/modules/app.js
+++ b/frontend/src/store/modules/app.js
@@ -44,15 +44,12 @@ export const useAppStore = defineStore("app", {
           (categoryCode) => code === categoryCode.schoolCategoryCode
         );
     },
-    displaySchoolCategoryCode: (state) => {
-      return (code) =>
-        state.instituteCategoryCodes.find(
-          (categoryCode) => code === categoryCode.schoolCategoryCode
-        )?.legacyCode
-        + " - " +
-        state.instituteCategoryCodes.find(
-          (categoryCode) => code === categoryCode.schoolCategoryCode
-        )?.label
+    displaySchoolCategoryCode: (state) => (code) => {
+      const categoryCode = state.instituteCategoryCodes.find(
+        (categoryCode) => code === categoryCode.schoolCategoryCode
+      )
+
+      return categoryCode?.legacyCode + " - " + categoryCode?.label
     },
     getInstituteFacilityCodes: (state) => state.instituteFacilityCodes,
     getInstituteFacilityCode: (state) => {