payservedb 3.4.2 → 3.4.4

package/index.js

@@ -106,7 +106,8 @@ const models = {
     Staff:require('./src/models/staff'),
     ServiceRequest:require('./src/models/servicerequest'),
     CountryTaxRate:require('./src/models/country_tax'),
-    Meter:require('./src/models/water_meter'),
+    Meter:require('./src/models/smart_water_meter'),
+    AnalogMeter:require('./src/models/analog_water_meter'),
     MeterSize:require('./src/models/water_meter_size'),
     MeterProtocol:require('./src/models/water_meter_communication'),
     MeterManufacturer:require('./src/models/water_meter_manufacturer'),

package/package.json

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

package/src/models/analog_water_meter.js

@@ -0,0 +1,46 @@
+const mongoose = require('mongoose');
+
+const analogMeterSchema = new mongoose.Schema({
+    unitNumber: {
+        type: String,
+        required: true,
+        trim: true,
+        index: true
+    },
+    customer: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    initialReading: {
+        type: Number,
+        required: true,
+        min: 0,
+        default: 0
+    },
+    currentReading: {
+        type: Number,
+        required: true,
+        min: 0,
+        default: 0
+    },
+    status: {
+        type: String
+    },
+    lastReadingDate: {
+        type: Date,
+        default: Date.now
+    },
+    readingHistory: [{
+        reading: Number,
+        date: Date,
+        readBy: String
+    }]
+}, {
+    timestamps: true
+});
+
+
+const AnalogMeter = mongoose.model('AnalogMeter', analogMeterSchema);
+
+module.exports = AnalogMeter;

package/src/models/dutyroster.js

@@ -19,7 +19,7 @@ const dutyRosterSchema = new mongoose.Schema({
     required: true,
   },
   time: {
-    type: String, // e.g., '08:00 AM - 05:00 PM'
+    type: String, 
     required: true
   },
   schedule: [{