@eeplatform/nuxt-layer-common 1.7.35 → 1.7.36

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @eeplatform/nuxt-layer-common
 
+## 1.7.36
+
+### Patch Changes
+
+- dac36cb: Fix enrollment form
+
 ## 1.7.35
 
 ### Patch Changes

package/components/EnrollmentPreview.vue

@@ -134,13 +134,7 @@
               </v-col>
               <v-col cols="12" class="mb-2">
                 <strong>Birth Date:</strong>
-                {{
-                  localProps.application.learnerInfo?.birthDate
-                    ? new Date(
-                        localProps.application.learnerInfo.birthDate
-                      ).toLocaleDateString()
-                    : "N/A"
-                }}
+                {{ birthDate }}
               </v-col>
               <v-col cols="6" class="mb-2">
                 <strong>Age:</strong>
@@ -152,18 +146,7 @@
               </v-col>
               <v-col cols="6" class="mb-2">
                 <strong>Place of Birth:</strong>
-                {{
-                  localProps.application.learnerInfo?.placeOfBirth.provinceName
-                }}
-                {{
-                  localProps.application.learnerInfo?.placeOfBirth.provinceName
-                    ? ", "
-                    : ""
-                }}
-                {{
-                  localProps.application.learnerInfo?.placeOfBirth
-                    .cityMunicipalityName
-                }}
+                {{ placeOfBirth }}
               </v-col>
               <v-col cols="12" class="mb-2">
                 <strong>Mother Tongue:</strong>
@@ -622,6 +605,32 @@ const localProps = defineProps({
   },
 });
 
+const placeOfBirth = computed(() => {
+  const province =
+    localProps.application.learnerInfo?.placeOfBirth.provinceName ?? "";
+  const city =
+    localProps.application.learnerInfo?.placeOfBirth.cityMunicipalityName ?? "";
+
+  if (province && city) {
+    return `${province}, ${city}`;
+  } else if (!province && city) {
+    return city;
+  } else {
+    return "N/A";
+  }
+});
+
+const birthDate = computed(() => {
+  const dateStr = localProps.application.learnerInfo?.birthDate;
+  if (!dateStr) return "N/A";
+
+  try {
+    return new Date(dateStr).toLocaleDateString();
+  } catch {
+    return dateStr;
+  }
+});
+
 const emits = defineEmits(["close", "reject", "accept"]);
 
 function getStatusColor(status: string): string {

package/package.json

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