fix: Explorer-Suche durchsucht jetzt auch Aktenzeichen + Betreff
Vorher nur k.thema, jetzt auch v.aktenzeichen + v.betreff der Ursprungsvorlage. COUNT-Query um JOIN erweitert.
This commit is contained in:
parent
3fd1bc5bd7
commit
a3e4dab633
@ -60,8 +60,11 @@ def list_ketten(
|
|||||||
params.append(partei)
|
params.append(partei)
|
||||||
|
|
||||||
if suche:
|
if suche:
|
||||||
where_clauses.append("k.thema LIKE ?")
|
where_clauses.append(
|
||||||
params.append(f"%{suche}%")
|
"(k.thema LIKE ? OR v.aktenzeichen LIKE ? OR v.betreff LIKE ?)"
|
||||||
|
)
|
||||||
|
like = f"%{suche}%"
|
||||||
|
params.extend([like, like, like])
|
||||||
|
|
||||||
# Global filter: Ratsperiode (filter on letzte_aktivitaet)
|
# Global filter: Ratsperiode (filter on letzte_aktivitaet)
|
||||||
per_clause, per_params = periode_date_filter(periode, "k.letzte_aktivitaet")
|
per_clause, per_params = periode_date_filter(periode, "k.letzte_aktivitaet")
|
||||||
@ -82,7 +85,7 @@ def list_ketten(
|
|||||||
where_sql = ("WHERE " + " AND ".join(where_clauses)) if where_clauses else ""
|
where_sql = ("WHERE " + " AND ".join(where_clauses)) if where_clauses else ""
|
||||||
|
|
||||||
total = conn.execute(
|
total = conn.execute(
|
||||||
f"SELECT COUNT(*) as cnt FROM ketten k {where_sql}", params
|
f"SELECT COUNT(*) as cnt FROM ketten k LEFT JOIN vorlagen v ON k.ursprung_id = v.id {where_sql}", params
|
||||||
).fetchone()["cnt"]
|
).fetchone()["cnt"]
|
||||||
|
|
||||||
offset = (page - 1) * page_size
|
offset = (page - 1) * page_size
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user