From 7c5b584890829892802e2146f645093db9e4a587 Mon Sep 17 00:00:00 2001
From: Floke <floke.com@gmail.com>
Date: Sat, 21 Mar 2026 19:42:58 +0000
Subject: [PATCH] [32788f42] Cleanup PDF list header, fix JOB prefix removal,
 and further improve consent logic

---
 fotograf-de-scraper/backend/main.py              | 16 +++++++---------
 .../backend/templates/appointment_list.html      |  5 ++---
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/fotograf-de-scraper/backend/main.py b/fotograf-de-scraper/backend/main.py
index d1ec7c1ed..94cc33c5e 100644
--- a/fotograf-de-scraper/backend/main.py
+++ b/fotograf-de-scraper/backend/main.py
@@ -193,8 +193,8 @@ def generate_appointment_overview_pdf(raw_events: list, job_name: str, event_typ
             a_text = qa.get('answer', '')
             if any(kw in q_text for kw in ["wie viele kinder", "anzahl kinder", "wieviele kinder"]):
                 num_children = a_text
-            elif "veröffentlichen" in q_text or "bilder" in q_text:
-                if "ja" in a_text.lower():
+            elif any(kw in q_text for kw in ["veröffentlichen", "bilder"]):
+                if "ja" in a_text.lower() or "gerne" in a_text.lower():
                     has_consent = True
                     
         parsed_events.append({
@@ -787,17 +787,15 @@ async def generate_appointment_list(job_id: str, event_type_name: str, db: Sessi
     if not api_token:
         raise HTTPException(status_code=400, detail="Calendly API token missing.")
     
-    # 1. Fetch job name from DB
-    job = db.query(DBJob).filter(DBJob.id == job_id).first()
-
     # 1. Fetch job name from DB
     job = db.query(DBJob).filter(DBJob.id == job_id).first()
     job_name = job.name if job else f"Auftrag {job_id}"
-    import re
-    job_name_clean = re.sub(r'^JOB\d+\s*', '', job_name)
-
     
-    # 2. Fetch raw Calendly events (no date range needed, defaults to +6 months)
+    # Clean job name: remove (JOB00005) or similar anywhere in string
+    import re
+    job_name_clean = re.sub(r'\(?JOB\d+\)?', '', job_name).strip()
+    
+    # 2. Fetch raw Calendly events
     try:
         from qr_generator import get_calendly_events_raw
         raw_events = get_calendly_events_raw(api_token, event_type_name=event_type_name)
diff --git a/fotograf-de-scraper/backend/templates/appointment_list.html b/fotograf-de-scraper/backend/templates/appointment_list.html
index ae431933f..73ac9d1c7 100644
--- a/fotograf-de-scraper/backend/templates/appointment_list.html
+++ b/fotograf-de-scraper/backend/templates/appointment_list.html
@@ -119,9 +119,8 @@
 
     <div class="header">
         <div class="header-text">
-            <h1>{{ job_name }}</h1>
-            <h2>Terminübersicht ({{ event_type_name }})</h2>
-            <p>Stand: {{ current_time }}</p>
+            <h1>{{ event_type_name }}</h1>
+            <p>Auftrag: {{ job_name }} | Stand: {{ current_time }}</p>
         </div>
         <div class="header-logo">
             {% if logo_base64 %}