Stabilisierungen

Author: SvenoF54

config/local-config.php.sample

@@ -12,7 +12,7 @@
 define('DB_NAME', 'mein-db-name');
 define('DB_USER', 'mein-db-user');
 define('DB_PASSWORD', 'mein-password');
-define('DB_HOST', 'mein-host');
+define('DB_HOST', 'mein-host'); 
 
 define('URL_PREFIX', 'http://meine.domain/mein-pfad/');  // Hinweis, am Ende muss ein Slash '/' stehen.
 define('API_KEY', '987654321');

daysOverview.php

@@ -33,10 +33,10 @@
 // configure VIEW
 
     $pageTitle = "Tagesübersicht";
-    $jsHeaderFiles = ["/js/utils.js", "js/overview-pages/configureEnergyChart.js", "js/overview-pages/configureAutarkyChart.js", 
+    $jsHeaderFiles = ["js/utils.js", "js/overview-pages/configureEnergyChart.js", "js/overview-pages/configureAutarkyChart.js", 
                       "js/overview-pages/formFunctionsForDayOverview.js"];
-    $jsFooterFiles = ["/js/overview-pages/documentReady.js", "/js/overview-pages/configureDataTable.js"];
-    $cssFiles = ["/css/overviewPage.css"];
+    $jsFooterFiles = ["js/overview-pages/documentReady.js", "js/overview-pages/configureDataTable.js"];
+    $cssFiles = ["css/overviewPage.css"];
     $jsVars = [   
         "timestampsTooltip" => json_encode($overviewPageService->getLabelsTooltip()),
         "timestampsXAxis" => json_encode($overviewPageService->getLabelsXAxis()),

hoursOverview.php

@@ -25,10 +25,10 @@
 // configure VIEW
 
     $pageTitle = "Stundenübersicht";
-    $jsHeaderFiles = ["/js/utils.js", "js/overview-pages/configureEnergyChart.js", "js/overview-pages/configureAutarkyChart.js", 
+    $jsHeaderFiles = ["js/utils.js", "js/overview-pages/configureEnergyChart.js", "js/overview-pages/configureAutarkyChart.js", 
                       "js/overview-pages/formFunctionsForHoursOverview.js"];
-    $jsFooterFiles = ["/js/overview-pages/documentReady.js", "/js/overview-pages/configureDataTable.js"];
-    $cssFiles = ["/css/overviewPage.css"];
+    $jsFooterFiles = ["js/overview-pages/documentReady.js", "js/overview-pages/configureDataTable.js"];
+    $cssFiles = ["css/overviewPage.css"];
     $jsVars = [
         "timestampsTooltip" => json_encode($overviewPageService->getLabelsTooltip()),
         "timestampsXAxis" => json_encode($overviewPageService->getLabelsXAxis()),

js/allPagesDocumentReady.js

@@ -66,4 +66,4 @@ $(document).ready(function() {
 
     // Add time for alerting
     setInterval(fetchAlertData, 10000);
-});
+});

js/dashboard/documentReady.js

@@ -105,4 +105,4 @@ $(document).ready(function() {
         if (stateInPercent >= 25 && stateInPercent < 85) return "akku-green-color";
         if (stateInPercent >= 85) return "akku-greenfull-color";
     }
-});
+});

js/status-energy-values/documentReady.js

@@ -37,4 +37,4 @@ $(document).ready(function() {
             }
         });
     });
-});
+});

lib/database/realTimeEnergyDataRow.php

@@ -19,21 +19,21 @@ class RealTimeEnergyDataRow
     private $countRows = null;
 
     public function __construct(
-        $timestampData, 
-        $intervalInSeconds, 
-        $emTotalPower, 
-        $emTotalPowerOverZero,
-        $emTotalPowerUnderZero,
-        $pm1TotalPower, 
-        $pm2TotalPower, 
-        $pm3TotalPower,        
+        $timestampData = null, 
+        $intervalInSeconds = 2, 
+        $emTotalPower = 0, 
+        $emTotalPowerOverZero = 0,
+        $emTotalPowerUnderZero = 0,
+        $pm1TotalPower = null, 
+        $pm2TotalPower = null, 
+        $pm3TotalPower = null,        
         $emMissingRows = null, 
         $pm1MissingRows = null, 
         $pm2MissingRows = null, 
         $pm3MissingRows = null,
         $countRows = null
     ) {
-        $this->timestampData = $timestampData;
+        $this->timestampData = ($timestampData != null) ? $timestampData : date("Y-m-d H:i:s");
         $this->intervalInSeconds = $intervalInSeconds;
         $this->emTotalPower = $emTotalPower;
         $this->emTotalPowerOverZero = $emTotalPowerOverZero;

lib/database/realTimeEnergyDataTable.php

@@ -189,7 +189,7 @@ public function getEnergyData($startTime, $endTime, $line1, $line2, $outPricePer
             $stmt->execute();
             $row = $stmt->fetch(PDO::FETCH_ASSOC);
 
-            if ($row) {    
+            if ($row && ($row["count_rows"] > 0)) {    
                 $totalRows = $row["count_rows"];
                 $emOverZero = $row["sum_em_over_0_rows"] / $totalRows * $row["sum_em_over_0"];
                 $emUnderZero = $row["sum_em_under_0_rows"] / $totalRows * $row["sum_em_under_0"];

lib/datasets/energyDataSet.php

@@ -26,7 +26,15 @@ public function __construct($timestampFrom, $timestampTo)
         $this->timestampTo = $timestampTo;
 
         $this->energy = new EnergyAndPriceTuple();
+        $this->energyOverZero = new EnergyAndPriceTuple();
         $this->energyUnderZero = new EnergyAndPriceTuple();
+        $this->energyUnderX1 = new EnergyAndPriceTuple();
+        $this->energyOverX1 = new EnergyAndPriceTuple();
+        $this->energyUnderX2 = new EnergyAndPriceTuple();
+        $this->energyOverX2 = new EnergyAndPriceTuple();
+        $this->productionPm1 = new EnergyAndPriceTuple();
+        $this->productionPm2 = new EnergyAndPriceTuple();
+        $this->productionPm3 = new EnergyAndPriceTuple();
         $this->savings = new EnergyAndPriceTuple();
         $this->missingRows = new MissingRowSet();          
     }

lib/services/realtimeService.php

@@ -36,7 +36,7 @@ public function isZeroFeedInActive()
 
     public function getLatestDataRow() : RealTimeEnergyDataRow
     {
-        return end($this->latestDataRows);
+        return count($this->latestDataRows) > 0 ? end($this->latestDataRows) : new RealTimeEnergyDataRow();
     }
 
 }