Zeige im Breadcrumb die Aktenstruktur und lass Kapitel samt Inhalt an ihren Ort ziehen.
Deploy Development / deploy (push) Successful in 23s
Test Suite / pytest-backend (push) Successful in 55s
Test Suite / smoke-dev (push) Successful in 0s
Test Suite / frontend-build (push) Successful in 5s

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
LarsandCursor committed 2026-10-17 12:15:23 +02:00
1 parent cafa4e8b92
commit 7ef73ad500
12 files changed
+627 -93

No files matched your search

+64 -8
View File
@@ -29,13 +29,31 @@ def rights_dict(rights) -> dict:
return rights.as_dict()
def _chapters(conn, kind: str, container_id: UUID) -> list[dict]:
def _chapters(conn, kind: str, container_id: UUID, mode: str = "position", direction: str = "asc") -> list[dict]:
column = "case_id" if kind == "case" else "matter_id"
rows = conn.execute(
f"SELECT id, title, position FROM chapters WHERE {column} = %s ORDER BY position, created_at",
f"SELECT id, title, position, document_on FROM chapters WHERE {column} = %s",
(container_id,),
).fetchall()
return [{"id": str(row["id"]), "title": row["title"], "position": row["position"]} for row in rows]
items = [
{
"id": str(row["id"]),
"title": row["title"],
"position": row["position"],
"document_on": dump_date(row["document_on"]),
}
for row in rows
]
if mode == "date":
dated = [item for item in items if item["document_on"]]
undated = [item for item in items if not item["document_on"]]
dated.sort(key=lambda item: (item["document_on"], item["position"], item["id"]))
undated.sort(key=lambda item: (item["position"], item["id"]))
if direction == "desc":
dated.reverse()
return dated + undated
items.sort(key=lambda item: (item["position"], item["id"]))
return items
def _annotations(conn, binding_id: UUID) -> list[dict]:
@@ -296,9 +314,31 @@ def case_trail(conn, actor: UUID, case: dict) -> list[dict]:
return trail
def _structural_case(conn, actor: UUID, matter: dict, context: Ctx | None) -> dict | None:
"""The case that places this matter in the structure. Several placements do not invent a main case."""
if context is not None and context.kind == "case":
case = get_case(conn, context.id)
if case is not None and case_rights(conn, actor, case).read:
return case
return None
placements = matter_placements(conn, actor, matter["id"], None)
if len(placements) != 1:
return None
case = get_case(conn, UUID(placements[0]["case_id"]))
if case is None or not case_rights(conn, actor, case).read:
return None
return case
def matter_trail(conn, actor: UUID, matter: dict, context: Ctx | None) -> list[dict]:
trail = [{"label": "Vorgänge", "href": "/matters"}]
_append_matter_steps(conn, actor, trail, matter, context)
case = _structural_case(conn, actor, matter, context)
if case is None:
trail = [{"label": "Vorgänge", "href": "/matters"}]
_append_matter_steps(conn, actor, trail, matter, None)
return trail
trail = case_trail(conn, actor, case)
trail[-1]["href"] = f"/cases/{case['id']}"
_append_matter_steps(conn, actor, trail, matter, Ctx("case", case["id"]))
return trail
@@ -369,7 +409,13 @@ def _contained_group(conn, actor: UUID, matter: dict, context: Ctx) -> dict | No
"parent_title": matter_title_if_readable(conn, actor, matter["parent_matter_id"]),
"version": matter["version"],
"rights": matter_right.as_dict(),
"chapters": _chapters(conn, "matter", matter["id"]),
"chapters": _chapters(
conn,
"matter",
matter["id"],
matter.get("content_order") or "position",
matter.get("content_order_dir") or "asc",
),
"content_order": matter.get("content_order") or "position",
"content_order_dir": matter.get("content_order_dir") or "asc",
"bindings": _ordered_bindings(
@@ -452,7 +498,9 @@ def case_detail(conn, actor: UUID, case: dict, rights) -> dict:
parent = get_case(conn, case["parent_case_id"])
if parent is not None and case_rights(conn, actor, parent).read:
payload["parent_title"] = parent["title"]
payload["chapters"] = _chapters(conn, "case", case["id"])
payload["chapters"] = _chapters(
conn, "case", case["id"], case.get("content_order") or "position", case.get("content_order_dir") or "asc"
)
subcases = []
for row in conn.execute(
"""
@@ -586,7 +634,13 @@ def matter_detail(conn, actor: UUID, matter: dict, rights, context: Ctx | None)
"kind_label": "Teilvorgang" if matter["parent_matter_id"] else "Vorgang",
"rights": rights.as_dict(),
"context": None if context is None else context.as_dict(),
"chapters": _chapters(conn, "matter", matter["id"]),
"chapters": _chapters(
conn,
"matter",
matter["id"],
matter.get("content_order") or "position",
matter.get("content_order_dir") or "asc",
),
}
submatters = []
for child in conn.execute(
@@ -791,6 +845,8 @@ LABELS = {
"chapter_created": "Kapitel angelegt",
"summary_changed": "Kurzbeschreibung geändert",
"binding_chapter": "In ein Kapitel eingeordnet",
"chapters_reordered": "Kapitelreihenfolge geändert",
"chapter_dated": "Kapiteldatum geändert",
"content_order": "Ordnungsart geändert",
"content_reordered": "Eigene Reihenfolge geändert",
}