From 8838b64a92b5dd70c935d7f7b5c75c36ede23d69 Mon Sep 17 00:00:00 2001 From: Varun Date: Tue, 25 Mar 2025 17:09:38 +0530 Subject: [PATCH] changes --- src/controllers/tanksController.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/controllers/tanksController.js b/src/controllers/tanksController.js index fa707e1d..0b4c13fd 100644 --- a/src/controllers/tanksController.js +++ b/src/controllers/tanksController.js @@ -1201,8 +1201,18 @@ exports.consumption = async (request, reply) => { return acc + parseInt(record.consumption, 10); }, 0); - const consumption = (waterlevel_at_midnight + total_water_added_from_midnight) - waterlevel + total_consumption_from_records; - totalConsumptionForSelectedBlockAndTypeOfWater += consumption; + let consumption; + +const isSameTime = start.getTime() === end.getTime(); +const isToday = moment(start).isSame(moment(), 'day'); + +if (isSameTime && !isToday) { + // Same date & time and NOT today => use only records + consumption = total_consumption_from_records; +} else { + // Normal case => use full calculation + consumption = (waterlevel_at_midnight + total_water_added_from_midnight) - waterlevel + total_consumption_from_records; +} // Add to the total consumption and capacities based on water type if (tank.typeOfWater === "bore" || tank.typeOfWater === "Bore Water") {