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

src/controllers/installationController.js

@@ -8322,6 +8322,14 @@ exports.particularCategory = async (req, reply) => {
           location: slave.tankLocation || "",
           connected_status: loraConnected ? "connected" : "disconnected",
           connected_to: slave.connected_to || "",
+          gsm_last_check_time: slave.gsm_last_check_time || null,
+                  gsm_last_disconnect_time: slave.gsm_last_disconnect_time || null,
+                  lora_last_disconnect_time: slave.lora_last_disconnect_time || null,
+                  connected_gsm_date: slave.connected_gsm_date || "",
+                   connected_gsm_time: slave.connected_gsm_time || "",
+                  connected_lora_date: slave.connected_lora_date || "",
+                  connected_lora_time: slave.connected_lora_time || "",
+                   support_lora_last_check_time: slave.support_lora_last_check_time || null,
           masterName: orderMap[master.hardwareId]?.masterName || "",
           type: "slave",
           typeOfWater: tankInfo?.typeOfWater || "",
@@ -8355,8 +8363,17 @@ exports.particularCategory = async (req, reply) => {
         type: "master",
         connected_status: gsmConnected ? "connected" : "disconnected",
         connected_slave_count: slaveDetails.length,
+        gsm_last_check_time: master.gsm_last_check_time || null,
+        gsm_last_disconnect_time: master.gsm_last_disconnect_time || null,
+        lora_last_disconnect_time: master.lora_last_disconnect_time || null,
+        connected_gsm_date: master.connected_gsm_date || "",
+         connected_gsm_time: master.connected_gsm_time || "",
+        connected_lora_date: master.connected_lora_date || "",
+        connected_lora_time: master.connected_lora_time || "",
+         support_gm_last_check_time: master.support_gsm_last_check_time || null,
         connected_slaves: slaveDetails,
         comments: masterComments,
+
         movedAt: category !== "Resolved" ? (issue?.movedAt || null) : null,
         resolvedAt: category === "Resolved" ? (issue?.resolvedAt || null) : null
       });