@eeplatform/nuxt-layer-common 1.7.50 → 1.7.52

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @eeplatform/nuxt-layer-common
 
+## 1.7.52
+
+### Patch Changes
+
+- 01dfd23: Fix enrollment form - reset semeste, track, and strand when grade level changes
+
+## 1.7.51
+
+### Patch Changes
+
+- 637cc21: Fix enrollment form for senior high
+
 ## 1.7.50
 
 ### Patch Changes

package/components/EnrollmentForm.vue

@@ -1274,6 +1274,7 @@
                       <v-radio-group
                         v-model="enrollment.seniorHighInfo.semester"
                         density="compact"
+                        :rules="[requiredRule]"
                       >
                         <v-radio label="1st" value="1st"></v-radio>
                         <v-radio label="2nd" value="2nd"></v-radio>
@@ -1298,6 +1299,7 @@
                             item-value="value"
                             :return-object="false"
                             :items="tracks"
+                            :rules="[requiredRule]"
                           ></v-autocomplete>
                         </v-col>
                       </v-row>
@@ -1317,6 +1319,7 @@
                             item-value="value"
                             :return-object="false"
                             :items="selectedTrackStrands"
+                            :rules="[requiredRule]"
                           ></v-autocomplete>
                         </v-col>
                       </v-row>
@@ -1491,10 +1494,16 @@ const birthdateRules = [
     const today = new Date();
     let age = today.getFullYear() - date.getFullYear();
     const monthDiff = today.getMonth() - date.getMonth();
-    if (monthDiff < 0 || (monthDiff === 0 && today.getDate() < date.getDate())) {
+    if (
+      monthDiff < 0 ||
+      (monthDiff === 0 && today.getDate() < date.getDate())
+    ) {
       age--;
     }
-    return age >= 5 || "Learner must be at least 5 years old (Kindergarten age)";
+    if (enrollment.value.gradeLevel === "non-graded") return true;
+    return (
+      age >= 5 || "Learner must be at least 5 years old (Kindergarten age)"
+    );
   },
   (v: any) => {
     if (!v) return true;
@@ -1503,7 +1512,10 @@ const birthdateRules = [
     const today = new Date();
     let age = today.getFullYear() - date.getFullYear();
     const monthDiff = today.getMonth() - date.getMonth();
-    if (monthDiff < 0 || (monthDiff === 0 && today.getDate() < date.getDate())) {
+    if (
+      monthDiff < 0 ||
+      (monthDiff === 0 && today.getDate() < date.getDate())
+    ) {
       age--;
     }
     return age <= 80 || "Learner must be at most 80 years old";
@@ -2261,10 +2273,22 @@ watch(selectedSchool, (val) => {
 
 watch(
   () => enrollment.value.gradeLevel,
-  () => {
+  (newGradeLevel) => {
     if (enrollment.value.returningLearnerInfo) {
       enrollment.value.returningLearnerInfo.lastGradeLevelCompleted = "";
     }
+
+    // Clear senior high fields when switching to a non-senior-high grade level
+    if (
+      enrollment.value.seniorHighInfo &&
+      !["grade-11", "grade-12"].includes(newGradeLevel)
+    ) {
+      enrollment.value.seniorHighInfo.semester = "";
+      enrollment.value.seniorHighInfo.track = "";
+      enrollment.value.seniorHighInfo.trackName = "";
+      enrollment.value.seniorHighInfo.strand = "";
+      enrollment.value.seniorHighInfo.strandName = "";
+    }
   }
 );
 
@@ -2350,7 +2374,11 @@ watch(
 
 const isKindergarten = computed(() => {
   const gradeLevel = enrollment.value.gradeLevel;
-  return gradeLevel === "kindergarten" || gradeLevel === "kinder";
+  return (
+    gradeLevel === "kindergarten" ||
+    gradeLevel === "kinder" ||
+    gradeLevel === "non-graded"
+  );
 });
 
 const allowedLastGradeLevels = computed(() => {
@@ -2598,7 +2626,8 @@ import { useMask } from "vuetify";
 watchEffect(() => {
   if (
     enrollment.value.learnerInfo.birthDate &&
-    parseBirthdate(enrollment.value.learnerInfo.birthDate).toString() !== "Invalid Date"
+    parseBirthdate(enrollment.value.learnerInfo.birthDate).toString() !==
+      "Invalid Date"
   ) {
     const birthDate = parseBirthdate(enrollment.value.learnerInfo.birthDate);
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "@eeplatform/nuxt-layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "1.7.50",
+  "version": "1.7.52",
   "main": "./nuxt.config.ts",
   "publishConfig": {
     "access": "public"