@eeplatform/nuxt-layer-common 1.7.23 → 1.7.25

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @eeplatform/nuxt-layer-common
 
+## 1.7.25
+
+### Patch Changes
+
+- 94e6f98: Fix get grade level query
+
+## 1.7.24
+
+### Patch Changes
+
+- ed7b645: Restrict last grade and school year options
+
 ## 1.7.23
 
 ### Patch Changes

package/components/EnrollmentForm.vue

@@ -715,10 +715,24 @@
                       required
                     />
                     <v-col cols="12">
-                      <v-text-field
+                      <v-combobox
                         v-model="enrollment.address.current.municipalityCity"
                         :rules="[requiredRule]"
-                      ></v-text-field>
+                        :items="citiesMunicipalities"
+                        item-title="name"
+                        item-value="name"
+                        :hide-no-data="false"
+                      >
+                        <template v-slot:no-data>
+                          <v-list-item>
+                            <v-list-item-title>
+                              No results matching "<strong>search</strong>".
+                              Press
+                              <kbd>enter</kbd> to create a new one
+                            </v-list-item-title>
+                          </v-list-item>
+                        </template>
+                      </v-combobox>
                     </v-col>
                   </v-row>
                 </v-col>
@@ -731,10 +745,24 @@
                       required
                     />
                     <v-col cols="12">
-                      <v-text-field
+                      <v-combobox
                         v-model="enrollment.address.current.province"
                         :rules="[requiredRule]"
-                      ></v-text-field>
+                        :items="provinces"
+                        item-title="name"
+                        item-value="name"
+                        :hide-no-data="false"
+                      >
+                        <template v-slot:no-data>
+                          <v-list-item>
+                            <v-list-item-title>
+                              No results matching "<strong>search</strong>".
+                              Press
+                              <kbd>enter</kbd> to create a new one
+                            </v-list-item-title>
+                          </v-list-item>
+                        </template>
+                      </v-combobox>
                     </v-col>
                   </v-row>
                 </v-col>
@@ -750,6 +778,7 @@
                       <v-text-field
                         v-model="enrollment.address.current.country"
                         :rules="[requiredRule]"
+                        readonly
                       ></v-text-field>
                     </v-col>
                   </v-row>
@@ -847,11 +876,25 @@
                       required
                     />
                     <v-col cols="12">
-                      <v-text-field
+                      <v-combobox
                         v-model="enrollment.address.permanent.municipalityCity"
                         :rules="[requiredRule]"
                         :readonly="sameAsCurrentAddress"
-                      ></v-text-field>
+                        :items="citiesMunicipalities"
+                        item-title="name"
+                        item-value="name"
+                        :hide-no-data="false"
+                      >
+                        <template v-slot:no-data>
+                          <v-list-item>
+                            <v-list-item-title>
+                              No results matching "<strong>search</strong>".
+                              Press
+                              <kbd>enter</kbd> to create a new one
+                            </v-list-item-title>
+                          </v-list-item>
+                        </template>
+                      </v-combobox>
                     </v-col>
                   </v-row>
                 </v-col>
@@ -864,11 +907,25 @@
                       required
                     />
                     <v-col cols="12">
-                      <v-text-field
+                      <v-combobox
                         v-model="enrollment.address.permanent.province"
                         :rules="[requiredRule]"
                         :readonly="sameAsCurrentAddress"
-                      ></v-text-field>
+                        :items="provinces"
+                        item-title="name"
+                        item-value="name"
+                        :hide-no-data="false"
+                      >
+                        <template v-slot:no-data>
+                          <v-list-item>
+                            <v-list-item-title>
+                              No results matching "<strong>search</strong>".
+                              Press
+                              <kbd>enter</kbd> to create a new one
+                            </v-list-item-title>
+                          </v-list-item>
+                        </template>
+                      </v-combobox>
                     </v-col>
                   </v-row>
                 </v-col>
@@ -1276,15 +1333,15 @@
                 <InputLabel
                   class="text-capitalize"
                   title="Last Grade Level Completed"
-                  required
+                  :required="!isKindergarten"
                 />
                 <v-col cols="12">
                   <v-autocomplete
                     v-model="
                       enrollment.returningLearnerInfo.lastGradeLevelCompleted
                     "
-                    :rules="[requiredRule]"
-                    :items="gradeLevels"
+                    :rules="isKindergarten ? [] : [requiredRule]"
+                    :items="allowedLastGradeLevels"
                   ></v-autocomplete>
                 </v-col>
               </v-row>
@@ -1295,14 +1352,14 @@
                 <InputLabel
                   class="text-capitalize"
                   title="Last School Year Completed"
-                  required
+                  :required="!isKindergarten"
                 />
                 <v-col cols="12">
                   <v-autocomplete
                     v-model="
                       enrollment.returningLearnerInfo.lastSchoolYearCompleted
                     "
-                    :rules="[requiredRule]"
+                    :rules="isKindergarten ? [] : [requiredRule]"
                     :items="lastSchoolYearOptions"
                   ></v-autocomplete>
                 </v-col>
@@ -1316,12 +1373,12 @@
             <InputLabel
               class="text-capitalize"
               title="Last School Attended"
-              required
+              :required="!isKindergarten"
             />
             <v-col cols="12">
               <v-text-field
                 v-model="enrollment.returningLearnerInfo.lastSchoolAttended"
-                :rules="[requiredRule]"
+                :rules="isKindergarten ? [] : [requiredRule]"
               ></v-text-field>
             </v-col>
           </v-row>
@@ -1412,6 +1469,14 @@ if (prop.school) {
 
 enrollment.value.createdBy = useCookie("user", cookieConfig).value ?? "";
 
+// Set default country values on mount
+if (!enrollment.value.address.current.country) {
+  enrollment.value.address.current.country = "Philippines";
+}
+if (!enrollment.value.address.permanent.country) {
+  enrollment.value.address.permanent.country = "Philippines";
+}
+
 const { getAll: getAllPSGC } = usePSGC();
 
 const region = ref("");
@@ -1652,6 +1717,13 @@ watch(selectedSchool, (val) => {
   }
 });
 
+watch(
+  () => enrollment.value.gradeLevel,
+  () => {
+    enrollment.value.returningLearnerInfo.lastGradeLevelCompleted = "";
+  }
+);
+
 const { gradeLevels, generateSchoolYears, motherTongueOptions, tracks } =
   useBasicEdu();
 
@@ -1660,10 +1732,10 @@ const gradeLevelOffering = ref<Record<string, any>[]>([]);
 const { getAll: getGradeLevels } = useGradeLevel();
 
 const { data: getGradeLevelReq } = await useLazyAsyncData(
-  "get-grade-level-offerings" + enrollment.value.school,
-  () => getGradeLevels({ school: enrollment.value.school, limit: 100 }),
+  "get-grade-level-offerings" + prop.school,
+  () => getGradeLevels({ school: prop.school, limit: 100 }),
   {
-    watch: [() => enrollment.value.school],
+    watch: [() => prop.school],
   }
 );
 
@@ -1695,11 +1767,81 @@ const isSeniorHighSchool = computed(() => {
   return ["grade-11", "grade-12"].includes(gradeLevel);
 });
 
+const isKindergarten = computed(() => {
+  const gradeLevel = enrollment.value.gradeLevel;
+  return gradeLevel === "kindergarten" || gradeLevel === "kinder";
+});
+
+const allowedLastGradeLevels = computed(() => {
+  const currentGrade = enrollment.value.gradeLevel;
+  if (!currentGrade) return gradeLevels;
+
+  // Define grade level order
+  const gradeOrder = [
+    "kindergarten",
+    "kinder",
+    "grade-1",
+    "grade-2",
+    "grade-3",
+    "grade-4",
+    "grade-5",
+    "grade-6",
+    "grade-7",
+    "grade-8",
+    "grade-9",
+    "grade-10",
+    "grade-11",
+    "grade-12",
+  ];
+
+  const currentIndex = gradeOrder.indexOf(currentGrade);
+  if (currentIndex === -1) return gradeLevels;
+
+  // Get grades that are equal to or one level below current grade
+  const allowedGrades = gradeOrder.slice(
+    Math.max(0, currentIndex - 1),
+    currentIndex + 1
+  );
+
+  // Filter gradeLevels to only include allowed grades
+  return gradeLevels.filter((level) => {
+    if (typeof level === "string") {
+      return allowedGrades.includes(level);
+    }
+    if (typeof level === "object" && level.value) {
+      return allowedGrades.includes(level.value);
+    }
+    return false;
+  });
+});
+
 const effectiveSchoolYearOptions = computed(() =>
   generateSchoolYears(0, "future")
 );
 
-const lastSchoolYearOptions = generateSchoolYears(50);
+const lastSchoolYearOptions = computed(() => {
+  const currentSchoolYear = enrollment.value.schoolYear;
+  const allYears = generateSchoolYears(50);
+
+  if (!currentSchoolYear) {
+    // If no school year is selected, exclude only future years (after current school year)
+    const today = new Date();
+    const currentYear = today.getFullYear();
+    const currentMonth = today.getMonth();
+    // School year typically starts in August (month 7), so if we're before August,
+    // the current school year is previous year - current year
+    const currentSchoolYearStart =
+      currentMonth < 7 ? currentYear - 1 : currentYear;
+    const currentSchoolYearStr = `${currentSchoolYearStart}-${
+      currentSchoolYearStart + 1
+    }`;
+
+    return allYears.filter((year) => year <= currentSchoolYearStr);
+  }
+
+  // Filter out years that are >= the selected enrollment school year
+  return allYears.filter((year) => year < currentSchoolYear);
+});
 
 const indigenousCommunitiesPhilippines = [
   // Luzon (Northern Philippines) - Cordillera Groups (Igorot Subgroups)
@@ -1794,7 +1936,7 @@ watch(enrollment, (val) => {
     enrollment.value.address.current.barangay = "";
     enrollment.value.address.current.municipalityCity = "";
     enrollment.value.address.current.province = "";
-    enrollment.value.address.current.country = "";
+    enrollment.value.address.current.country = "Philippines";
     enrollment.value.address.current.zipCode = "";
     enrollment.value.address.permanent.houseNumber = "";
     enrollment.value.address.permanent.streetName = "";
@@ -1802,7 +1944,7 @@ watch(enrollment, (val) => {
     enrollment.value.address.permanent.barangay = "";
     enrollment.value.address.permanent.municipalityCity = "";
     enrollment.value.address.permanent.province = "";
-    enrollment.value.address.permanent.country = "";
+    enrollment.value.address.permanent.country = "Philippines";
     enrollment.value.address.permanent.zipCode = "";
   }
 });
@@ -1822,7 +1964,7 @@ watchEffect(() => {
     enrollment.value.address.permanent.province =
       enrollment.value.address.current.province;
     enrollment.value.address.permanent.country =
-      enrollment.value.address.current.country;
+      enrollment.value.address.current.country || "Philippines";
     enrollment.value.address.permanent.zipCode =
       enrollment.value.address.current.zipCode;
   } else {
@@ -1832,7 +1974,7 @@ watchEffect(() => {
     enrollment.value.address.permanent.barangay = "";
     enrollment.value.address.permanent.municipalityCity = "";
     enrollment.value.address.permanent.province = "";
-    enrollment.value.address.permanent.country = "";
+    enrollment.value.address.permanent.country = "Philippines";
     enrollment.value.address.permanent.zipCode = "";
   }
 });

package/package.json

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