Sven/aufbau2csv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Das Merge der Erw-Tabellen erfolgt nun auch per Zeilenindex, da der nornale Merge-Weg für doppelte Zeilen sorgte

Browse Source
This commit is contained in:
Sven Riwoldt
2024-10-29 11:31:09 +01:00
parent 8555987c38
commit 3c192d6ddb
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
CMDB2CSV_Aufbaumaster.py
View File

@@ -117,7 +117,6 @@ class MainUI(QDialog): # erbt von QDialog
############################################################################################## ##############################################################################################
#def collect_erweiterung(self):
def has_special_characters(self, s): def has_special_characters(self, s):
# Regex pattern für Sonderzeichen # 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'] self.df_vte_erw = self.df_vte_erw[self.df_vte_erw['Gruppierung'] == 'Erweiterung']
print("Self_ERW: ",self.df_vte_erw['Hostname']) 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 = 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'].replace('', np.nan)
self.df_cmdb_erw['Hostname'] = self.df_cmdb_erw['Hostname'].fillna(method='ffill') 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 # 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) ic(self.dfb_erw)
@@ -416,11 +428,12 @@ class MainUI(QDialog): # erbt von QDialog
options=options) options=options)
print(os.path.splitext(os.path.basename(self.savefilename))[0]) #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))[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_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) print("Datei wurde gespeichert:", self.savefilename)