payservedb 4.7.5 → 4.7.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payservedb",
-  "version": "4.7.5",
+  "version": "4.7.8",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/src/models/common_area_utility_alert.js

@@ -0,0 +1,38 @@
+const mongoose = require('mongoose');
+
+const alertSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true,
+        index: true
+    },
+    date: {
+        type: Date,
+        required: true
+    },
+    utilityType: {
+        type: String,
+        required: true,
+        enum: ['Generator', 'Water', 'Electricity']
+    },
+    description: {
+        type: String,
+        required: true
+    },
+    status: {
+        type: String,
+        required: true,
+        enum: ['Open', 'Resolved', 'Ignored'],
+        default: 'Open'
+    },
+    resolvedDate: {
+        type: Date
+    }
+}, { timestamps: true });
+
+// Compound index for efficient querying
+alertSchema.index({ facilityId: 1, date: 1, utilityType: 1 });
+
+const Alert = mongoose.model('Alert', alertSchema);
+module.exports = Alert;

package/src/models/dutyroster.js

@@ -6,47 +6,125 @@ const dutyRosterSchema = new mongoose.Schema({
     ref: 'Facility',
     required: true,
   },
-  name: {
-    type: String,
-    required: true,
-  },
-  phone: {
-    type: String,
-    required: true,
-  },
-  activity: {
-    type: String,
-    required: true,
-  },
-  startTime: {
-    type: String,
-    required: true
-  },
-  endTime: {
-    type: String,
-    required: true
-  },
-  approved: {
-    type: Boolean,
-    default: false
+  staffDetails: {
+    name: {
+      type: String,
+      required: true,
+    },
+    phone: {
+      type: String,
+      required: true,
+    },
+    role: {
+      type: String,
+      required: true,
+      // Examples: 'Site Manager', 'GRE', 'Site support staff', 'Plumber', etc.
+    }
   },
-  approvedBy: {
-    type: mongoose.Schema.Types.ObjectId,
-    ref: 'User'
+
+  // Regular weekly schedule
+  weeklySchedule: {
+    monday: {
+      startTime: String,
+      endTime: String,
+      status: {
+        type: String,
+        enum: ['ON', 'OFF', 'AL', 'CL', 'ML/PL', 'PH', 'UI'],
+        default: 'ON'
+      }
+    },
+    tuesday: {
+      startTime: String,
+      endTime: String,
+      status: {
+        type: String,
+        enum: ['ON', 'OFF', 'AL', 'CL', 'ML/PL', 'PH', 'UI'],
+        default: 'ON'
+      }
+    },
+    wednesday: {
+      startTime: String,
+      endTime: String,
+      status: {
+        type: String,
+        enum: ['ON', 'OFF', 'AL', 'CL', 'ML/PL', 'PH', 'UI'],
+        default: 'ON'
+      }
+    },
+    thursday: {
+      startTime: String,
+      endTime: String,
+      status: {
+        type: String,
+        enum: ['ON', 'OFF', 'AL', 'CL', 'ML/PL', 'PH', 'UI'],
+        default: 'ON'
+      }
+    },
+    friday: {
+      startTime: String,
+      endTime: String,
+      status: {
+        type: String,
+        enum: ['ON', 'OFF', 'AL', 'CL', 'ML/PL', 'PH', 'UI'],
+        default: 'ON'
+      }
+    },
+    saturday: {
+      startTime: String,
+      endTime: String,
+      status: {
+        type: String,
+        enum: ['ON', 'OFF', 'AL', 'CL', 'ML/PL', 'PH', 'UI'],
+        default: 'ON'
+      }
+    },
+    sunday: {
+      startTime: String,
+      endTime: String,
+      status: {
+        type: String,
+        enum: ['ON', 'OFF', 'AL', 'CL', 'ML/PL', 'PH', 'UI'],
+        default: 'ON'
+      }
+    }
   },
-  schedule: [{
+
+  // For exceptions to the regular schedule
+  exceptions: [{
     date: {
       type: Date,
       required: true
     },
+    startTime: String,
+    endTime: String,
     status: {
       type: String,
-      enum: ['pending', 'completed', 'missed', 'rescheduled'],
-      default: 'pending'
+      enum: ['ON', 'OFF', 'AL', 'CL', 'ML/PL', 'PH', 'UI'],
+      required: true
+    },
+    reason: String
+  }],
+
+  // Metadata
+  metadata: {
+    period: {
+      startDate: Date,
+      endDate: Date
     }
-  }]
+  }
 }, {
   timestamps: true
 });
 
+// Status code definitions
+dutyRosterSchema.statics.STATUS_CODES = {
+  ON: 'On Duty',
+  OFF: 'Off Duty',
+  AL: 'Annual Leave',
+  CL: 'Casual Leave',
+  'ML/PL': 'Medical/Paternity Leave',
+  PH: 'Public Holiday',
+  UI: 'Unplanned Issues'
+};
+
 module.exports = mongoose.model('DutyRoster', dutyRosterSchema);