diff --git a/src/controllers/tanksController.js b/src/controllers/tanksController.js index 075c3034..336ad056 100644 --- a/src/controllers/tanksController.js +++ b/src/controllers/tanksController.js @@ -3065,7 +3065,8 @@ exports.motorAction = async (req, reply) => { const start = moment(motorData.startTime, 'DD-MMM-YYYY - HH:mm'); const stop = moment(currentTime, 'DD-MMM-YYYY - HH:mm'); const duration = moment.duration(stop.diff(start)); - const runtime = Math.floor(duration.asMinutes()); + const runtime = Math.floor(duration.asMinutes()); // runtime in minutes + await Tank.findOneAndUpdate( { customerId, tankName: motorData.receiverTank, tankLocation: motorData.receiver_type.toLowerCase() }, @@ -3079,7 +3080,7 @@ exports.motorAction = async (req, reply) => { stopTime: currentTime, receiverfinalwaterlevel: receiverFinalWaterLevel.toString(), quantity_delivered: quantityDelivered.toString(), - runtime:runtime.toString() + runtime: runtime.toString() } } ); @@ -3251,43 +3252,6 @@ async function stopMotor(motorId, customerId, start_instance_id) { } -async function stopMotor(motorId, customerId, start_instance_id) { - const currentTime = moment().tz('Asia/Kolkata').format('DD-MMM-YYYY - HH:mm'); - await Tank.updateOne( - { customerId, "connections.inputConnections.motor_id": motorId }, - { $set: { - "connections.inputConnections.$.motor_stop_status": "1", - "connections.inputConnections.$.stopTime": currentTime, - "connections.inputConnections.$.threshold_type": null, - "connections.inputConnections.$.manual_threshold_time": null, - "connections.inputConnections.$.manual_threshold_percentage": null - }} - ); - - if (motorIntervals[motorId]) { - clearInterval(motorIntervals[motorId]); - delete motorIntervals[motorId]; - } - - // eventEmitter.emit("motorStop", customerId, [], "", "", currentTime, "Mobile APP", 0, "", motorId, ""); - - const motorData = await MotorData.findOne({ customerId, motor_id: motorId, start_instance_id }); - if (motorData) { - const startTime = moment(motorData.startTime, 'DD-MMM-YYYY - HH:mm'); - const runtime = moment.duration(moment(currentTime, 'DD-MMM-YYYY - HH:mm').diff(startTime)).asSeconds(); - - const receiverTank = await Tank.findOne({ customerId, tankName: motorData.receiverTank, tankLocation: motorData.receiver_type.toLowerCase() }); - const receiverFinalWaterLevel = parseInt(receiverTank.waterlevel.replace(/,/g, ''), 10); - const quantityDelivered = receiverFinalWaterLevel - parseInt(motorData.receiverInitialwaterlevel.replace(/,/g, ''), 10); - - await MotorData.updateOne( - { customerId, motor_id: motorId, start_instance_id }, - { $set: { stopTime: currentTime, receiverfinalwaterlevel: receiverFinalWaterLevel.toString(), quantity_delivered: quantityDelivered.toString(), runtime: runtime } } - ); - } -} - - const monitorWaterLevels = async () => {