@7365admin1/core 2.28.0 → 2.29.0

package/dist/index.mjs

@@ -2577,10 +2577,12 @@ function useUserRepo() {
   async function updateUserFieldById({ _id, field, value } = {}, session) {
     const allowedFields = [
       "name",
-      "gender",
       "email",
       "contact",
+      "nric",
+      "dateOfBirth",
       "profile",
+      "gender",
       "defaultOrg"
     ];
     if (!allowedFields.includes(field)) {
@@ -6380,7 +6382,7 @@ function useUserController() {
   async function updateUserFieldById(req, res, next) {
     const validation = Joi13.object({
       _id: Joi13.string().hex().required(),
-      field: Joi13.string().valid("name", "gender", "email", "contact", "profile", "defaultOrg").required(),
+      field: Joi13.string().valid("name", "email", "contact", "nric", "dateOfBirth", "profile", "gender", "defaultOrg").required(),
       value: Joi13.when("field", {
         switch: [
           { is: "email", then: Joi13.string().email().required() },
@@ -34116,7 +34118,7 @@ function useOccurrenceBookRepo() {
     date = "",
     status = ""
   }, session) {
-    page = page > 0 ? page - 1 : 0;
+    page = page > 0 && !date ? page - 1 : 0;
     const _site = toObjectId12(site);
     const query = {
       site: _site,
@@ -34141,7 +34143,7 @@ function useOccurrenceBookRepo() {
           throw new BadRequestError146("Invalid date format. Use DD/MM/YYYY.");
         if (day > 31 || month > 12)
           throw new BadRequestError146("Invalid date value.");
-        dateObj = new Date(Date.UTC(year, month - 1, day));
+        dateObj = new Date(Date.UTC(year, month - 1, day - 1));
       } else {
         dateObj = new Date(date);
       }
@@ -37597,12 +37599,15 @@ function useIncidentReportRepo() {
     }
     if (dateFrom) {
       const [year, month, day] = dateFrom.split("-").map(Number);
-      const start = new Date(year, month - 1, day, 0, 0, 0, 0).toISOString();
-      const end = new Date(year, month - 1, day, 23, 59, 59, 999).toISOString();
+      const offset = 8;
+      const start = new Date(Date.UTC(year, month - 1, day, -offset, 0, 0, 0));
+      const end = new Date(
+        Date.UTC(year, month - 1, day, 23 - offset, 59, 59, 999)
+      );
       dateExpr = {
         "incidentInformation.incidentTypeAndTime.dateOfIncident": {
-          $gte: start,
-          $lte: end
+          $gte: start.toISOString(),
+          $lte: end.toISOString()
         }
       };
     }