diff --git a/src/controllers/tanksController.js b/src/controllers/tanksController.js index efbe2877..9d547b63 100644 --- a/src/controllers/tanksController.js +++ b/src/controllers/tanksController.js @@ -960,7 +960,7 @@ exports.consumption = async (request, reply) => { const tanks = await Tank.find(tankQuery); const tankData = []; - + const tankconsumptionData = []; // Variable to track total consumption for the selected block and typeofwater let totalConsumptionForSelectedBlockAndTypeOfWater = 0; @@ -971,7 +971,7 @@ exports.consumption = async (request, reply) => { const tankname = tank.tankName; - + const tankConsumptions = await TankConsumptionOriginalSchema.find({ customerId, @@ -990,6 +990,10 @@ exports.consumption = async (request, reply) => { const total_consumption_from_records = filteredConsumptions.reduce((acc, record) => { return acc + parseInt(record.consumption, 10); }, 0); + tankconsumptionData.push({ + tankname, + consumptionRecordsdatewise: filteredConsumptions + }) const consumption = (waterlevel_at_midnight + total_water_added_from_midnight) - waterlevel + total_consumption_from_records; @@ -998,6 +1002,7 @@ exports.consumption = async (request, reply) => { tankData.push({ tankname, + totalConsumption: consumption, block: tank.blockName, TypeofWater: tank.typeOfWater, @@ -1010,7 +1015,7 @@ exports.consumption = async (request, reply) => { // Include the total consumption in the response const response = { status_code: 200, - tankData, + tankData,consumptiorecordsdatewise:tankconsumptionData, [`total consumption of ${typeofwater} and selected block`]: totalConsumptionForSelectedBlockAndTypeOfWater };