@eeplatform/basic-edu 1.10.28 → 1.10.30

package/dist/index.mjs

@@ -2947,8 +2947,13 @@ var addressSchema = Joi5.object({
   streetName: Joi5.string().optional().allow("", null),
   sitio: Joi5.string().optional().allow("", null),
   barangay: Joi5.string().required(),
+  barangayName: Joi5.string().optional().allow("", null),
   municipalityCity: Joi5.string().required(),
+  municipalityCityName: Joi5.string().optional().allow("", null),
   province: Joi5.string().optional().allow("", null),
+  provinceName: Joi5.string().optional().allow("", null),
+  region: Joi5.string().optional().allow("", null),
+  regionName: Joi5.string().optional().allow("", null),
   country: Joi5.string().optional().allow("", null),
   zipCode: Joi5.string().optional().allow("", null)
 });
@@ -2972,9 +2977,9 @@ var learnerInfoSchema = Joi5.object({
   placeOfBirth: Joi5.object({
     region: Joi5.string().required(),
     regionName: Joi5.string().optional().allow("", null),
-    province: Joi5.string().required(),
+    province: Joi5.string().optional().allow("", null),
     provinceName: Joi5.string().optional().allow("", null),
-    cityMunicipality: Joi5.string().required(),
+    cityMunicipality: Joi5.string().optional().allow("", null),
     cityMunicipalityName: Joi5.string().optional().allow("", null)
   }).required(),
   motherTongue: Joi5.string().optional().allow("", null),
@@ -3030,6 +3035,8 @@ var schemaEnrollment = Joi5.object({
   specialProgram: Joi5.string().optional().allow("", null),
   specialProgramName: Joi5.string().optional().allow("", null),
   // Added to match frontend
+  specialProgramMajor: Joi5.string().optional().allow("", null),
+  // Added to match frontend
   gwa: Joi5.number().optional().allow(null, 0),
   subjects: Joi5.array().items(
     Joi5.object({
@@ -3064,9 +3071,9 @@ var schemaEnrollment = Joi5.object({
   }).optional(),
   seniorHighInfo: Joi5.object({
     semester: Joi5.string().optional().allow("", null),
-    track: Joi5.string().hex().optional().allow("", null),
+    track: Joi5.string().optional().allow("", null),
     trackName: Joi5.string().optional().allow("", null),
-    strand: Joi5.string().hex().optional().allow("", null),
+    strand: Joi5.string().optional().allow("", null),
     strandName: Joi5.string().optional().allow("", null)
   }).optional(),
   alternativeLearningOptions: Joi5.array().items(Joi5.string()).optional(),
@@ -3164,6 +3171,8 @@ function MLearner(value) {
     specialProgram: value.specialProgram,
     specialProgramName: value.specialProgramName ?? "",
     // Added to match frontend
+    specialProgramMajor: value.specialProgramMajor ?? "",
+    // Added to match frontend
     gwa: value.gwa ?? 0,
     subjects: value.subjects ?? [],
     returningLearner: value.returningLearner ?? false,
@@ -4037,6 +4046,7 @@ var schemaProgramScreening = Joi9.object({
   specialProgram: Joi9.string().hex().required(),
   specialProgramName: Joi9.string().optional().allow("", null),
   specialProgramCode: Joi9.string().optional().allow("", null),
+  specialProgramMajor: Joi9.string().optional().allow("", null),
   gradeLevel: Joi9.string().required(),
   applicant: Joi9.string().hex().required(),
   applicantName: Joi9.string().optional().allow("", null),
@@ -4099,6 +4109,7 @@ function modelProgramScreening(value) {
     specialProgram: value.specialProgram,
     specialProgramName: value.specialProgramName ?? "",
     specialProgramCode: value.specialProgramCode ?? "",
+    specialProgramMajor: value.specialProgramMajor ?? "",
     applicant: value.applicant,
     applicantName: value.applicantName ?? "",
     gwa: value.gwa ?? 0,
@@ -4817,6 +4828,12 @@ var schemaProgram = Joi11.object({
       grade: Joi11.number().min(0).max(100).required()
     })
   ).optional(),
+  majors: Joi11.array().items(
+    Joi11.object({
+      title: Joi11.string().max(100).required(),
+      value: Joi11.string().max(100).required()
+    })
+  ).optional(),
   description: Joi11.string().max(500).optional().allow(null, ""),
   status: Joi11.string().valid("active", "inactive", "deleted").optional(),
   createdAt: Joi11.string().isoDate().optional(),
@@ -4834,6 +4851,12 @@ var schemaProgramUpdate = Joi11.object({
       title: Joi11.string().max(100).required(),
       grade: Joi11.number().min(0).max(100).required()
     })
+  ).optional(),
+  majors: Joi11.array().items(
+    Joi11.object({
+      title: Joi11.string().max(100).required(),
+      value: Joi11.string().max(100).required()
+    })
   ).optional()
 });
 function modelProgram(value) {
@@ -4864,6 +4887,7 @@ function modelProgram(value) {
     gradeLevels: value.gradeLevels ?? [],
     gwa: value.gwa ?? 0,
     subjects: value.subjects ?? [],
+    majors: value.majors ?? [],
     description: value.description ?? "",
     status: value.status ?? "active",
     createdAt: value.createdAt ?? (/* @__PURE__ */ new Date()).toISOString(),
@@ -5468,16 +5492,18 @@ function useEnrollmentService() {
           );
         }
       }
-      if (value.specialProgram) {
+      let specialProgram = null;
+      const programId = String(value.specialProgram);
+      if (programId) {
         value.status = "screening";
-      }
-      const enrollmentId = await _add(value, session);
-      if (value.specialProgram) {
-        const programId = String(value.specialProgram);
-        const specialProgram = await getProgramById(programId);
+        specialProgram = await getProgramById(programId);
         if (!specialProgram) {
           throw new BadRequestError18("Special program not found.");
         }
+        value.specialProgramName = specialProgram.name;
+      }
+      const enrollmentId = await _add(value, session);
+      if (specialProgram) {
         await addProgramScreening(
           {
             school: String(value.school),
@@ -5486,6 +5512,7 @@ function useEnrollmentService() {
             specialProgram: programId,
             specialProgramName: specialProgram.name,
             specialProgramCode: specialProgram.code,
+            specialProgramMajor: value.specialProgramMajor,
             gradeLevel: value.gradeLevel,
             applicant: enrollmentId.toString(),
             applicantName: `${value.learnerInfo.firstName} ${value.learnerInfo.lastName}`,
@@ -35713,6 +35740,7 @@ function useGradeLevelService() {
       }
       for (let index = 0; index < value.gradeLevels.length; index++) {
         const gradeLevel = value.gradeLevels[index];
+        const isNonGradeLevel = gradeLevel.toLowerCase() === "non-grade-level";
         const isKindergarten = gradeLevel.toLowerCase() === "kindergarten";
         const isPrimary = [
           "grade-1",
@@ -35725,6 +35753,11 @@ function useGradeLevelService() {
         let educationLevel = "";
         let minNumberOfLearners = 0;
         let maxNumberOfLearners = 0;
+        if (isNonGradeLevel) {
+          educationLevel = "non-grade-level";
+          minNumberOfLearners = 15;
+          maxNumberOfLearners = 30;
+        }
         if (isKindergarten) {
           educationLevel = "elementary";
           minNumberOfLearners = 15;