From 5b031e9d8d6d7956e5a8d3e7076e0593a0a42f9f341a23ab2e940329d57da8d8 Mon Sep 17 00:00:00 2001 From: linuxero Date: Mon, 10 Mar 2025 10:23:48 +0100 Subject: [PATCH] Fixed None type in EmployeeModel.py --- Gui/EmployeesTable.qml | 2 +- lib/DB/EmployeeModel.py | 3 ++- main.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Gui/EmployeesTable.qml b/Gui/EmployeesTable.qml index 304f2dd..04b6182 100644 --- a/Gui/EmployeesTable.qml +++ b/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 diff --git a/lib/DB/EmployeeModel.py b/lib/DB/EmployeeModel.py index 64fb884..1efa977 100644 --- a/lib/DB/EmployeeModel.py +++ b/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 diff --git a/main.py b/main.py index 5b548e5..05cacfd 100644 --- a/main.py +++ b/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)