diff --git a/src/controllers/tanksController.js b/src/controllers/tanksController.js index 2a795496..6ad20279 100644 --- a/src/controllers/tanksController.js +++ b/src/controllers/tanksController.js @@ -932,7 +932,13 @@ exports.motorAction = async (req, reply) => { const thresholdTime = moment().add(req.body.manual_threshold_time, 'minutes').toDate(); const intervalId = setInterval(async () => { // Check if threshold time has been reached - if (new Date() >= thresholdTime) { + const splr_tank_info3 = await Tank.findOne({ customerId, tankName: req.body.from, tankLocation: req.body.from_type.toLowerCase() }); + const splr_tank_info3_waterlevel = parseInt(supplier_tank_info.waterlevel, 10); + const splr_tank_info3_capacity = parseInt(supplier_tank_info.capacity, 10); + const splr_tank_info3_percentage = (splr_tank_info3_waterlevel / splr_tank_info3_capacity) * 100; + + + if (new Date() >= thresholdTime || splr_tank_info3_percentage<=20) { // Stop the motor pump await Tank.updateOne( { customerId, "connections.inputConnections.motor_id": motorId }, diff --git a/src/models/tanks.js b/src/models/tanks.js index 53a6063f..3e6e3532 100644 --- a/src/models/tanks.js +++ b/src/models/tanks.js @@ -53,6 +53,7 @@ const tanksSchema = new mongoose.Schema({ waterlevel_at_midnight:{ type: String,default:"0" }, total_water_added_from_midnight:{ type: String,default:"0" }, auto_min_percentage :{ type: String, default: "20" }, + reserved_percentage:{type: String,default:"20"}, auto_max_percentage :{ type: String, default: "80" },