From 8de079b89c8d77fcbe38a7f4a45418c5e238b6d1 Mon Sep 17 00:00:00 2001 From: Sven Riwoldt Date: Tue, 5 Nov 2024 14:47:38 +0000 Subject: [PATCH] Das Setzen der Seriennummer funktioniert nicht --- CMDB2CSV_Aufbaumaster.py | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/CMDB2CSV_Aufbaumaster.py b/CMDB2CSV_Aufbaumaster.py index 63fd1b4a..cb199ce7 100755 --- a/CMDB2CSV_Aufbaumaster.py +++ b/CMDB2CSV_Aufbaumaster.py @@ -28,6 +28,10 @@ class MainUI(QDialog): # erbt von QDialog self.group = None self.typ = None self.objdict = {} + # für SFP Überarbeitung + self.configid = '' + self.i = 1 + self.temp = '' def open_file_dialog(self): self.filename, _ = QFileDialog.getOpenFileName( @@ -423,11 +427,35 @@ class MainUI(QDialog): # erbt von QDialog self.dfb_erw = self.dfb_erw.apply(self.korrektur_hersteller, axis=1) - # Anapssung des Objekttypen - self.dfb_erw = self.dfb_erw.apply(self.anpassung_Objekttyp, axis=1) + # Anapssung des Objekttypen alt, hier zu Typ SFP + #self.dfb_erw = self.dfb_erw.apply(self.anpassung_Objekttyp, axis=1) + #Neu + self.dfb_erw = self.dfb_erw.apply(self.korrektur_sfp, axis=1) #ic(self.dfb_erw) + def korrektur_sfp(self,sfp): + self.configid = sfp['CONFIG-ID'] + + if (sfp['Serien-Nr.'] in ('', np.nan, 'bitte nachtragen')) and self.i == 1: + sfp['Serien-Nr.'] = 'dummy' + str(self.i) + self.i = self.i + 1 + self.temp = self.configid + elif (sfp['Serien-Nr.'] in ('', np.nan, 'bitte nachtragen')) and self.i !=1 and self.temp == self.configid: + sfp['Serien-Nr.'] = 'dummy' + str(self.i) + self.i = self.i + 1 + elif (sfp['Serien-Nr.'] in ('', np.nan, 'bitte nachtragen')) and self.i !=1 and self.temp != self.configid: + self.i = 1 + sfp['Serien-Nr.'] = 'dummy' + str(self.i) + self.i = self.i + 1 + else: + pass + + + + return sfp + + def save_file_dialog(self): # ic(self.dfb_gg) options = QFileDialog.Options()