Merge pull request #1030 from bcgov/fix/EDX-1760

limit grade options for schl/dist view
bcgov · Sep 14, 2023 · 02dbaa5 · 02dbaa5
2 parents 8768f4a + 7383e5b
commit 02dbaa5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/frontend/src/components/common/forms/SchoolDetailsForm.vue b/frontend/src/components/common/forms/SchoolDetailsForm.vue
@@ -445,7 +445,7 @@
                   v-if="isGradeOfferedUpdateAllowed && editing"
                   id="schoolGrades"
                   v-model="schoolDetailsCopy.grades"
-                  :items="gradeCodes"
+                  :items="gradeOptions"
                   item-title="label"
                   item-value="schoolGradeCode"
                   variant="underlined"
@@ -1062,6 +1062,7 @@ export default {
     ...mapState(instituteStore, ['provinceCodes']),
     ...mapState(instituteStore, ['countryCodes']),
     ...mapState(instituteStore, ['gradeCodes']),
+    ...mapState(instituteStore, ['gradeOptions']),
     dataReady: function () {
       return this.userInfo;
     },
@@ -1088,7 +1089,7 @@ export default {
     },
     isGradeOfferedUpdateAllowed() {
       return this.school.schoolCategoryCode !== 'INDP_FNS' && this.school.schoolCategoryCode !== 'INDEPEND';
-    },
+    }
   },
   watch: {
     schoolDetailsFormValid(value) {
@@ -1389,7 +1390,7 @@ export default {
     sortGrades() {
       const gradeList = [];
       for (const grade of this.schoolGradeTypes) {
-        if (this.schoolDetailsCopy.grades.find((rawGrade) => rawGrade.schoolGradeCode === grade.schoolGradeCode)) {
+        if (this.schoolDetailsCopy.grades.find((rawGrade) => rawGrade.schoolGradeCode === grade.schoolGradeCode )) {
           gradeList.push(grade);
         }
       }

diff --git a/frontend/src/store/modules/institute.js b/frontend/src/store/modules/institute.js
@@ -40,7 +40,8 @@ export const instituteStore = defineStore('institute', {
     activeCountryCodesGet: state => state.activeCountryCodes,
     independentAuthoritySchoolContacts: state => state.schoolContactTypeCodes?.filter(type => !type.offshoreOnly),
     offshoreSchoolContacts: state => state.schoolContactTypeCodes?.filter(type => !type.indOnly),
-    regularSchoolContactTypes: state => state.schoolContactTypeCodes?.filter(type => !type.indOnly && !type.offshoreOnly)
+    regularSchoolContactTypes: state => state.schoolContactTypeCodes?.filter(type => !type.indOnly && !type.offshoreOnly),
+    gradeOptions: state => state.gradeCodes?.filter(grade => !['KINDHALF', 'ELEMUNGR', 'SECUNGR'].includes(grade.schoolGradeCode))
   },
   actions: {
     async setFacilityTypeCodes(facilityTypeCodes) {