@7365admin1/module-hygiene 4.29.1-staging.15 → 4.29.1-staging.17

package/.changeset/schedule-task-repeat-pause.md

@@ -0,0 +1,5 @@
+---
+"@7365admin1/module-hygiene": minor
+---
+
+Schedule tasks can repeat (daily, weekdays, weekly on chosen days, monthly), have an end date and be paused. Older tasks (picked dates only) behave exactly as before. List and detail rows add nextRun, lastRun, lastRunStatus and scheduleStatus plus the stored time, dates and repeat fields. A visit whose minute was missed by a restart still runs later the same day, once (run marker lastRunDate). The runner returns the visits it added (`fired`) so the API can notify staff. An extra visit added before the daily list exists no longer cancels the area's regular visits. Create and update check the form in plain English (required fields, time format, start before end, no schedule that can never run).

package/.changeset/schedule-task-set-fields.md

@@ -0,0 +1,5 @@
+---
+"@7365admin1/module-hygiene": minor
+---
+
+Extra-visit sets now store `scheduleTaskId`, `scheduleTaskTitle` and `scheduleTaskTime`, returned by the area-checklist unit/set responses (null on older sets). The history PDF marks not-done items "Missed".

package/dist/index.d.ts

@@ -281,6 +281,8 @@ type TAreaChecklist = {
     attachment?: string[];
     isScheduleTask?: boolean;
     scheduleTaskId?: string | ObjectId;
+    scheduleTaskTitle?: string;
+    scheduleTaskTime?: string;
 };
 type TAreaChecklistUnits = {
     unit: string | ObjectId;
@@ -641,6 +643,17 @@ declare function useCheckOutItemController(): {
     decideCheckOutItem: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
+/**
+ * Schedule task rules: repeat, end date, paused, "when does it run next".
+ * Pure (no database, no core import) so every rule is unit-testable.
+ *
+ * A task with none of `repeat` / `startDate` / `endDate` / `paused` behaves
+ * exactly as before: it runs on the dates listed in `dates`, at `time`.
+ * All times are Singapore time (UTC+8, no daylight saving).
+ */
+declare const REPEATS: readonly ["none", "daily", "weekdays", "weekly", "monthly"];
+type TRepeat = (typeof REPEATS)[number];
+
 type TScheduleTask = {
     _id?: ObjectId;
     site: string | ObjectId;
@@ -653,21 +666,32 @@ type TScheduleTask = {
         name: string;
         value: ObjectId;
     }[];
+    repeat?: TRepeat;
+    daysOfWeek?: number[];
+    dayOfMonth?: number;
+    startDate?: string;
+    endDate?: string;
+    paused?: boolean;
+    lastRunDate?: string;
     status?: "active" | "deleted";
     createdAt?: string | Date;
     updatedAt?: string | Date;
     deletedAt?: string | Date;
 };
-type TScheduleTaskCreate = Pick<TScheduleTask, "site" | "serviceType" | "title" | "time" | "dates" | "description" | "areas">;
+type TScheduleTaskCreate = Pick<TScheduleTask, "site" | "serviceType" | "title" | "time" | "dates" | "description" | "areas" | "repeat" | "daysOfWeek" | "dayOfMonth" | "startDate" | "endDate" | "paused">;
 type TScheduleTaskGetQuery = {
     page?: number;
     limit?: number;
     search?: string;
 } & Pick<TScheduleTask, "site" | "serviceType">;
-type TScheduleTaskGetById = Pick<TScheduleTask, "title" | "time" | "dates" | "description" | "areas" | "status" | "createdAt">;
-type TScheduleTaskUpdate = Partial<Pick<TScheduleTask, "title" | "time" | "dates" | "description" | "areas">>;
+type TScheduleTaskGetById = Pick<TScheduleTask, "title" | "time" | "dates" | "description" | "areas" | "status" | "createdAt" | "repeat" | "daysOfWeek" | "dayOfMonth" | "startDate" | "endDate" | "paused" | "lastRunDate">;
+type TScheduleTaskUpdate = Partial<Pick<TScheduleTask, "title" | "time" | "dates" | "description" | "areas" | "repeat" | "daysOfWeek" | "dayOfMonth" | "startDate" | "endDate" | "paused">>;
 declare const scheduleTaskSchema: Joi.ObjectSchema<any>;
 declare function MScheduleTask(value: TScheduleTaskCreate): {
+    status: string;
+    createdAt: Date;
+    updatedAt: string;
+    deletedAt: string;
     site: string | ObjectId;
     serviceType: AppServiceType;
     title: string;
@@ -678,33 +702,41 @@ declare function MScheduleTask(value: TScheduleTaskCreate): {
         name: string;
         value: ObjectId;
     }[];
-    status: string;
-    createdAt: Date;
-    updatedAt: string;
-    deletedAt: string;
 };
 
 declare function useScheduleTaskRepository(): {
     createIndex: () => Promise<void>;
     createTextIndex: () => Promise<void>;
     createScheduleTask: (value: TScheduleTaskCreate, session?: ClientSession) => Promise<ObjectId>;
-    getScheduleTasks: ({ page, limit, search, site, serviceType, }: TScheduleTaskGetQuery) => Promise<{}>;
-    getAllScheduleTask: () => Promise<TScheduleTask[]>;
+    getScheduleTasks: ({ page, limit, search, site, serviceType, }: TScheduleTaskGetQuery) => Promise<any>;
+    getAllScheduleTask: (today?: string) => Promise<TScheduleTask[]>;
+    markScheduleTaskRan: (_id: string | ObjectId, date: string) => Promise<void>;
     getScheduleTaskById: (_id: string | ObjectId, session?: ClientSession) => Promise<TScheduleTaskGetById>;
     updateScheduleTask: (_id: string | ObjectId, value: TScheduleTaskUpdate, session?: ClientSession) => Promise<number>;
     deleteScheduleTask: (_id: string | ObjectId, session?: ClientSession) => Promise<number>;
 };
 
+/** An extra visit that was just added to today's list (for the caller to notify staff). */
+type TFiredScheduleTask = {
+    _id: ObjectId;
+    site: string | ObjectId;
+    serviceType: TAppServiceType;
+    title: string;
+    time: string;
+    areas: string[];
+};
 declare function useScheduleTaskService(): {
     checkScheduleConditions: (schedule: any, serviceType: TAppServiceType, currentDate?: Date) => boolean;
     processScheduledTasks: (currentDate?: Date) => Promise<{
         processed: number;
         validated: number;
+        fired: TFiredScheduleTask[];
         tasks?: undefined;
     } | {
         processed: number;
         validated: number;
         tasks: TScheduleTask[];
+        fired: TFiredScheduleTask[];
     }>;
 };
 
@@ -725,4 +757,4 @@ declare function useQRController(): {
     generateQR: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
-export { CHECKOUT_DECIDABLE_STATUS, CHECKOUT_DECISIONS, MArea, MAreaChecklist, MCheckOutItem, MParentChecklist, MScheduleTask, MStock, MSupply, MUnit, TArea, TAreaChecklist, TAreaChecklistBatchCreate, TAreaChecklistCreate, TAreaChecklistUnits, TAreaChecklistUnitsUpdate, TAreaChecklistUpdate, TAreaCreate, TAreaGetQuery, TAreaUnits, TAreaUpdate, TAreaUpdateChecklist, TCheckOutDecision, TCheckOutItem, TCheckOutItemCreate, TCheckOutItemCreateByBatchService, TCheckOutItemCreateService, TCheckOutItemDecision, TCheckOutItemGetById, TCheckOutItemGetQuery, TCleaningScheduleArea, TCleaningScheduleAreaGetQuery, TGetStocksQuery, TParentChecklist, TParentChecklistCreate, TParentChecklistGetQuery, TScheduleTask, TScheduleTaskCreate, TScheduleTaskGetById, TScheduleTaskGetQuery, TScheduleTaskUpdate, TStock, TStockCreate, TStockCreateService, TSupply, TSupplyCreate, TSupplyGetById, TSupplyGetQuery, TSupplyUpdate, TUnit, TUnitCreate, TUnitGetQuery, TUnitUpdate, allowedCheckOutItemStatus, allowedChecklistStatus, allowedPeriods, allowedStatus, allowedTypes, applyCheckOutDecision, areaChecklistSchema, areaSchema, buildCheckOutDecision, checkOutItemSchema, isCheckOutDecision, parentChecklistSchema, scheduleTaskSchema, stockSchema, supplySchema, unitSchema, useAreaChecklistController, useAreaChecklistRepo, useAreaChecklistService, useAreaController, useAreaExportService, useAreaRepo, useAreaService, useCheckOutItemController, useCheckOutItemRepository, useCheckOutItemService, useHygieneDashboardController, useHygieneDashboardRepository, useParentChecklistController, useParentChecklistRepo, useQRController, useQRService, useScheduleTaskController, useScheduleTaskRepository, useScheduleTaskService, useStockController, useStockRepository, useStockService, useSupplyController, useSupplyRepository, useUnitController, useUnitExportService, useUnitRepository, useUnitService };
+export { CHECKOUT_DECIDABLE_STATUS, CHECKOUT_DECISIONS, MArea, MAreaChecklist, MCheckOutItem, MParentChecklist, MScheduleTask, MStock, MSupply, MUnit, TArea, TAreaChecklist, TAreaChecklistBatchCreate, TAreaChecklistCreate, TAreaChecklistUnits, TAreaChecklistUnitsUpdate, TAreaChecklistUpdate, TAreaCreate, TAreaGetQuery, TAreaUnits, TAreaUpdate, TAreaUpdateChecklist, TCheckOutDecision, TCheckOutItem, TCheckOutItemCreate, TCheckOutItemCreateByBatchService, TCheckOutItemCreateService, TCheckOutItemDecision, TCheckOutItemGetById, TCheckOutItemGetQuery, TCleaningScheduleArea, TCleaningScheduleAreaGetQuery, TFiredScheduleTask, TGetStocksQuery, TParentChecklist, TParentChecklistCreate, TParentChecklistGetQuery, TScheduleTask, TScheduleTaskCreate, TScheduleTaskGetById, TScheduleTaskGetQuery, TScheduleTaskUpdate, TStock, TStockCreate, TStockCreateService, TSupply, TSupplyCreate, TSupplyGetById, TSupplyGetQuery, TSupplyUpdate, TUnit, TUnitCreate, TUnitGetQuery, TUnitUpdate, allowedCheckOutItemStatus, allowedChecklistStatus, allowedPeriods, allowedStatus, allowedTypes, applyCheckOutDecision, areaChecklistSchema, areaSchema, buildCheckOutDecision, checkOutItemSchema, isCheckOutDecision, parentChecklistSchema, scheduleTaskSchema, stockSchema, supplySchema, unitSchema, useAreaChecklistController, useAreaChecklistRepo, useAreaChecklistService, useAreaController, useAreaExportService, useAreaRepo, useAreaService, useCheckOutItemController, useCheckOutItemRepository, useCheckOutItemService, useHygieneDashboardController, useHygieneDashboardRepository, useParentChecklistController, useParentChecklistRepo, useQRController, useQRService, useScheduleTaskController, useScheduleTaskRepository, useScheduleTaskService, useStockController, useStockRepository, useStockService, useSupplyController, useSupplyRepository, useUnitController, useUnitExportService, useUnitRepository, useUnitService };