From 3c192d6ddb1df9c9215a23dff9af88767f7e9dc5 Mon Sep 17 00:00:00 2001 From: Sven Riwoldt Date: Tue, 29 Oct 2024 11:31:09 +0100 Subject: [PATCH] =?UTF-8?q?Das=20Merge=20der=20Erw-Tabellen=20erfolgt=20nu?= =?UTF-8?q?n=20auch=20per=20Zeilenindex,=20da=20der=20nornale=20Merge-Weg?= =?UTF-8?q?=20f=C3=BCr=20doppelte=20Zeilen=20sorgte?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMDB2CSV_Aufbaumaster.py | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/CMDB2CSV_Aufbaumaster.py b/CMDB2CSV_Aufbaumaster.py index ebc70104..eccda234 100755 --- a/CMDB2CSV_Aufbaumaster.py +++ b/CMDB2CSV_Aufbaumaster.py @@ -117,7 +117,6 @@ class MainUI(QDialog): # erbt von QDialog ############################################################################################## - #def collect_erweiterung(self): def has_special_characters(self, s): # Regex pattern für Sonderzeichen @@ -392,15 +391,28 @@ class MainUI(QDialog): # erbt von QDialog self.df_vte_erw = self.df_vte_erw[self.df_vte_erw['Gruppierung'] == 'Erweiterung'] print("Self_ERW: ",self.df_vte_erw['Hostname']) + self.df_vte_erw = self.df_vte_erw.reset_index(drop=True) self.df_cmdb_erw = self.df_cmdb self.df_cmdb_erw['Hostname']= self.df_cmdb_erw['Hostname'].replace('', np.nan) self.df_cmdb_erw['Hostname'] = self.df_cmdb_erw['Hostname'].fillna(method='ffill') - self.df_cmdb_erw = self.df_cmdb_erw[self.df_cmdb_erw['Filter'] == 'Grundgerät'] + self.df_cmdb_erw = self.df_cmdb_erw[self.df_cmdb_erw['Filter'] == 'Erweiterung'] + self.df_cmdb_erw = self.df_cmdb_erw.reset_index(drop=True) + + self.df_cmdb_erw = self.df_cmdb_erw.drop( + columns=['WV-Start', 'WV-Ende', 'CMDB-Status', 'Aufgabe Schritt', 'Filter', 'Waermeabgabe [BTU/h]', + 'kalk. Strom [A]']) # Zusammensetzen der Tabellen - self.dfb_erw = self.df_vte_erw.merge(self.df_cmdb_erw, on=['Hostname'], how='left') + #self.dfb_erw = self.df_vte_erw.merge(self.df_cmdb_erw) + self.dfb_erw = pd.concat([self.df_cmdb_erw, self.df_vte_erw], ignore_index=False) + #self.dfb_erw = (pd.concat([self.df_cmdb_erw, self.df_vte_erw]) + # .sort_index(kind='stable') + # .reset_index(drop=True) + # ) + + ic(self.dfb_erw) @@ -416,11 +428,12 @@ class MainUI(QDialog): # erbt von QDialog options=options) - print(os.path.splitext(os.path.basename(self.savefilename))[0]) - print(os.path.splitext(os.path.basename(self.savefilename))[1]) + #print(os.path.splitext(os.path.basename(self.savefilename))[0]) + #print(os.path.splitext(os.path.basename(self.savefilename))[1]) self.dfb_gg.to_csv(os.path.splitext(os.path.basename(self.savefilename))[0]+"_GG"+os.path.splitext(os.path.basename(self.savefilename))[1], index=None, header=True, encoding='utf-8') - self.dfb_erw.to_csv(self.savefilename+"_ERW", index=None, header=True, encoding='utf-8') + self.dfb_erw.to_csv(os.path.splitext(os.path.basename(self.savefilename))[0]+"_ERW"+os.path.splitext(os.path.basename(self.savefilename))[1], index=None, header=True, encoding='utf-8') + #self.savefilename+"_ERW", index=None, header=True, encoding='utf-8') print("Datei wurde gespeichert:", self.savefilename)