no message

Abrechnung/module.php

@@ -5,37 +5,22 @@ 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');
 
-        // PDF & Script
+        $this->RegisterScript('StartBilling', 'Abrechnung starten', "<?php IPS_RequestAction(" . $this->InstanceID . ", 'StartBilling', ''); ?>");
-        $this->RegisterScript(
-            'StartBilling',
-            'Abrechnung starten',
-            "<?php IPS_RequestAction(" . $this->InstanceID . ", 'StartBilling', ''); ?>"
-        );
-
         $this->RegisterMediaDocument('InvoicePDF', 'Letzte Rechnung', 'pdf');
     }
 
@@ -44,84 +29,81 @@ 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':
-                $content = $this->GenerateInvoices();
+                try {
-                if (!$content) {
+                    $pdfContent = $this->GenerateInvoices();
-                    echo "❌ Fehler bei der PDF-Erstellung";
+                    if (!$pdfContent) {
-                    return;
+                        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();
                 }
-                $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'));
+        $from = GetValue($this->GetIDForIdent('FromDate'));
-        $to      = GetValue($this->GetIDForIdent('ToDate'));
+        $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;
         }
 
-        // Stromkosten einmal berechnen
+        // 🔥 NEU: Stromkosten EINMAL für alle User 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, $water, $tariffs, $from, $to);
+            $this->BuildUserInvoice($pdf, $user, $power, $water, $tariffs, $from, $to);
         }
 
         return $pdf->Output('Abrechnung.pdf', 'S');
     }
 
-    private function BuildUserInvoice($pdf, array $user, array $water, array $tariffs, int $from, int $to)
+
+    private function BuildUserInvoice($pdf, $user, $power, $water, $tariffs, $from, $to)
     {
         $pdf->AddPage();
 
@@ -130,266 +112,320 @@ class Abrechnung extends IPSModule
         <p>{$user['address']}<br>{$user['city']}</p>
         <p><strong>Zeitraum:</strong> " . date('d.m.Y', $from) . " – " . date('d.m.Y', $to) . "</p><br>";
 
-        // Stromkosten
+        // ⚡ Stromkosten (aus globaler Berechnung)
         $html .= "<h3>⚡ Stromkosten</h3>";
         $powerResult = $this->GetCalculatedPowerCosts($user['id']);
         $html .= $powerResult['html'];
+        $totalPower = $powerResult['sum'];
 
-        // Nebenkosten (Wasser/Wärme)
+
+        // 💧 Nebenkosten
         $html .= "<h3>💧 Nebenkosten (Wasser/Wärme)</h3>";
-        $additional = $this->CalculateAdditionalCosts($water, $tariffs, $user['id'], $from, $to);
+        $additionalResult = $this->CalculateAdditionalCosts($water, $tariffs, $user['id'], $from, $to);
-        $html .= $additional['html'];
+        $html .= $additionalResult['html'];
+        $totalAdditional = $additionalResult['sum'];
 
-        // Gesamt
+        $grandTotal = $totalPower + $totalAdditional;
-        $grandTotal = $powerResult['sum'] + $additional['sum'];
+        $html .= "<h3 style='text-align:right;'>Gesamttotal: <strong>" . number_format($grandTotal, 2) . " CHF</strong></h3>";
-        $html .= "<h3 style='text-align:right;'>Gesamttotal:
-                  <strong>" . number_format($grandTotal, 2) . " CHF</strong></h3>";
 
         $pdf->writeHTML($html, true, false, true, false, '');
     }
 
-    // ======================================================================
+private function CalculateAllPowerCosts($powerMeters, $tariffs, $from, $to)
-    //  STROMKOSTEN → GLOBAL EINMAL BERECHNEN
+{
-    // ======================================================================
+    IPS_LogMessage('Abrechnung', "CalculateAllPowerCosts: from=" . date('d.m.Y H:i', $from) . " to=" . date('d.m.Y H:i', $to));
 
-    private function CalculateAllPowerCosts(array $powerMeters, array $tariffs, int $from, int $to)
+    $this->powerCostCache = [];  // Cache leeren
-    {
-        $this->powerCostCache = [];
-        $metersByUser = [];
 
-        // User-Zuordnung
+    // 1. Zähler je User aufbauen
-        foreach ($powerMeters as $m) {
+    $metersByUser = [];
-            if (!isset($m['user_id'])) {
+    foreach ($powerMeters as $m) {
-                continue;
+        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
             }
 
-            $userId = (int)$m['user_id'];
+            // 2b. Verhältnis PV / Netz pro User
-            $name   = $m['name'] ?? ('Meter_' . $userId);
+            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;
+            }
 
-            $metersByUser[$userId][$name] = [
+            // 2c. Werte pro Zähler verteilen
-                'importVar' => $m['var_consumption'] ?? null,
+            foreach ($slot as $name => $v) {
-                'exportVar' => $m['var_feed'] ?? null
+                $imp = $v['imp'];
-            ];
+                $exp = $v['exp'];
 
-            $this->powerCostCache[$userId][$name] = [
+                $this->powerCostCache[$userId][$name]['imp'] += $imp;
-                'name'             => $name,
+                $this->powerCostCache[$userId][$name]['exp'] += $exp;
-                '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)) {
+                if ($pvCoversAll) {
-            return;
+                    // 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;
 
-        // 15-Minuten Raster
+                    if ($pSolar !== null) {
-        for ($ts = $from; $ts < $to; $ts += 900) {
+                        $this->powerCostCache[$userId][$name]['cost_solar'] += ($imp * $pSolar) / 100.0;
-            $slotEnd = min($to, $ts + 900);
+                    }
-
+                    if ($pFeed !== null) {
-            $pGrid  = $this->getTariffPriceAt($tariffs, ['Netztarif'], $ts);
+                        $this->powerCostCache[$userId][$name]['rev_feedin'] += ((1 - $ratio) * $exp * $pFeed) / 100.0;
-            $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 {
-                    $ratio = 0;
+                    // Teil Netzbezug
-                    $pvCoversAll = true;
+                    $this->powerCostCache[$userId][$name]['solar_bezug']  += $ratio * $imp;
-                }
+                    $this->powerCostCache[$userId][$name]['netz_bezug']   += (1 - $ratio) * $imp;
+                    $this->powerCostCache[$userId][$name]['solarverkauf'] += $exp;
 
-                // Werte verteilen
+                    if ($pGrid !== null) {
-                foreach ($slot as $name => $v) {
+                        $this->powerCostCache[$userId][$name]['cost_grid'] += ((1 - $ratio) * $imp * $pGrid) / 100.0;
-
+                    }
-                    $imp = $v['imp'];
+                    if ($pSolar !== null) {
-                    $exp = $v['exp'];
+                        $this->powerCostCache[$userId][$name]['cost_solar'] += ($ratio * $imp * $pSolar) / 100.0;
-
+                    }
-                    $entry = &$this->powerCostCache[$userId][$name];
+                    if ($pFeed !== null) {
-
+                        $this->powerCostCache[$userId][$name]['rev_feedin'] += ($exp * $pFeed) / 100.0;
-                    $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(int $userId): array
+private function GetCalculatedPowerCosts($userId)
-    {
+{
-        $html = "
+    $html = "<table border='1' cellspacing='0' cellpadding='3' width='100%' style='font-size:8px;'>
-        <table border='1' cellspacing='0' cellpadding='3' width='100%' style='font-size:8px;'>
+    <tr style='background-color:#f0f0f0;'>
-        <tr style='background-color:#f0f0f0;'>
+        <th>Zähler</th>
-            <th>Zähler</th>
+        <th>Import (kWh)</th>
-            <th>Import (kWh)</th>
+        <th>Export (kWh)</th>
-            <th>Export (kWh)</th>
+        <th>Solarbezug (kWh)</th>
-            <th>Solarbezug (kWh)</th>
+        <th>Netzbezug (kWh)</th>
-            <th>Netzbezug (kWh)</th>
+        <th>Solareinspeisung (kWh)</th>
-            <th>Solareinspeisung (kWh)</th>
+        <th>Solarverkauf (kWh)</th>
-            <th>Solarverkauf (kWh)</th>
+        <th>Kosten Solar (CHF)</th>
-            <th>Kosten Solar (CHF)</th>
+        <th>Kosten Netz (CHF)</th>
-            <th>Kosten Netz (CHF)</th>
+        <th>Ertrag Einspeisung (CHF)</th>
-            <th>Ertrag Einspeisung (CHF)</th>
+        <th>Summe (CHF)</th>
-            <th>Summe (CHF)</th>
+    </tr>";
-        </tr>";
 
-        if (empty($this->powerCostCache) || !isset($this->powerCostCache[$userId])) {
+    if (empty($this->powerCostCache) || !isset($this->powerCostCache[$userId])) {
-            $html .= "<tr><td colspan='11' align='center'>Keine Stromzähler gefunden</td></tr></table><br>";
+        $html .= "<tr><td colspan='11' align='center'>Keine Stromzähler für diesen Benutzer</td></tr></table><br>";
-            return ['html' => $html, 'sum' => 0];
+        return ['html' => $html, 'sum' => 0.0];
-        }
-
-        $sum = 0;
-
-        foreach ($this->powerCostCache[$userId] as $entry) {
-
-            $subtotal = $entry['cost_grid'] + $entry['cost_solar'] - $entry['rev_feedin'];
-            $sum += $subtotal;
-
-            $html .= "
-            <tr>
-                <td>{$entry['name']}</td>
-                <td align='right'>" . number_format($entry['imp'], 3) . "</td>
-                <td align='right'>" . number_format($entry['exp'], 3) . "</td>
-                <td align='right'>" . number_format($entry['solar_bezug'], 3) . "</td>
-                <td align='right'>" . number_format($entry['netz_bezug'], 3) . "</td>
-                <td align='right'>" . number_format($entry['solareinspeisung'], 3) . "</td>
-                <td align='right'>" . number_format($entry['solarverkauf'], 3) . "</td>
-                <td align='right'>" . number_format($entry['cost_solar'], 2) . "</td>
-                <td align='right'>" . number_format($entry['cost_grid'], 2) . "</td>
-                <td align='right'>" . number_format($entry['rev_feedin'], 2) . "</td>
-                <td align='right'><b>" . number_format($subtotal, 2) . "</b></td>
-            </tr>";
-        }
-
-        $html .= "
-        <tr style='background-color:#f9f9f9; font-weight:bold;'>
-            <td colspan='10' align='right'>Total Stromkosten:</td>
-            <td align='right'>" . number_format($sum, 2) . "</td>
-        </tr>
-        </table><br>";
-
-        return ['html' => $html, 'sum' => $sum];
     }
 
-    // ======================================================================
+    $sum = 0.0;
-    //  WASSER / WÄRME
-    // ======================================================================
 
-    private function CalculateAdditionalCosts(array $waterMeters, array $tariffs, int $userId, int $from, int $to): array
+    foreach ($this->powerCostCache[$userId] as $name => $a) {
+        $subtotal = $a['cost_grid'] + $a['cost_solar'] - $a['rev_feedin'];
+        $sum += $subtotal;
+
+        $html .= "<tr>
+            <td>{$a['name']}</td>
+            <td align='right'>" . number_format($a['imp'], 3) . "</td>
+            <td align='right'>" . number_format($a['exp'], 3) . "</td>
+            <td align='right'>" . number_format($a['solar_bezug'], 3) . "</td>
+            <td align='right'>" . number_format($a['netz_bezug'], 3) . "</td>
+            <td align='right'>" . number_format($a['solareinspeisung'], 3) . "</td>
+            <td align='right'>" . number_format($a['solarverkauf'], 3) . "</td>
+            <td align='right'>" . number_format($a['cost_solar'], 2) . "</td>
+            <td align='right'>" . number_format($a['cost_grid'], 2) . "</td>
+            <td align='right'>" . number_format($a['rev_feedin'], 2) . "</td>
+            <td align='right'><b>" . number_format($subtotal, 2) . "</b></td>
+        </tr>";
+    }
+
+    $html .= "<tr style='background-color:#f9f9f9; font-weight:bold;'>
+        <td colspan='10' align='right'>Total Stromkosten:</td>
+        <td align='right'>" . number_format($sum, 2) . "</td>
+    </tr></table><br>";
+
+    return ['html' => $html, 'sum' => $sum];
+}
+
+
+    private function CalculateAdditionalCosts($waterMeters, $tariffs, $userId, $from, $to)
     {
-        $html = "
+        $html = "<table border='1' cellspacing='0' cellpadding='3' width='100%' style='font-size:8px;'>
-        <table border='1' cellspacing='0' cellpadding='3' width='100%' style='font-size:8px;'>
         <tr style='background-color:#f0f0f0;'>
-            <th>Zähler</th>
+            <th>Zähler</th><th>Typ</th><th>Start</th><th>Ende</th>
-            <th>Typ</th>
+            <th>Zähler Start</th><th>Zähler Ende</th><th>Verbrauch</th><th>Tarif (Rp)</th><th>Kosten (CHF)</th>
-            <th>Start</th>
-            <th>Ende</th>
-            <th>Zähler Start</th>
-            <th>Zähler Ende</th>
-            <th>Verbrauch</th>
-            <th>Tarif (Rp)</th>
-            <th>Kosten (CHF)</th>
         </tr>";
 
-        $total = 0;
+        $total = 0.0;
         $usedTariffs = [];
 
         foreach ($waterMeters as $m) {
-
+            if ($m['user_id'] != $userId) continue;
-            if ($m['user_id'] != $userId) {
-                continue;
-            }
-
             $type = $m['meter_type'] ?? 'Warmwasser';
-            $row  = $this->AddMeterToPDFRow($m, $tariffs, $from, $to, $type);
+            $cost = $this->AddMeterToPDFRow($m, $tariffs, $from, $to, $type);
-
+            $html .= $cost['row'];
-            $html .= $row['row'];
+            $total += $cost['value'];
-            $total += $row['value'];
+            $usedTariffs = array_merge($usedTariffs, $cost['tariffs']);
-            $usedTariffs = array_merge($usedTariffs, $row['tariffs']);
         }
 
-        $html .= "
+        $html .= "<tr style='background-color:#f9f9f9; font-weight:bold;'>
-        <tr style='background-color:#f9f9f9; font-weight:bold;'>
             <td colspan='8' align='right'>Total Nebenkosten:</td>
             <td align='right'>" . number_format($total, 2) . "</td>
-        </tr>
+        </tr></table><br>";
-        </table><br>";
 
         if (!empty($usedTariffs)) {
             $html .= "<p><strong>Angewendete Nebenkostentarife:</strong></p><ul>";
             foreach ($usedTariffs as $t) {
-                $html .= "<li>" . date('d.m.Y', $t['start']) . " – " . date('d.m.Y', $t['end'])
+                $html .= "<li>" . date('d.m.Y', $t['start']) . " – " . date('d.m.Y', $t['end']) . ": " .
-                     . ": " . number_format($t['price'], 2) . " Rp</li>";
+                    number_format($t['price'], 2) . " Rp</li>";
             }
             $html .= "</ul><br>";
         }
@@ -397,81 +433,68 @@ class Abrechnung extends IPSModule
         return ['html' => $html, 'sum' => $total];
     }
 
+    // ====================== Kernlogik für Wasser/Wärme ======================
 
-    private function AddMeterToPDFRow(array $meter, array $tariffs, int $from, int $to, string $type): array
+    private function AddMeterToPDFRow($meter, $tariffs, $from, $to, $type)
     {
         $rows = '';
-        $totalCost = 0;
+        $totalCost = 0.0;
         $usedTariffs = [];
         $varId = $meter['var_consumption'];
 
-        if (!IPS_VariableExists($varId)) {
+        if (!IPS_VariableExists($varId)) return ['row' => '', 'value' => 0, 'tariffs' => []];
-            return ['row' => '', 'value' => 0, 'tariffs' => []];
-        }
 
-        // Finde passende Tarife
+        $filteredTariffs = array_filter($tariffs, fn($t) =>
-        $filtered = array_filter(
+            strtolower(trim($t['unit_type'] ?? '')) === strtolower(trim($type))
-            $tariffs,
-            fn($t) => strtolower(trim($t['unit_type'] ?? '')) === strtolower(trim($type))
         );
 
-        foreach ($filtered as &$t) {
+        foreach ($filteredTariffs 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));
 
-        usort($filtered, fn($a, $b) => ($a['start_ts'] ?? 0) <=> ($b['start_ts'] ?? 0));
+        $currentStart = $from;
-
+        while ($currentStart < $to) {
-        // Zeitfenster aufsplitten
+            $activeTariff = null;
-        $current = $from;
+            foreach ($filteredTariffs as $t) {
-        while ($current < $to) {
+                if (($t['start_ts'] ?? 0) <= $currentStart && $currentStart <= ($t['end_ts'] ?? 0)) {
-
+                    $activeTariff = $t;
-            $active = null;
-
-            foreach ($filtered as $t) {
-                if (($t['start_ts'] <= $current) && ($current <= $t['end_ts'])) {
-                    $active = $t;
                     break;
                 }
             }
 
-            if (!$active) {
+            if (!$activeTariff) {
-                $active = [
+                $activeTariff = ['start_ts' => $currentStart, 'end_ts' => $to, 'price' => 0.0];
-                    'start_ts' => $current,
+            }
-                    'end_ts'   => $to,
+
-                    'price'    => 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
                 ];
             }
 
-            $segmentEnd = min($active['end_ts'], $to);
+            $startValue = $this->GetValueAt($varId, $currentStart, true);
-            $tariffPrice = floatval($active['price']);
+            $segmentEnd = ($tariffEnd < $to) ? $tariffEnd : $to;
-
-            // 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) {
+            if ($startValue === null || $endValue === null) break;
-                break;
-            }
 
             $verbrauch = max(0, $endValue - $startValue);
-            $kosten = ($tariffPrice / 100) * $verbrauch;
+            $kosten = round(($tariffPrice / 100) * $verbrauch, 2);
-
             $totalCost += $kosten;
 
-            $rows .= "
+            $rows .= "<tr>
-            <tr>
                 <td>{$meter['name']}</td>
                 <td>{$type}</td>
-                <td align='center'>" . date('d.m.Y', $current) . "</td>
+                <td align='center'>" . date('d.m.Y', $currentStart) . "</td>
                 <td align='center'>" . date('d.m.Y', $segmentEnd) . "</td>
                 <td align='right'>" . number_format($startValue, 2) . "</td>
                 <td align='right'>" . number_format($endValue, 2) . "</td>
@@ -480,47 +503,31 @@ class Abrechnung extends IPSModule
                 <td align='right'>" . number_format($kosten, 2) . "</td>
             </tr>";
 
-            $current = ($active['end_ts'] < $to) ? ($active['end_ts'] + 1) : $to;
+            if ($tariffEnd < $to) $currentStart = $tariffEnd + 1;
+            else break;
         }
 
-        return [
+        if ($rows === '') return ['row' => '', 'value' => 0, 'tariffs' => []];
-            'row'     => $rows,
+
-            'value'   => $totalCost,
+        return ['row' => $rows, 'value' => $totalCost, 'tariffs' => array_values($usedTariffs)];
-            'tariffs' => array_values($usedTariffs)
-        ];
     }
 
-    // ======================================================================
+    // ====================== Hilfsfunktionen ======================
-    //  HILFSFUNKTIONEN
-    // ======================================================================
 
-    private function GetValueAt(int $varId, int $timestamp, bool $nearestAfter = true)
+    private function GetValueAt($varId, $timestamp, $nearestAfter = true)
     {
         $archiveID = @IPS_GetInstanceListByModuleID('{43192F0B-135B-4CE7-A0A7-1475603F3060}')[0];
+        if (!$archiveID || !IPS_VariableExists($varId)) return null;
 
-        if (!$archiveID || !IPS_VariableExists($varId)) {
+        $values = @AC_GetLoggedValues($archiveID, $varId, $timestamp - 30 * 86400, $timestamp + 30 * 86400, 0);
-            return null;
+        if (empty($values)) return floatval(GetValue($varId));
-        }
-
-        $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) {
-                return $v['Value'];
+                $closest = $v['Value'];
-            }
+                break;
-            if (!$nearestAfter && $v['TimeStamp'] <= $timestamp) {
+            } elseif (!$nearestAfter && $v['TimeStamp'] <= $timestamp) {
                 $closest = $v['Value'];
             }
         }
@@ -528,89 +535,87 @@ class Abrechnung extends IPSModule
         return $closest ?? floatval(GetValue($varId));
     }
 
-
     private function getDeltaFromArchive(int $varId, int $tStart, int $tEnd): float
     {
-        $startValue = $this->GetValueAt($varId, $tStart, false);
+        $startValue = $this->GetValueAt($varId, $tStart, false); // Wert davor/zu Beginn
-        $endValue   = $this->GetValueAt($varId, $tEnd, true);
+        $endValue   = $this->GetValueAt($varId, $tEnd, true);    // Wert danach/zum Ende
 
         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;
-        return ($diff < 0) ? 0.0 : $diff;
+        if ($diff < 0) {
+            // Sicherheitsnetz bei Zähler-Reset
+            $diff = 0.0;
+        }
+        return (float)$diff;
     }
 
-
+    private function toUnixTs($val, $endOfDay = false)
-    private function toUnixTs($val, bool $endOfDay = false)
     {
-        if (is_int($val)) {
+        if (is_int($val)) return $val;
-            return $val;
+        if (is_numeric($val)) return intval($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(
+                    return strtotime(sprintf('%04d-%02d-%02d %s', $obj['year'], $obj['month'], $obj['day'], $time));
-                        '%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);
 
-    private function getTariffPriceAt(array $tariffs, array $typeSynonyms, int $ts)
+        $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)
     {
         $wanted = array_map('strtolower', $typeSynonyms);
-        $matches = [];
+        $cands = [];
-
         foreach ($tariffs as $t) {
+            $u = strtolower(trim($t['unit_type'] ?? ''));
+            if (!in_array($u, $wanted)) continue;
 
-            $type = strtolower(trim($t['unit_type'] ?? ''));
+            $s = $this->toUnixTs($t['start'], false);
-
+            $e = $this->toUnixTs($t['end'], true);
-            if (!in_array($type, $wanted)) {
+            if (!$s || !$e) continue;
-                continue;
+            if ($s <= $ts && $ts <= $e) $cands[] = floatval($t['price']);
-            }
-
-            $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;
-        if (empty($matches)) {
+        return end($cands);
-            return null;
-        }
-
-        return end($matches);
     }
 }
-
 ?>