@eeplatform/basic-edu 1.10.3 → 1.10.5

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @eeplatform/basic-edu
 
+## 1.10.5
+
+### Patch Changes
+
+- 79e0776: Enrollement management - fix service
+
+## 1.10.4
+
+### Patch Changes
+
+- e84650f: Revise track and strand management
+
 ## 1.10.3
 
 ### Patch Changes

package/dist/index.d.ts

@@ -85,8 +85,11 @@ type TSubject = {
     curriculum: ObjectId | string;
     curriculumName: string;
     effectiveSchoolYear?: number[];
-    educationLevel: string;
     gradeLevel: string;
+    track?: string | ObjectId;
+    trackName?: string;
+    strand?: string | ObjectId;
+    strandName?: string;
     program?: string | ObjectId;
     programName?: string;
     subjectCode: string;
@@ -112,8 +115,11 @@ declare function modelSubject(value: TSubject): {
     curriculum: ObjectId;
     curriculumName: string;
     effectiveSchoolYear: number[];
-    educationLevel: string;
     gradeLevel: string;
+    track: string | ObjectId | undefined;
+    trackName: string;
+    strand: string | ObjectId | undefined;
+    strandName: string;
     program: string | ObjectId | undefined;
     programName: string;
     subjectCode: string;
@@ -154,7 +160,7 @@ declare function useSubjectRepo(): {
     updateById: (_id: ObjectId | string, value: Partial<TSubject>, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
     deleteById: (_id: string | ObjectId, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
     deleteByCurriculum: (curriculumId: string | ObjectId, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
-    getAsOptions: () => Promise<{}>;
+    getAsOptions: (gradeLevel: string[]) => Promise<{}>;
 };
 
 declare function useSubjectController(): {
@@ -289,8 +295,10 @@ type TReturningLearnerInfo = {
 };
 type TSeniorHighInformation = {
     semester: string;
-    track: string;
-    strand: string;
+    track: string | ObjectId;
+    trackName: string;
+    strandName: string;
+    strand: string | ObjectId;
 };
 type TLearningModality = "Modular (Print)" | "Modular (Digital)" | "Online" | "Radio-Based Instruction" | "Educational Television" | "Blended" | "Homeschooling";
 declare const schemaUpdateStatus: Joi.ObjectSchema<any>;
@@ -381,6 +389,8 @@ declare function useEnrollmentService(): {
         gradeLevel: string;
         specialProgram?: string;
         numberOfApplications: number;
+        track?: string;
+        strand?: string;
     }) => Promise<{
         message: string;
         createdEnrollments: {
@@ -404,8 +414,6 @@ type TGradeLevel = {
     school?: ObjectId | string;
     educationLevel: string;
     gradeLevel: string;
-    tracks?: string[];
-    trackStrands?: string[];
     teachingStyle: string;
     maxNumberOfLearners: number;
     minNumberOfLearners: number;
@@ -425,8 +433,6 @@ declare function MGradeLevel(value: TGradeLevel): {
     school: string | ObjectId | undefined;
     educationLevel: string;
     gradeLevel: string;
-    tracks: string[];
-    trackStrands: string[];
     teachingStyle: string;
     maxNumberOfLearners: number;
     minNumberOfLearners: number;
@@ -476,6 +482,8 @@ declare function useGradeLevelRepo(): {
         school: string | ObjectId;
         gradeLevel: string;
         status?: string;
+        track?: string;
+        strand?: string;
     }, session?: ClientSession) => Promise<mongodb.WithId<bson.Document> | TGradeLevel | null>;
 };
 
@@ -866,7 +874,7 @@ declare function usePlantillaController(): {
 declare function useLearnerRepo(): {
     createIndexes: () => Promise<void>;
     add: (value: TLearner, session?: ClientSession) => Promise<ObjectId>;
-    getAll: ({ search, page, limit, sort, status, school, schoolYear, level, }?: {
+    getAll: ({ search, page, limit, sort, status, school, schoolYear, level, track, strand, }?: {
         search?: string | undefined;
         page?: number | undefined;
         limit?: number | undefined;
@@ -875,6 +883,8 @@ declare function useLearnerRepo(): {
         school?: string | undefined;
         schoolYear?: string | undefined;
         level?: string | undefined;
+        track?: string | undefined;
+        strand?: string | undefined;
     }) => Promise<Record<string, any> | {
         items: any[];
         pages: number;
@@ -886,6 +896,8 @@ declare function useLearnerRepo(): {
         gradeLevel: string;
         specialProgram?: string | ObjectId;
         status?: string;
+        track?: string | ObjectId;
+        strand?: string | ObjectId;
     }, session?: ClientSession) => Promise<number>;
     updateStatusById: (_id: string | ObjectId, status: string, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
     getById: (_id: string | ObjectId, status?: string) => Promise<TLearner | null>;
@@ -983,6 +995,10 @@ type TSection = {
     label?: string;
     schoolYear: string;
     gradeLevel: string;
+    track?: ObjectId | string;
+    trackName?: string;
+    strand?: ObjectId | string;
+    strandName?: string;
     adviser?: ObjectId | string;
     adviserName?: string;
     students: number;
@@ -1051,7 +1067,7 @@ type TSectionStudent = {
     school: ObjectId | string;
     schoolName?: string;
     section: ObjectId | string;
-    student: string;
+    student: string | ObjectId;
     studentName: string;
     gradeLevel?: string;
     educationLevel?: string;
@@ -1079,7 +1095,6 @@ declare function useSectionStudentRepo(): {
         schoolYear?: string;
     }) => Promise<{}>;
     getStudent: (options: {
-        learner?: string | ObjectId;
         schoolYear?: string;
         section?: string | ObjectId;
         gradeLevel?: string;
@@ -1100,7 +1115,6 @@ type TSectionSubject = {
     section: ObjectId | string;
     sectionName: string;
     gradeLevel: string;
-    educationLevel: string;
     schoolYear: string;
     subjectCode: string;
     subjectName: string;
@@ -1820,4 +1834,106 @@ declare function useKindergartenDomainController(): {
     deleteById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
-export { MAsset, MBuilding, MBuildingUnit, MCurriculum, MGradeLevel, MLearner, MPersonnel, MPlantilla, MStockCard, TAddress, TAddressInformation, TAsset, TBasicEduCount, TBlockTime, TBuilding, TBuildingUnit, TCurriculum, TDivision, TEnrollment, TGradeLevel, TKindergartenDomain, TKindergartenRoutine, TLearner, TLearnerInfo, TLearningModality, TParentGuardianInfo, TPersonContact, TPersonnel, TPlantilla, TProgram, TProgramScreening, TRegion, TReturningLearnerInfo, TSchool, TSection, TSectionPreset, TSectionStudent, TSectionSubject, TSeniorHighInformation, TStockCard, TSubject, TTeachingLoad, TTeachingLoadSlot, allowedSectionStudentStatuses, modelBasicEduCount, modelDivision, modelKindergartenDomain, modelKindergartenRoutine, modelProgram, modelProgramScreening, modelRegion, modelSchool, modelSection, modelSectionPreset, modelSectionStudent, modelSectionSubject, modelSubject, modelTeachingLoad, modelTeachingLoadSlot, schemaAsset, schemaAssetUpdateOption, schemaBasicEduCount, schemaBuilding, schemaBuildingUnit, schemaCurriculum, schemaDivision, schemaDivisionUpdate, schemaEnrollment, schemaGenerateSections, schemaGradeLevel, schemaKindergartenDomain, schemaKindergartenRoutine, schemaKindergartenRoutineUpdate, schemaPersonnel, schemaPlantilla, schemaProgram, schemaProgramScreening, schemaProgramScreeningUpdate, schemaProgramUpdate, schemaRegion, schemaSchool, schemaSchoolUpdate, schemaSection, schemaSectionPreset, schemaSectionStudent, schemaSectionSubject, schemaSectionSubjectSetup, schemaStockCard, schemaSubject, schemaSubjectAdd, schemaTeachingLoad, schemaTeachingLoadSlot, schemaUpdateOptions, schemaUpdateStatus, statusesProgramScreening, useAssetController, useAssetRepo, useBasicEduCountRepo, useBuildingController, useBuildingRepo, useBuildingService, useBuildingUnitController, useBuildingUnitRepo, useBuildingUnitService, useCurriculumController, useCurriculumRepo, useDivisionController, useDivisionRepo, useDivisionService, useEnrollmentController, useEnrollmentRepo, useEnrollmentService, useGradeLevelController, useGradeLevelRepo, useKindergartenDomainController, useKindergartenDomainRepo, useKindergartenDomainService, useKindergartenRoutineController, useKindergartenRoutineRepo, useLearnerController, useLearnerRepo, usePersonnelController, usePersonnelRepo, usePlantillaController, usePlantillaRepo, usePlantillaService, useProgramController, useProgramRepo, useProgramScreeningController, useProgramScreeningRepo, useRegionController, useRegionRepo, useSchoolController, useSchoolRepo, useSchoolService, useSectionController, useSectionPresetController, useSectionPresetRepo, useSectionRepo, useSectionStudentController, useSectionStudentRepo, useSectionSubjectController, useSectionSubjectRepo, useSectionSubjectService, useStockCardController, useStockCardRepository, useStockCardService, useSubjectController, useSubjectRepo, useSubjectService, useTeachingLoadController, useTeachingLoadRepo, useTeachingLoadSlotController, useTeachingLoadSlotRepo };
+type TTrack = {
+    _id?: ObjectId;
+    school: ObjectId | string;
+    name: string;
+    status?: string;
+    createdAt?: string | Date;
+    updatedAt?: string | Date;
+    deletedAt?: string | Date;
+};
+declare const schemaTrack: Joi.ObjectSchema<any>;
+declare function modelTrack(value: TTrack): TTrack;
+
+declare function useTrackRepo(): {
+    createIndexes: () => Promise<void>;
+    add: (value: TTrack, session?: ClientSession) => Promise<ObjectId>;
+    getAll: ({ search, page, limit, sort, status, school, }?: {
+        search?: string;
+        page?: number;
+        limit?: number;
+        sort?: Record<string, any>;
+        status?: string;
+        school?: string;
+    }) => Promise<Record<string, any> | {
+        items: any[];
+        pages: number;
+        pageRange: string;
+    }>;
+    getById: (_id: string | ObjectId) => Promise<TTrack>;
+    getBySchool: (school: string | ObjectId) => Promise<TTrack[]>;
+    updateFieldById: ({ _id, field, value }?: {
+        _id: string | ObjectId;
+        field: string;
+        value: string | Array<any> | object;
+    }, session?: ClientSession) => Promise<string>;
+    updateById: (_id: string | ObjectId, value: Pick<TTrack, "name">, session?: ClientSession) => Promise<string>;
+    deleteById: (_id: string | ObjectId, session?: ClientSession) => Promise<string>;
+};
+
+declare function useTrackService(): {
+    deleteById: (id: string) => Promise<string>;
+};
+
+declare function useTrackController(): {
+    add: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    getAll: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    getById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    getBySchool: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    updateField: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    deleteById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+};
+
+type TStrand = {
+    _id?: ObjectId;
+    school: ObjectId | string;
+    track: ObjectId | string;
+    trackName?: string;
+    name: string;
+    status?: string;
+    createdAt?: string | Date;
+    updatedAt?: string | Date;
+    deletedAt?: string | Date;
+};
+declare const schemaStrand: Joi.ObjectSchema<any>;
+declare function modelStrand(value: TStrand): TStrand;
+
+declare function useStrandRepo(): {
+    createIndexes: () => Promise<void>;
+    add: (value: TStrand, session?: ClientSession) => Promise<ObjectId>;
+    getAll: ({ search, page, limit, sort, status, school, track, }?: {
+        search?: string;
+        page?: number;
+        limit?: number;
+        sort?: Record<string, any>;
+        status?: string;
+        school?: string;
+        track?: string;
+    }) => Promise<Record<string, any> | {
+        items: any[];
+        pages: number;
+        pageRange: string;
+    }>;
+    getById: (_id: string | ObjectId) => Promise<TStrand>;
+    getBySchool: (school: string | ObjectId) => Promise<TStrand[]>;
+    updateFieldById: ({ _id, field, value }?: {
+        _id: string | ObjectId;
+        field: string;
+        value: string | Array<any> | object;
+    }, session?: ClientSession) => Promise<string>;
+    updateById: (_id: string | ObjectId, value: Pick<TStrand, "name">, session?: ClientSession) => Promise<string>;
+    deleteById: (_id: string | ObjectId, session?: ClientSession) => Promise<string>;
+    countByTrack: (track: string) => Promise<number>;
+};
+
+declare function useStrandController(): {
+    add: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    getAll: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    getById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    getBySchool: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    updateField: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    deleteById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+};
+
+export { MAsset, MBuilding, MBuildingUnit, MCurriculum, MGradeLevel, MLearner, MPersonnel, MPlantilla, MStockCard, TAddress, TAddressInformation, TAsset, TBasicEduCount, TBlockTime, TBuilding, TBuildingUnit, TCurriculum, TDivision, TEnrollment, TGradeLevel, TKindergartenDomain, TKindergartenRoutine, TLearner, TLearnerInfo, TLearningModality, TParentGuardianInfo, TPersonContact, TPersonnel, TPlantilla, TProgram, TProgramScreening, TRegion, TReturningLearnerInfo, TSchool, TSection, TSectionPreset, TSectionStudent, TSectionSubject, TSeniorHighInformation, TStockCard, TStrand, TSubject, TTeachingLoad, TTeachingLoadSlot, TTrack, allowedSectionStudentStatuses, modelBasicEduCount, modelDivision, modelKindergartenDomain, modelKindergartenRoutine, modelProgram, modelProgramScreening, modelRegion, modelSchool, modelSection, modelSectionPreset, modelSectionStudent, modelSectionSubject, modelStrand, modelSubject, modelTeachingLoad, modelTeachingLoadSlot, modelTrack, schemaAsset, schemaAssetUpdateOption, schemaBasicEduCount, schemaBuilding, schemaBuildingUnit, schemaCurriculum, schemaDivision, schemaDivisionUpdate, schemaEnrollment, schemaGenerateSections, schemaGradeLevel, schemaKindergartenDomain, schemaKindergartenRoutine, schemaKindergartenRoutineUpdate, schemaPersonnel, schemaPlantilla, schemaProgram, schemaProgramScreening, schemaProgramScreeningUpdate, schemaProgramUpdate, schemaRegion, schemaSchool, schemaSchoolUpdate, schemaSection, schemaSectionPreset, schemaSectionStudent, schemaSectionSubject, schemaSectionSubjectSetup, schemaStockCard, schemaStrand, schemaSubject, schemaSubjectAdd, schemaTeachingLoad, schemaTeachingLoadSlot, schemaTrack, schemaUpdateOptions, schemaUpdateStatus, statusesProgramScreening, useAssetController, useAssetRepo, useBasicEduCountRepo, useBuildingController, useBuildingRepo, useBuildingService, useBuildingUnitController, useBuildingUnitRepo, useBuildingUnitService, useCurriculumController, useCurriculumRepo, useDivisionController, useDivisionRepo, useDivisionService, useEnrollmentController, useEnrollmentRepo, useEnrollmentService, useGradeLevelController, useGradeLevelRepo, useKindergartenDomainController, useKindergartenDomainRepo, useKindergartenDomainService, useKindergartenRoutineController, useKindergartenRoutineRepo, useLearnerController, useLearnerRepo, usePersonnelController, usePersonnelRepo, usePlantillaController, usePlantillaRepo, usePlantillaService, useProgramController, useProgramRepo, useProgramScreeningController, useProgramScreeningRepo, useRegionController, useRegionRepo, useSchoolController, useSchoolRepo, useSchoolService, useSectionController, useSectionPresetController, useSectionPresetRepo, useSectionRepo, useSectionStudentController, useSectionStudentRepo, useSectionSubjectController, useSectionSubjectRepo, useSectionSubjectService, useStockCardController, useStockCardRepository, useStockCardService, useStrandController, useStrandRepo, useSubjectController, useSubjectRepo, useSubjectService, useTeachingLoadController, useTeachingLoadRepo, useTeachingLoadSlotController, useTeachingLoadSlotRepo, useTrackController, useTrackRepo, useTrackService };