From e5df29da262a3f456f09e61fd148a760e3050653 Mon Sep 17 00:00:00 2001 From: Bhaskar Date: Mon, 19 May 2025 17:19:48 +0530 Subject: [PATCH] changes --- src/controllers/installationController.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/controllers/installationController.js b/src/controllers/installationController.js index bd19ea75..fb10db0f 100644 --- a/src/controllers/installationController.js +++ b/src/controllers/installationController.js @@ -1852,22 +1852,23 @@ exports.getMasterSlaveSummary = async (req, reply) => { if (matchedTank) { tankHeight = parseFloat(matchedTank.tankHeight) || 0; - + const indiaTime = moment.tz( `${moment(matchedTank.date).format("YYYY-MM-DD")} ${matchedTank.time}`, "YYYY-MM-DD HH:mm:ss", "Asia/Kolkata" ); - - + connectedLoraDate = indiaTime.format("DD-MM-YYYY"); connectedLoraTime = indiaTime.format("HH:mm:ss"); - + loraStatus = tankHeight > 0 ? "connected" : "disconnected"; - - // if (loraStatus === "disconnected") { - // loraLastDisconnect = `${connectedLoraDate} ${connectedLoraTime}`; - // } + + // ⛔ Override if master is disconnected + if (gsmStatus === "disconnected") { + loraStatus = "disconnected"; + } + if (loraStatus === "disconnected") { if (connectedLoraDate && connectedLoraTime) { loraLastDisconnect = `${connectedLoraDate} ${connectedLoraTime}`; @@ -1876,6 +1877,7 @@ exports.getMasterSlaveSummary = async (req, reply) => { } } } + } // Update in DB await Insensors.updateOne(