Funktion wieder hergestellt

app/routes.py

@@ -193,7 +193,7 @@ def forderungen_liste(request: Request, db: Session = Depends(get_session), limi
     for f in forderung_filter_config:
         context[f.name] = {filter_type_option[f.filter_type]: single_quote(params.get(f.name, f.default_value))}
 
-    query = templates.TemplateResponse(request, "forderungen/queries/forderungen_liste.sql", context).body.decode(
+    query = templates.TemplateResponse(request, "forderungen/liste/queries/forderungen_liste.sql", context).body.decode(
         "utf-8"
     )
     # print(query)
@@ -223,9 +223,9 @@ def forderungen_liste(request: Request, db: Session = Depends(get_session), limi
     if len(q_limit) == 0:
         return None
 
-    template = "forderungen/liste.html"
+    template = "base/liste.html"
     if page > 0:
-        template = "forderungen/liste_tabelle.html"
+        template = "base/liste_tabelle.html"
 
     return templates.TemplateResponse(
         request,
@@ -268,7 +268,9 @@ def forderungen_details(
         "forderung_mahnung",
         "versicherungen",
     ]:
-        query = templates.TemplateResponse(request, f"forderungen/queries/{filename}.sql", context).body.decode("utf-8")
+        query = templates.TemplateResponse(request, f"forderungen/details/queries/{filename}.sql", context).body.decode(
+            "utf-8"
+        )
         template_context[filename] = db.execute(text(query)).fetchall()
     template_context["forderung"] = {
         "id": "12345",
@@ -282,7 +284,7 @@ def forderungen_details(
     template_context["files"] = files
     template_context["add7days"] = datetime.now() + timedelta(days=7)
 
-    return templates.TemplateResponse(request, "forderungen/details.html", template_context)
+    return templates.TemplateResponse(request, "forderungen/details/details.html", template_context)
 
 
 @router.post("/app/forderungen/details/{client_db}_{document_no}", response_class=HTMLResponse)
@@ -320,7 +322,7 @@ async def post_forderungen_details(
                     v = v.replace(",", ".")
                 data[k] = v
     query = templates.TemplateResponse(
-        request, "forderungen/queries/update_details.sql", context={"data": data}
+        request, "forderungen/details/queries/post/update_details.sql", context={"data": data}
     ).body.decode("utf-8")
     print(query)
     for subquery in query.split(";"):
@@ -332,7 +334,7 @@ async def post_forderungen_details(
 @router.get("/app/forderungen/dashboard", response_class=HTMLResponse)
 def forderungen_dashboard(request: Request, db: Session = Depends(get_session)):
     context = {"summary": False}
-    return templates.TemplateResponse(request, "forderungen/dashboard.html", context)
+    return templates.TemplateResponse(request, "forderungen/dashboard/dashboard.html", context)
 
 
 @router.get("/chat", response_class=HTMLResponse)
@@ -443,7 +445,9 @@ def export_docx2(request: Request, client_db: str, document_no: str, db: Session
             }
         },
     }
-    query = templates.TemplateResponse(request, "forderungen/queries/forderung_kopf.sql", context).body.decode("utf-8")
+    query = templates.TemplateResponse(request, "forderungen/details/queries/forderung_kopf.sql", context).body.decode(
+        "utf-8"
+    )
     q = db.execute(text(query)).fetchone()
 
     doc = DocxTemplate("templates\\forderungen\\docs\\Mahnung_AHR.docx")

templates/base/liste.html

@@ -1,15 +1,15 @@
 {% extends "base/base.html" %}
 {% block content %}
 
-{%include 'forderungen/liste_filter.html' %}
+{%include 'base/liste_filter.html' %}
 
 <div  id="liste-content">
 <table class="table table-striped table-bordered table-sm">
   <thead>
-    {%include 'forderungen/liste_kopfzeile.html' %}    
+    {%include 'forderungen/liste/liste_kopfzeile.html' %}    
   </thead>
   <tbody>
-    {%include 'forderungen/liste_tabelle.html' %}
+    {%include 'base/liste_tabelle.html' %}
   </tbody>
 </table>
 </div>

templates/base/liste_tabelle.html

@@ -1,5 +1,5 @@
     {% for row in forderungen_liste %}
-      {%include 'forderungen/liste_zeile.html' %}
+      {%include 'forderungen/liste/liste_zeile.html' %}
     {% endfor %}
 
     <tr hx-trigger="revealed" hx-swap="outerHTML" hx-get="" hx-vals='{"page" : "{{ page+1 }}"}'>