@eeplatform/basic-edu 1.3.10 → 1.3.12

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @eeplatform/basic-edu
 
+## 1.3.12
+
+### Patch Changes
+
+- f4c3853: Revise get all enrollment query
+
+## 1.3.11
+
+### Patch Changes
+
+- 1ccf060: Enrollment mgmt - revise add service
+
 ## 1.3.10
 
 ### Patch Changes

package/dist/index.d.ts

@@ -81,19 +81,27 @@ declare function useCurriculumController(): {
 
 type BasicEducEnrForm = {
     _id?: ObjectId;
-    region: ObjectId;
-    sdo: ObjectId;
+    region: string;
+    regionName?: string;
+    province?: string;
+    cityMunicipality: string;
+    division: string;
+    divisionName?: string;
+    schoolId: string;
     school: ObjectId;
+    schoolName?: string;
     schoolYear: string;
-    gradeLevelToEnroll: string;
+    gradeLevel: string;
+    returningLearner: boolean;
     learnerInfo: EnrLearnerInfo;
     parentGuardianInfo: EnrParentGuardianInfo;
-    addressInfo: AddressInformation;
+    address: AddressInformation;
     returningLearnerInfo?: EnrReturningLearnerInfo;
     seniorHighInfo?: EnrSeniorHighInformation;
-    preferredLearningModalities?: EnrLearningModality[];
-    certification: EnrCert;
+    alternativeLearningOptions?: string[];
+    isCertifiedAndConsented: boolean;
     status?: string;
+    remarks?: string;
     rejectionReason?: string;
     createdAt?: Date | string;
     updatedAt?: Date | string;
@@ -103,29 +111,23 @@ type BasicEducEnrForm = {
     deletedBy?: string;
 };
 type EnrLearnerInfo = {
+    psaBirthCertificateNo?: string;
     lrn?: string;
     lastName: string;
     firstName: string;
     middleName?: string;
     extensionName?: string;
     birthDate: string;
-    sex: "Male" | "Female";
+    sex: string;
     age: number;
-    placeOfBirth?: {
-        municipalityCity: string;
-        province?: string;
-        country?: string;
-    };
+    placeOfBirth: string;
     motherTongue?: string;
-    hasDisability: boolean;
-    disabilityTypes?: DisabilityType[];
-    otherDisabilityDetails?: string;
-    isIndigenous?: boolean;
-    indigenousCommunity?: string;
-    is4PsBeneficiary?: boolean;
     fourPsHouseholdId?: string;
+    indigenousCommunity?: string;
+    withDisability: boolean;
+    disabilities?: string[];
+    otherDisabilityDetails?: string;
 };
-type DisabilityType = "Visual Impairment (Blind)" | "Visual Impairment (Low Vision)" | "Hearing Impairment" | "Learning Disability" | "Intellectual Disability" | "Autism Spectrum Disorder" | "Emotional-Behavioral Disorder" | "Orthopedic/Physical Handicap" | "Speech/Language Disorder" | "Cerebral Palsy" | "Special Health Problem/Chronic Disease" | "Multiple Disorder" | "Cancer" | "Other";
 type EnrParentGuardianInfo = {
     father?: PersonContact;
     mother?: PersonContact;
@@ -138,8 +140,8 @@ type PersonContact = {
     contactNumber?: string;
 };
 type AddressInformation = {
-    currentAddress: EnrAddress;
-    permanentAddress?: EnrAddress;
+    current: EnrAddress;
+    permanent: EnrAddress;
     sameAsCurrent?: boolean;
 };
 type EnrAddress = {
@@ -166,27 +168,30 @@ type EnrSeniorHighInformation = {
     strand: string;
 };
 type EnrLearningModality = "Modular (Print)" | "Modular (Digital)" | "Online" | "Radio-Based Instruction" | "Educational Television" | "Blended" | "Homeschooling";
-type EnrCert = {
-    certifiedBy: string;
-    date: string;
-    consentGiven: boolean;
-};
 declare const schemaEnrollment: Joi.ObjectSchema<any>;
 declare function MEnrollment(value: BasicEducEnrForm): {
     _id: ObjectId | undefined;
-    region: ObjectId;
-    sdo: ObjectId;
+    region: string;
+    regionName: string;
+    province: string;
+    cityMunicipality: string;
+    division: string;
+    divisionName: string;
     school: ObjectId;
+    schoolId: string;
+    schoolName: string;
     schoolYear: string;
-    gradeLevelToEnroll: string;
+    gradeLevel: string;
+    returningLearner: boolean;
     learnerInfo: EnrLearnerInfo;
     parentGuardianInfo: EnrParentGuardianInfo;
-    addressInfo: AddressInformation;
+    address: AddressInformation;
     returningLearnerInfo: EnrReturningLearnerInfo | undefined;
     seniorHighInfo: EnrSeniorHighInformation | undefined;
-    preferredLearningModalities: EnrLearningModality[];
-    certification: EnrCert;
+    alternativeLearningOptions: string[];
+    isCertifiedAndConsented: boolean;
     status: string;
+    remarks: string;
     rejectionReason: string;
     createdAt: string | Date;
     updatedAt: string | Date;
@@ -217,6 +222,19 @@ declare function useEnrollmentRepo(): {
     getById: (_id: string | ObjectId) => Promise<BasicEducEnrForm>;
     getByLrn: (lrn: string, schoolYear?: string) => Promise<BasicEducEnrForm | null>;
     deleteById: (_id: string | ObjectId, deletedBy?: string, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
+    getByApplicantInfo: ({ school, schoolYear, gradeLevel, firstName, lastName, middleName, birthDate, placeOfBirth, }?: {
+        school?: string | undefined;
+        schoolYear?: string | undefined;
+        gradeLevel?: string | undefined;
+        firstName?: string | undefined;
+        lastName?: string | undefined;
+        middleName?: string | undefined;
+        birthDate?: string | undefined;
+        placeOfBirth?: string | undefined;
+    }) => Promise<{
+        accepted: boolean;
+        length: number;
+    }>;
     getBySchoolAndYear: (school: string | ObjectId, schoolYear: string) => Promise<BasicEducEnrForm[]>;
 };
 
@@ -729,4 +747,4 @@ declare function usePlantillaController(): {
     bulkAddPlantillas: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
-export { AddressInformation, BasicEducEnrForm, DisabilityType, EnrAddress, EnrCert, EnrLearnerInfo, EnrLearningModality, EnrParentGuardianInfo, EnrReturningLearnerInfo, EnrSeniorHighInformation, MAsset, MCurriculum, MEnrollment, MGradeLevel, MPlantilla, MStockCard, PersonContact, TAsset, TCurriculum, TCurriculumSubject, TDivision, TGradeLevel, TPlantilla, TRegion, TSchool, TStockCard, modelDivision, modelRegion, modelSchool, schemaAsset, schemaAssetUpdateOption, schemaCurriculum, schemaDivision, schemaDivisionUpdate, schemaEnrollment, schemaGradeLevel, schemaPlantilla, schemaRegion, schemaSchool, schemaSchoolUpdate, schemaStockCard, useAssetController, useAssetRepo, useCurriculumController, useCurriculumRepo, useDivisionController, useDivisionRepo, useDivisionService, useEnrollmentController, useEnrollmentRepo, useEnrollmentService, useGradeLevelController, useGradeLevelRepo, usePlantillaController, usePlantillaRepo, usePlantillaService, useRegionController, useRegionRepo, useSchoolController, useSchoolRepo, useSchoolService, useStockCardController, useStockCardRepository, useStockCardService };
+export { AddressInformation, BasicEducEnrForm, EnrAddress, EnrLearnerInfo, EnrLearningModality, EnrParentGuardianInfo, EnrReturningLearnerInfo, EnrSeniorHighInformation, MAsset, MCurriculum, MEnrollment, MGradeLevel, MPlantilla, MStockCard, PersonContact, TAsset, TCurriculum, TCurriculumSubject, TDivision, TGradeLevel, TPlantilla, TRegion, TSchool, TStockCard, modelDivision, modelRegion, modelSchool, schemaAsset, schemaAssetUpdateOption, schemaCurriculum, schemaDivision, schemaDivisionUpdate, schemaEnrollment, schemaGradeLevel, schemaPlantilla, schemaRegion, schemaSchool, schemaSchoolUpdate, schemaStockCard, useAssetController, useAssetRepo, useCurriculumController, useCurriculumRepo, useDivisionController, useDivisionRepo, useDivisionService, useEnrollmentController, useEnrollmentRepo, useEnrollmentService, useGradeLevelController, useGradeLevelRepo, usePlantillaController, usePlantillaRepo, usePlantillaService, useRegionController, useRegionRepo, useSchoolController, useSchoolRepo, useSchoolService, useStockCardController, useStockCardRepository, useStockCardService };