Anpassungen am Ladetaions-Verbraucher Bugfixes wenn ladung nciht mehr startete

2025-11-05 14:43:32 +01:00
parent 5e08aa051d
commit fa8c78a94d
22 changed files with 2216 additions and 24 deletions
--- a/temp_mid2.txt
+++ b/temp_mid2.txt
@@ -0,0 +1,106 @@
+        foreach ($filteredTariffs as $t) {
+            $startTs = intval($t['start_ts']);
+            $endTs   = intval($t['end_ts']);
+            if ($startTs === 0 || $endTs === 0) continue;
+
+            if ($startTs <= $currentStart && $currentStart <= $endTs) {
+                $activeTariff = $t;
+                IPS_LogMessage('Abrechnung', sprintf(
+                    "   ✅ Tarif erkannt: %.2f Rp gültig %s → %s",
+                    floatval($t['price']),
+                    date('d.m.Y H:i', $startTs),
+                    date('d.m.Y H:i', $endTs)
+                ));
+                break;
+            }
+        }
+
+        // 🔹 Falls kein aktiver Tarif → 0 Rp
+        if (!$activeTariff) {
+            IPS_LogMessage('Abrechnung', "⚠ Kein Tarif aktiv bei " . date('d.m.Y H:i', $currentStart) . " → 0 Rp");
+            $activeTariff = [
+                'start_ts' => $currentStart,
+                'end_ts'   => $to,
+                'price'    => 0.0,
+                'unit_type'=> $type
+            ];
+        }
+
+        $tariffEnd   = intval($activeTariff['end_ts']);
+        $tariffPrice = floatval($activeTariff['price']);
+        $tariffLabel = number_format($tariffPrice, 2, ',', '');
+
+        // 🔹 Start- & Endwerte aus Archiv
+        $startValue = $this->GetValueAt($varId, $currentStart, true);
+        if ($startValue === null) {
+            IPS_LogMessage('Abrechnung', "⚠ Kein Startwert für " . date('d.m.Y H:i', $currentStart));
+            break;
+        }
+
+        $segmentEnd = ($tariffEnd < $to) ? $tariffEnd : $to;
+        $endValue = $this->GetValueAt($varId, $segmentEnd, true);
+        if ($endValue === null) {
+            IPS_LogMessage('Abrechnung', "⚠ Kein Endwert für " . date('d.m.Y H:i', $segmentEnd));
+            break;
+        }
+
+        // 🔹 Verbrauch & Kosten
+        $verbrauch = max(0, $endValue - $startValue);
+        $kosten = round(($tariffPrice / 100) * $verbrauch, 2);
+        $totalCost += $kosten;
+
+        IPS_LogMessage('Abrechnung', sprintf(
+            "   📊 Segment %d: %.3f → %.3f (Δ=%.3f) | Tarif=%.3f Rp | Kosten=%.2f CHF",
+            $segmentIndex, $startValue, $endValue, $verbrauch, $tariffPrice, $kosten
+        ));
+
+        // 🔹 Tabellenzeile
+        $rows .= "
+        <tr>
+            <td>{$meter['name']}</td>
+            <td>{$type}</td>
+            <td>" . date('d.m.Y H:i', $currentStart) . "</td>
+            <td>" . date('d.m.Y H:i', $segmentEnd) . "</td>
+            <td>" . number_format($startValue, 2) . "</td>
+            <td>" . number_format($endValue, 2) . "</td>
+            <td>" . number_format($verbrauch, 2) . "</td>
+            <td>{$tariffLabel}</td>
+            <td>" . number_format($kosten, 2) . "</td>
+        </tr>";
+
+        // 🔹 Neuen Startpunkt setzen (FIX: +1 Sekunde nach Tarifende)
+        if ($tariffEnd < $to) {
+            $currentStart = $tariffEnd + 1;
+        } else {
+            break;
+        }
+
+        $segmentIndex++;
+    }
+
+    // Fallback, falls keine Segmente erzeugt wurden
+    if ($rows === '') {
+        IPS_LogMessage('Abrechnung', "⚠ Keine Segmente erzeugt, Fallback auf Gesamtzeitraum");
+        $startValue = $this->GetValueAt($varId, $from, false);
+        $endValue   = $this->GetValueAt($varId, $to, true);
+        $verbrauch = max(0, $endValue - $startValue);
+        $rows = "
+        <tr>
+            <td>{$meter['name']}</td>
+            <td>{$type}</td>
+            <td>" . date('d.m.Y H:i', $from) . "</td>
+            <td>" . date('d.m.Y H:i', $to) . "</td>
+            <td>" . number_format($startValue, 2) . "</td>
+            <td>" . number_format($endValue, 2) . "</td>
+            <td>" . number_format($verbrauch, 2) . "</td>
+            <td>0</td>
+            <td>0.00</td>
+        </tr>";
+    }
+
+    IPS_LogMessage('Abrechnung', sprintf("✅ [AddMeterToPDFRow] Fertig: %.2f CHF total, %d Segmente", $totalCost, $segmentIndex - 1));
+
+    return ['row' => $rows, 'value' => $totalCost];
+}
+
+}