diff --git a/src/controllers/createConnectionController.js b/src/controllers/createConnectionController.js index 467d27b4..4e666033 100644 --- a/src/controllers/createConnectionController.js +++ b/src/controllers/createConnectionController.js @@ -163,9 +163,14 @@ exports.getConnections = async (req, reply) => { throw boom.boomify(err); } }; + + + + + // exports.createConnectionsforOh = async (req, body) => { // try { // const customerId = req.params.customerId; diff --git a/src/controllers/tanksController.js b/src/controllers/tanksController.js index 4025e6a8..96d85335 100644 --- a/src/controllers/tanksController.js +++ b/src/controllers/tanksController.js @@ -370,51 +370,51 @@ exports.motorAction = async (req, reply) => { - if(supplier_tank_type==="sump" && receiver_type === "sump"){ - const receiver_capacity = parseInt(receiver_tank_info.capacity.replace(/,/g, ''), 10) - // console.log(receiver_capacity,"0",receiver_tank_info.tankName) - await Tank.findOneAndUpdate({customerId, tankName: receiver_tank,tankLocation:receiver_type}, { $set: { motor_status: "1" } }); - const supplier_tank_info = await Tank.findOne({ customerId ,tankName:supplier_tank,tankLocation:supplier_tank_type}); - - let supplier_waterlevel = parseInt(supplier_tank_info.waterlevel.replace(/,/g, ''), 10) - let receiver_waterlevel = parseInt(receiver_tank_info.waterlevel.replace(/,/g, ''), 10) - // console.log(receiver_waterlevel,"1") - intervals[interval_variable] = setInterval(async function () { - // Calculate new water levels - const rcvr_info = await Tank.findOne({ customerId ,tankName:receiver_tank,tankLocation:receiver_type}); - const supplier_capacity = parseInt(supplier_tank_info.capacity.replace(/,/g, ''), 10) - // Calculate new water levels - const newWaterLevel = receiver_waterlevel + 300//Math.floor(supplier_waterlevel * 0.1); - const newSupplierWaterLevel = Math.min(supplier_capacity, supplier_waterlevel - 300);// Math.floor(supplier_waterlevel * 0.15)); - // Check if updating should stop - if ((newWaterLevel/receiver_capacity)*100 >= 97 || (newWaterLevel/receiver_capacity)*100 >= desired_water_percentage || rcvr_info.motor_status === "0" || (newSupplierWaterLevel/supplier_capacity)*100 <= 5 ) { + // if(supplier_tank_type==="sump" && receiver_type === "sump"){ + // const receiver_capacity = parseInt(receiver_tank_info.capacity.replace(/,/g, ''), 10) + // // console.log(receiver_capacity,"0",receiver_tank_info.tankName) + // await Tank.findOneAndUpdate({customerId, tankName: receiver_tank,tankLocation:receiver_type}, { $set: { motor_status: "1" } }); + // const supplier_tank_info = await Tank.findOne({ customerId ,tankName:supplier_tank,tankLocation:supplier_tank_type}); + + // let supplier_waterlevel = parseInt(supplier_tank_info.waterlevel.replace(/,/g, ''), 10) + // let receiver_waterlevel = parseInt(receiver_tank_info.waterlevel.replace(/,/g, ''), 10) + // // console.log(receiver_waterlevel,"1") + // intervals[interval_variable] = setInterval(async function () { + // // Calculate new water levels + // const rcvr_info = await Tank.findOne({ customerId ,tankName:receiver_tank,tankLocation:receiver_type}); + // const supplier_capacity = parseInt(supplier_tank_info.capacity.replace(/,/g, ''), 10) + // // Calculate new water levels + // const newWaterLevel = receiver_waterlevel + 300//Math.floor(supplier_waterlevel * 0.1); + // const newSupplierWaterLevel = Math.min(supplier_capacity, supplier_waterlevel - 300);// Math.floor(supplier_waterlevel * 0.15)); + // // Check if updating should stop + // if ((newWaterLevel/receiver_capacity)*100 >= 97 || (newWaterLevel/receiver_capacity)*100 >= desired_water_percentage || rcvr_info.motor_status === "0" || (newSupplierWaterLevel/supplier_capacity)*100 <= 5 ) { - clearInterval(intervals[interval_variable]); // Clear the interval for this tank - delete intervals[interval_variable]; + // clearInterval(intervals[interval_variable]); // Clear the interval for this tank + // delete intervals[interval_variable]; - await Tank.findOneAndUpdate({customerId, tankName: receiver_tank,tankLocation:receiver_type}, { $set: { motor_status: "0" } }); + // await Tank.findOneAndUpdate({customerId, tankName: receiver_tank,tankLocation:receiver_type}, { $set: { motor_status: "0" } }); - console.log("end for" + receiver_tank); - } else { - // Update water levels in database + // console.log("end for" + receiver_tank); + // } else { + // // Update water levels in database - supplier_waterlevel = newSupplierWaterLevel; - receiver_waterlevel = newWaterLevel; - console.log(supplier_waterlevel,"0") - console.log(receiver_waterlevel,"1") - // console.log((newSupplierWaterLevel/supplier_capacity)*100) - // console.log((newWaterLevel/receiver_capacity)*100) - await Promise.all([ - Tank.findOneAndUpdate({customerId, tankName: receiver_tank}, { $set: { waterlevel: newWaterLevel } }), - Tank.findOneAndUpdate({customerId, tankName: supplier_tank}, { $set: { waterlevel: newSupplierWaterLevel } }) - ]); - } - }, 2000); - - } + // supplier_waterlevel = newSupplierWaterLevel; + // receiver_waterlevel = newWaterLevel; + // console.log(supplier_waterlevel,"0") + // console.log(receiver_waterlevel,"1") + // // console.log((newSupplierWaterLevel/supplier_capacity)*100) + // // console.log((newWaterLevel/receiver_capacity)*100) + // await Promise.all([ + // Tank.findOneAndUpdate({customerId, tankName: receiver_tank}, { $set: { waterlevel: newWaterLevel } }), + // Tank.findOneAndUpdate({customerId, tankName: supplier_tank}, { $set: { waterlevel: newSupplierWaterLevel } }) + // ]); + // } + // }, 2000); + + // }