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

src/controllers/tanksController.js

@@ -318,9 +318,38 @@ exports.getTanklevels = async (req, reply) => {
     updated_data.forEach((tank) => {
       const waterlevel = parseInt(tank.waterlevel.replace(/,/g, ''), 10);
       const capacity = parseInt(tank.capacity.replace(/,/g, ''), 10);
+      const waterlevelPercentage = ((waterlevel / capacity) * 100).toFixed(2);
+      tank.waterlevelPercentage = waterlevelPercentage; // Add water level percentage to each tank object
       console.log(`Processing tank: ${tank.tankName}`);
-      console.log(`Type of Water: ${tank.typeOfWater}, Location: ${tank.tankLocation}, Waterlevel: ${waterlevel}, Capacity: ${capacity}`);
+      console.log(`Type of Water: ${tank.typeOfWater}, Location: ${tank.tankLocation}, Waterlevel: ${waterlevel}, Capacity: ${capacity}, Waterlevel Percentage: ${waterlevelPercentage}%`);
+
+      // Calculate and add water level percentages for inputConnections
+      if (tank.connections.inputConnections) {
+        tank.connections.inputConnections.forEach(inputConnection => {
+          if (inputConnection.water_level && inputConnection.capacity) {
+            const inputWaterLevel = parseInt(inputConnection.water_level.replace(/,/g, ''), 10);
+            const inputCapacity = parseInt(inputConnection.capacity.replace(/,/g, ''), 10);
+            inputConnection.waterlevelPercentage = ((inputWaterLevel / inputCapacity) * 100).toFixed(2);
+          } else {
+            inputConnection.waterlevelPercentage = null;
+          }
+        });
+      }
+
+      // Calculate and add water level percentages for outputConnections
+      if (tank.connections.outputConnections) {
+        tank.connections.outputConnections.forEach(outputConnection => {
+          if (outputConnection.water_level && outputConnection.capacity) {
+            const outputWaterLevel = parseInt(outputConnection.water_level.replace(/,/g, ''), 10);
+            const outputCapacity = parseInt(outputConnection.capacity.replace(/,/g, ''), 10);
+            outputConnection.waterlevelPercentage = ((outputWaterLevel / outputCapacity) * 100).toFixed(2);
+          } else {
+            outputConnection.waterlevelPercentage = null;
+          }
+        });
+      }
 
+      // Summing up the total water levels and capacities
       if (tank.tankLocation === 'sump' && tank.typeOfWater === 'Drinking Water') {
         sumSumpDrinkingWater += waterlevel;
         sumSumpDrinkingWaterCapacity += capacity;

src/models/tanks.js

@@ -58,7 +58,7 @@ const tanksSchema = new mongoose.Schema({
       {
         inputConnections: { type: String },
         input_type: { type: String },
-          inputismotor: { type: Boolean, },
+        inputismotor: { type: Boolean },
         motor_id: { type: String, default: null },
         motor_status: { type: String, default: "0" },
         auto_mode: { type: String, default: "inactive" },
@@ -71,14 +71,15 @@ const tanksSchema = new mongoose.Schema({
         threshold_type: { type: String, default: "percentage" },
         startTime: { type: String, default: null },
         start_instance_id: { type: String, default: null },
-          stopTime:{type: String,default:null}
+        stopTime: { type: String, default: null },
+        waterlevelPercentage: { type: String, default: null } // Added field
       }
     ],
     outputConnections: [
       {
         outputConnections: { type: String },
         output_type: { type: String },
-          outputismotor: { type: Boolean, },
+        outputismotor: { type: Boolean },
         motor_id: { type: String, default: null },
         motor_status: { type: String, default: "0" },
         motor_stop_status: { type: String, default: "1" },
@@ -87,7 +88,7 @@ const tanksSchema = new mongoose.Schema({
         manual_threshold_percentage: { type: String, default: "90" },
         manual_threshold_time: { type: String, default: null },
         threshold_type: { type: String, default: "percentage" },
-          
+        waterlevelPercentage: { type: String, default: null } // Added field
       }
     ]
   }