From 90041a8f4d2dac7c81b508f9984eb49ffcbb934b Mon Sep 17 00:00:00 2001 From: DanielHaefliger Date: Fri, 5 Dec 2025 09:42:50 +0100 Subject: [PATCH] no message --- Abrechnung/module.php | 807 +++++++++++++++++++++--------------------- 1 file changed, 401 insertions(+), 406 deletions(-) diff --git a/Abrechnung/module.php b/Abrechnung/module.php index 15d9a11..b0ca6d8 100644 --- a/Abrechnung/module.php +++ b/Abrechnung/module.php @@ -5,22 +5,37 @@ include_once __DIR__ . '/libs/vendor/autoload.php'; // TCPDF via Composer class Abrechnung extends IPSModule { + private array $powerCostCache = []; + + // ====================================================================== + // MODULE INITIALISIERUNG + // ====================================================================== + public function Create() { parent::Create(); + // Properties $this->RegisterPropertyString('Users', '[]'); $this->RegisterPropertyString('PowerMeters', '[]'); $this->RegisterPropertyString('WaterMeters', '[]'); $this->RegisterPropertyString('Tariffs', '[]'); + // Zeitraum-Variablen $this->RegisterVariableInteger('FromDate', 'Startdatum', '~UnixTimestamp', 1); $this->RegisterVariableInteger('ToDate', 'Enddatum', '~UnixTimestamp', 2); $this->RegisterVariableString('LastResult', 'Letzte Abrechnung', '', 3); + $this->EnableAction('FromDate'); $this->EnableAction('ToDate'); - $this->RegisterScript('StartBilling', 'Abrechnung starten', "InstanceID . ", 'StartBilling', ''); ?>"); + // PDF & Script + $this->RegisterScript( + 'StartBilling', + 'Abrechnung starten', + "InstanceID . ", 'StartBilling', ''); ?>" + ); + $this->RegisterMediaDocument('InvoicePDF', 'Letzte Rechnung', 'pdf'); } @@ -29,81 +44,84 @@ class Abrechnung extends IPSModule parent::ApplyChanges(); } + private function RegisterMediaDocument($Ident, $Name, $Extension, $Position = 0) { $mid = @IPS_GetObjectIDByIdent($Ident, $this->InstanceID); + if ($mid === false) { $mid = IPS_CreateMedia(5); // 5 = Document IPS_SetParent($mid, $this->InstanceID); IPS_SetIdent($mid, $Ident); IPS_SetName($mid, $Name); IPS_SetPosition($mid, $Position); - IPS_SetMediaFile($mid, 'media/' . $mid . '.' . $Extension, false); + IPS_SetMediaFile($mid, "media/{$mid}.{$Extension}", false); } } + // ====================================================================== + // ACTION HANDLER + // ====================================================================== + public function RequestAction($Ident, $Value) { switch ($Ident) { + case 'FromDate': case 'ToDate': SetValue($this->GetIDForIdent($Ident), $Value); break; case 'StartBilling': - try { - $pdfContent = $this->GenerateInvoices(); - if (!$pdfContent) { - echo "❌ Fehler bei der PDF-Erstellung"; - return; - } - - $mediaID = $this->GetIDForIdent('InvoicePDF'); - IPS_SetMediaContent($mediaID, base64_encode($pdfContent)); - SetValue($this->GetIDForIdent('LastResult'), 'Abrechnung vom ' . date('d.m.Y H:i')); - echo "✅ PDF erfolgreich erstellt."; - } catch (Throwable $e) { - echo "❌ Ausnahmefehler: " . $e->getMessage(); + $content = $this->GenerateInvoices(); + if (!$content) { + echo "❌ Fehler bei der PDF-Erstellung"; + return; } + $mediaID = $this->GetIDForIdent('InvoicePDF'); + IPS_SetMediaContent($mediaID, base64_encode($content)); + SetValue($this->GetIDForIdent('LastResult'), 'Abrechnung vom ' . date('d.m.Y H:i')); + echo "✅ PDF erfolgreich erstellt."; break; } } - // ====================== PDF-Erstellung ====================== + // ====================================================================== + // PDF ERSTELLUNG + // ====================================================================== public function GenerateInvoices() { - $from = GetValue($this->GetIDForIdent('FromDate')); - $to = GetValue($this->GetIDForIdent('ToDate')); - + $from = GetValue($this->GetIDForIdent('FromDate')); + $to = GetValue($this->GetIDForIdent('ToDate')); $users = json_decode($this->ReadPropertyString('Users'), true); $power = json_decode($this->ReadPropertyString('PowerMeters'), true); $water = json_decode($this->ReadPropertyString('WaterMeters'), true); $tariffs = json_decode($this->ReadPropertyString('Tariffs'), true); if (!class_exists('TCPDF')) { - IPS_LogMessage('Abrechnung', 'TCPDF nicht gefunden!'); return false; } - // 🔥 NEU: Stromkosten EINMAL für alle User berechnen + // Stromkosten einmal berechnen $this->CalculateAllPowerCosts($power, $tariffs, $from, $to); + // PDF Grundstruktur $pdf = new TCPDF('P', 'mm', 'A4', true, 'UTF-8', false); $pdf->SetCreator('IPSymcon Abrechnung'); $pdf->SetMargins(15, 15, 15); $pdf->SetAutoPageBreak(true, 20); $pdf->SetFont('dejavusans', '', 9); + // Für jeden Nutzer Seite erzeugen foreach ($users as $user) { - $this->BuildUserInvoice($pdf, $user, $power, $water, $tariffs, $from, $to); + $this->BuildUserInvoice($pdf, $user, $water, $tariffs, $from, $to); } return $pdf->Output('Abrechnung.pdf', 'S'); } - - private function BuildUserInvoice($pdf, $user, $power, $water, $tariffs, $from, $to) + private function BuildUserInvoice($pdf, array $user, array $water, array $tariffs, int $from, int $to) { $pdf->AddPage(); @@ -112,320 +130,266 @@ class Abrechnung extends IPSModule

{$user['address']}
{$user['city']}

Zeitraum: " . date('d.m.Y', $from) . " – " . date('d.m.Y', $to) . "


"; - // ⚡ Stromkosten (aus globaler Berechnung) + // Stromkosten $html .= "

⚡ Stromkosten

"; $powerResult = $this->GetCalculatedPowerCosts($user['id']); $html .= $powerResult['html']; - $totalPower = $powerResult['sum']; - - // 💧 Nebenkosten + // Nebenkosten (Wasser/Wärme) $html .= "

💧 Nebenkosten (Wasser/Wärme)

"; - $additionalResult = $this->CalculateAdditionalCosts($water, $tariffs, $user['id'], $from, $to); - $html .= $additionalResult['html']; - $totalAdditional = $additionalResult['sum']; + $additional = $this->CalculateAdditionalCosts($water, $tariffs, $user['id'], $from, $to); + $html .= $additional['html']; - $grandTotal = $totalPower + $totalAdditional; - $html .= "

Gesamttotal: " . number_format($grandTotal, 2) . " CHF

"; + // Gesamt + $grandTotal = $powerResult['sum'] + $additional['sum']; + $html .= "

Gesamttotal: + " . number_format($grandTotal, 2) . " CHF

"; $pdf->writeHTML($html, true, false, true, false, ''); } -private function CalculateAllPowerCosts($powerMeters, $tariffs, $from, $to) -{ - IPS_LogMessage('Abrechnung', "CalculateAllPowerCosts: from=" . date('d.m.Y H:i', $from) . " to=" . date('d.m.Y H:i', $to)); + // ====================================================================== + // STROMKOSTEN → GLOBAL EINMAL BERECHNEN + // ====================================================================== - $this->powerCostCache = []; // Cache leeren + private function CalculateAllPowerCosts(array $powerMeters, array $tariffs, int $from, int $to) + { + $this->powerCostCache = []; + $metersByUser = []; - // 1. Zähler je User aufbauen - $metersByUser = []; - foreach ($powerMeters as $m) { - if (!isset($m['user_id'])) { - continue; - } - $userId = (int)$m['user_id']; - $name = $m['name'] ?? ('Meter_' . $m['user_id']); - - if (!isset($metersByUser[$userId])) { - $metersByUser[$userId] = []; - } - $metersByUser[$userId][$name] = [ - 'importVar' => $m['var_consumption'] ?? null, - 'exportVar' => $m['var_feed'] ?? null - ]; - - // Akkus initialisieren - if (!isset($this->powerCostCache[$userId])) { - $this->powerCostCache[$userId] = []; - } - $this->powerCostCache[$userId][$name] = [ - 'name' => $name, - 'imp' => 0.0, - 'exp' => 0.0, - 'solar_bezug' => 0.0, - 'netz_bezug' => 0.0, - 'solareinspeisung' => 0.0, - 'solarverkauf' => 0.0, - 'cost_solar' => 0.0, - 'cost_grid' => 0.0, - 'rev_feedin' => 0.0 - ]; - } - - if (empty($metersByUser)) { - IPS_LogMessage('Abrechnung', 'CalculateAllPowerCosts: keine Stromzähler definiert.'); - return; - } - - // 2. 15-Minuten-Schritte - for ($ts = $from; $ts < $to; $ts += 900) { - $slotEnd = min($to, $ts + 900); - - // Tarife (gleich für alle User) - $pGrid = $this->getTariffPriceAt($tariffs, ['Netztarif'], $ts); - $pSolar = $this->getTariffPriceAt($tariffs, ['Solartarif'], $ts); - $pFeed = $this->getTariffPriceAt($tariffs, ['Einspeisetarif'], $ts); - - foreach ($metersByUser as $userId => $meters) { - - $impTotal = 0.0; - $expTotal = 0.0; - $slot = []; - - // 2a. Deltas je Zähler des Users - IPS_LogMessage("ABR", "---- DELTA-Berechnung für Intervall " . date("H:i", $ts) . " - " . date("H:i", $slotEnd) . " ----"); - -// 2a. Deltas je Zähler des Users -IPS_LogMessage("ABR", "---- BEGIN USER-METER DELTA BLOCK ----"); -IPS_LogMessage("ABR", "Intervall: " . date("d.m.Y H:i", $ts) . " - " . date("d.m.Y H:i", $slotEnd)); - -foreach ($meters as $name => $mm) { - - IPS_LogMessage("ABR", "Meter: $name"); - IPS_LogMessage("ABR", " RAW mm JSON: " . json_encode($mm)); - - $impDelta = 0.0; - $expDelta = 0.0; - - // -------------------- - // IMPORT - // -------------------- - if (isset($mm['importVar'])) { - IPS_LogMessage("ABR", " importVar found: " . $mm['importVar']); - } else { - IPS_LogMessage("ABR", " ⚠ importVar NOT FOUND IN ARRAY!"); - } - - if (!empty($mm['importVar'])) { - - $varId = (int)$mm['importVar']; - IPS_LogMessage("ABR", " Checking IMPORT variable ID = $varId"); - - if (IPS_VariableExists($varId)) { - IPS_LogMessage("ABR", " → IMPORT variable EXISTS"); - - $impDelta = $this->getDeltaFromArchive($varId, $ts, $slotEnd); - - IPS_LogMessage("ABR", " → IMPORT DELTA = $impDelta"); - } else { - IPS_LogMessage("ABR", " ⚠ IMPORT variable DOES NOT EXIST in IPS!"); - } - } else { - IPS_LogMessage("ABR", " ⚠ importVar IS EMPTY OR NULL"); - } - - // -------------------- - // EXPORT - // -------------------- - if (isset($mm['exportVar'])) { - IPS_LogMessage("ABR", " exportVar found: " . $mm['exportVar']); - } else { - IPS_LogMessage("ABR", " ⚠ exportVar NOT FOUND IN ARRAY!"); - } - - if (!empty($mm['exportVar'])) { - - $varId = (int)$mm['exportVar']; - IPS_LogMessage("ABR", " Checking EXPORT variable ID = $varId"); - - if (IPS_VariableExists($varId)) { - IPS_LogMessage("ABR", " → EXPORT variable EXISTS"); - - $expDelta = $this->getDeltaFromArchive($varId, $ts, $slotEnd); - - IPS_LogMessage("ABR", " → EXPORT DELTA = $expDelta"); - } else { - IPS_LogMessage("ABR", " ⚠ EXPORT variable DOES NOT EXIST in IPS!"); - } - } else { - IPS_LogMessage("ABR", " ⚠ exportVar IS EMPTY OR NULL"); - } - - // -------------------- - // DELTAS WURDEN GEFUNDEN? - // -------------------- - if ($impDelta > 0.0 || $expDelta > 0.0) { - - IPS_LogMessage("ABR", " ✔ VALID DELTAS → imp=$impDelta exp=$expDelta"); - - $slot[$name] = ['imp' => $impDelta, 'exp' => $expDelta]; - - $impTotal += $impDelta; - $expTotal += $expDelta; - - } else { - - IPS_LogMessage("ABR", " ⚠ NO DELTA FOUND FOR THIS METER (imp=0 exp=0)"); - } - - IPS_LogMessage("ABR", "-------------------------------------------"); -} - -IPS_LogMessage("ABR", "---- END USER-METER DELTA BLOCK ----"); -IPS_LogMessage("ABR", "Intervall SUMME: impTotal=$impTotal | expTotal=$expTotal"); - - - if ($impTotal == 0.0 && $expTotal == 0.0) { - continue; // für diesen User in diesem Intervall nichts passiert + // User-Zuordnung + foreach ($powerMeters as $m) { + if (!isset($m['user_id'])) { + continue; } - // 2b. Verhältnis PV / Netz pro User - if ($impTotal <= $expTotal && $expTotal > 0.0) { - $ratio = $impTotal / $expTotal; // PV deckt alles - $pvCoversAll = true; - } elseif ($impTotal > 0.0) { - $ratio = $expTotal / $impTotal; // Netzzusatz nötig - $pvCoversAll = false; - } else { - $ratio = 0.0; - $pvCoversAll = true; - } + $userId = (int)$m['user_id']; + $name = $m['name'] ?? ('Meter_' . $userId); - // 2c. Werte pro Zähler verteilen - foreach ($slot as $name => $v) { - $imp = $v['imp']; - $exp = $v['exp']; + $metersByUser[$userId][$name] = [ + 'importVar' => $m['var_consumption'] ?? null, + 'exportVar' => $m['var_feed'] ?? null + ]; - $this->powerCostCache[$userId][$name]['imp'] += $imp; - $this->powerCostCache[$userId][$name]['exp'] += $exp; + $this->powerCostCache[$userId][$name] = [ + 'name' => $name, + 'imp' => 0.0, + 'exp' => 0.0, + 'solar_bezug' => 0.0, + 'netz_bezug' => 0.0, + 'solareinspeisung' => 0.0, + 'solarverkauf' => 0.0, + 'cost_solar' => 0.0, + 'cost_grid' => 0.0, + 'rev_feedin' => 0.0 + ]; + } - if ($pvCoversAll) { - // PV deckt gesamten Verbrauch - $this->powerCostCache[$userId][$name]['solar_bezug'] += $imp; - $this->powerCostCache[$userId][$name]['solareinspeisung'] += (1 - $ratio) * $exp; - $this->powerCostCache[$userId][$name]['solarverkauf'] += $ratio * $exp; + if (empty($metersByUser)) { + return; + } - if ($pSolar !== null) { - $this->powerCostCache[$userId][$name]['cost_solar'] += ($imp * $pSolar) / 100.0; - } - if ($pFeed !== null) { - $this->powerCostCache[$userId][$name]['rev_feedin'] += ((1 - $ratio) * $exp * $pFeed) / 100.0; + // 15-Minuten Raster + for ($ts = $from; $ts < $to; $ts += 900) { + $slotEnd = min($to, $ts + 900); + + $pGrid = $this->getTariffPriceAt($tariffs, ['Netztarif'], $ts); + $pSolar = $this->getTariffPriceAt($tariffs, ['Solartarif'], $ts); + $pFeed = $this->getTariffPriceAt($tariffs, ['Einspeisetarif'], $ts); + + foreach ($metersByUser as $userId => $meters) { + + $impTotal = 0.0; + $expTotal = 0.0; + $slot = []; + + // Deltas je Zähler + foreach ($meters as $name => $mm) { + $impDelta = !empty($mm['importVar']) + ? $this->getDeltaFromArchive((int)$mm['importVar'], $ts, $slotEnd) + : 0.0; + + $expDelta = !empty($mm['exportVar']) + ? $this->getDeltaFromArchive((int)$mm['exportVar'], $ts, $slotEnd) + : 0.0; + + if ($impDelta > 0 || $expDelta > 0) { + $slot[$name] = ['imp' => $impDelta, 'exp' => $expDelta]; + $impTotal += $impDelta; + $expTotal += $expDelta; } + } + + if ($impTotal == 0.0 && $expTotal == 0.0) { + continue; + } + + // Verhältnis bestimmen + if ($impTotal <= $expTotal && $expTotal > 0) { + $ratio = $impTotal / $expTotal; + $pvCoversAll = true; + } elseif ($impTotal > 0) { + $ratio = $expTotal / $impTotal; + $pvCoversAll = false; } else { - // Teil Netzbezug - $this->powerCostCache[$userId][$name]['solar_bezug'] += $ratio * $imp; - $this->powerCostCache[$userId][$name]['netz_bezug'] += (1 - $ratio) * $imp; - $this->powerCostCache[$userId][$name]['solarverkauf'] += $exp; + $ratio = 0; + $pvCoversAll = true; + } - if ($pGrid !== null) { - $this->powerCostCache[$userId][$name]['cost_grid'] += ((1 - $ratio) * $imp * $pGrid) / 100.0; - } - if ($pSolar !== null) { - $this->powerCostCache[$userId][$name]['cost_solar'] += ($ratio * $imp * $pSolar) / 100.0; - } - if ($pFeed !== null) { - $this->powerCostCache[$userId][$name]['rev_feedin'] += ($exp * $pFeed) / 100.0; + // Werte verteilen + foreach ($slot as $name => $v) { + + $imp = $v['imp']; + $exp = $v['exp']; + + $entry = &$this->powerCostCache[$userId][$name]; + + $entry['imp'] += $imp; + $entry['exp'] += $exp; + + if ($pvCoversAll) { + + $entry['solar_bezug'] += $imp; + $entry['solareinspeisung'] += (1 - $ratio) * $exp; + $entry['solarverkauf'] += $ratio * $exp; + + if ($pSolar !== null) { + $entry['cost_solar'] += ($imp * $pSolar) / 100; + } + if ($pFeed !== null) { + $entry['rev_feedin'] += ((1 - $ratio) * $exp * $pFeed) / 100; + } + + } else { + + $entry['solar_bezug'] += $ratio * $imp; + $entry['netz_bezug'] += (1 - $ratio) * $imp; + $entry['solarverkauf'] += $exp; + + if ($pGrid !== null) { + $entry['cost_grid'] += ((1 - $ratio) * $imp * $pGrid) / 100; + } + if ($pSolar !== null) { + $entry['cost_solar'] += ($ratio * $imp * $pSolar) / 100; + } + if ($pFeed !== null) { + $entry['rev_feedin'] += ($exp * $pFeed) / 100; + } } } } } } - IPS_LogMessage('Abrechnung', 'CalculateAllPowerCosts: Fertig.'); -} + // ====================================================================== + // BEREITS BERECHNETE STROMKOSTEN → RÜCKGABE PRO USER + // ====================================================================== -private function GetCalculatedPowerCosts($userId) -{ - $html = " - - - - - - - - - - - - - "; - - if (empty($this->powerCostCache) || !isset($this->powerCostCache[$userId])) { - $html .= "
ZählerImport (kWh)Export (kWh)Solarbezug (kWh)Netzbezug (kWh)Solareinspeisung (kWh)Solarverkauf (kWh)Kosten Solar (CHF)Kosten Netz (CHF)Ertrag Einspeisung (CHF)Summe (CHF)
Keine Stromzähler für diesen Benutzer

"; - return ['html' => $html, 'sum' => 0.0]; - } - - $sum = 0.0; - - foreach ($this->powerCostCache[$userId] as $name => $a) { - $subtotal = $a['cost_grid'] + $a['cost_solar'] - $a['rev_feedin']; - $sum += $subtotal; - - $html .= " - {$a['name']} - " . number_format($a['imp'], 3) . " - " . number_format($a['exp'], 3) . " - " . number_format($a['solar_bezug'], 3) . " - " . number_format($a['netz_bezug'], 3) . " - " . number_format($a['solareinspeisung'], 3) . " - " . number_format($a['solarverkauf'], 3) . " - " . number_format($a['cost_solar'], 2) . " - " . number_format($a['cost_grid'], 2) . " - " . number_format($a['rev_feedin'], 2) . " - " . number_format($subtotal, 2) . " - "; - } - - $html .= " - Total Stromkosten: - " . number_format($sum, 2) . " -
"; - - return ['html' => $html, 'sum' => $sum]; -} - - - private function CalculateAdditionalCosts($waterMeters, $tariffs, $userId, $from, $to) + private function GetCalculatedPowerCosts(int $userId): array { - $html = " + $html = " +
- - + + + + + + + + + + + "; - $total = 0.0; + if (empty($this->powerCostCache) || !isset($this->powerCostCache[$userId])) { + $html .= "
ZählerTypStartEndeZähler StartZähler EndeVerbrauchTarif (Rp)Kosten (CHF)ZählerImport (kWh)Export (kWh)Solarbezug (kWh)Netzbezug (kWh)Solareinspeisung (kWh)Solarverkauf (kWh)Kosten Solar (CHF)Kosten Netz (CHF)Ertrag Einspeisung (CHF)Summe (CHF)
Keine Stromzähler gefunden

"; + return ['html' => $html, 'sum' => 0]; + } + + $sum = 0; + + foreach ($this->powerCostCache[$userId] as $entry) { + + $subtotal = $entry['cost_grid'] + $entry['cost_solar'] - $entry['rev_feedin']; + $sum += $subtotal; + + $html .= " + + {$entry['name']} + " . number_format($entry['imp'], 3) . " + " . number_format($entry['exp'], 3) . " + " . number_format($entry['solar_bezug'], 3) . " + " . number_format($entry['netz_bezug'], 3) . " + " . number_format($entry['solareinspeisung'], 3) . " + " . number_format($entry['solarverkauf'], 3) . " + " . number_format($entry['cost_solar'], 2) . " + " . number_format($entry['cost_grid'], 2) . " + " . number_format($entry['rev_feedin'], 2) . " + " . number_format($subtotal, 2) . " + "; + } + + $html .= " + + Total Stromkosten: + " . number_format($sum, 2) . " + +
"; + + return ['html' => $html, 'sum' => $sum]; + } + + // ====================================================================== + // WASSER / WÄRME + // ====================================================================== + + private function CalculateAdditionalCosts(array $waterMeters, array $tariffs, int $userId, int $from, int $to): array + { + $html = " + + + + + + + + + + + + "; + + $total = 0; $usedTariffs = []; foreach ($waterMeters as $m) { - if ($m['user_id'] != $userId) continue; + + if ($m['user_id'] != $userId) { + continue; + } + $type = $m['meter_type'] ?? 'Warmwasser'; - $cost = $this->AddMeterToPDFRow($m, $tariffs, $from, $to, $type); - $html .= $cost['row']; - $total += $cost['value']; - $usedTariffs = array_merge($usedTariffs, $cost['tariffs']); + $row = $this->AddMeterToPDFRow($m, $tariffs, $from, $to, $type); + + $html .= $row['row']; + $total += $row['value']; + $usedTariffs = array_merge($usedTariffs, $row['tariffs']); } - $html .= " + $html .= " + -
ZählerTypStartEndeZähler StartZähler EndeVerbrauchTarif (Rp)Kosten (CHF)
Total Nebenkosten: " . number_format($total, 2) . "

"; + +
"; if (!empty($usedTariffs)) { $html .= "

Angewendete Nebenkostentarife:


"; } @@ -433,68 +397,81 @@ private function GetCalculatedPowerCosts($userId) return ['html' => $html, 'sum' => $total]; } - // ====================== Kernlogik für Wasser/Wärme ====================== - private function AddMeterToPDFRow($meter, $tariffs, $from, $to, $type) + private function AddMeterToPDFRow(array $meter, array $tariffs, int $from, int $to, string $type): array { $rows = ''; - $totalCost = 0.0; + $totalCost = 0; $usedTariffs = []; $varId = $meter['var_consumption']; - if (!IPS_VariableExists($varId)) return ['row' => '', 'value' => 0, 'tariffs' => []]; + if (!IPS_VariableExists($varId)) { + return ['row' => '', 'value' => 0, 'tariffs' => []]; + } - $filteredTariffs = array_filter($tariffs, fn($t) => - strtolower(trim($t['unit_type'] ?? '')) === strtolower(trim($type)) + // Finde passende Tarife + $filtered = array_filter( + $tariffs, + fn($t) => strtolower(trim($t['unit_type'] ?? '')) === strtolower(trim($type)) ); - foreach ($filteredTariffs as &$t) { + foreach ($filtered as &$t) { $t['start_ts'] = $this->toUnixTs($t['start'], false); $t['end_ts'] = $this->toUnixTs($t['end'], true); } unset($t); - usort($filteredTariffs, fn($a, $b) => ($a['start_ts'] ?? 0) <=> ($b['start_ts'] ?? 0)); - $currentStart = $from; - while ($currentStart < $to) { - $activeTariff = null; - foreach ($filteredTariffs as $t) { - if (($t['start_ts'] ?? 0) <= $currentStart && $currentStart <= ($t['end_ts'] ?? 0)) { - $activeTariff = $t; + usort($filtered, fn($a, $b) => ($a['start_ts'] ?? 0) <=> ($b['start_ts'] ?? 0)); + + // Zeitfenster aufsplitten + $current = $from; + while ($current < $to) { + + $active = null; + + foreach ($filtered as $t) { + if (($t['start_ts'] <= $current) && ($current <= $t['end_ts'])) { + $active = $t; break; } } - if (!$activeTariff) { - $activeTariff = ['start_ts' => $currentStart, 'end_ts' => $to, 'price' => 0.0]; - } - - $tariffEnd = intval($activeTariff['end_ts']); - $tariffPrice = floatval($activeTariff['price']); - - $key = $activeTariff['start_ts'] . '-' . $activeTariff['end_ts'] . '-' . $tariffPrice; - if (!isset($usedTariffs[$key])) { - $usedTariffs[$key] = [ - 'start' => $activeTariff['start_ts'], - 'end' => $activeTariff['end_ts'], - 'price' => $tariffPrice + if (!$active) { + $active = [ + 'start_ts' => $current, + 'end_ts' => $to, + 'price' => 0 ]; } - $startValue = $this->GetValueAt($varId, $currentStart, true); - $segmentEnd = ($tariffEnd < $to) ? $tariffEnd : $to; + $segmentEnd = min($active['end_ts'], $to); + $tariffPrice = floatval($active['price']); + + // Eintrag merken für Zusammenfassung + $usedTariffs[$active['start_ts'] . "-" . $active['end_ts']] = [ + 'start' => $active['start_ts'], + 'end' => $active['end_ts'], + 'price' => $tariffPrice + ]; + + // Werte aus Archiv + $startValue = $this->GetValueAt($varId, $current, true); $endValue = $this->GetValueAt($varId, $segmentEnd, true); - if ($startValue === null || $endValue === null) break; + if ($startValue === null || $endValue === null) { + break; + } $verbrauch = max(0, $endValue - $startValue); - $kosten = round(($tariffPrice / 100) * $verbrauch, 2); + $kosten = ($tariffPrice / 100) * $verbrauch; + $totalCost += $kosten; - $rows .= " + $rows .= " + {$meter['name']} {$type} - " . date('d.m.Y', $currentStart) . " + " . date('d.m.Y', $current) . " " . date('d.m.Y', $segmentEnd) . " " . number_format($startValue, 2) . " " . number_format($endValue, 2) . " @@ -503,31 +480,47 @@ private function GetCalculatedPowerCosts($userId) " . number_format($kosten, 2) . " "; - if ($tariffEnd < $to) $currentStart = $tariffEnd + 1; - else break; + $current = ($active['end_ts'] < $to) ? ($active['end_ts'] + 1) : $to; } - if ($rows === '') return ['row' => '', 'value' => 0, 'tariffs' => []]; - - return ['row' => $rows, 'value' => $totalCost, 'tariffs' => array_values($usedTariffs)]; + return [ + 'row' => $rows, + 'value' => $totalCost, + 'tariffs' => array_values($usedTariffs) + ]; } - // ====================== Hilfsfunktionen ====================== + // ====================================================================== + // HILFSFUNKTIONEN + // ====================================================================== - private function GetValueAt($varId, $timestamp, $nearestAfter = true) + private function GetValueAt(int $varId, int $timestamp, bool $nearestAfter = true) { $archiveID = @IPS_GetInstanceListByModuleID('{43192F0B-135B-4CE7-A0A7-1475603F3060}')[0]; - if (!$archiveID || !IPS_VariableExists($varId)) return null; - $values = @AC_GetLoggedValues($archiveID, $varId, $timestamp - 30 * 86400, $timestamp + 30 * 86400, 0); - if (empty($values)) return floatval(GetValue($varId)); + if (!$archiveID || !IPS_VariableExists($varId)) { + return null; + } + + $values = @AC_GetLoggedValues( + $archiveID, + $varId, + $timestamp - 2592000, // 30 Tage zurück + $timestamp + 2592000, // 30 Tage nach vorne + 0 + ); + + if (empty($values)) { + return floatval(GetValue($varId)); + } $closest = null; + foreach ($values as $v) { if ($nearestAfter && $v['TimeStamp'] >= $timestamp) { - $closest = $v['Value']; - break; - } elseif (!$nearestAfter && $v['TimeStamp'] <= $timestamp) { + return $v['Value']; + } + if (!$nearestAfter && $v['TimeStamp'] <= $timestamp) { $closest = $v['Value']; } } @@ -535,87 +528,89 @@ private function GetCalculatedPowerCosts($userId) return $closest ?? floatval(GetValue($varId)); } + private function getDeltaFromArchive(int $varId, int $tStart, int $tEnd): float { - $startValue = $this->GetValueAt($varId, $tStart, false); // Wert davor/zu Beginn - $endValue = $this->GetValueAt($varId, $tEnd, true); // Wert danach/zum Ende + $startValue = $this->GetValueAt($varId, $tStart, false); + $endValue = $this->GetValueAt($varId, $tEnd, true); if ($startValue === null || $endValue === null) { - IPS_LogMessage('Abrechnung', "getDeltaFromArchive: Keine Werte für Var $varId zwischen " . date('d.m.Y H:i', $tStart) . " und " . date('d.m.Y H:i', $tEnd)); return 0.0; } $diff = $endValue - $startValue; - if ($diff < 0) { - // Sicherheitsnetz bei Zähler-Reset - $diff = 0.0; - } - return (float)$diff; - } - - private function toUnixTs($val, $endOfDay = false) - { - if (is_int($val)) return $val; - if (is_numeric($val)) return intval($val); - - if (is_string($val)) { - $s = trim($val); - if ($s !== '' && $s[0] === '{') { - $obj = json_decode($s, true); - if (isset($obj['year'], $obj['month'], $obj['day'])) { - $time = $endOfDay ? '23:59:59' : '00:00:00'; - return strtotime(sprintf('%04d-%02d-%02d %s', $obj['year'], $obj['month'], $obj['day'], $time)); - } - } - $ts = strtotime($s); - return $ts === false ? null : $ts; - } - return null; - } - - private function readDelta($varId, $tStart, $tEnd) - { - if (!is_int($tStart)) $tStart = strtotime($tStart); - if (!is_int($tEnd)) $tEnd = strtotime($tEnd); - - $archiveID = @IPS_GetInstanceListByModuleID('{43192F0B-135B-4CE7-A0A7-1475603F3060}')[0]; - if (!$archiveID || !IPS_VariableExists($varId)) return 0.0; - - $values = @AC_GetLoggedValues($archiveID, $varId, $tStart - 86400, $tEnd + 86400, 0); - if (empty($values)) return 0.0; - - usort($values, fn($a, $b) => intval($a['TimeStamp']) <=> intval($b['TimeStamp'])); - $vStart = null; - $vEnd = null; - - foreach ($values as $v) { - if ($v['TimeStamp'] <= $tStart) $vStart = $v['Value']; - if ($v['TimeStamp'] <= $tEnd) $vEnd = $v['Value']; - if ($v['TimeStamp'] > $tEnd) break; - } - - if ($vStart === null) $vStart = floatval(GetValue($varId)); - if ($vEnd === null) $vEnd = floatval(GetValue($varId)); - - $diff = $vEnd - $vStart; return ($diff < 0) ? 0.0 : $diff; } - private function getTariffPriceAt($tariffs, $typeSynonyms, $ts) + + private function toUnixTs($val, bool $endOfDay = false) + { + if (is_int($val)) { + return $val; + } + + if (is_numeric($val)) { + return intval($val); + } + + if (is_string($val)) { + + $s = trim($val); + + if ($s !== '' && $s[0] === '{') { + $obj = json_decode($s, true); + + if (isset($obj['year'], $obj['month'], $obj['day'])) { + $time = $endOfDay ? '23:59:59' : '00:00:00'; + return strtotime(sprintf( + '%04d-%02d-%02d %s', + $obj['year'], + $obj['month'], + $obj['day'], + $time + )); + } + } + + $ts = strtotime($s); + return $ts === false ? null : $ts; + } + + return null; + } + + + private function getTariffPriceAt(array $tariffs, array $typeSynonyms, int $ts) { $wanted = array_map('strtolower', $typeSynonyms); - $cands = []; - foreach ($tariffs as $t) { - $u = strtolower(trim($t['unit_type'] ?? '')); - if (!in_array($u, $wanted)) continue; + $matches = []; - $s = $this->toUnixTs($t['start'], false); - $e = $this->toUnixTs($t['end'], true); - if (!$s || !$e) continue; - if ($s <= $ts && $ts <= $e) $cands[] = floatval($t['price']); + foreach ($tariffs as $t) { + + $type = strtolower(trim($t['unit_type'] ?? '')); + + if (!in_array($type, $wanted)) { + continue; + } + + $start = $this->toUnixTs($t['start'], false); + $end = $this->toUnixTs($t['end'], true); + + if (!$start || !$end) { + continue; + } + + if ($start <= $ts && $ts <= $end) { + $matches[] = floatval($t['price']); + } } - if (empty($cands)) return null; - return end($cands); + + if (empty($matches)) { + return null; + } + + return end($matches); } } + ?>