@eeplatform/nuxt-layer-common 1.7.30 → 1.7.31

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @eeplatform/nuxt-layer-common
 
+## 1.7.31
+
+### Patch Changes
+
+- b19de01: Fix enrollment form address
+
 ## 1.7.30
 
 ### Patch Changes

package/components/EnrollmentForm.vue

@@ -116,7 +116,7 @@
           </v-row>
         </v-col>
 
-        <v-col cols="2" class="pb-0">
+        <v-col cols="3" class="pb-0">
           <v-row no-gutters>
             <InputLabel class="text-capitalize" title="Grade Level" required />
             <v-col cols="12">
@@ -167,6 +167,28 @@
                   </v-row>
                 </v-col>
 
+                <v-col
+                  v-if="
+                    enrollment.specialProgram && selectedProgram.majors.length
+                  "
+                  cols="12"
+                >
+                  <v-row no-gutters>
+                    <InputLabel
+                      class="text-capitalize"
+                      title="Major"
+                      required
+                    />
+                    <v-col cols="12">
+                      <v-autocomplete
+                        v-model="enrollment.specialProgramMajor"
+                        :rules="[requiredRule]"
+                        :items="selectedProgram.majors"
+                      ></v-autocomplete>
+                    </v-col>
+                  </v-row>
+                </v-col>
+
                 <v-col
                   v-if="enrollment.specialProgram && selectedProgram.gwa"
                   cols="12"
@@ -402,83 +424,35 @@
 
         <v-col cols="12" class="mt-4">
           <v-row>
-            <v-col cols="6">
+            <v-col cols="3">
               <v-row no-gutters>
+                <InputLabel
+                  class="text-capitalize"
+                  title="Place of Birth(Municipality/City)"
+                  required
+                />
                 <v-col cols="12">
-                  <span class="font-weight-bold text-subtitle-1">
-                    Place of Birth
-                  </span>
+                  <v-combobox
+                    v-model="
+                      enrollment.learnerInfo.placeOfBirth.cityMunicipality
+                    "
+                    :rules="[requiredRule]"
+                    :items="birthCitiesMunicipalities"
+                    item-title="name"
+                    item-value="code"
+                    :return-object="false"
+                    :hide-no-data="false"
+                    :loading="loadingBirthCityMun"
+                  >
+                    <template v-slot:no-data>
+                      <v-list-item>
+                        <v-list-item-title>
+                          No results found. Press <kbd>enter</kbd> to search
+                        </v-list-item-title>
+                      </v-list-item>
+                    </template>
+                  </v-combobox>
                 </v-col>
-
-                <v-row>
-                  <v-col cols="6">
-                    <v-row no-gutters>
-                      <InputLabel
-                        class="text-capitalize"
-                        title="Province"
-                        required
-                      />
-                      <v-col cols="12">
-                        <v-combobox
-                          v-model="enrollment.learnerInfo.placeOfBirth.province"
-                          :rules="[requiredRule]"
-                          :items="birthProvinces"
-                          item-title="name"
-                          item-value="code"
-                          :return-object="false"
-                          :hide-no-data="false"
-                          :loading="loadingBirthProvinces"
-                          @keydown.enter="getBirthCityMun()"
-                        >
-                          <template v-slot:no-data>
-                            <v-list-item>
-                              <v-list-item-title>
-                                No results found. Press <kbd>enter</kbd> to
-                                search
-                              </v-list-item-title>
-                            </v-list-item>
-                          </template>
-                        </v-combobox>
-                      </v-col>
-                    </v-row>
-                  </v-col>
-
-                  <v-col cols="6">
-                    <v-row no-gutters>
-                      <InputLabel
-                        class="text-capitalize"
-                        title="Municipality/City"
-                        required
-                      />
-                      <v-col cols="12">
-                        <v-combobox
-                          v-model="
-                            enrollment.learnerInfo.placeOfBirth.cityMunicipality
-                          "
-                          :rules="[requiredRule]"
-                          :items="birthCitiesMunicipalities"
-                          item-title="name"
-                          item-value="code"
-                          :return-object="false"
-                          :hide-no-data="false"
-                          :disabled="
-                            !enrollment.learnerInfo.placeOfBirth.province
-                          "
-                          :loading="loadingBirthCityMun"
-                        >
-                          <template v-slot:no-data>
-                            <v-list-item>
-                              <v-list-item-title>
-                                No results found. Press <kbd>enter</kbd> to
-                                search
-                              </v-list-item-title>
-                            </v-list-item>
-                          </template>
-                        </v-combobox>
-                      </v-col>
-                    </v-row>
-                  </v-col>
-                </v-row>
               </v-row>
             </v-col>
           </v-row>
@@ -736,22 +710,16 @@
 
                 <v-col cols="3">
                   <v-row no-gutters>
-                    <InputLabel
-                      class="text-capitalize"
-                      title="Province"
-                      required
-                    />
+                    <InputLabel class="text-capitalize" title="Province" />
                     <v-col cols="12">
                       <v-combobox
                         v-model="enrollment.address.current.province"
-                        :rules="[requiredRule]"
                         :items="currentProvinces"
                         item-title="name"
                         item-value="code"
                         :return-object="false"
                         :hide-no-data="false"
                         :loading="loadingCurrentProvinces"
-                        @keydown.enter="getCurrentCityMun()"
                       >
                         <template v-slot:no-data>
                           <v-list-item>
@@ -783,7 +751,6 @@
                         item-value="code"
                         :return-object="false"
                         :hide-no-data="false"
-                        :disabled="!enrollment.address.current.province"
                         :loading="loadingCurrentCityMun"
                       >
                         <template v-slot:no-data>
@@ -912,15 +879,10 @@
 
                 <v-col cols="3">
                   <v-row no-gutters>
-                    <InputLabel
-                      class="text-capitalize"
-                      title="Province"
-                      required
-                    />
+                    <InputLabel class="text-capitalize" title="Province" />
                     <v-col cols="12">
                       <v-combobox
                         v-model="enrollment.address.permanent.province"
-                        :rules="[requiredRule]"
                         :readonly="sameAsCurrentAddress"
                         :items="permanentProvinces"
                         item-title="name"
@@ -928,7 +890,7 @@
                         :return-object="false"
                         :hide-no-data="false"
                         :loading="loadingPermanentProvinces"
-                        @keydown.enter="getPermanentCityMun()"
+                        :disabled="sameAsCurrentAddress"
                       >
                         <template v-slot:no-data>
                           <v-list-item>
@@ -961,7 +923,7 @@
                         item-value="code"
                         :return-object="false"
                         :hide-no-data="false"
-                        :disabled="!enrollment.address.permanent.province"
+                        :disabled="sameAsCurrentAddress"
                         :loading="loadingPermanentCityMun"
                       >
                         <template v-slot:no-data>
@@ -1688,26 +1650,26 @@ watchEffect(() => {
 });
 
 const currentCitiesMunicipalities = ref<Array<Record<string, any>>>([]);
-const selectedCurrentProvince = computed(() => {
-  return enrollment.value.address.current.province || "";
-});
 
 const loadingCurrentCityMun = ref(false);
 
 const getCurrentCityMun = debounce(async () => {
-  if (!selectedCurrentProvince.value) {
-    currentCitiesMunicipalities.value = [];
-    return;
-  }
-
   try {
     loadingCurrentCityMun.value = true;
     const res = await getAllPSGC({
       type: "City",
-      prefix: selectedCurrentProvince.value.slice(0, 5),
-      limit: 2000,
+      prefix: enrollment.value.address.current.province
+        ? enrollment.value.address.current.province.slice(0, 5)
+        : "",
+      limit: 1700,
     });
-    currentCitiesMunicipalities.value = res.items;
+
+    currentCitiesMunicipalities.value = res.items.map((i: any) => ({
+      ...i,
+      props: {
+        subtitle: `${i.region}${i.province ? ` - ${i.province}` : ""}`,
+      },
+    }));
   } catch (error) {
     currentCitiesMunicipalities.value = [];
   } finally {
@@ -1715,9 +1677,14 @@ const getCurrentCityMun = debounce(async () => {
   }
 }, 500);
 
-watch(selectedCurrentProvince, () => {
-  getCurrentCityMun();
-});
+watch(
+  () => enrollment.value.address.current.province,
+  () => {
+    getCurrentCityMun();
+  }
+);
+
+getCurrentCityMun();
 
 // Current Address - Barangays
 const currentBarangays = ref<Array<Record<string, any>>>([]);
@@ -1738,7 +1705,7 @@ const getCurrentBarangays = debounce(async () => {
     const res = await getAllPSGC({
       type: "Bgy",
       prefix: selectedCurrentCityMun.value.slice(0, 7),
-      limit: 200,
+      limit: 1000,
     });
     currentBarangays.value = res.items;
   } catch (error) {
@@ -1774,26 +1741,26 @@ watchEffect(() => {
 });
 
 const permanentCitiesMunicipalities = ref<Array<Record<string, any>>>([]);
-const selectedPermanentProvince = computed(() => {
-  return enrollment.value.address.permanent.province || "";
-});
 
 const loadingPermanentCityMun = ref(false);
 
 const getPermanentCityMun = debounce(async () => {
-  if (!selectedPermanentProvince.value) {
-    permanentCitiesMunicipalities.value = [];
-    return;
-  }
-
   try {
     loadingPermanentCityMun.value = true;
     const res = await getAllPSGC({
       type: "City",
-      prefix: selectedPermanentProvince.value.slice(0, 5),
-      limit: 200,
+      prefix: enrollment.value.address.permanent.province
+        ? enrollment.value.address.permanent.province.slice(0, 5)
+        : "",
+      limit: 1700,
     });
-    permanentCitiesMunicipalities.value = res.items;
+
+    permanentCitiesMunicipalities.value = res.items.map((i: any) => ({
+      ...i,
+      props: {
+        subtitle: `${i.region}${i.province ? ` - ${i.province}` : ""}`,
+      },
+    }));
   } catch (error) {
     permanentCitiesMunicipalities.value = [];
   } finally {
@@ -1801,9 +1768,14 @@ const getPermanentCityMun = debounce(async () => {
   }
 }, 500);
 
-watch(selectedPermanentProvince, () => {
-  getPermanentCityMun();
-});
+watch(
+  () => enrollment.value.address.permanent.province,
+  () => {
+    getPermanentCityMun();
+  }
+);
+
+getPermanentCityMun();
 
 // Permanent Address - Barangays
 const permanentBarangays = ref<Array<Record<string, any>>>([]);
@@ -1824,7 +1796,7 @@ const getPermanentBarangays = debounce(async () => {
     const res = await getAllPSGC({
       type: "Bgy",
       prefix: selectedPermanentCityMun.value.slice(0, 7),
-      limit: 200,
+      limit: 1000,
     });
     permanentBarangays.value = res.items;
   } catch (error) {
@@ -1838,56 +1810,24 @@ watch(selectedPermanentCityMun, () => {
   getPermanentBarangays();
 });
 
-// Place of Birth - Province and City/Municipality
-const birthProvinces = ref<Array<Record<string, any>>>([]);
-
-const { data: dataBirthProvinces, status: statusBirthProvinces } =
-  await useLazyAsyncData("get-all-psgc-birth-provinces", () =>
-    getAllPSGC({
-      type: "Prov",
-      limit: 100,
-    })
-  );
-
-const loadingBirthProvinces = computed(
-  () => statusBirthProvinces.value === "pending"
-);
-
-watchEffect(() => {
-  if (dataBirthProvinces.value) {
-    birthProvinces.value = dataBirthProvinces.value.items;
-  }
-});
-
 const birthCitiesMunicipalities = ref<Array<Record<string, any>>>([]);
-const selectedBirthProvince = computed(() => {
-  const province = birthProvinces.value.find(
-    (p) => p.code === enrollment.value.learnerInfo.placeOfBirth.province
-  );
-
-  if (!province) {
-    return "";
-  }
-
-  return province.code;
-});
 
 const loadingBirthCityMun = ref(false);
 
 const getBirthCityMun = debounce(async () => {
-  if (!selectedBirthProvince.value) {
-    birthCitiesMunicipalities.value = [];
-    return;
-  }
-
   try {
     loadingBirthCityMun.value = true;
     const res = await getAllPSGC({
       type: "City",
-      prefix: selectedBirthProvince.value.slice(0, 5),
-      limit: 2000,
+      limit: 1700,
     });
-    birthCitiesMunicipalities.value = res.items;
+
+    birthCitiesMunicipalities.value = res.items.map((i: any) => ({
+      ...i,
+      props: {
+        subtitle: `${i.region}${i.province ? ` - ${i.province}` : ""}`,
+      },
+    }));
   } catch (error) {
     birthCitiesMunicipalities.value = [];
   } finally {
@@ -1895,61 +1835,216 @@ const getBirthCityMun = debounce(async () => {
   }
 }, 500);
 
-watch(selectedBirthProvince, () => {
-  getBirthCityMun();
-});
+getBirthCityMun();
 
-// Auto-fill place of birth region and region name when province is selected
+// Auto-fill place of birth city/municipality name when selected
 watch(
-  () => enrollment.value.learnerInfo.placeOfBirth.province,
+  () => enrollment.value.learnerInfo.placeOfBirth.cityMunicipality,
+  (cityMunCode) => {
+    if (!cityMunCode) {
+      enrollment.value.learnerInfo.placeOfBirth.cityMunicipalityName = "";
+      return;
+    }
+
+    const cityMun = birthCitiesMunicipalities.value.find(
+      (c) => c.code === cityMunCode
+    );
+    if (cityMun) {
+      enrollment.value.learnerInfo.placeOfBirth.cityMunicipalityName =
+        cityMun.name;
+      enrollment.value.learnerInfo.placeOfBirth.province = cityMun.province
+        ? cityMun.code.slice(0, 5) + "00000"
+        : "";
+      enrollment.value.learnerInfo.placeOfBirth.provinceName =
+        cityMun.province ?? "";
+      enrollment.value.learnerInfo.placeOfBirth.region =
+        cityMun.code.slice(0, 2) + "00000000";
+      enrollment.value.learnerInfo.placeOfBirth.regionName = cityMun.region;
+    }
+  }
+);
+
+// Auto-fill current address province name when province is selected
+watch(
+  () => enrollment.value.address.current.province,
   (provinceCode) => {
     if (!provinceCode) {
-      enrollment.value.learnerInfo.placeOfBirth.region = "";
-      enrollment.value.learnerInfo.placeOfBirth.regionName = "";
-      enrollment.value.learnerInfo.placeOfBirth.provinceName = "";
-      enrollment.value.learnerInfo.placeOfBirth.cityMunicipality = "";
-      enrollment.value.learnerInfo.placeOfBirth.cityMunicipalityName = "";
+      enrollment.value.address.current.provinceName = "";
+      enrollment.value.address.current.municipalityCity = "";
+      enrollment.value.address.current.municipalityCityName = "";
+      enrollment.value.address.current.barangay = "";
+      enrollment.value.address.current.barangayName = "";
+      enrollment.value.address.current.streetName = "";
+      enrollment.value.address.current.houseNumber = "";
       return;
     }
 
-    const province = birthProvinces.value.find((p) => p.code === provinceCode);
+    // Clear dependent fields when province changes
+    enrollment.value.address.current.municipalityCity = "";
+    enrollment.value.address.current.municipalityCityName = "";
+    enrollment.value.address.current.barangay = "";
+    enrollment.value.address.current.barangayName = "";
+    enrollment.value.address.current.streetName = "";
+    enrollment.value.address.current.houseNumber = "";
+
+    const province = currentProvinces.value.find(
+      (p) => p.code === provinceCode
+    );
     if (province) {
-      // Set province name
-      enrollment.value.learnerInfo.placeOfBirth.provinceName = province.name;
+      enrollment.value.address.current.provinceName = province.name;
+    }
+  }
+);
 
-      // Get region code from province code (first 2 digits + zeros)
-      const regionCode = province.code.slice(0, 2) + "00000000";
-      enrollment.value.learnerInfo.placeOfBirth.region = regionCode;
+// Auto-fill current address city/municipality, province, and region when selected
+watch(
+  () => enrollment.value.address.current.municipalityCity,
+  (cityMunCode) => {
+    if (!cityMunCode) {
+      enrollment.value.address.current.municipalityCityName = "";
+      enrollment.value.address.current.barangay = "";
+      enrollment.value.address.current.barangayName = "";
+      enrollment.value.address.current.streetName = "";
+      enrollment.value.address.current.houseNumber = "";
+      return;
+    }
 
-      // Find and set region name
-      const region = regions.value.find((r) => r.code === regionCode);
-      if (region) {
-        enrollment.value.learnerInfo.placeOfBirth.regionName = region.name;
-      }
+    // Clear dependent fields when city/municipality changes
+    enrollment.value.address.current.barangay = "";
+    enrollment.value.address.current.barangayName = "";
+    enrollment.value.address.current.streetName = "";
+    enrollment.value.address.current.houseNumber = "";
+
+    const cityMun = currentCitiesMunicipalities.value.find(
+      (c) => c.code === cityMunCode
+    );
+    if (cityMun) {
+      enrollment.value.address.current.municipalityCityName = cityMun.name;
+      enrollment.value.address.current.province = cityMun.province
+        ? cityMun.code.slice(0, 5) + "00000"
+        : "";
+      enrollment.value.address.current.provinceName = cityMun.province ?? "";
+      enrollment.value.address.current.region =
+        cityMun.code.slice(0, 2) + "00000000";
+      enrollment.value.address.current.regionName = cityMun.region;
     }
   }
 );
 
-// Auto-fill place of birth city/municipality name when selected
+// Auto-fill current address barangay name when selected
 watch(
-  () => enrollment.value.learnerInfo.placeOfBirth.cityMunicipality,
+  () => enrollment.value.address.current.barangay,
+  (barangayCode) => {
+    if (!barangayCode) {
+      enrollment.value.address.current.barangayName = "";
+      return;
+    }
+
+    const barangay = currentBarangays.value.find(
+      (b) => b.code === barangayCode
+    );
+    if (barangay) {
+      enrollment.value.address.current.barangayName = barangay.name;
+    }
+  }
+);
+
+// Auto-fill permanent address province name when province is selected
+watch(
+  () => enrollment.value.address.permanent.province,
+  (provinceCode) => {
+    // Don't clear fields if permanent address is same as current address
+    if (sameAsCurrentAddress.value) {
+      return;
+    }
+
+    if (!provinceCode) {
+      enrollment.value.address.permanent.provinceName = "";
+      enrollment.value.address.permanent.municipalityCity = "";
+      enrollment.value.address.permanent.municipalityCityName = "";
+      enrollment.value.address.permanent.barangay = "";
+      enrollment.value.address.permanent.barangayName = "";
+      enrollment.value.address.permanent.streetName = "";
+      enrollment.value.address.permanent.houseNumber = "";
+      return;
+    }
+
+    // Clear dependent fields when province changes
+    enrollment.value.address.permanent.municipalityCity = "";
+    enrollment.value.address.permanent.municipalityCityName = "";
+    enrollment.value.address.permanent.barangay = "";
+    enrollment.value.address.permanent.barangayName = "";
+    enrollment.value.address.permanent.streetName = "";
+    enrollment.value.address.permanent.houseNumber = "";
+
+    const province = permanentProvinces.value.find(
+      (p) => p.code === provinceCode
+    );
+    if (province) {
+      enrollment.value.address.permanent.provinceName = province.name;
+    }
+  }
+);
+
+// Auto-fill permanent address city/municipality, province, and region when selected
+watch(
+  () => enrollment.value.address.permanent.municipalityCity,
   (cityMunCode) => {
+    // Don't clear fields if permanent address is same as current address
+    if (sameAsCurrentAddress.value) {
+      return;
+    }
+
     if (!cityMunCode) {
-      enrollment.value.learnerInfo.placeOfBirth.cityMunicipalityName = "";
+      enrollment.value.address.permanent.municipalityCityName = "";
+      enrollment.value.address.permanent.barangay = "";
+      enrollment.value.address.permanent.barangayName = "";
+      enrollment.value.address.permanent.streetName = "";
+      enrollment.value.address.permanent.houseNumber = "";
       return;
     }
 
-    const cityMun = birthCitiesMunicipalities.value.find(
+    // Clear dependent fields when city/municipality changes
+    enrollment.value.address.permanent.barangay = "";
+    enrollment.value.address.permanent.barangayName = "";
+    enrollment.value.address.permanent.streetName = "";
+    enrollment.value.address.permanent.houseNumber = "";
+
+    const cityMun = permanentCitiesMunicipalities.value.find(
       (c) => c.code === cityMunCode
     );
     if (cityMun) {
-      enrollment.value.learnerInfo.placeOfBirth.cityMunicipalityName =
-        cityMun.name;
+      enrollment.value.address.permanent.municipalityCityName = cityMun.name;
+      enrollment.value.address.permanent.province = cityMun.province
+        ? cityMun.code.slice(0, 5) + "00000"
+        : "";
+      enrollment.value.address.permanent.provinceName = cityMun.province ?? "";
+      enrollment.value.address.permanent.region =
+        cityMun.code.slice(0, 2) + "00000000";
+      enrollment.value.address.permanent.regionName = cityMun.region;
+    }
+  }
+);
+
+// Auto-fill permanent address barangay name when selected
+watch(
+  () => enrollment.value.address.permanent.barangay,
+  (barangayCode) => {
+    if (!barangayCode) {
+      enrollment.value.address.permanent.barangayName = "";
+      return;
+    }
+
+    const barangay = permanentBarangays.value.find(
+      (b) => b.code === barangayCode
+    );
+    if (barangay) {
+      enrollment.value.address.permanent.barangayName = barangay.name;
     }
   }
 );
 
-const { getAll } = useProgram();
+const { getAll: getSpecialPrograms } = useProgram();
 
 const programs = ref<Array<Record<string, any>>>([]);
 
@@ -1958,7 +2053,7 @@ const enrollmentSchool = computed(() => enrollment.value.school);
 const { data: getPrograms } = await useLazyAsyncData(
   `get-programs-as-options-enrollment-form-${enrollment.value.school}`,
   () =>
-    getAll({
+    getSpecialPrograms({
       limit: 20,
       school: enrollment.value.school,
     }),
@@ -1996,19 +2091,11 @@ watchEffect(() => {
 });
 
 const hasSpecialProgram = computed(() => {
-  if (!programs.value.length) {
-    return false;
-  }
-
-  const juniorHigh = ["grade-7", "grade-8", "grade-9", "grade-10"];
-
-  const isJuniorHigh = juniorHigh.includes(enrollment.value.gradeLevel);
-
-  if (isJuniorHigh && programs.value.length > 0) {
-    return true;
-  }
+  const program = programs.value.filter((i) =>
+    i.gradeLevels.includes(enrollment.value.gradeLevel)
+  );
 
-  return false;
+  return program.length > 0;
 });
 
 const schools = ref<TSchool[]>([]);
@@ -2111,7 +2198,9 @@ watch(selectedSchool, (val) => {
 watch(
   () => enrollment.value.gradeLevel,
   () => {
-    enrollment.value.returningLearnerInfo.lastGradeLevelCompleted = "";
+    if (enrollment.value.returningLearnerInfo) {
+      enrollment.value.returningLearnerInfo.lastGradeLevelCompleted = "";
+    }
   }
 );
 
@@ -2338,16 +2427,26 @@ watch(enrollment, (val) => {
     enrollment.value.address.current.streetName = "";
     enrollment.value.address.current.sitio = "";
     enrollment.value.address.current.barangay = "";
+    enrollment.value.address.current.barangayName = "";
     enrollment.value.address.current.municipalityCity = "";
+    enrollment.value.address.current.municipalityCityName = "";
     enrollment.value.address.current.province = "";
+    enrollment.value.address.current.provinceName = "";
+    enrollment.value.address.current.region = "";
+    enrollment.value.address.current.regionName = "";
     enrollment.value.address.current.country = "Philippines";
     enrollment.value.address.current.zipCode = "";
     enrollment.value.address.permanent.houseNumber = "";
     enrollment.value.address.permanent.streetName = "";
     enrollment.value.address.permanent.sitio = "";
     enrollment.value.address.permanent.barangay = "";
+    enrollment.value.address.permanent.barangayName = "";
     enrollment.value.address.permanent.municipalityCity = "";
+    enrollment.value.address.permanent.municipalityCityName = "";
     enrollment.value.address.permanent.province = "";
+    enrollment.value.address.permanent.provinceName = "";
+    enrollment.value.address.permanent.region = "";
+    enrollment.value.address.permanent.regionName = "";
     enrollment.value.address.permanent.country = "Philippines";
     enrollment.value.address.permanent.zipCode = "";
   }
@@ -2363,10 +2462,20 @@ watchEffect(() => {
       enrollment.value.address.current.sitio;
     enrollment.value.address.permanent.barangay =
       enrollment.value.address.current.barangay;
+    enrollment.value.address.permanent.barangayName =
+      enrollment.value.address.current.barangayName;
     enrollment.value.address.permanent.municipalityCity =
       enrollment.value.address.current.municipalityCity;
+    enrollment.value.address.permanent.municipalityCityName =
+      enrollment.value.address.current.municipalityCityName;
     enrollment.value.address.permanent.province =
       enrollment.value.address.current.province;
+    enrollment.value.address.permanent.provinceName =
+      enrollment.value.address.current.provinceName;
+    enrollment.value.address.permanent.region =
+      enrollment.value.address.current.region;
+    enrollment.value.address.permanent.regionName =
+      enrollment.value.address.current.regionName;
     enrollment.value.address.permanent.country =
       enrollment.value.address.current.country || "Philippines";
     enrollment.value.address.permanent.zipCode =
@@ -2376,8 +2485,13 @@ watchEffect(() => {
     enrollment.value.address.permanent.streetName = "";
     enrollment.value.address.permanent.sitio = "";
     enrollment.value.address.permanent.barangay = "";
+    enrollment.value.address.permanent.barangayName = "";
     enrollment.value.address.permanent.municipalityCity = "";
+    enrollment.value.address.permanent.municipalityCityName = "";
     enrollment.value.address.permanent.province = "";
+    enrollment.value.address.permanent.provinceName = "";
+    enrollment.value.address.permanent.region = "";
+    enrollment.value.address.permanent.regionName = "";
     enrollment.value.address.permanent.country = "Philippines";
     enrollment.value.address.permanent.zipCode = "";
   }

package/composables/useBasicEdu.ts

@@ -1,5 +1,9 @@
 export default function useBasicEdu() {
   const educationLevels = [
+    {
+      title: "Non Grade Level",
+      value: "non-grade-level",
+    },
     {
       title: "Elementary",
       value: "elementary",
@@ -37,6 +41,11 @@ export default function useBasicEdu() {
   }
 
   const gradeLevels = [
+    {
+      title: "Non-Grade Level",
+      value: "non-grade-level",
+      level: "non-grade-level",
+    },
     {
       title: "Kindergarten",
       value: "kindergarten",

package/composables/useEnrollment.ts

@@ -72,6 +72,8 @@ export default function useEnrollment() {
         municipalityCityName: "",
         province: "",
         provinceName: "",
+        region: "",
+        regionName: "",
         country: "",
         zipCode: "",
       },
@@ -81,7 +83,10 @@ export default function useEnrollment() {
         sitio: "",
         barangay: "",
         municipalityCity: "",
+        municipalityCityName: "",
         province: "",
+        region: "",
+        regionName: "",
         country: "",
         zipCode: "",
       },

package/composables/useProgram.ts

@@ -7,6 +7,7 @@ export function useProgram() {
     code: "",
     gwa: 0,
     subjects: [],
+    majors: [],
     description: "",
     gradeLevels: [],
   });

package/package.json

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

package/types/enrollment.d.ts

@@ -17,6 +17,7 @@ declare type TTLearner = {
   specialProgram?: string;
   specialProgramName?: string;
   specialProgramCode?: string;
+  specialProgramMajor?: string;
   gwa?: number;
   subjects?: { title: string; grade: number }[];
   returningLearner: boolean;
@@ -94,6 +95,8 @@ declare type EnrAddress = {
   municipalityCityName?: string;
   province: string;
   provinceName?: string;
+  region?: string;
+  regionName?: string;
   country?: string;
   zipCode?: string;
 };

package/types/program.d.ts

@@ -7,6 +7,7 @@ declare type TProgram = {
   gradeLevels?: string[];
   gwa?: number;
   subjects?: { title: string; grade: number }[];
+  majors?: { title: string; value: string }[];
   description?: string;
   status?: string;
   createdAt?: string;
@@ -21,7 +22,8 @@ declare type TProgramScreening = {
   schoolYear: string;
   gradeLevel: string;
   specialProgram: string;
-  specialProgramName?: string;
+  specialProgramName: string;
+  specialProgramMajor: string;
   applicant: string;
   applicantName?: string;
   gwa?: number;