浏览代码

oprava zobrazenia dat u stanic

marek 1 月之前
父节点
当前提交
5993599f17
共有 3 个文件被更改,包括 24 次插入22 次删除
  1. 10 10
      templates/en/panel/stations/station.eta
  2. 10 10
      templates/sk/panel/stations/station.eta
  3. 4 2
      utils/meteostanice.js

+ 10 - 10
templates/en/panel/stations/station.eta

@@ -19,22 +19,22 @@
 
 <p><strong>websocket key:</strong> <%= it.meteostanica.websocketKey %> <a href="/en/panel/stations/<%= it.meteostanica.id %>/resetWebsocketKey">reset</a></p>
 
-<% if (it.data?.[it.data?.length - 1]) { %>
+<% if (it.data?.[0]) { %>
 <div class="stats">
     <div class="indoor">
         <h3>indoor</h3>
-        <p>temp: <%= it.data?.[it.data?.length - 1].indoorTemp / 100 %> °C</p>
-        <p>pressure: <%= it.data?.[it.data?.length - 1].indoorPressure / 100 %> hPa</p>
-        <p>humidity: <%= it.data?.[it.data?.length - 1].indoorHumidity / 100 %>%</p>
-        <p>altitude: <%= it.data?.[it.data?.length - 1].indoorAltitude / 100 %>m</p>
+        <p>temp: <%= it.data?.[0].indoorTemp / 100 %> °C</p>
+        <p>pressure: <%= it.data?.[0].indoorPressure / 100 %> hPa</p>
+        <p>humidity: <%= it.data?.[0].indoorHumidity / 100 %>%</p>
+        <p>altitude: <%= it.data?.[0].indoorAltitude / 100 %>m</p>
     </div>
     <div class="outdoor">
         <h3>outdoor</h3>
-        <p>connected: <%= it.data?.[it.data?.length - 1].outdoorConnected %></p>
-        <p>temp: <%= it.data?.[it.data?.length - 1].outdoorTemp / 100 %> °C</p>
-        <p>pressure: <%= it.data?.[it.data?.length - 1].outdoorPressure / 100 %> hPa</p>
-        <p>humidity: <%= it.data?.[it.data?.length - 1].outdoorHumidity / 100 %>%</p>
-        <p>altitude: <%= it.data?.[it.data?.length - 1].outdoorAltitude / 100 %>m</p>
+        <p>connected: <%= it.data?.[0].outdoorConnected %></p>
+        <p>temp: <%= it.data?.[0].outdoorTemp / 100 %> °C</p>
+        <p>pressure: <%= it.data?.[0].outdoorPressure / 100 %> hPa</p>
+        <p>humidity: <%= it.data?.[0].outdoorHumidity / 100 %>%</p>
+        <p>altitude: <%= it.data?.[0].outdoorAltitude / 100 %>m</p>
     </div>
 </div>
 <% } %>

+ 10 - 10
templates/sk/panel/stations/station.eta

@@ -19,22 +19,22 @@
 
 <p><strong>websocket kľúč:</strong> <%= it.meteostanica.websocketKey %> <a href="/panel/stations/<%= it.meteostanica.id %>/resetWebsocketKey">reset</a></p>
 
-<% if (it.data?.[it.data?.length - 1]) { %>
+<% if (it.data?.[0]) { %>
 <div class="stats">
     <div class="indoor">
         <h3>vnútorné</h3>
-        <p>teplota: <%= it.data?.[it.data?.length - 1].indoorTemp / 100 %> °C</p>
-        <p>tlak: <%= it.data?.[it.data?.length - 1].indoorPressure / 100 %> hPa</p>
-        <p>vlhkosť: <%= it.data?.[it.data?.length - 1].indoorHumidity / 100 %>%</p>
-        <p>nadmorská výška: <%= it.data?.[it.data?.length - 1].indoorAltitude / 100 %>m</p>
+        <p>teplota: <%= it.data?.[0].indoorTemp / 100 %> °C</p>
+        <p>tlak: <%= it.data?.[0].indoorPressure / 100 %> hPa</p>
+        <p>vlhkosť: <%= it.data?.[0].indoorHumidity / 100 %>%</p>
+        <p>nadmorská výška: <%= it.data?.[0].indoorAltitude / 100 %>m</p>
     </div>
     <div class="outdoor">
         <h3>vonkajšie</h3>
-        <p>pripojené: <%= it.data?.[it.data?.length - 1].outdoorConnected %></p>
-        <p>teplota: <%= it.data?.[it.data?.length - 1].outdoorTemp / 100 %> °C</p>
-        <p>tlak: <%= it.data?.[it.data?.length - 1].outdoorPressure / 100 %> hPa</p>
-        <p>vlhkosť: <%= it.data?.[it.data?.length - 1].outdoorHumidity / 100 %>%</p>
-        <p>nadmorská výška: <%= it.data?.[it.data?.length - 1].outdoorAltitude / 100 %>m</p>
+        <p>pripojené: <%= it.data?.[0].outdoorConnected %></p>
+        <p>teplota: <%= it.data?.[0].outdoorTemp / 100 %> °C</p>
+        <p>tlak: <%= it.data?.[0].outdoorPressure / 100 %> hPa</p>
+        <p>vlhkosť: <%= it.data?.[0].outdoorHumidity / 100 %>%</p>
+        <p>nadmorská výška: <%= it.data?.[0].outdoorAltitude / 100 %>m</p>
     </div>
 </div>
 <% } %>

+ 4 - 2
utils/meteostanice.js

@@ -94,7 +94,8 @@ export default class Meteostanice {
         const statement = meteostaniceDB.prepare(`
             SELECT *
             FROM list 
-            WHERE owner = $owner;
+            WHERE owner = $owner
+            ORDER BY timestamp DESC;
         `)
 
         const result = statement.all({
@@ -161,7 +162,8 @@ export default class Meteostanice {
         const statement = meteostaniceDB.prepare(`
             SELECT *
             FROM data 
-            WHERE meteostanica = $meteostanica;
+            WHERE meteostanica = $meteostanica
+            ORDER BY timestamp DESC;
         `)
 
         const result = statement.all({