payservedb 4.6.5 → 4.6.7

package/index.js

@@ -137,7 +137,10 @@ const models = {
     Supplier: require('./src/models/suppliers'),
     PurchaseRequest: require('./src/models/purchase_request'),
     PurchaseOrder: require('./src/models/purchase_order'),
-    RFQ: require('./src/models/quotation')
+    RFQ: require('./src/models/quotation'),
+    CommonAreaElectricityReading: require('./src/models/common_area_electricity'),
+    CommonAreaWaterReading: require('./src/models/common_area_water'),
+    CommonAreaGeneratorReading: require('./src/models/common_area_generator')
 
 };
 

package/package.json

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

package/src/models/common_area_electricity.js

@@ -0,0 +1,41 @@
+const mongoose = require('mongoose');
+
+const commonAreaElectricityReadingSchema = new mongoose.Schema({
+  facilityId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'Facility',
+    required: true,
+    index: true
+  },
+  date: {
+    type: Date,
+    required: true,
+    default: Date.now
+  },
+  location: {
+    type: String,
+    enum: ['Common Area', 'Lift', 'Pumps'],
+    required: true,
+    trim: true
+  },
+  openingReadingKWh: {
+    type: Number,
+    required: true
+  },
+  closingReadingKWh: {
+    type: Number,
+    required: true
+  },
+  consumptionKWh: {
+    type: Number,
+    required: true
+  },
+  total: {
+    type: Number
+  }
+}, {
+  timestamps: true
+});
+
+const CommonAreaElectricityReading = mongoose.model('CommonAreaElectricityReading', commonAreaElectricityReadingSchema);
+module.exports = CommonAreaElectricityReading;

package/src/models/common_area_generator.js

@@ -0,0 +1,38 @@
+const mongoose = require('mongoose');
+
+const commonAreaGeneratorReadingSchema = new mongoose.Schema({
+  facilityId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'Facility',
+    required: true,
+    index: true
+  },
+  date: {
+    type: Date,
+    required: true
+  },
+  openingReadingHrs: {
+    type: Number,
+    required: true
+  },
+  closingReadingHrs: {
+    type: Number,
+    required: true
+  },
+  totalHrsRun: {
+    type: Number,
+    required: true
+  },
+  fuelLevel: {
+    type: String,
+    trim: true
+  },
+  refillAmountLiters: {
+    type: Number
+  }
+}, {
+  timestamps: true
+});
+
+const CommonAreaGeneratorReading = mongoose.model('CommonAreaGeneratorReading', commonAreaGeneratorReadingSchema);
+module.exports = CommonAreaGeneratorReading;

package/src/models/common_area_water.js

@@ -0,0 +1,39 @@
+const mongoose = require('mongoose');
+
+const commonAreaWaterReadingSchema = new mongoose.Schema({
+  facilityId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'Facility',
+    required: true,
+    index: true
+  },
+  date: {
+    type: Date,
+    required: true,
+    default: Date.now
+  },
+  sourceType: {
+    type: String,
+    enum: ['City Council', 'Borehole'],
+    required: true,
+    trim: true
+  },
+  openingReadingM3: {
+    type: Number,
+    required: true
+  },
+  closingReadingM3: {
+    type: Number,
+    required: true
+  },
+  consumptionM3: {
+    type: Number,
+    required: true
+  }
+}, {
+  timestamps: true
+});
+
+const CommonAreaWaterReading = mongoose.model('CommonAreaWaterReading', commonAreaWaterReadingSchema);
+module.exports = CommonAreaWaterReading;
+

package/src/models/purchase_request.js

@@ -29,7 +29,6 @@ const purchaseRequestSchema = new mongoose.Schema({
     }],
     from: {
         type: String,
-        ref: 'User',
         trim: true
     },
     date: {