diff --git a/src/controllers/tanksController.js b/src/controllers/tanksController.js index 9b8d5b11..718c23ce 100644 --- a/src/controllers/tanksController.js +++ b/src/controllers/tanksController.js @@ -299,13 +299,16 @@ exports.motorAction = async (req, reply) => { // await changingfrom_tankwaterlevel(customerId,initial_update,supplier_tank_info); - let supplier_waterlevel = parseInt(supplier_tank_info.waterlevel.replace(/,/g, ''), 10) + // let supplier_waterlevel = parseInt(supplier_tank_info.waterlevel.replace(/,/g, ''), 10) // console.log(supplier_waterlevel) - let receiver_waterlevel = parseInt(receiver_tank_info.waterlevel.replace(/,/g, ''), 10) + // let receiver_waterlevel = parseInt(receiver_tank_info.waterlevel.replace(/,/g, ''), 10) intervals[interval_variable] = setInterval(async function () { // Calculate new water levels const supplier_tank_info2 = await Tank.findOne({ customerId ,tankName:supplier_tank,tankLocation:supplier_tank_type}); const rcvr_info = await Tank.findOne({ customerId ,tankName:receiver_tank,tankLocation:receiver_type}); + let receiver_waterlevel = parseInt(rcvr_info.waterlevel.replace(/,/g, ''), 10) + + let supplier_waterlevel = parseInt(supplier_tank_info2.waterlevel.replace(/,/g, ''), 10) const newWaterLevel = receiver_waterlevel + (250*sum_oh_count)//Math.floor(supplier_waterlevel * 0.1); const newSupplierWaterLevel = supplier_waterlevel//Math.floor(supplier_waterlevel * 0.1); const supplier_capacity = parseInt(supplier_tank_info.capacity.replace(/,/g, ''), 10) @@ -332,16 +335,16 @@ exports.motorAction = async (req, reply) => { } else { // Update water levels in database //supplier_waterlevel = newSupplierWaterLevel; - receiver_waterlevel = newWaterLevel; + // receiver_waterlevel = newWaterLevel; console.log((newSupplierWaterLevel/supplier_capacity)*100) // console.log((newWaterLevel/receiver_capacity)*100) console.log(receiver_tank+""+newWaterLevel+""+"bore to sump") await Tank.findOneAndUpdate({customerId, tankName: receiver_tank,tankLocation:receiver_type}, { $set: { waterlevel: newWaterLevel } }) - if (supplier_tank_info2.motor_status==="0"){ + //if (supplier_tank_info2.motor_status==="0"){ supplier_waterlevel = parseInt(supplier_tank_info2.waterlevel.replace(/,/g, ''), 10)-250 console.log(supplier_tank+""+newSupplierWaterLevel+""+"s to oh") await Tank.findOneAndUpdate({customerId, tankName: supplier_tank,tankLocation:supplier_tank_type}, { $set: { waterlevel: supplier_waterlevel } }) - } + // } } }, 2000); @@ -405,6 +408,7 @@ exports.motorAction = async (req, reply) => { if(supplier_tank_type==="sump" && receiver_type === "sump"){ const receiver_capacity = parseInt(receiver_tank_info.capacity.replace(/,/g, ''), 10) + const sumpTank = await Tank.findOne({ customerId, tankName: receiver_tank, tankLocation: receiver_type }); const connection = sumpTank.connections.inputConnections.find((conn) => conn.inputConnections === supplier_tank); @@ -419,16 +423,19 @@ exports.motorAction = async (req, reply) => { 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) + // 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 splr_tank_info = await Tank.findOne({ customerId ,tankName:supplier_tank,tankLocation:supplier_tank_type}); const rcvr_info = await Tank.findOne({ customerId ,tankName:receiver_tank,tankLocation:receiver_type}); const supplier_capacity = parseInt(supplier_tank_info.capacity.replace(/,/g, ''), 10) + let supplier_waterlevel = parseInt(splr_tank_info.waterlevel.replace(/,/g, ''), 10) + let receiver_waterlevel = parseInt(rcvr_info.waterlevel.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)); + const newWaterLevel = receiver_waterlevel + 250//Math.floor(supplier_waterlevel * 0.1); + const newSupplierWaterLevel = Math.min(supplier_capacity, supplier_waterlevel - 250);// 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 <= stop_at ) { @@ -443,8 +450,8 @@ exports.motorAction = async (req, reply) => { } else { // Update water levels in database - supplier_waterlevel = newSupplierWaterLevel; - receiver_waterlevel = newWaterLevel; + // supplier_waterlevel = newSupplierWaterLevel; + // receiver_waterlevel = newWaterLevel; console.log(supplier_waterlevel,"0") console.log(receiver_waterlevel,"1") // console.log((newSupplierWaterLevel/supplier_capacity)*100) @@ -477,12 +484,14 @@ exports.motorAction = async (req, reply) => { } - let receiver_waterlevel = parseInt(receiver_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}); //console.log(rcvr_info) + let receiver_waterlevel = parseInt(rcvr_info.waterlevel.replace(/,/g, ''), 10) + //console.log(rcvr_info.motor_status) const newWaterLevel = receiver_waterlevel+(250*bore_sump_count); //console.log(newWaterLevel,"2",receiver_tank_info.tankName) @@ -507,7 +516,7 @@ exports.motorAction = async (req, reply) => { } else { // Update water levels in database - receiver_waterlevel = newWaterLevel; + // receiver_waterlevel = newWaterLevel; //console.log((newWaterLevel/receiver_capacity)*100,"4",receiver_tank_info.tankName) await Tank.findOneAndUpdate({customerId, tankName: receiver_tank,tankLocation:receiver_type}, { $set: { waterlevel: newWaterLevel } })