diff --git a/Medevio/40 agenda a požadavky/Report_AgendaPozadavky.py b/Medevio/40 agenda a požadavky/Report_AgendaPozadavky.py index 882e1f0..c058f43 100644 --- a/Medevio/40 agenda a požadavky/Report_AgendaPozadavky.py +++ b/Medevio/40 agenda a požadavky/Report_AgendaPozadavky.py @@ -217,6 +217,24 @@ with conn.cursor() as cur: ) rows = cur.fetchall() +with conn.cursor() as cur: + cur.execute( + """ + SELECT + id AS Request_ID, + displayTitle AS Title, + pacient_prijmeni AS Pacient_Prijmeni, + pacient_jmeno AS Pacient_Jmeno, + pacient_rodnecislo AS DOB, + createdAt AS Created, + doneAt, + removedAt + FROM pozadavky + ORDER BY createdAt DESC + """ + ) + pozadavky_all_rows = cur.fetchall() + with conn.cursor() as cur: cur.execute( """ @@ -280,6 +298,19 @@ if not df_agenda_full.empty: df_agenda_full["Date"] = df_agenda_full["Date"].astype(str) print(f"✅ Loaded {len(df_agenda_full)} rows from medevio_agenda.") +df_pozadavky_all = pd.DataFrame(pozadavky_all_rows) +if not df_pozadavky_all.empty: + df_pozadavky_all["Patient"] = ( + df_pozadavky_all["Pacient_Prijmeni"].fillna("") + " " + df_pozadavky_all["Pacient_Jmeno"].fillna("") + ).str.strip() + df_pozadavky_all["Date"] = df_pozadavky_all["Created"].astype(str).str[:10] + df_pozadavky_all["doneAt"] = df_pozadavky_all["doneAt"].astype(str).str[:10].replace("None", "") + df_pozadavky_all["removedAt"] = df_pozadavky_all["removedAt"].astype(str).str[:10].replace("None", "") + df_pozadavky_all = df_pozadavky_all[ + ["Date", "Title", "Patient", "DOB", "Request_ID", "doneAt", "removedAt"] + ].fillna("") +print(f"✅ Loaded {len(df_pozadavky_all)} total requests from pozadavky.") + # ==================== 3️⃣ MERGE + DEDUPLICATE ==================== print("🟢 Merging and deduplicating (Agenda preferred)...") @@ -311,6 +342,7 @@ with pd.ExcelWriter(xlsx_path, engine="openpyxl") as writer: df_open.to_excel(writer, sheet_name="Otevřené požadavky", index=False) df_merged.to_excel(writer, sheet_name="Merged", index=False) df_agenda_full.to_excel(writer, sheet_name="Agenda kompletní", index=False) + df_pozadavky_all.to_excel(writer, sheet_name="Požadavky kompletní", index=False) wb = load_workbook(xlsx_path) for name, df_ref in [ @@ -318,6 +350,7 @@ for name, df_ref in [ ("Otevřené požadavky", df_open), ("Merged", df_merged), ("Agenda kompletní", df_agenda_full), + ("Požadavky kompletní", df_pozadavky_all), ]: ws = wb[name] format_ws(ws, df_ref)