m.stangl/kabellaengen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Zusammenfassung der WSCAD Export Methoden zu einer. Abfage der bezüge zu Beginn

Browse Source
This commit is contained in:
lertlmaier
2025-07-04 09:34:47 +02:00
parent ca2831ea23
commit 80b96da6b6
1 changed files with 6 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/portalexport.py
+6 -37
View File
@@ -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")