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:19:06 +01:00
parent ffc4bef90b
commit 4aa25fb6e3
1 changed files with 41 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
Abrechnung/module.php
View File

@@ -302,7 +302,7 @@ private function AddMeterToPDFRow($meter, $tariffs, $from, $to, $type)
date_default_timezone_set('Europe/Zurich');
// 🔹 Filtere relevante Tarife nach Typ
// 🔹 Passende Tarife nach Typ filtern
$filteredTariffs = array_filter($tariffs, function ($t) use ($type) {
return strtolower(trim($t['unit_type'] ?? '')) === strtolower(trim($type));
});
@@ -312,7 +312,7 @@ private function AddMeterToPDFRow($meter, $tariffs, $from, $to, $type)
return ['row' => '', 'value' => 0];
}
// 🔹 Normiere Zeiträume
// 🔹 Zeitstempel konvertieren und sortieren
foreach ($filteredTariffs as &$t) {
$t['start_ts'] = $this->toUnixTs($t['start'], false);
$t['end_ts'] = $this->toUnixTs($t['end'], true);
@@ -323,7 +323,6 @@ private function AddMeterToPDFRow($meter, $tariffs, $from, $to, $type)
$currentStart = $from;
while ($currentStart < $to) {
// 🔹 Aktiven Tarif suchen
$activeTariff = null;
foreach ($filteredTariffs as $t) {
if (($t['start_ts'] ?? 0) <= $currentStart && $currentStart <= ($t['end_ts'] ?? 0)) {
@@ -343,35 +342,32 @@ private function AddMeterToPDFRow($meter, $tariffs, $from, $to, $type)
$tariffEnd = intval($activeTariff['end_ts']);
$tariffPrice = floatval($activeTariff['price']);
$tariffLabel = number_format($tariffPrice, 2, ',', '');
// 🔹 Werte aus Archiv lesen
$startValue = $this->GetValueAt($varId, $currentStart, true);
$segmentEnd = ($tariffEnd < $to) ? $tariffEnd : $to;
$endValue = $this->GetValueAt($varId, $segmentEnd, true);
$startValue = $this->GetValueAt($varId, $currentStart, true);
$segmentEnd = ($tariffEnd < $to) ? $tariffEnd : $to;
$endValue = $this->GetValueAt($varId, $segmentEnd, true);
if ($startValue === null || $endValue === null) break;
$verbrauch = max(0, $endValue - $startValue);
$kosten = round(($tariffPrice / 100) * $verbrauch, 2);
$totalCost += $kosten;
$verbrauch = max(0, $endValue - $startValue);
$kosten = round(($tariffPrice / 100) * $verbrauch, 2);
$totalCost += $kosten;
// 🔹 Kurze Datumsangaben
$startDate = date('d.m.Y', $currentStart);
$endDate = date('d.m.Y', $segmentEnd);
// 🔹 Tabellenzeile mit sichtbaren Linien
// 🧾 TCPDF-kompatible Tabellenzeile (sichtbare Linien)
$rows .= "
<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 nobr='true'>
<td align='left' border='1' style='padding:2px;'>{$meter['name']}</td>
<td align='left' border='1' style='padding:2px;'>{$type}</td>
<td align='center' border='1' style='padding:2px;'>{$startDate}</td>
<td align='center' border='1' style='padding:2px;'>{$endDate}</td>
<td align='right' border='1' style='padding:2px;'>" . number_format($startValue, 2) . "</td>
<td align='right' border='1' style='padding:2px;'>" . number_format($endValue, 2) . "</td>
<td align='right' border='1' style='padding:2px;'>" . number_format($verbrauch, 2) . "</td>
<td align='right' border='1' style='padding:2px;'>" . number_format($tariffPrice, 2) . "</td>
<td align='right' border='1' style='padding:2px;'>" . number_format($kosten, 2) . "</td>
</tr>";
if ($tariffEnd < $to) {
@@ -381,26 +377,36 @@ private function AddMeterToPDFRow($meter, $tariffs, $from, $to, $type)
}
}
// 🔹 Fallback – kein Segment gefunden
// Fallback (keine Segmente)
if ($rows === '') {
$startVal = $this->GetValueAt($varId, $from, false);
$endVal = $this->GetValueAt($varId, $to, true);
$verbrauch = max(0, $endVal - $startVal);
$rows = "
<tr>
<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 nobr='true'>
<td align='left' border='1'>{$meter['name']}</td>
<td align='left' border='1'>{$type}</td>
<td align='center' border='1'>" . date('d.m.Y', $from) . "</td>
<td align='center' border='1'>" . date('d.m.Y', $to) . "</td>
<td align='right' border='1'>" . number_format($startVal, 2) . "</td>
<td align='right' border='1'>" . number_format($endVal, 2) . "</td>
<td align='right' border='1'>" . number_format($verbrauch, 2) . "</td>
<td align='right' border='1'>0.00</td>
<td align='right' border='1'>0.00</td>
</tr>";
}
return ['row' => $rows, 'value' => $totalCost];
// 🧾 Totalsumme in separater, deutlich sichtbarer Zeile
$rows .= "
<tr nobr='true' style='font-weight:bold; background-color:#f0f0f0;'>
<td colspan='8' align='right' border='1' style='padding:4px;'>Total {$type}:</td>
<td align='right' border='1' style='padding:4px;'>" . number_format($totalCost, 2) . "</td>
</tr>";
// Komplett in eine sichtbare Tabelle einbetten (damit TCPDF Linien rendert)
$table = "<table border='1' cellspacing='0' cellpadding='3' width='100%' style='font-size:8px;'>{$rows}</table>";
return ['row' => $table, 'value' => $totalCost];
}