From 6cc3ed7421d60337c468d5a1e42dd3195bccad75 Mon Sep 17 00:00:00 2001 From: Varun Date: Wed, 26 Mar 2025 16:50:11 +0530 Subject: [PATCH] changes --- src/controllers/tanksController.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/controllers/tanksController.js b/src/controllers/tanksController.js index c0e79d69..17365ce8 100644 --- a/src/controllers/tanksController.js +++ b/src/controllers/tanksController.js @@ -6506,6 +6506,7 @@ exports.consumptionofparticulartank = async (request, reply) => { return dateA - dateB; // Sort in ascending order }); + // Calculate total consumption from filtered records const total_consumption_from_records = filteredConsumptions.reduce((acc, record) => { return acc + parseInt(record.consumption, 10); @@ -6513,6 +6514,20 @@ exports.consumptionofparticulartank = async (request, reply) => { // Calculate final consumption const consumption = (waterlevel_at_midnight + total_water_added_from_midnight) - waterlevel + total_consumption_from_records; + // If end date is today, attach one extra record +const today = moment().startOf('day'); +const isEndDateToday = moment(end).isSame(today, 'day'); + +if (isEndDateToday) { + const extraConsumption = (waterlevel_at_midnight + total_water_added_from_midnight) - waterlevel; + const now = moment().format("DD-MMM-YYYY - HH:mm"); + + filteredConsumptions.push({ + tankName: tank.tankName, + consumption: extraConsumption.toString(), + time: now + }); +} // Prepare response data const tankData = {