Merge pull request #1847 from bcgov/feature/indies

Additional fix for indies
bcgov · Jan 3, 2024 · 78ef3f3 · 78ef3f3
2 parents 5572c5c + b8d59a1
commit 78ef3f3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/backend/src/components/institute/institute.js b/backend/src/components/institute/institute.js
@@ -893,6 +893,11 @@ async function updateSchool(req, res) {
     }
     payload.neighborhoodLearning = nlcObjectsArray;
     payload.grades=gradesObjectArray;
+
+    if(!['OFFSHORE', 'INDEPEND', 'INDP_FNS'].includes(payload.schoolCategoryCode)){
+      payload.independentAuthorityId = null;
+    }
+
     const result = await utils.putData(config.get('server:institute:instituteSchoolURL') + '/' + payload.schoolId, payload, utils.getUser(req).idir_username);
     return res.status(HttpStatus.OK).json(result);
 

diff --git a/frontend/src/components/institute/common/Details.vue b/frontend/src/components/institute/common/Details.vue
@@ -96,7 +96,7 @@
             </v-col>
           </v-row>
           <v-row
-              v-if="editing && schoolDetailsCopy.independentAuthorityId"
+              v-if="editing && ['OFFSHORE', 'INDEPEND', 'INDP_FNS'].includes(schoolDetailsCopy.schoolCategoryCode)"
               class="d-flex justify-start"
           >
             <v-col
@@ -110,6 +110,7 @@
                   item-value="authorityID"
                   item-title="authorityCodeName"
                   :items="activeAuthorities"
+                  :rules="[rules.required()]"
                   variant="underlined"
                   class="pt-0"
                   clearable
@@ -288,6 +289,7 @@
                     item-title="label"
                     variant="underlined"
                     label="School Category"
+                    @update:model-value="validateForm"
                     class="mt-n5"
                     single
                     required