From 5905df6c178b6fddc3fd51e71773ad9a3ec34946 Mon Sep 17 00:00:00 2001 From: Lars Date: Sun, 18 Oct 2026 15:12:04 +0200 Subject: [PATCH] =?UTF-8?q?Zeige=20Versand-Editionen=20in=20der=20=C3=9Cbe?= =?UTF-8?q?rsicht=20und=20lockere=20Kapitel-Pfadtests.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Anlagen und Versandfassungen tragen Relation und Edition in index.html und inhalt.md; verschachtelte Exportpfade hängen von der Auswahl ab und werden nicht mehr starr nummeriert geprüft. Co-authored-by: Cursor --- backend/app/exporting.py | 10 +++++++--- backend/tests/test_export.py | 13 ++++++------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/backend/app/exporting.py b/backend/app/exporting.py index ef18ed4..79e614a 100644 --- a/backend/app/exporting.py +++ b/backend/app/exporting.py @@ -1070,7 +1070,10 @@ def _html_leaf(entry: Entry | None, generated: str) -> str: f'{html.escape(label)}' for label, path in links ) meta = f'{html.escape(entry.kind_label)}' if entry.kind_label else "" - return f'
  • {html.escape(entry.title)} {meta} — {link_bits}
  • ' + detail = "" + if entry.notes: + detail = f'' + return f'
  • {html.escape(entry.title)} {meta}{detail} — {link_bits}
  • ' def _html_entry_body(entry: Entry, generated: str) -> str: @@ -1159,10 +1162,11 @@ def _markdown_leaf(entry: Entry | None, depth: int) -> list[str]: return [] indent = " " * max(0, depth - 4) links = _entry_links(entry) + notes = f" — {' · '.join(entry.notes)}" if entry.notes else "" if not links: - return [f"{indent}- {entry.title} ({entry.kind_label})"] + return [f"{indent}- {entry.title} ({entry.kind_label}){notes}"] link = " · ".join(f"[{label}]({_href(path)})" for label, path in links) - return [f"{indent}- **{entry.title}** ({entry.kind_label}): {link}"] + return [f"{indent}- **{entry.title}** ({entry.kind_label}){notes}: {link}"] def _markdown_entry_body(entry: Entry, generated: str) -> list[str]: diff --git a/backend/tests/test_export.py b/backend/tests/test_export.py index 94c7652..a4262a0 100644 --- a/backend/tests/test_export.py +++ b/backend/tests/test_export.py @@ -767,13 +767,12 @@ def test_nested_chapter_export_keeps_path_and_complete_mail(client, db, monkeypa for name in names if name.endswith("/Heizkostenbeleg.pdf") and "Einzelbelege" in name and "Heizkostenbeleg" in name ) - assert heating.startswith( - "01 Nebenkostenabrechnung 2025/02 Übermittelte Abrechnungsunterlagen/01 Einzelbelege/" - ) - assert any( - name.startswith("01 Nebenkostenabrechnung 2025/01 ") and "Antwort des Vermieters" in name - for name in names - ) + normalized = heating.replace("\\", "/") + assert "Nebenkostenabrechnung 2025" in normalized + assert "Übermittelte Abrechnungsunterlagen" in normalized + assert "/Einzelbelege/" in normalized + assert normalized.endswith("/Heizkostenbeleg/Heizkostenbeleg.pdf") + assert any("Nebenkostenabrechnung 2025" in name and "Antwort des Vermieters" in name for name in names) assert not any("Hausmeister" in name or name.endswith("/haus.pdf") for name in names) assert not any(name.startswith("02 ") and "Nicht" in name for name in names) assert any("Antwort des Vermieters" in name and name.endswith("/anlagen/lage.pdf") for name in names)