Das Setzen der Seriennummer funktioniert nicht
This commit is contained in:
@@ -28,6 +28,10 @@ class MainUI(QDialog): # erbt von QDialog
|
|||||||
self.group = None
|
self.group = None
|
||||||
self.typ = None
|
self.typ = None
|
||||||
self.objdict = {}
|
self.objdict = {}
|
||||||
|
# für SFP Überarbeitung
|
||||||
|
self.configid = ''
|
||||||
|
self.i = 1
|
||||||
|
self.temp = ''
|
||||||
|
|
||||||
def open_file_dialog(self):
|
def open_file_dialog(self):
|
||||||
self.filename, _ = QFileDialog.getOpenFileName(
|
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)
|
self.dfb_erw = self.dfb_erw.apply(self.korrektur_hersteller, axis=1)
|
||||||
|
|
||||||
# Anapssung des Objekttypen
|
# Anapssung des Objekttypen alt, hier zu Typ SFP
|
||||||
self.dfb_erw = self.dfb_erw.apply(self.anpassung_Objekttyp, axis=1)
|
#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)
|
#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):
|
def save_file_dialog(self):
|
||||||
# ic(self.dfb_gg)
|
# ic(self.dfb_gg)
|
||||||
options = QFileDialog.Options()
|
options = QFileDialog.Options()
|
||||||
|
|||||||
Reference in New Issue
Block a user