Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend

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") {