@eeplatform/nuxt-layer-common 1.7.54 → 1.7.56

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @eeplatform/nuxt-layer-common
 
+## 1.7.56
+
+### Patch Changes
+
+- df8f3cf: Fix enrollment form
+
+## 1.7.55
+
+### Patch Changes
+
+- ce622a8: Fix enrollment form
+
 ## 1.7.54
 
 ### Patch Changes

package/components/EnrollmentForm.vue

@@ -1530,12 +1530,31 @@ const enrollment = defineModel<TLearner>({
 
 const { cookieConfig } = useRuntimeConfig().public;
 
-if (prop.school) {
-  setTimeout(() => {
+const { getById: getSchoolById } = useSchool();
+
+if (prop.schoolId) {
+  setTimeout(async () => {
     enrollment.value.schoolId = prop.schoolId ?? "school";
   }, 1000);
 }
 
+if (prop.school && !prop.selfService) {
+  setTimeout(async () => {
+    try {
+      const school = await getSchoolById(prop.school ?? "school");
+      if (school) {
+        enrollment.value.school = school._id;
+        enrollment.value.region = school.region;
+        enrollment.value.province = school.province;
+        enrollment.value.cityMunicipality = school.cityMunicipality;
+        enrollment.value.schoolName = school.name;
+      }
+    } catch (error) {
+      console.error("Error setting school ID:", error);
+    }
+  }, 1000);
+}
+
 enrollment.value.createdBy = useCookie("user", cookieConfig).value ?? "";
 
 function validZipCode(value: string) {
@@ -2244,8 +2263,11 @@ watch(selectedSchool, (val) => {
 
   const school = schools.value.find((s) => s.id === val);
 
-  if (school?.name) {
+  if (school) {
     enrollment.value.school = school?._id ?? "";
+  }
+
+  if (school?.name) {
     enrollment.value.schoolName = school?.name;
   }
 

package/components/EnrollmentQuestion.vue

@@ -29,46 +29,6 @@
                     </span>
                   </v-col>
 
-                  <v-col v-if="isSelfService" cols="12">
-                    <InputLabel title="Region" />
-                    <v-autocomplete
-                      v-model="step1.answer.region"
-                      :items="regions"
-                      item-title="name"
-                      item-value="code"
-                      :loading="regionStatus"
-                      :disabled="regionStatus"
-                    ></v-autocomplete>
-                  </v-col>
-
-                  <v-col v-if="isSelfService" cols="12">
-                    <InputLabel title="Province" />
-                    <v-autocomplete
-                      v-model="step1.answer.province"
-                      :items="step1Provinces"
-                      item-title="name"
-                      item-value="code"
-                      :return-object="false"
-                      :loading="step1ProvincesStatus"
-                      :disabled="step1ProvincesStatus || !step1.answer.region"
-                    ></v-autocomplete>
-                  </v-col>
-
-                  <v-col v-if="isSelfService" cols="12">
-                    <InputLabel title="City/Municipality" />
-                    <v-autocomplete
-                      v-model="step1.answer.cityMunicipality"
-                      :items="step1CitiesMunicipalities"
-                      item-title="name"
-                      item-value="code"
-                      :loading="step1CitiesMunicipalitiesStatus"
-                      :disabled="
-                        step1CitiesMunicipalitiesStatus ||
-                        !step1.answer.province
-                      "
-                    ></v-autocomplete>
-                  </v-col>
-
                   <v-col cols="12">
                     <InputLabel title="School" required />
                     <v-combobox
@@ -110,6 +70,49 @@
                     </v-combobox>
                   </v-col>
 
+                  <v-col v-if="isSelfService" cols="12">
+                    <InputLabel title="Region" />
+                    <v-autocomplete
+                      v-model="step1.answer.region"
+                      :items="regions"
+                      item-title="name"
+                      item-value="code"
+                      :loading="regionStatus"
+                      :disabled="regionStatus"
+                      clearable
+                    ></v-autocomplete>
+                  </v-col>
+
+                  <v-col v-if="isSelfService" cols="12">
+                    <InputLabel title="Province" />
+                    <v-autocomplete
+                      v-model="step1.answer.province"
+                      :items="step1Provinces"
+                      item-title="name"
+                      item-value="code"
+                      :return-object="false"
+                      :loading="step1ProvincesStatus"
+                      :disabled="step1ProvincesStatus || !step1.answer.region"
+                      clearable
+                    ></v-autocomplete>
+                  </v-col>
+
+                  <v-col v-if="isSelfService" cols="12">
+                    <InputLabel title="City/Municipality" />
+                    <v-autocomplete
+                      v-model="step1.answer.cityMunicipality"
+                      :items="step1CitiesMunicipalities"
+                      item-title="name"
+                      item-value="code"
+                      :loading="step1CitiesMunicipalitiesStatus"
+                      :disabled="
+                        step1CitiesMunicipalitiesStatus ||
+                        !step1.answer.province
+                      "
+                      clearable
+                    ></v-autocomplete>
+                  </v-col>
+
                   <v-col cols="12" class="mt-4">
                     <v-btn
                       class="text-none px-4"
@@ -269,10 +272,39 @@ watchEffect(() => {
   }
 });
 
+// Auto-fill region/province/city when a school is selected
+const isAutoFillingFromSchool = ref(false);
+
+watch(
+  () => step1.value.answer.schoolId,
+  (newSchoolId) => {
+    if (!newSchoolId) return;
+    const school = schools.value.find((s) => s.id === newSchoolId);
+    if (!school) return;
+
+    isAutoFillingFromSchool.value = true;
+    step1.value.answer.school = school._id ?? "";
+    step1.value.answer.schoolName = school.name;
+    step1.value.answer.cityMunicipality = school.cityMunicipalityPSGC ?? "";
+    step1.value.answer.province = school.cityMunicipalityPSGC
+      ? school.cityMunicipalityPSGC.slice(0, 5) + "00000"
+      : "";
+    step1.value.answer.region = school.cityMunicipalityPSGC
+      ? school.cityMunicipalityPSGC.slice(0, 2) + "00000000"
+      : "";
+    step1.value.answer.regionName = school.regionName ?? "";
+
+    nextTick(() => {
+      isAutoFillingFromSchool.value = false;
+    });
+  }
+);
+
 // Clear cascade: region -> province -> city
 watch(
   () => step1.value.answer.region,
   () => {
+    if (isAutoFillingFromSchool.value) return;
     step1.value.answer.province = "";
     step1.value.answer.cityMunicipality = "";
     step1.value.answer.schoolId = "";
@@ -282,6 +314,7 @@ watch(
 watch(
   () => step1.value.answer.province,
   () => {
+    if (isAutoFillingFromSchool.value) return;
     step1.value.answer.cityMunicipality = "";
     step1.value.answer.schoolId = "";
   }
@@ -290,6 +323,7 @@ watch(
 watch(
   () => step1.value.answer.cityMunicipality,
   () => {
+    if (isAutoFillingFromSchool.value) return;
     step1.value.answer.schoolId = "";
   }
 );

package/middleware/02.member.ts

@@ -6,8 +6,6 @@ export default defineNuxtRouteMiddleware(async (to) => {
   const APP = useRuntimeConfig().public.APP;
   const org = (to.params.org as string) ?? "";
 
-  console.log(APP);
-
   const { loggedInUser } = useLocalAuth();
 
   const { getByApp } = useMember();

package/package.json

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

package/plugins/secure-member.client.ts

@@ -15,7 +15,7 @@ export default defineNuxtPlugin(() => {
     const userId = computed(() => useCookie("user").value ?? "");
 
     const { data: userMemberData, error: userMemberError } = useLazyAsyncData(
-      "get-member-by-id",
+      `get-member-by-id-${userId.value}-${APP}-${org}`,
       () => getByUserType(userId.value, APP, org),
       { watch: [userId] }
     );
@@ -37,7 +37,7 @@ export default defineNuxtPlugin(() => {
     const roleId = computed(() => userMemberData.value?.role ?? "");
 
     const { data: getRoleByIdReq } = useLazyAsyncData(
-      "get-role-by-id",
+      `get-role-by-id-${roleId.value}`,
       () => getById(roleId.value),
       { watch: [roleId], immediate: false }
     );