merge main

lib/DB/EmployeeDAO.py

@@ -6,7 +6,7 @@ from ..PyqcrmFlags import PyqcrmAppliEmpyFlags
 
 
 class EmployeeDAO(QObject):
-    newEmployeeAdded = Signal()
+    newEmployeeAdded = Signal(bool)
 
     __cur = None
     __all_cols = None
@@ -44,7 +44,8 @@ class EmployeeDAO(QObject):
             if self.__cur:
                 self.__cur.callproc("addApplicant", (json.dumps(data), applicant, enc_key,))
                 self.__con.commit()
-                self.newEmployeeAdded.emit()
+                self.newEmployeeAdded.emit(True)
 
         except mariadb.Error as e:
             print(str(e))
+            self.newEmployeeAdded.emit(False)

lib/DB/EmployeeModel.py

@@ -6,6 +6,7 @@ import re
 
 
 class EmployeeModel(QAbstractTableModel):
+    addedNewEmployee = Signal(bool)
     __data = None
     __employee_dao = None
     __visible_index = None
@@ -26,17 +27,20 @@ class EmployeeModel(QAbstractTableModel):
 
     @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()

lib/DB/ObjectModel.py

@@ -25,7 +25,7 @@ class ObjectModel(QAbstractTableModel):
         #self.__getData()
 
     @Slot(dict, list, bool)
-    def addObject(self, new_object, new_objcontact):
+    def addObject(self, new_object, new_objcontact = None, new_contact = False):
         print(new_object)
 
         print(new_objcontact)