no message
This commit is contained in:
@@ -225,16 +225,18 @@ private function GetValueAt(int $varId, int $timestamp, bool $nearestAfter = tru
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
$maxDays = 365; // 🔹 maximal 1 Jahr zurück / vor suchen
|
$maxDays = 365; // maximal 1 Jahr suchen
|
||||||
$stepDays = 7; // 🔹 Schrittweise Erweiterung (jeweils 7 Tage)
|
$stepDays = 30; // in 30-Tage-Blöcken durchsuchen
|
||||||
$valueFound = null;
|
$valueFound = null;
|
||||||
|
|
||||||
if ($nearestAfter) {
|
if ($nearestAfter) {
|
||||||
for ($offset = 0; $offset <= $maxDays; $offset += $stepDays) {
|
// 🔹 Suche den ersten Wert NACH dem gewünschten Zeitpunkt
|
||||||
|
for ($offset = 0; $offset < $maxDays; $offset += $stepDays) {
|
||||||
$from = $timestamp + $offset * 86400;
|
$from = $timestamp + $offset * 86400;
|
||||||
$to = $from + $stepDays * 86400;
|
$to = $from + $stepDays * 86400;
|
||||||
$values = @AC_GetLoggedValues($archiveID, $varId, $from, $to, 1000);
|
$values = @AC_GetLoggedValues($archiveID, $varId, $from, $to, 0);
|
||||||
if (!empty($values)) {
|
if (!empty($values)) {
|
||||||
|
// ersten Wert nach Timestamp nehmen
|
||||||
foreach ($values as $v) {
|
foreach ($values as $v) {
|
||||||
if ($v['TimeStamp'] >= $timestamp) {
|
if ($v['TimeStamp'] >= $timestamp) {
|
||||||
$valueFound = floatval($v['Value']);
|
$valueFound = floatval($v['Value']);
|
||||||
@@ -244,93 +246,150 @@ private function GetValueAt(int $varId, int $timestamp, bool $nearestAfter = tru
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
for ($offset = 0; $offset <= $maxDays; $offset += $stepDays) {
|
// 🔹 Suche den letzten Wert VOR dem gewünschten Zeitpunkt
|
||||||
|
for ($offset = 0; $offset < $maxDays; $offset += $stepDays) {
|
||||||
$from = $timestamp - ($offset + $stepDays) * 86400;
|
$from = $timestamp - ($offset + $stepDays) * 86400;
|
||||||
$to = $timestamp - $offset * 86400;
|
$to = $timestamp - $offset * 86400;
|
||||||
$values = @AC_GetLoggedValues($archiveID, $varId, $from, $to, 1000);
|
$values = @AC_GetLoggedValues($archiveID, $varId, $from, $to, 0);
|
||||||
if (!empty($values)) {
|
if (!empty($values)) {
|
||||||
$valueFound = floatval($values[count($values) - 1]['Value']);
|
// letzten Wert vor Timestamp nehmen
|
||||||
break;
|
$last = null;
|
||||||
|
foreach ($values as $v) {
|
||||||
|
if ($v['TimeStamp'] <= $timestamp) {
|
||||||
|
$last = $v;
|
||||||
|
} else {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if ($last !== null) {
|
||||||
|
$valueFound = floatval($last['Value']);
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($valueFound !== null) {
|
// 🔹 Falls nichts im Archiv: aktuellen Variablenwert nehmen
|
||||||
return $valueFound;
|
if ($valueFound === null) {
|
||||||
|
$fallback = floatval(GetValue($varId));
|
||||||
|
IPS_LogMessage('Abrechnung', "⚠ Kein Archivwert für $varId gefunden – nutze aktuellen Wert ($fallback)");
|
||||||
|
return $fallback;
|
||||||
}
|
}
|
||||||
|
|
||||||
// ❗ Fallback, wenn gar nichts im Archiv gefunden wird
|
return $valueFound;
|
||||||
$fallback = floatval(GetValue($varId));
|
|
||||||
IPS_LogMessage('Abrechnung', "⚠ Kein Archivwert für $varId im Umkreis von $maxDays Tagen gefunden, nutze aktuellen Wert ($fallback)");
|
|
||||||
return $fallback;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
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];
|
||||||
}
|
}
|
||||||
|
|
||||||
// Iteriere über alle Tarifabschnitte, die den Abrechnungszeitraum ganz oder teilweise überlappen
|
// 🔹 1. Tarife nach Typ filtern
|
||||||
foreach ($relevantTariffs as $t) {
|
$filteredTariffs = array_filter($tariffs, function ($t) use ($type) {
|
||||||
$tStart = strtotime($t['start']);
|
$typeNorm = strtolower(trim($type));
|
||||||
$tEnd = strtotime($t['end']);
|
$tariffType = strtolower(trim($t['unit_type'] ?? ''));
|
||||||
|
$map = [
|
||||||
|
'strombezug' => ['strom', 'strombezug', 'stromzähler', 'stromverbrauch'],
|
||||||
|
'warmwasser' => ['warmwasser', 'wasser', 'hww'],
|
||||||
|
'kaltwasser' => ['kaltwasser', 'wasser', 'kww'],
|
||||||
|
'wärme' => ['wärme', 'heizung', 'heat']
|
||||||
|
];
|
||||||
|
return in_array($tariffType, $map[$typeNorm] ?? []) || $tariffType === $typeNorm;
|
||||||
|
});
|
||||||
|
|
||||||
// Überlappung mit Abrechnungszeitraum prüfen
|
if (empty($filteredTariffs)) {
|
||||||
if ($tEnd < $from || $tStart > $to) continue;
|
IPS_LogMessage('Abrechnung', "⚠ Keine passenden Tarife für $type gefunden");
|
||||||
|
return ['row' => '', 'value' => 0];
|
||||||
|
}
|
||||||
|
|
||||||
// Effektive Tarifperiode innerhalb des Abrechnungszeitraums bestimmen
|
// 🔹 2. Zeitstempel konvertieren & sortieren
|
||||||
$periodStart = max($from, $tStart);
|
foreach ($filteredTariffs as &$t) {
|
||||||
$periodEnd = min($to, $tEnd);
|
$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']);
|
||||||
|
}
|
||||||
|
unset($t);
|
||||||
|
usort($filteredTariffs, fn($a, $b) => $a['start_ts'] <=> $b['start_ts']);
|
||||||
|
|
||||||
// Archivwerte zu Beginn und Ende der Teilperiode holen
|
$current = $from;
|
||||||
$valueStart = $this->GetValueAt($meter['var_consumption'], $periodStart, false);
|
while ($current < $to) {
|
||||||
$valueEnd = $this->GetValueAt($meter['var_consumption'], $periodEnd, true);
|
// 🔹 Aktiven Tarif finden
|
||||||
|
$active = null;
|
||||||
if ($valueStart === null || $valueEnd === null) {
|
foreach ($filteredTariffs as $t) {
|
||||||
IPS_LogMessage('Abrechnung', "⚠ Keine gültigen Werte für {$meter['name']} zwischen $periodStart und $periodEnd");
|
if ($t['start_ts'] <= $current && $current < $t['end_ts']) {
|
||||||
continue;
|
$active = $t;
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Verbrauch & Kosten berechnen
|
// 🔹 Zeitraumgrenzen bestimmen
|
||||||
$verbrauch = max(0, $valueEnd - $valueStart);
|
if ($active) {
|
||||||
$tarifRp = floatval($t['price']);
|
$segmentEnd = min($active['end_ts'], $to);
|
||||||
$kostenCHF = round(($tarifRp / 100) * $verbrauch, 2);
|
$tariffPrice = floatval($active['price']);
|
||||||
$totalCost += $kostenCHF;
|
$tariffLabel = number_format($tariffPrice, 2);
|
||||||
|
} else {
|
||||||
|
// kein Tarif → bis zum nächsten bekannten oder Abrechnungsende
|
||||||
|
$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';
|
||||||
|
}
|
||||||
|
|
||||||
// Tabellenzeile erzeugen
|
// Sicherheitsnetz (kein 0-Länge-Segment)
|
||||||
|
if ($segmentEnd <= $current) break;
|
||||||
|
|
||||||
|
// 🔹 Verbrauch holen & Kosten berechnen
|
||||||
|
$startVal = $this->GetValueAt($varId, $current, false);
|
||||||
|
$endVal = $this->GetValueAt($varId, $segmentEnd, true);
|
||||||
|
$diff = max(0, $endVal - $startVal);
|
||||||
|
$costCHF = round(($tariffPrice / 100) * $diff, 2);
|
||||||
|
$totalCost += $costCHF;
|
||||||
|
|
||||||
|
// 🔹 HTML-Zeile schreiben
|
||||||
$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', $periodStart) . "</td>
|
<td>" . date('d.m.Y H:i', $current) . "</td>
|
||||||
<td>" . date('d.m.Y H:i', $periodEnd) . "</td>
|
<td>" . date('d.m.Y H:i', $segmentEnd) . "</td>
|
||||||
<td>" . number_format($valueStart, 2) . "</td>
|
<td>" . number_format($startVal, 2) . "</td>
|
||||||
<td>" . number_format($valueEnd, 2) . "</td>
|
<td>" . number_format($endVal, 2) . "</td>
|
||||||
<td>" . number_format($verbrauch, 2) . "</td>
|
<td>" . number_format($diff, 2) . "</td>
|
||||||
<td>" . number_format($tarifRp, 2) . "</td>
|
<td>{$tariffLabel}</td>
|
||||||
<td>" . number_format($kostenCHF, 2) . "</td>
|
<td>" . number_format($costCHF, 2) . "</td>
|
||||||
</tr>";
|
</tr>";
|
||||||
|
|
||||||
|
$current = $segmentEnd + 1; // nächster Abschnitt
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 🔹 Fallback, falls keine Zeile
|
||||||
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