Unterschiede

Hier werden die Unterschiede zwischen zwei Versionen angezeigt.

--- software:frontends:meter_readings [2023/01/29 21:02] – schwaneberg
+++ software:frontends:meter_readings [2023/01/30 18:52] (aktuell) – schwaneberg
@@ Zeile 13: / Zeile 13: @@
 Web Adresse im lokalen Netzwerk: <IP-Adresse>/summary.php
 <code php>
-<?php // program "vz_read_strom.php", 2014-05-09 RudolfReuter
+<?php // program "summary.php", 2022-01-29 Oliver Schwaneberg, based on program "vz_read_strom.php", 2014-05-09 RudolfReuter?>
-// Version Zaehler EMH eHZ
-?>
 <h3>Zählerstände auslesen</h3>
 <?php
@@ Zeile 22: / Zeile 20: @@
 }
 else {
-    $month = date("m");
     //echo "actual date \n";
     $year = date("Y");
@@ Zeile 62: / Zeile 59: @@
     echo "<h3>" . $year . "</h3><br>";
     echo "<table>";
-    echo "<tr><th>Monat</th><th>Stromzählerstand</th><th>Wärmezählerstand</th></tr>";
+    echo "<tr><th>Datum</th><th>Stromzählerstand</th><th>Wärmezählerstand</th></tr>";
     foreach ($months as $month => $month_name) {
-        // This example fetches two meters using different time windows, as the heater is read less frequently
+        $last_day = date("t", mktime(0, 0, 0, $month, 1, $year));
-        $str_from_electric = "$year-$month-01 22:00:00";
+        $str_from = "$year-$month-$last_day 0:00:00";
-        $str_from_heat = "$year-$month-01 0:00:00";
+        $date1 = new DateTime($str_from);
-        $date1 = new DateTime($str_from_electric);
         $time_from = $date1->getTimestamp() * 1000;
-        $date1 = new DateTime($str_from_heat);
-        $time_from_heat = $date1->getTimestamp() * 1000;
-        $str_to = "$year-$month-01 23:59:59";
+        $str_to = "$year-$month-$last_day 23:59:59";
         $date2 =  new DateTime($str_to);
         $time_to = $date2->getTimestamp() * 1000;
         $str_sql_electric = "SELECT value FROM data WHERE channel_id=$channel_id_electric AND timestamp BETWEEN $time_from AND $time_to";
-        $str_sql_heat = "SELECT value FROM data WHERE channel_id=$channel_id_heat AND timestamp BETWEEN $time_from_heat AND $time_to";
+        $str_sql_heat = "SELECT value FROM data WHERE channel_id=$channel_id_heat AND timestamp BETWEEN $time_from AND $time_to";
         $sql_res = $conn->prepare($str_sql_electric);
@@ Zeile 85: / Zeile 79: @@
         $sql_res->execute();
         $rows_heat = $sql_res->fetchAll();
-        echo "<tr><td>" . $month_name . "</td><td>" . number_format(end($rows_electric)["value"]/1000, 0, ',', '.') . "</td><td>" . number_format(end($rows_heat)["value"]/1000, 0, ',', '.') . "</td></tr>";
+        echo "<tr><td>" . $last_day . ". " . $month_name . "</td><td>" . number_format(end($rows_electric)["value"]/1000, 0, ',', '.') . "</td><td>" . number_format(end($rows_heat)["value"]/1000, 0, ',', '.') . "</td></tr>";
     }
     echo "</table>";