@eeplatform/basic-edu 1.10.28 → 1.10.30

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @eeplatform/basic-edu
 
+## 1.10.30
+
+### Patch Changes
+
+- 16f4d00: Relax validation for seniorHigh track/strand
+
+## 1.10.29
+
+### Patch Changes
+
+- dd447b3: Update dependencies
+
 ## 1.10.28
 
 ### Patch Changes

package/dist/index.d.ts

@@ -246,6 +246,7 @@ type TEnrollment = TLearner & {
     applyToSpecialProgram?: boolean;
     specialProgram?: string | ObjectId;
     specialProgramName?: string;
+    specialProgramMajor?: string;
     gwa?: number;
     subjects?: {
         title: string;
@@ -298,8 +299,13 @@ type TAddress = {
     streetName?: string;
     sitio?: string;
     barangay: string;
+    barangayName?: string;
     municipalityCity: string;
+    municipalityCityName?: string;
     province: string;
+    provinceName?: string;
+    region?: string;
+    regionName?: string;
     country?: string;
     zipCode?: string;
 };
@@ -334,6 +340,7 @@ declare function MLearner(value: TEnrollment): {
     gradeLevel: string;
     specialProgram: string | ObjectId | undefined;
     specialProgramName: string;
+    specialProgramMajor: string;
     gwa: number;
     subjects: {
         title: string;
@@ -1611,6 +1618,10 @@ type TProgram = {
         title: string;
         grade: number;
     }[];
+    majors?: {
+        title: string;
+        value: string;
+    }[];
     description?: string;
     status: string;
     createdAt?: string | Date;
@@ -1668,6 +1679,7 @@ type TProgramScreening = {
     specialProgram: string | ObjectId;
     specialProgramName?: string;
     specialProgramCode?: string;
+    specialProgramMajor?: string;
     applicant: string | ObjectId;
     applicantName?: string;
     gwa?: number;

package/dist/index.js

@@ -3058,8 +3058,13 @@ var addressSchema = import_joi5.default.object({
   streetName: import_joi5.default.string().optional().allow("", null),
   sitio: import_joi5.default.string().optional().allow("", null),
   barangay: import_joi5.default.string().required(),
+  barangayName: import_joi5.default.string().optional().allow("", null),
   municipalityCity: import_joi5.default.string().required(),
+  municipalityCityName: import_joi5.default.string().optional().allow("", null),
   province: import_joi5.default.string().optional().allow("", null),
+  provinceName: import_joi5.default.string().optional().allow("", null),
+  region: import_joi5.default.string().optional().allow("", null),
+  regionName: import_joi5.default.string().optional().allow("", null),
   country: import_joi5.default.string().optional().allow("", null),
   zipCode: import_joi5.default.string().optional().allow("", null)
 });
@@ -3083,9 +3088,9 @@ var learnerInfoSchema = import_joi5.default.object({
   placeOfBirth: import_joi5.default.object({
     region: import_joi5.default.string().required(),
     regionName: import_joi5.default.string().optional().allow("", null),
-    province: import_joi5.default.string().required(),
+    province: import_joi5.default.string().optional().allow("", null),
     provinceName: import_joi5.default.string().optional().allow("", null),
-    cityMunicipality: import_joi5.default.string().required(),
+    cityMunicipality: import_joi5.default.string().optional().allow("", null),
     cityMunicipalityName: import_joi5.default.string().optional().allow("", null)
   }).required(),
   motherTongue: import_joi5.default.string().optional().allow("", null),
@@ -3141,6 +3146,8 @@ var schemaEnrollment = import_joi5.default.object({
   specialProgram: import_joi5.default.string().optional().allow("", null),
   specialProgramName: import_joi5.default.string().optional().allow("", null),
   // Added to match frontend
+  specialProgramMajor: import_joi5.default.string().optional().allow("", null),
+  // Added to match frontend
   gwa: import_joi5.default.number().optional().allow(null, 0),
   subjects: import_joi5.default.array().items(
     import_joi5.default.object({
@@ -3175,9 +3182,9 @@ var schemaEnrollment = import_joi5.default.object({
   }).optional(),
   seniorHighInfo: import_joi5.default.object({
     semester: import_joi5.default.string().optional().allow("", null),
-    track: import_joi5.default.string().hex().optional().allow("", null),
+    track: import_joi5.default.string().optional().allow("", null),
     trackName: import_joi5.default.string().optional().allow("", null),
-    strand: import_joi5.default.string().hex().optional().allow("", null),
+    strand: import_joi5.default.string().optional().allow("", null),
     strandName: import_joi5.default.string().optional().allow("", null)
   }).optional(),
   alternativeLearningOptions: import_joi5.default.array().items(import_joi5.default.string()).optional(),
@@ -3275,6 +3282,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,
@@ -4124,6 +4133,7 @@ var schemaProgramScreening = import_joi9.default.object({
   specialProgram: import_joi9.default.string().hex().required(),
   specialProgramName: import_joi9.default.string().optional().allow("", null),
   specialProgramCode: import_joi9.default.string().optional().allow("", null),
+  specialProgramMajor: import_joi9.default.string().optional().allow("", null),
   gradeLevel: import_joi9.default.string().required(),
   applicant: import_joi9.default.string().hex().required(),
   applicantName: import_joi9.default.string().optional().allow("", null),
@@ -4186,6 +4196,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,
@@ -4895,6 +4906,12 @@ var schemaProgram = import_joi11.default.object({
       grade: import_joi11.default.number().min(0).max(100).required()
     })
   ).optional(),
+  majors: import_joi11.default.array().items(
+    import_joi11.default.object({
+      title: import_joi11.default.string().max(100).required(),
+      value: import_joi11.default.string().max(100).required()
+    })
+  ).optional(),
   description: import_joi11.default.string().max(500).optional().allow(null, ""),
   status: import_joi11.default.string().valid("active", "inactive", "deleted").optional(),
   createdAt: import_joi11.default.string().isoDate().optional(),
@@ -4912,6 +4929,12 @@ var schemaProgramUpdate = import_joi11.default.object({
       title: import_joi11.default.string().max(100).required(),
       grade: import_joi11.default.number().min(0).max(100).required()
     })
+  ).optional(),
+  majors: import_joi11.default.array().items(
+    import_joi11.default.object({
+      title: import_joi11.default.string().max(100).required(),
+      value: import_joi11.default.string().max(100).required()
+    })
   ).optional()
 });
 function modelProgram(value) {
@@ -4942,6 +4965,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(),
@@ -5537,16 +5561,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 import_nodejs_utils19.BadRequestError("Special program not found.");
         }
+        value.specialProgramName = specialProgram.name;
+      }
+      const enrollmentId = await _add(value, session);
+      if (specialProgram) {
         await addProgramScreening(
           {
             school: String(value.school),
@@ -5555,6 +5581,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}`,
@@ -35748,6 +35775,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",
@@ -35760,6 +35788,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;