From 80b96da6b676d4d3cf13eed0ecd1c68370db1fa6 Mon Sep 17 00:00:00 2001 From: lertlmaier Date: Fri, 4 Jul 2025 09:34:47 +0200 Subject: [PATCH] =?UTF-8?q?Zusammenfassung=20der=20WSCAD=20Export=20Method?= =?UTF-8?q?en=20zu=20einer.=20Abfage=20der=20bez=C3=BCge=20zu=20Beginn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/portalexport.py | 43 ++++++------------------------------------- 1 file changed, 6 insertions(+), 37 deletions(-) diff --git a/lib/portalexport.py b/lib/portalexport.py index 08f3fc1..5bd34e1 100644 --- a/lib/portalexport.py +++ b/lib/portalexport.py @@ -475,9 +475,10 @@ class ExcelConverter: # Duplikate und Errors self._write_duplicates_errors(writer, df_gleiche_eingaenge, df_gleiche_ausgaenge, df_fehler) - - elif export_type == "WSCAD": + elif export_type in ["WSCAD", "WSCAD mit Bezug"]: + df_gleiche_eingaenge, df_gleiche_ausgaenge, df_fehler, df_eingaenge, df_ausgaenge = dataframes + include_bezug = export_type == "WSCAD mit Bezug" # Basis-Template df_result = pd.DataFrame( @@ -497,41 +498,9 @@ class ExcelConverter: ] ) - df_result = self._append_df(df_result, df_fehler) - df_result = self._append_df(df_result, df_eingaenge) - df_result = self._append_df(df_result, df_ausgaenge) - - with pd.ExcelWriter(export_path, engine="openpyxl") as writer: - df_result.to_excel(writer, index=False, sheet_name="WSCAD") - # Duplikate und Errors - self._write_duplicates_errors(writer, df_gleiche_eingaenge, df_gleiche_ausgaenge, df_fehler) - - - elif export_type == "WSCAD mit Bezug": - - df_gleiche_eingaenge, df_gleiche_ausgaenge, df_fehler, df_eingaenge, df_ausgaenge = dataframes - - # Basis-Template - df_result = pd.DataFrame( - columns=[ - "Anschluss", - "Kommentar", - "Symboltext", - "Bezug", - "Sondertext 1", - "Sondertext 2", - "Sondertext 3", - "Sondertext 4", - "Sondertext 5", - "Sondertext 6", - "Sondertext 7", - "Sondertext 8", - ] - ) - - df_result = self._append_df(df_result, df_fehler, include_bezug=True) - df_result = self._append_df(df_result, df_eingaenge, include_bezug=True) - df_result = self._append_df(df_result, df_ausgaenge, include_bezug=True) + df_result = self._append_df(df_result, df_fehler, include_bezug) + df_result = self._append_df(df_result, df_eingaenge, include_bezug) + df_result = self._append_df(df_result, df_ausgaenge, include_bezug) with pd.ExcelWriter(export_path, engine="openpyxl") as writer: df_result.to_excel(writer, index=False, sheet_name="WSCAD")