@@ -38,14 +37,14 @@
}
function handleMessage(msg) {
try {
- var data = (typeof msg === 'string') ? JSON.parse(msg) : msg;
- Apply(data);
- } catch(e) {
- console.error('PV_Visu handleMessage error:', e, msg);
+ var d = (typeof msg === 'string') ? JSON.parse(msg) : msg;
+ Apply(d);
+ } catch (e) {
+ console.error('PV_Visu handleMessage error', e, msg);
}
}
- // Bind to HTML-SDK
+ // Register HTML-SDK handler
if (typeof registerMessageHandler === 'function') {
registerMessageHandler(handleMessage);
}
-
+
\ No newline at end of file
diff --git a/PV_Visu/module.php b/PV_Visu/module.php
index 768fcae..30682c3 100644
--- a/PV_Visu/module.php
+++ b/PV_Visu/module.php
@@ -2,7 +2,6 @@
declare(strict_types=1);
-
class PV_Visu extends IPSModule
{
public function Create()
@@ -14,13 +13,36 @@ class PV_Visu extends IPSModule
$this->RegisterPropertyInteger('VarFeedIn', 0);
$this->RegisterPropertyInteger('VarGrid', 0);
// HTML-SDK Tile aktivieren
- $this->SetVisualizationType(1);
+ $this->SetVisualizationType(3);
}
- public function ApplyChanges(): void
+
+
+ public function ApplyChanges(): void
{
parent::ApplyChanges();
- $this->GetVisualizationTile();
+ // Auf Änderungen der Zähler-Variablen reagieren
+ foreach (['VarProduction', 'VarConsumption', 'VarFeedIn', 'VarGrid'] as $prop) {
+ $vid = $this->ReadPropertyInteger($prop);
+ if ($vid > 0) {
+ // Register event for variable update
+ $this->RegisterMessage($vid, VM_UPDATE);
+ }
+ }
+ }
+
+ public function MessageSink(int $TimeStamp, int $SenderID, int $Message, $Data): void
+ {
+ if ($Message === VM_UPDATE) {
+ // bei jeder Aktualisierung einer Zählervariable neu senden
+ $this->UpdateData();
+ }
+ }(int $TimeStamp, int $SenderID, int $Message, $Data): void
+ {
+ if ($Message === VM_UPDATE) {
+ // bei jeder Aktualisierung einer Zählervariable neu senden
+ $this->UpdateData();
+ }
}
/**
@@ -28,38 +50,9 @@ class PV_Visu extends IPSModule
*/
public function GetVisualizationTile(): string
{
- $start = strtotime('today 00:00');
- $end = time();
-
- $prod = $this->GetDailyTotal($this->ReadPropertyInteger('VarProduction'), $start, $end);
- $cons = $this->GetDailyTotal($this->ReadPropertyInteger('VarConsumption'), $start, $end);
- $feed = $this->GetDailyTotal($this->ReadPropertyInteger('VarFeedIn'), $start, $end);
- $grid = $this->GetDailyTotal($this->ReadPropertyInteger('VarGrid'), $start, $end);
-
- // Prozent-Quoten
- $prodCons = $prod > 0 ? ($cons / $prod) * 100 : 0;
- $prodFeed = $prod > 0 ? ($feed / $prod) * 100 : 0;
- $consPV = $cons > 0 ? min($prod, $cons) / $cons * 100 : 0;
- $consGrid = $cons > 0 ? ($grid / $cons) * 100 : 0;
-
- $data = [
- 'prodCons' => round($prodCons, 1),
- 'prodFeed' => round($prodFeed, 1),
- 'consPV' => round($consPV, 1),
- 'consGrid' => round($consGrid, 1),
- 'value' => [
- 'prod' => round($prod, 2),
- 'cons' => round($cons, 2),
- 'feed' => round($feed, 2),
- 'grid' => round($grid, 2),
- ],
- ];
-
- // Daten als JSON-String übergeben
- $json = json_encode($data);
- $this->UpdateVisualizationValue($json);
-
- // HTML-Template laden und zurückgeben
+ // Initial senden
+ $this->UpdateData();
+ // HTML laden
$htmlPath = __DIR__ . '/module.html';
if (!file_exists($htmlPath)) {
$this->LogMessage("module.html nicht gefunden in $htmlPath", KL_ERROR);
@@ -69,9 +62,9 @@ class PV_Visu extends IPSModule
}
/**
- * Callback vom HTML: sendet frische Daten
+ * Callback vom HTML: frische Daten senden
*/
- public function RequestAction($Ident, $Value): void
+ public function RequestAction(string $Ident, $Value): void
{
if ($Ident === 'update') {
$this->UpdateData();
@@ -81,21 +74,21 @@ class PV_Visu extends IPSModule
}
/**
- * Aktualisiert Daten und sendet an Tile
+ * Berechnet Tagesdaten und schickt sie an die Visualisierung
*/
public function UpdateData(): void
{
$start = strtotime('today 00:00');
$end = time();
- $prod = $this->GetDailyTotal($this->ReadPropertyInteger('VarProduction'), $start, $end);
- $cons = $this->GetDailyTotal($this->ReadPropertyInteger('VarConsumption'), $start, $end);
- $feed = $this->GetDailyTotal($this->ReadPropertyInteger('VarFeedIn'), $start, $end);
- $grid = $this->GetDailyTotal($this->ReadPropertyInteger('VarGrid'), $start, $end);
+ $prod = $this->GetDailyTotal($this->ReadPropertyInteger('VarProduction'), $start, $end);
+ $cons = $this->GetDailyTotal($this->ReadPropertyInteger('VarConsumption'), $start, $end);
+ $feed = $this->GetDailyTotal($this->ReadPropertyInteger('VarFeedIn'), $start, $end);
+ $grid = $this->GetDailyTotal($this->ReadPropertyInteger('VarGrid'), $start, $end);
$prodCons = $prod > 0 ? ($cons / $prod) * 100 : 0;
$prodFeed = $prod > 0 ? ($feed / $prod) * 100 : 0;
- $consPV = $cons > 0 ? min($prod, $cons) / $cons * 100 : 0;
+ $consPV = $cons > 0 ? (min($prod, $cons) / $cons) * 100 : 0;
$consGrid = $cons > 0 ? ($grid / $cons) * 100 : 0;
$data = [
@@ -111,12 +104,12 @@ class PV_Visu extends IPSModule
],
];
- $json = json_encode($data);
- $this->UpdateVisualizationValue($json);
+ // Als JSON-String senden
+ $this->UpdateVisualizationValue(json_encode($data));
}
/**
- * Holt Tages-Aggregat aus dem IPS-Archiv
+ * Holt aggregierte Tageswerte (Summe) aus dem Archiv
*/
private function GetDailyTotal(int $varID, int $start, int $end): float
{
@@ -128,6 +121,11 @@ class PV_Visu extends IPSModule
return 0.0;
}
$values = AC_GetAggregatedValues($archives[0], $varID, 1, $start, $end, 1);
- return empty($values) ? 0.0 : (float) $values[0]['Avg'];
+ if (empty($values)) {
+ return 0.0;
+ }
+ // Für Zähler den Summenwert nutzen
+ return (float)$values[0]['Sum'];
}
-}
\ No newline at end of file
+}
+?>
\ No newline at end of file