diff --git a/fix_zuKontobewegung.php b/fix_zuKontobewegung.php index a14fdb2..d705f7f 100644 --- a/fix_zuKontobewegung.php +++ b/fix_zuKontobewegung.php @@ -54,7 +54,7 @@ JOIN zahlungstag zt ON zt.id = kf.zahlungstag_id JOIN zahlungsmonate zm ON zm.id = kf.zahlungsmonate_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"); $monat_wert = $monat[0]['wert']; diff --git a/forms/fixkosten.php b/forms/fixkosten.php index 0f23b44..5824fb6 100644 --- a/forms/fixkosten.php +++ b/forms/fixkosten.php @@ -189,7 +189,7 @@ FROM kostenfix kf JOIN zahlungstag zt ON zt.id = kf.zahlungstag_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 * FROM kontobewegung kb_inner WHERE kb_inner.kostenfix_id = kf.id diff --git a/konto.php b/konto.php index eebc31a..01a2e52 100644 --- a/konto.php +++ b/konto.php @@ -8,7 +8,8 @@ kontostand, darstellungsfarbe AS backgroundcolor, 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 FROM konto WHERE id = $G_konto_id;"); @@ -20,7 +21,7 @@ $konto_backgroundColor = $row ? $row['backgroundcolor'] : '#ff0000'; $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'];