no message
This commit is contained in:
+43
-101
@@ -268,130 +268,72 @@ private function GetValueAt(int $varId, int $timestamp, bool $nearestAfter = tru
|
|||||||
|
|
||||||
private function AddMeterToPDFRow($meter, $tariffs, $from, $to, $type)
|
private function AddMeterToPDFRow($meter, $tariffs, $from, $to, $type)
|
||||||
{
|
{
|
||||||
|
$archiveID = @IPS_GetInstanceListByModuleID('{43192F0B-135B-4CE7-A0A7-1475603F3060}')[0];
|
||||||
|
if (!$archiveID || !IPS_VariableExists($meter['var_consumption'])) {
|
||||||
|
IPS_LogMessage('Abrechnung', "❌ AddMeterToPDFRow: Archiv oder Variable {$meter['var_consumption']} nicht gefunden");
|
||||||
|
return ['row' => '', 'value' => 0];
|
||||||
|
}
|
||||||
|
|
||||||
$rows = '';
|
$rows = '';
|
||||||
$totalCost = 0.0;
|
$totalCost = 0.0;
|
||||||
|
|
||||||
$varId = $meter['var_consumption'];
|
// Tarife nach Startzeit sortieren
|
||||||
if (!IPS_VariableExists($varId)) {
|
usort($tariffs, fn($a, $b) => strtotime($a['start']) <=> strtotime($b['start']));
|
||||||
IPS_LogMessage('Abrechnung', "❌ Variable {$varId} für {$meter['name']} nicht gefunden");
|
|
||||||
|
// Filter: nur Tarife des Typs (z. B. Strombezug, Warmwasser)
|
||||||
|
$relevantTariffs = array_filter($tariffs, fn($t) => strtolower($t['unit_type']) == strtolower($type));
|
||||||
|
if (empty($relevantTariffs)) {
|
||||||
|
IPS_LogMessage('Abrechnung', "⚠ Keine Tarife für Typ $type gefunden");
|
||||||
return ['row' => '', 'value' => 0];
|
return ['row' => '', 'value' => 0];
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- Relevante Tarife nach Typ filtern ---
|
// Iteriere über alle Tarifabschnitte, die den Abrechnungszeitraum ganz oder teilweise überlappen
|
||||||
$filteredTariffs = array_filter($tariffs, function ($t) use ($type) {
|
foreach ($relevantTariffs as $t) {
|
||||||
$tariffType = strtolower(trim($t['unit_type'] ?? ''));
|
$tStart = strtotime($t['start']);
|
||||||
$typeNorm = strtolower(trim($type));
|
$tEnd = strtotime($t['end']);
|
||||||
|
|
||||||
$map = [
|
// Überlappung mit Abrechnungszeitraum prüfen
|
||||||
'strombezug' => ['strom', 'strombezug', 'stromzähler', 'stromverbrauch'],
|
if ($tEnd < $from || $tStart > $to) continue;
|
||||||
'warmwasser' => ['warmwasser', 'wasser', 'hww'],
|
|
||||||
'kaltwasser' => ['kaltwasser', 'wasser', 'kww'],
|
|
||||||
'wärme' => ['wärme', 'heizung', 'heat']
|
|
||||||
];
|
|
||||||
return in_array($tariffType, $map[$typeNorm] ?? []) || $tariffType === $typeNorm;
|
|
||||||
});
|
|
||||||
|
|
||||||
if (empty($filteredTariffs)) {
|
// Effektive Tarifperiode innerhalb des Abrechnungszeitraums bestimmen
|
||||||
IPS_LogMessage('Abrechnung', "⚠ Keine passenden Tarife für $type gefunden");
|
$periodStart = max($from, $tStart);
|
||||||
return ['row' => '', 'value' => 0];
|
$periodEnd = min($to, $tEnd);
|
||||||
}
|
|
||||||
|
|
||||||
// --- Tarife sicher in Zeiträume umwandeln ---
|
// Archivwerte zu Beginn und Ende der Teilperiode holen
|
||||||
foreach ($filteredTariffs as &$t) {
|
$valueStart = $this->GetValueAt($meter['var_consumption'], $periodStart, false);
|
||||||
$t['start_ts'] = is_numeric($t['start']) ? intval($t['start']) : strtotime($t['start']);
|
$valueEnd = $this->GetValueAt($meter['var_consumption'], $periodEnd, true);
|
||||||
$t['end_ts'] = is_numeric($t['end']) ? intval($t['end']) : strtotime($t['end']);
|
|
||||||
if (!$t['start_ts'] || !$t['end_ts']) {
|
|
||||||
IPS_LogMessage('Abrechnung', "⚠ Ungültiger Tarifzeitraum: " . json_encode($t));
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
unset($t);
|
|
||||||
|
|
||||||
// Sortiere Tarife nach Startzeit
|
if ($valueStart === null || $valueEnd === null) {
|
||||||
usort($filteredTariffs, fn($a, $b) => $a['start_ts'] <=> $b['start_ts']);
|
IPS_LogMessage('Abrechnung', "⚠ Keine gültigen Werte für {$meter['name']} zwischen $periodStart und $periodEnd");
|
||||||
|
|
||||||
$current = $from;
|
|
||||||
|
|
||||||
while ($current < $to) {
|
|
||||||
// Finde aktiven Tarif für diesen Zeitpunkt
|
|
||||||
$activeTariff = null;
|
|
||||||
foreach ($filteredTariffs as $t) {
|
|
||||||
if ($t['start_ts'] <= $current && $current <= $t['end_ts']) {
|
|
||||||
$activeTariff = $t;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Wenn kein aktiver Tarif, nimm nächsten oder rechne 0 Rp
|
|
||||||
if (!$activeTariff) {
|
|
||||||
$nextStart = $to;
|
|
||||||
foreach ($filteredTariffs as $t) {
|
|
||||||
if ($t['start_ts'] > $current && $t['start_ts'] < $nextStart) {
|
|
||||||
$nextStart = $t['start_ts'];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
$segmentEnd = min($nextStart, $to);
|
|
||||||
$tariffPrice = 0.0;
|
|
||||||
$tariffLabel = 'kein Tarif';
|
|
||||||
} else {
|
|
||||||
$segmentEnd = min($activeTariff['end_ts'], $to);
|
|
||||||
$tariffPrice = floatval($activeTariff['price']);
|
|
||||||
$tariffLabel = number_format($tariffPrice, 2);
|
|
||||||
}
|
|
||||||
|
|
||||||
// --- Verbrauch für diesen Zeitraum ---
|
|
||||||
$startVal = $this->GetValueAt($varId, $current, true);
|
|
||||||
$endVal = $this->GetValueAt($varId, $segmentEnd, true);
|
|
||||||
if ($startVal === null || $endVal === null) {
|
|
||||||
IPS_LogMessage('Abrechnung', "⚠ Keine Werte für {$meter['name']} im Zeitraum " . date('d.m.Y H:i', $current) . " - " . date('d.m.Y H:i', $segmentEnd));
|
|
||||||
$current = $segmentEnd + 1;
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
$diff = max(0, $endVal - $startVal);
|
// Verbrauch & Kosten berechnen
|
||||||
$costCHF = round(($tariffPrice / 100) * $diff, 2);
|
$verbrauch = max(0, $valueEnd - $valueStart);
|
||||||
$totalCost += $costCHF;
|
$tarifRp = floatval($t['price']);
|
||||||
|
$kostenCHF = round(($tarifRp / 100) * $verbrauch, 2);
|
||||||
|
$totalCost += $kostenCHF;
|
||||||
|
|
||||||
// --- Ausgabezeile ---
|
// Tabellenzeile erzeugen
|
||||||
$rows .= "
|
$rows .= "
|
||||||
<tr>
|
<tr>
|
||||||
<td>{$meter['name']}</td>
|
<td>{$meter['name']}</td>
|
||||||
<td>$type</td>
|
<td>{$type}</td>
|
||||||
<td>" . date('d.m.Y H:i', $current) . "</td>
|
<td>" . date('d.m.Y H:i', $periodStart) . "</td>
|
||||||
<td>" . date('d.m.Y H:i', $segmentEnd) . "</td>
|
<td>" . date('d.m.Y H:i', $periodEnd) . "</td>
|
||||||
<td>" . number_format($startVal, 2) . "</td>
|
<td>" . number_format($valueStart, 2) . "</td>
|
||||||
<td>" . number_format($endVal, 2) . "</td>
|
<td>" . number_format($valueEnd, 2) . "</td>
|
||||||
<td>" . number_format($diff, 2) . "</td>
|
<td>" . number_format($verbrauch, 2) . "</td>
|
||||||
<td>" . $tariffLabel . "</td>
|
<td>" . number_format($tarifRp, 2) . "</td>
|
||||||
<td>" . number_format($costCHF, 2) . "</td>
|
<td>" . number_format($kostenCHF, 2) . "</td>
|
||||||
</tr>";
|
</tr>";
|
||||||
|
|
||||||
$current = $segmentEnd + 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- Falls nichts berechnet wurde (z. B. fehlende Tarife) ---
|
if ($rows === '') {
|
||||||
if ($rows == '') {
|
$rows = "<tr><td colspan='9'>Keine Tarifabschnitte im Zeitraum gefunden</td></tr>";
|
||||||
$startVal = $this->GetValueAt($varId, $from, false);
|
|
||||||
$endVal = $this->GetValueAt($varId, $to, true);
|
|
||||||
$diff = max(0, $endVal - $startVal);
|
|
||||||
$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($startVal, 2) . "</td>
|
|
||||||
<td>" . number_format($endVal, 2) . "</td>
|
|
||||||
<td>" . number_format($diff, 2) . "</td>
|
|
||||||
<td>0</td>
|
|
||||||
<td>0.00</td>
|
|
||||||
</tr>";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return ['row' => $rows, 'value' => $totalCost];
|
return ['row' => $rows, 'value' => $totalCost];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user