Floke/Brancheneinstufung2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[32788f42] Cleanup PDF list header, fix JOB prefix removal, and further improve consent logic

Browse Source
This commit is contained in:
Floke
2026-03-21 19:42:58 +00:00
parent a128ca9921
commit 7c5b584890
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fotograf-de-scraper/backend/main.py
View File

@@ -193,8 +193,8 @@ def generate_appointment_overview_pdf(raw_events: list, job_name: str, event_typ
a_text = qa.get('answer', '') a_text = qa.get('answer', '')
if any(kw in q_text for kw in ["wie viele kinder", "anzahl kinder", "wieviele kinder"]): if any(kw in q_text for kw in ["wie viele kinder", "anzahl kinder", "wieviele kinder"]):
num_children = a_text num_children = a_text
elif "veröffentlichen" in q_text or "bilder" in q_text: elif any(kw in q_text for kw in ["veröffentlichen", "bilder"]):
if "ja" in a_text.lower(): if "ja" in a_text.lower() or "gerne" in a_text.lower():
has_consent = True has_consent = True
parsed_events.append({ 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: if not api_token:
raise HTTPException(status_code=400, detail="Calendly API token missing.") 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 # 1. Fetch job name from DB
job = db.query(DBJob).filter(DBJob.id == job_id).first() job = db.query(DBJob).filter(DBJob.id == job_id).first()
job_name = job.name if job else f"Auftrag {job_id}" job_name = job.name if job else f"Auftrag {job_id}"
# Clean job name: remove (JOB00005) or similar anywhere in string
import re import re
job_name_clean = re.sub(r'^JOB\d+\s*', '', job_name) job_name_clean = re.sub(r'\(?JOB\d+\)?', '', job_name).strip()
# 2. Fetch raw Calendly events
# 2. Fetch raw Calendly events (no date range needed, defaults to +6 months)
try: try:
from qr_generator import get_calendly_events_raw from qr_generator import get_calendly_events_raw
raw_events = get_calendly_events_raw(api_token, event_type_name=event_type_name) raw_events = get_calendly_events_raw(api_token, event_type_name=event_type_name)

5
fotograf-de-scraper/backend/templates/appointment_list.html
View File

@@ -119,9 +119,8 @@
<div class="header"> <div class="header">
<div class="header-text"> <div class="header-text">
<h1>{{ job_name }}</h1> <h1>{{ event_type_name }}</h1>
<h2>Terminübersicht ({{ event_type_name }})</h2> <p>Auftrag: {{ job_name }} | Stand: {{ current_time }}</p>
<p>Stand: {{ current_time }}</p>
</div> </div>
<div class="header-logo"> <div class="header-logo">
{% if logo_base64 %} {% if logo_base64 %}