@eeplatform/nuxt-layer-common 1.7.35 → 1.7.37

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @eeplatform/nuxt-layer-common
 
+## 1.7.37
+
+### Patch Changes
+
+- d35d59f: Fix enrollment application preview component
+
+## 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>
@@ -574,42 +557,44 @@
           </v-btn>
         </v-col>
 
-        <v-col
-          v-if="localProps.application?.status === 'pending'"
-          cols="6"
-          class="pa-0"
-        >
-          <v-menu>
-            <template #activator="{ props }">
-              <v-btn
-                block
-                variant="flat"
-                color="black"
-                class="text-none"
-                size="large"
-                height="48"
-                v-bind="props"
-                tile
-              >
-                More actions
-              </v-btn>
-            </template>
-
-            <v-list class="pa-0">
-              <v-list-item @click="emits('accept')">
-                <v-list-item-title class="text-subtitle-1 font-weight-medium">
-                  Accept Application
-                </v-list-item-title>
-              </v-list-item>
-
-              <v-list-item @click="emits('reject')" class="text-red">
-                <v-list-item-title class="text-subtitle-1 font-weight-medium">
-                  Reject Application
-                </v-list-item-title>
-              </v-list-item>
-            </v-list>
-          </v-menu>
-        </v-col>
+        <slot name="action">
+          <v-col
+            v-if="localProps.application?.status === 'pending'"
+            cols="6"
+            class="pa-0"
+          >
+            <v-menu>
+              <template #activator="{ props }">
+                <v-btn
+                  block
+                  variant="flat"
+                  color="black"
+                  class="text-none"
+                  size="large"
+                  height="48"
+                  v-bind="props"
+                  tile
+                >
+                  More actions
+                </v-btn>
+              </template>
+
+              <v-list class="pa-0">
+                <v-list-item @click="emits('accept')">
+                  <v-list-item-title class="text-subtitle-1 font-weight-medium">
+                    Accept Application
+                  </v-list-item-title>
+                </v-list-item>
+
+                <v-list-item @click="emits('reject')" class="text-red">
+                  <v-list-item-title class="text-subtitle-1 font-weight-medium">
+                    Reject Application
+                  </v-list-item-title>
+                </v-list-item>
+              </v-list>
+            </v-menu>
+          </v-col>
+        </slot>
       </v-row>
     </v-toolbar>
   </v-card>
@@ -622,6 +607,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.37",
   "main": "./nuxt.config.ts",
   "publishConfig": {
     "access": "public"