Merge branch 'refs/heads/linuxero'

Gui/EmployeesTable.qml

@@ -175,7 +175,7 @@ Item
 
                 Text
                 {
-                    text: model.display === null? "": model.display
+                    text: (model.display === null || model.display === undefined)? "": model.display
                     elide: Text.ElideRight
                     width: parent.width
                     height: parent.height

lib/DB/EmployeeModel.py

@@ -70,7 +70,8 @@ class EmployeeModel(QAbstractTableModel):
             if applicant_col == 2 and self.__everyone:
                 tr = 'Ja' if tr == 1 else 'Nein'
             else:
-                tr = re.sub("Keine Angabe ","", tr)
+                if tr:
+                    tr = re.sub("Keine Angabe ","", tr)
             #print(f"Data: {tr}")
             # return row[index.column() + 2]
             return tr

main.py

@@ -121,10 +121,10 @@ if __name__ == "__main__":
     else:
         initializeProgram()
 
+    engine.rootContext().setContextProperty("config", config)
     engine.rootContext().setContextProperty("sys_printers", printers)
     engine.rootContext().setContextProperty("bad_config", bad_config) #     print(f"Fehler: {i}")
     engine.rootContext().setContextProperty("db_con", db_con)
-    engine.rootContext().setContextProperty("config", config)
     engine.rootContext().setContextProperty("systray", tray)
 
     engine.load(qml_file)