thomas.py/Haushaltsbuch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Filter in Datumsspalte angepasst, Fehlerkorrektur: Fixkosten in Januar/Februar

Browse Source
This commit is contained in:
p3t3rp1Lz 2026-02-22 14:23:56 +01:00
parent 7e31b2b781
commit 54f0d7636f
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fix_zuKontobewegung.php
View File

@ -54,7 +54,7 @@
JOIN zahlungstag zt ON zt.id = kf.zahlungstag_id JOIN zahlungstag zt ON zt.id = kf.zahlungstag_id
JOIN zahlungsmonate zm ON zm.id = kf.zahlungsmonate_id JOIN zahlungsmonate zm ON zm.id = kf.zahlungsmonate_id
JOIN konto k ON k.id = kf.konto_id JOIN konto k ON k.id = kf.konto_id
WHERE zm.name LIKE '%' || CAST(:monat_wert AS INT) || '%' WHERE :monat_wert = ANY(string_to_array(zm.name, ',')::INT[])
ORDER BY kf.id ASC"); ORDER BY kf.id ASC");
$monat_wert = $monat[0]['wert']; $monat_wert = $monat[0]['wert'];

2
forms/fixkosten.php
View File

@ -189,7 +189,7 @@
FROM kostenfix kf FROM kostenfix kf
JOIN zahlungstag zt ON zt.id = kf.zahlungstag_id JOIN zahlungstag zt ON zt.id = kf.zahlungstag_id
JOIN zahlungsmonate zm ON zm.id = kf.zahlungsmonate_id JOIN zahlungsmonate zm ON zm.id = kf.zahlungsmonate_id
WHERE zm.name LIKE '%' || CAST(:monat_wert AS INT) || '%' WHERE :monat_wert = ANY(string_to_array(zm.name, ',')::INT[])
AND NOT EXISTS (SELECT * AND NOT EXISTS (SELECT *
FROM kontobewegung kb_inner FROM kontobewegung kb_inner
WHERE kb_inner.kostenfix_id = kf.id WHERE kb_inner.kostenfix_id = kf.id

5
konto.php
View File

@ -8,7 +8,8 @@
kontostand, kontostand,
darstellungsfarbe AS backgroundcolor, darstellungsfarbe AS backgroundcolor,
bezeichnung AS konto, bezeichnung AS konto,
(date_trunc('month', CURRENT_DATE::date) - interval '2 month')::date AS von, /*(date_trunc('month', CURRENT_DATE::date) - interval '2 month')::date AS von,*/
'2025-01-01' AS von,
(date_trunc('month', CURRENT_DATE::date) + interval '1 month' - interval '1 day')::date AS bis (date_trunc('month', CURRENT_DATE::date) + interval '1 month' - interval '1 day')::date AS bis
FROM konto FROM konto
WHERE id = $G_konto_id;"); WHERE id = $G_konto_id;");
@ -20,7 +21,7 @@
$konto_backgroundColor = $row ? $row['backgroundcolor'] : '#ff0000'; $konto_backgroundColor = $row ? $row['backgroundcolor'] : '#ff0000';
$monat_aktuell_von = $row ? $row['von'] : '2000-01-01'; $monat_aktuell_von = $row ? $row['von'] : '2000-01-01';
$monat_aktuell_bis = $row ? $row['bis'] : '2000-01-01'; $monat_aktuell_bis = $row ? $row['bis'] : '2100-01-01';
$G_selectedRange = $_GET['range'] ?? $row['von'] . " to " . $row['bis']; $G_selectedRange = $_GET['range'] ?? $row['von'] . " to " . $row['bis'];