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

no message

Browse Source
This commit is contained in:
Daniel Häfliger
2025-11-05 14:17:19 +01:00
parent f23fabd460
commit ffc4bef90b
1 changed files with 30 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
Abrechnung/module.php
View File

@@ -302,7 +302,7 @@ private function AddMeterToPDFRow($meter, $tariffs, $from, $to, $type)
date_default_timezone_set('Europe/Zurich');
// 🔹 Tarife nach Typ filtern
// 🔹 Filtere relevante Tarife nach Typ
$filteredTariffs = array_filter($tariffs, function ($t) use ($type) {
return strtolower(trim($t['unit_type'] ?? '')) === strtolower(trim($type));
});
@@ -312,30 +312,18 @@ private function AddMeterToPDFRow($meter, $tariffs, $from, $to, $type)
return ['row' => '', 'value' => 0];
}
// 🔹 Zeitstempel normieren und sortieren
// 🔹 Normiere Zeiträume
foreach ($filteredTariffs as &$t) {
$t['start_ts'] = $this->toUnixTs($t['start'], false);
$t['end_ts'] = $this->toUnixTs($t['end'], true);
if (!$t['start_ts'] || !$t['end_ts']) {
IPS_LogMessage('Abrechnung', "⚠ Ungültiger Tarifzeitraum: " . json_encode($t));
} else {
IPS_LogMessage('Abrechnung', sprintf(
" 🕓 Tarif gültig von %s bis %s @ %.3f Rp",
date('d.m.Y H:i', $t['start_ts']),
date('d.m.Y H:i', $t['end_ts']),
floatval($t['price'])
));
}
}
unset($t);
usort($filteredTariffs, fn($a, $b) => ($a['start_ts'] ?? 0) <=> ($b['start_ts'] ?? 0));
$currentStart = $from;
$segmentIndex = 1;
while ($currentStart < $to) {
// 🔹 Aktiven Tarif finden
// 🔹 Aktiven Tarif suchen
$activeTariff = null;
foreach ($filteredTariffs as $t) {
if (($t['start_ts'] ?? 0) <= $currentStart && $currentStart <= ($t['end_ts'] ?? 0)) {
@@ -345,7 +333,6 @@ private function AddMeterToPDFRow($meter, $tariffs, $from, $to, $type)
}
if (!$activeTariff) {
IPS_LogMessage('Abrechnung', "⚠ Kein Tarif aktiv bei " . date('d.m.Y H:i', $currentStart));
$activeTariff = [
'start_ts' => $currentStart,
'end_ts' => $to,
@@ -358,32 +345,33 @@ private function AddMeterToPDFRow($meter, $tariffs, $from, $to, $type)
$tariffPrice = floatval($activeTariff['price']);
$tariffLabel = number_format($tariffPrice, 2, ',', '');
// 🔹 Werte lesen
// 🔹 Werte aus Archiv lesen
$startValue = $this->GetValueAt($varId, $currentStart, true);
$segmentEnd = ($tariffEnd < $to) ? $tariffEnd : $to;
$endValue = $this->GetValueAt($varId, $segmentEnd, true);
if ($startValue === null || $endValue === null) {
IPS_LogMessage('Abrechnung', "⚠ Keine Werte für {$meter['name']} im Zeitraum " . date('d.m.Y H:i', $currentStart));
break;
}
if ($startValue === null || $endValue === null) break;
$verbrauch = max(0, $endValue - $startValue);
$kosten = round(($tariffPrice / 100) * $verbrauch, 2);
$totalCost += $kosten;
// 🔹 Tabellenzeile formatiert
// 🔹 Kurze Datumsangaben
$startDate = date('d.m.Y', $currentStart);
$endDate = date('d.m.Y', $segmentEnd);
// 🔹 Tabellenzeile mit sichtbaren Linien
$rows .= "
<tr style='border-bottom:0.3px solid #ccc;'>
<td style='padding:2px;'>{$meter['name']}</td>
<td style='padding:2px;'>{$type}</td>
<td style='padding:2px; text-align:center;'>" . date('d.m.Y H:i', $currentStart) . "</td>
<td style='padding:2px; text-align:center;'>" . date('d.m.Y H:i', $segmentEnd) . "</td>
<td style='padding:2px; text-align:right;'>" . number_format($startValue, 2) . "</td>
<td style='padding:2px; text-align:right;'>" . number_format($endValue, 2) . "</td>
<td style='padding:2px; text-align:right;'>" . number_format($verbrauch, 2) . "</td>
<td style='padding:2px; text-align:right;'>" . $tariffLabel . "</td>
<td style='padding:2px; text-align:right;'>" . number_format($kosten, 2) . "</td>
<tr>
<td border='1' align='left' style='padding:2px;'>{$meter['name']}</td>
<td border='1' align='left' style='padding:2px;'>{$type}</td>
<td border='1' align='center' style='padding:2px;'>{$startDate}</td>
<td border='1' align='center' style='padding:2px;'>{$endDate}</td>
<td border='1' align='right' style='padding:2px;'>" . number_format($startValue, 2) . "</td>
<td border='1' align='right' style='padding:2px;'>" . number_format($endValue, 2) . "</td>
<td border='1' align='right' style='padding:2px;'>" . number_format($verbrauch, 2) . "</td>
<td border='1' align='right' style='padding:2px;'>" . $tariffLabel . "</td>
<td border='1' align='right' style='padding:2px;'>" . number_format($kosten, 2) . "</td>
</tr>";
if ($tariffEnd < $to) {
@@ -391,26 +379,24 @@ private function AddMeterToPDFRow($meter, $tariffs, $from, $to, $type)
} else {
break;
}
$segmentIndex++;
}
// Fallback – kein Segment berechnet
// 🔹 Fallback – kein Segment gefunden
if ($rows === '') {
$startVal = $this->GetValueAt($varId, $from, false);
$endVal = $this->GetValueAt($varId, $to, true);
$verbrauch = max(0, $endVal - $startVal);
$rows = "
<tr>
<td style='padding:2px;'>{$meter['name']}</td>
<td style='padding:2px;'>{$type}</td>
<td style='padding:2px;'>" . date('d.m.Y H:i', $from) . "</td>
<td style='padding:2px;'>" . date('d.m.Y H:i', $to) . "</td>
<td style='padding:2px; text-align:right;'>" . number_format($startVal, 2) . "</td>
<td style='padding:2px; text-align:right;'>" . number_format($endVal, 2) . "</td>
<td style='padding:2px; text-align:right;'>" . number_format($verbrauch, 2) . "</td>
<td style='padding:2px; text-align:right;'>0.00</td>
<td style='padding:2px; text-align:right;'>0.00</td>
<td border='1' align='left'>{$meter['name']}</td>
<td border='1' align='left'>{$type}</td>
<td border='1' align='center'>" . date('d.m.Y', $from) . "</td>
<td border='1' align='center'>" . date('d.m.Y', $to) . "</td>
<td border='1' align='right'>" . number_format($startVal, 2) . "</td>
<td border='1' align='right'>" . number_format($endVal, 2) . "</td>
<td border='1' align='right'>" . number_format($verbrauch, 2) . "</td>
<td border='1' align='right'>0.00</td>
<td border='1' align='right'>0.00</td>
</tr>";
}