From 959810c9e370ee4e7436b349d64223e90b18e95e4977973d197bcec307e5c00f Mon Sep 17 00:00:00 2001 From: Daniel Stoppek Date: Tue, 10 Dec 2024 10:46:40 +0100 Subject: [PATCH] reuse Database classes --- lib/ConfigLoader.py | 5 +---- lib/DB/UserManager.py | 16 +++++++++++----- pyqcrm.pyproject | 3 ++- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/lib/ConfigLoader.py b/lib/ConfigLoader.py index 446762b..f26ed9a 100644 --- a/lib/ConfigLoader.py +++ b/lib/ConfigLoader.py @@ -88,10 +88,7 @@ class ConfigLoader(QObject): def __checkAdminUser(self): # print(f"In {__file__} file, __checkAdminUser()") - con = DbManager().getConnection() - cur = con.cursor() - cur.callproc("checkAdmin") - result = cur.fetchall() + result = UserManager().checkAdmin() if not result: #if not result[0][0] == 1: self.adminUserError.emit("Kein Admin vorhanden", False) diff --git a/lib/DB/UserManager.py b/lib/DB/UserManager.py index 263b109..285f914 100644 --- a/lib/DB/UserManager.py +++ b/lib/DB/UserManager.py @@ -31,21 +31,25 @@ class UserManager(QObject): def __hashPassword(self): self.__password = Vermasseln.userPasswordHash(self.__password) + def checkAdmin(self): + self.__cur.callproc("checkAdmin") + result = self.__cur.fetchall() + return result def getUser(self): - self.__closeConnection() + pass def getUsers(self): - self.__closeConnection() + pass def delUser(self): - self.__closeConnection() + pass def updateUser(self): - self.__closeConnection() + pass def disableUser(self): - self.__closeConnection() + pass @Slot(str, str) def login(self, username, password): @@ -67,3 +71,5 @@ class UserManager(QObject): if hash_password == hash_pw: self.loginOkay.emit() + + diff --git a/pyqcrm.pyproject b/pyqcrm.pyproject index 339a454..3734ab6 100644 --- a/pyqcrm.pyproject +++ b/pyqcrm.pyproject @@ -30,6 +30,7 @@ "lib/DB/UserDAO.py", "lib/DB/BusinessDAO.py", "lib/DB/AddressModel.py", - "lib/DB/AddressDAO.py" + "lib/DB/AddressDAO.py", + "lib/PyqcrmDataRoles.py" ] }