Fixing ObjectAddOnContactPerson.qml conflict

lib/DB/EmployeeModel.py

@@ -2,9 +2,11 @@ from PySide6.QtCore import QAbstractTableModel, QModelIndex, Qt, Slot, Signal
 from .EmployeeDAO import EmployeeDAO
 from ..PyqcrmFlags import PyqcrmFlags, PyqcrmAppliEmpyFlags
 from ..ConfigLoader import ConfigLoader
+import re
 
 
 class EmployeeModel(QAbstractTableModel):
+    addedNewEmployee = Signal(bool)
     __data = None
     __employee_dao = None
     __visible_index = None
@@ -20,21 +22,25 @@ class EmployeeModel(QAbstractTableModel):
         self.__employee_dao.newEmployeeAdded.connect(self.__refreshView)
         self.__conf = ConfigLoader().getConfig()
         self.__key = self.__conf['pyqcrm']['ENCRYPTION_KEY']
+        print(self.__key)
         self.__getData()
 
     @Slot(dict, bool)
     def addEmployee(self, new_employee, applicant = True):
-        new_employee['worklicense'] = int(new_employee['worklicense'])
-        new_employee['residencetype'] = int(new_employee['residencetype'])
+        if 'worklicense' in new_employee:
+            new_employee['worklicense'] = int(new_employee['worklicense'])
+            new_employee['residencetype'] = int(new_employee['residencetype'])
         self.__employee_dao.addEmployee(new_employee, self.__key, applicant)
 
     @Slot(str)
     def viewCriterion(self, criterion, processed = False, fired = False):
         self.__getData(criterion, processed, fired)
 
-    @Slot()
-    def __refreshView(self):
-        self.__getData()
+    @Slot(bool)
+    def __refreshView(self, added):
+        if added:
+            self.__getData()
+        self.addedNewEmployee.emit(added)
 
     def __getData(self, criterion = "Alle", processed = False, fired = False, every_state = True):
         self.beginResetModel()
@@ -64,6 +70,8 @@ class EmployeeModel(QAbstractTableModel):
             tr = row[applicant_col] #if type(row[index.column() + 2]) is str else str(row[index.column() + 2], "utf-8")
             if applicant_col == 2 and self.__everyone:
                 tr = 'Ja' if tr == 1 else 'Nein'
+            else:
+                tr = re.sub("Keine Angabe ","", tr)
             #print(f"Data: {tr}")
             # return row[index.column() + 2]
             return tr