From 34f0dda210a9b24c5c3d46550f75af3bac66e40c Mon Sep 17 00:00:00 2001
From: Etienne Chassaing <60154720+cetiennec@users.noreply.github.com>
Date: Wed, 6 Aug 2025 11:53:47 +0200
Subject: [PATCH] Qconso computation corrected

---
 main.py                |  4 +---
 templates/control.html | 19 +++++--------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/main.py b/main.py
index abe2edc..f9dcbba 100644
--- a/main.py
+++ b/main.py
@@ -110,9 +110,7 @@ def format_DS_data(data):
         "TankLevel": np.round(data.get("TankLevel", 0.0), 2),
         "Qinlet": np.round(data.get("Inlet_flow", 0.0), 1),
         "Qoutlet": np.round(data.get("Outlet_flow", 0.0), 1),
-        "Q_conso_filt": np.round(data.get("Qdrain_sp", 0.0), 1),
-        "Q_conso_filt": np.round(data.get("Qdrain_sp", 0.0), 1),
-        "Q_conso_filt": np.round(data.get("Qdrain_sp", 0.0), 1),
+        "Q_conso": np.round(data.get("Inlet_flow", 0.0), 1) - np.round(data.get("Outlet_flow", 0.0), 1),
     }
 
 
diff --git a/templates/control.html b/templates/control.html
index b1df70a..a0440a4 100644
--- a/templates/control.html
+++ b/templates/control.html
@@ -339,20 +339,20 @@
             <div class="monitor-block">
                 <h2><i class="fas fa-thermometer-half"></i> Pro</h2>
                 <div class="monitor-values" id="Pro">
-                    <div class="monitor-value">#1<br>0.0 units</div>
-                    <div class="monitor-value">#2<br>0.0 units</div>
-                    <div class="monitor-value">#3<br>0.0 units</div>
+                    <div class="monitor-value">#1<br>0.0 bar</div>
+                    <div class="monitor-value">#2<br>0.0 bar</div>
+                    <div class="monitor-value">#3<br>0.0 bar</div>
                 </div>
             </div>
             <div class="monitor-block">
                 <div style="display: flex; justify-content: space-between;">
                     <div style="flex: 1; margin-right: 10px;">
                         <h2><i class="fas fa-tachometer-alt"></i> Tank Level</h2>
-                        <div class="monitor-value">DS<br>0.0</div>
+                        <div class="monitor-value"><br>0.0 %</div>
                     </div>
                     <div style="flex: 1; margin-left: 10px;">
                         <h2><i class="fas fa-exchange-alt"></i> Qconso</h2>
-                        <div class="monitor-value">DS<br>0.0 L/h</div>
+                        <div class="monitor-value"><br>0.0 L/h</div>
                     </div>
                 </div>
             </div>
@@ -508,15 +508,6 @@
             }
         }
 
-        function updateMonitorValues(id, values, unit) {
-            const container = document.getElementById(id);
-            const valueElements = container.querySelectorAll('.monitor-value');
-            valueElements.forEach((element, index) => {
-                if (index < values.length) {
-                    element.innerHTML = `#${index + 1}<br>${values[index]} ${unit}`;
-                }
-            });
-        }
 
         setInterval(updateMonitorData, 1000);