dh/Symcon_Belevo_Energiemanagement_testing
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
dh
2025-11-05 08:33:04 +01:00
parent f637640872
commit e7eb56c57c
1 changed files with 66 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Abrechnung/module.php
+66 -44
View File
@@ -284,19 +284,20 @@ private function AddMeterToPDFRow($meter, $tariffs, $from, $to, $type)
{ {
$rows = ''; $rows = '';
$totalCost = 0.0; $totalCost = 0.0;
$varId = $meter['var_consumption'];
IPS_LogMessage('Abrechnung', "🔧 [AddMeterToPDFRow] Starte Berechnung für {$meter['name']} ($type) von " . date('d.m.Y H:i', $from) . " bis " . date('d.m.Y H:i', $to)); $varId = $meter['var_consumption'];
IPS_LogMessage('Abrechnung', "🔧 [AddMeterToPDFRow] Start für Zähler '{$meter['name']}' (Typ: {$type}), Zeitraum: " . date('d.m.Y H:i', $from) . " - " . date('d.m.Y H:i', $to) . ", VarID={$varId}");
if (!IPS_VariableExists($varId)) { if (!IPS_VariableExists($varId)) {
IPS_LogMessage('Abrechnung', "❌ Variable {$varId} für {$meter['name']} nicht gefunden"); IPS_LogMessage('Abrechnung', "❌ [AddMeterToPDFRow] Variable {$varId} für {$meter['name']} nicht gefunden");
return ['row' => '', 'value' => 0]; return ['row' => '', 'value' => 0];
} }
// --- 1. Relevante Tarife filtern --- // --- Relevante Tarife nach Typ filtern (LOGGING ONLY) ---
$filteredTariffs = array_filter($tariffs, function ($t) use ($type) { $filteredTariffs = array_filter($tariffs, function ($t) use ($type) {
$typeNorm = strtolower(trim($type));
$tariffType = strtolower(trim($t['unit_type'] ?? '')); $tariffType = strtolower(trim($t['unit_type'] ?? ''));
$typeNorm = strtolower(trim($type));
$map = [ $map = [
'strombezug' => ['strom', 'strombezug', 'stromzähler', 'stromverbrauch'], 'strombezug' => ['strom', 'strombezug', 'stromzähler', 'stromverbrauch'],
'warmwasser' => ['warmwasser', 'wasser', 'hww'], 'warmwasser' => ['warmwasser', 'wasser', 'hww'],
@@ -306,50 +307,47 @@ private function AddMeterToPDFRow($meter, $tariffs, $from, $to, $type)
return in_array($tariffType, $map[$typeNorm] ?? []) || $tariffType === $typeNorm; return in_array($tariffType, $map[$typeNorm] ?? []) || $tariffType === $typeNorm;
}); });
IPS_LogMessage('Abrechnung', "🔹 Gefundene Tarife für Typ '$type': " . count($filteredTariffs)); IPS_LogMessage('Abrechnung', "🔹 [AddMeterToPDFRow] passende Tarife für '{$type}': " . count($filteredTariffs));
if (empty($filteredTariffs)) { if (empty($filteredTariffs)) {
IPS_LogMessage('Abrechnung', "⚠ Keine passenden Tarife gefunden → alles 0 Rp"); IPS_LogMessage('Abrechnung', "⚠ [AddMeterToPDFRow] Keine passenden Tarife für Typ '{$type}' gefunden → 0 Rp");
return ['row' => '', 'value' => 0]; return ['row' => '', 'value' => 0];
} }
// --- 2. Zeitstempel normalisieren & sortieren --- // --- Tarife sicher in Zeiträume umwandeln (LOGGING ONLY) ---
foreach ($filteredTariffs as &$t) { foreach ($filteredTariffs as &$t) {
$t['start_ts'] = is_numeric($t['start']) ? intval($t['start']) : strtotime($t['start']); $t['start_ts'] = is_numeric($t['start']) ? intval($t['start']) : strtotime($t['start']);
$t['end_ts'] = is_numeric($t['end']) ? intval($t['end']) : strtotime($t['end']); $t['end_ts'] = is_numeric($t['end']) ? intval($t['end']) : strtotime($t['end']);
IPS_LogMessage('Abrechnung', sprintf( IPS_LogMessage('Abrechnung', sprintf(
" 🕓 Tarif: %s - %s @ %.3f Rp", " 🕓 Tariffenster: %s → %s | Preis: %s Rp | unit_type='%s'",
date('d.m.Y H:i', $t['start_ts']), $t['start_ts'] ? date('d.m.Y H:i', $t['start_ts']) : '❌',
date('d.m.Y H:i', $t['end_ts']), $t['end_ts'] ? date('d.m.Y H:i', $t['end_ts']) : '❌',
floatval($t['price']) isset($t['price']) ? str_replace('.', ',', (string)$t['price']) : '❌',
$t['unit_type'] ?? '—'
)); ));
} }
unset($t); unset($t);
// Sortiere Tarife nach Startzeit (unverändert)
usort($filteredTariffs, fn($a, $b) => $a['start_ts'] <=> $b['start_ts']); usort($filteredTariffs, fn($a, $b) => $a['start_ts'] <=> $b['start_ts']);
// --- 3. Iteration über Tarifabschnitte ---
$current = $from; $current = $from;
$segIndex = 1; $segIndex = 1;
while ($current < $to) { while ($current < $to) {
IPS_LogMessage('Abrechnung', "➡️ [Segment $segIndex] Start: " . date('d.m.Y H:i', $current)); IPS_LogMessage('Abrechnung', "➡️ [AddMeterToPDFRow] Segment {$segIndex} START: " . date('d.m.Y H:i', $current));
// Aktiven Tarif finden // Finde aktiven Tarif für diesen Zeitpunkt (unverändert)
$active = null; $activeTariff = null;
foreach ($filteredTariffs as $t) { foreach ($filteredTariffs as $t) {
if ($t['start_ts'] <= $current && $current < $t['end_ts']) { if ($t['start_ts'] <= $current && $current <= $t['end_ts']) {
$active = $t; $activeTariff = $t;
break; break;
} }
} }
if ($active) { // Wenn kein aktiver Tarif, nimm nächsten oder rechne 0 Rp (unverändert)
$segmentEnd = min($active['end_ts'], $to); if (!$activeTariff) {
$tariffPrice = floatval($active['price']);
$tariffLabel = number_format($tariffPrice, 2);
IPS_LogMessage('Abrechnung', sprintf(" ✅ Aktiver Tarif gefunden: %.3f Rp (gültig bis %s)", $tariffPrice, date('d.m.Y H:i', $active['end_ts'])));
} else {
// Kein aktiver Tarif gefunden → Nulltarif
$nextStart = $to; $nextStart = $to;
foreach ($filteredTariffs as $t) { foreach ($filteredTariffs as $t) {
if ($t['start_ts'] > $current && $t['start_ts'] < $nextStart) { if ($t['start_ts'] > $current && $t['start_ts'] < $nextStart) {
@@ -359,33 +357,49 @@ private function AddMeterToPDFRow($meter, $tariffs, $from, $to, $type)
$segmentEnd = min($nextStart, $to); $segmentEnd = min($nextStart, $to);
$tariffPrice = 0.0; $tariffPrice = 0.0;
$tariffLabel = 'kein Tarif'; $tariffLabel = 'kein Tarif';
IPS_LogMessage('Abrechnung', sprintf(" ⚠ Kein Tarif aktiv – verwende 0 Rp bis %s", date('d.m.Y H:i', $segmentEnd))); IPS_LogMessage('Abrechnung', " ⚠ Kein aktiver Tarif → 0 Rp bis " . date('d.m.Y H:i', $segmentEnd));
} else {
$segmentEnd = min($activeTariff['end_ts'], $to);
$tariffPrice = floatval($activeTariff['price']);
$tariffLabel = number_format($tariffPrice, 2, ',', '');
IPS_LogMessage('Abrechnung', sprintf(
" ✅ Aktiver Tarif: %.3f Rp | gültig bis %s | SegmentEnd=%s",
$tariffPrice,
date('d.m.Y H:i', $activeTariff['end_ts']),
date('d.m.Y H:i', $segmentEnd)
));
} }
// Sicherheitsnetz (unverändert)
if ($segmentEnd <= $current) { if ($segmentEnd <= $current) {
IPS_LogMessage('Abrechnung', " ⚠ SegmentEnd <= current – Abbruch (Ende erreicht oder Tariflücke fehlerhaft)"); IPS_LogMessage('Abrechnung', " ⚠ segmentEnd <= current (" . date('d.m.Y H:i', $segmentEnd) . " <= " . date('d.m.Y H:i', $current) . "), Abbruch der Schleife.");
break; break;
} }
// --- 4. Werte holen --- // --- Verbrauch für diesen Zeitraum (unverändert) ---
$startVal = $this->GetValueAt($varId, $current, false); IPS_LogMessage('Abrechnung', " 🔎 Hole Startwert @ " . date('d.m.Y H:i', $current) . " (nearestAfter=true)");
$startVal = $this->GetValueAt($varId, $current, true);
IPS_LogMessage('Abrechnung', " 🔎 Hole Endwert @ " . date('d.m.Y H:i', $segmentEnd) . " (nearestAfter=true)");
$endVal = $this->GetValueAt($varId, $segmentEnd, true); $endVal = $this->GetValueAt($varId, $segmentEnd, true);
if ($startVal === null || $endVal === null) {
IPS_LogMessage('Abrechnung', " ⚠ Keine Werte gefunden (startVal=" . var_export($startVal, true) . ", endVal=" . var_export($endVal, true) . ") → Segment übersprungen");
$current = $segmentEnd + 1;
$segIndex++;
continue;
}
$diff = max(0, $endVal - $startVal); $diff = max(0, $endVal - $startVal);
$costCHF = round(($tariffPrice / 100) * $diff, 2); $costCHF = round(($tariffPrice / 100) * $diff, 2);
$totalCost += $costCHF; $totalCost += $costCHF;
IPS_LogMessage('Abrechnung', sprintf( IPS_LogMessage('Abrechnung', sprintf(
" 📊 Werte: Start=%.3f (%.s), Ende=%.3f (%.s), Verbrauch=%.3f, Tarif=%.3f Rp, Kosten=%.3f CHF", " 📊 Segment %d: Start=%.3f, Ende=%.3f, Verbrauch=%.3f, Tarif=%s, Kosten=%.2f CHF",
$startVal, $segIndex, $startVal, $endVal, $diff, $tariffLabel, $costCHF
date('d.m.Y H:i', $current),
$endVal,
date('d.m.Y H:i', $segmentEnd),
$diff,
$tariffPrice,
$costCHF
)); ));
// --- 5. HTML-Zeile erstellen --- // --- Ausgabezeile (unverändert) ---
$rows .= " $rows .= "
<tr> <tr>
<td>{$meter['name']}</td> <td>{$meter['name']}</td>
@@ -395,20 +409,26 @@ private function AddMeterToPDFRow($meter, $tariffs, $from, $to, $type)
<td>" . number_format($startVal, 2) . "</td> <td>" . number_format($startVal, 2) . "</td>
<td>" . number_format($endVal, 2) . "</td> <td>" . number_format($endVal, 2) . "</td>
<td>" . number_format($diff, 2) . "</td> <td>" . number_format($diff, 2) . "</td>
<td>{$tariffLabel}</td> <td>" . $tariffLabel . "</td>
<td>" . number_format($costCHF, 2) . "</td> <td>" . number_format($costCHF, 2) . "</td>
</tr>"; </tr>";
$current = $segmentEnd + 1; // unverändert
$segIndex++; $segIndex++;
$current = $segmentEnd + 1;
} }
// --- 6. Falls keine Zeilen --- // --- Falls nichts berechnet wurde (unverändert) ---
if ($rows === '') { if ($rows == '') {
IPS_LogMessage('Abrechnung', "⚠ Keine Tarifabschnitte oder Werte berechnet – Erstelle Nullzeile"); IPS_LogMessage('Abrechnung', "⚠ [AddMeterToPDFRow] Keine Segmente berechnet – Fallback-Zeile mit 0 Rp");
$startVal = $this->GetValueAt($varId, $from, false); $startVal = $this->GetValueAt($varId, $from, false);
$endVal = $this->GetValueAt($varId, $to, true); $endVal = $this->GetValueAt($varId, $to, true);
$diff = max(0, $endVal - $startVal); $diff = max(0, $endVal - $startVal);
IPS_LogMessage('Abrechnung', sprintf(
" 🔁 Fallback: Start=%.3f (@%s), Ende=%.3f (@%s), Verbrauch=%.3f",
$startVal, date('d.m.Y H:i', $from),
$endVal, date('d.m.Y H:i', $to),
$diff
));
$rows = " $rows = "
<tr> <tr>
<td>{$meter['name']}</td> <td>{$meter['name']}</td>
@@ -423,7 +443,9 @@ private function AddMeterToPDFRow($meter, $tariffs, $from, $to, $type)
</tr>"; </tr>";
} }
IPS_LogMessage('Abrechnung', sprintf("✅ [AddMeterToPDFRow] Fertig: %.3f CHF total (%d Segmente)", $totalCost, $segIndex - 1)); IPS_LogMessage('Abrechnung', sprintf("✅ [AddMeterToPDFRow] Fertig für '%s' (%s): Total=%.2f CHF",
$meter['name'], $type, $totalCost
));
return ['row' => $rows, 'value' => $totalCost]; return ['row' => $rows, 'value' => $totalCost];
} }