diff --git a/lib/DB/BusinessDAO.py b/lib/DB/BusinessDAO.py index 954de8b..59852b7 100644 --- a/lib/DB/BusinessDAO.py +++ b/lib/DB/BusinessDAO.py @@ -17,6 +17,7 @@ class BusinessDAO(QObject): self.__cur = self.__con.cursor() + def getBusiness(self, enc_key, criterion = "Alle"): if self.__cur: self.__cur.callproc("getCustomerView", (enc_key, criterion,)) diff --git a/lib/DB/BusinessModel.py b/lib/DB/BusinessModel.py index b033225..0b895a6 100644 --- a/lib/DB/BusinessModel.py +++ b/lib/DB/BusinessModel.py @@ -68,22 +68,23 @@ class BusinessModel(QAbstractTableModel): def __init__(self): super().__init__() -# <<<<<<< HEAD + + self.__business_dao = BusinessDAO() self.__business_dao.newBusinessAdded.connect(self.__refreshView) self.__conf = ConfigLoader().getConfig() self.__key = self.__conf['pyqcrm']['ENCRYPTION_KEY'] -# ======= -# self.__key = ConfigLoader().getKey() -# >>>>>>> e28c68f (AddCustomer, AddContact finished) + self.__getData() def __getData(self, criterion = "Alle"): self.beginResetModel() + rows, self.__visible_columns = self.__business_dao.getBusiness(self.__key, criterion) + self.__data = rows self.endResetModel() @@ -134,6 +135,7 @@ class BusinessModel(QAbstractTableModel): @Slot(dict, int) def addBusiness(self, business, contact_id): + BusinessDAO().addBusiness(self.__key, business, contact_id) @Slot() diff --git a/lib/DB/ContactModel.py b/lib/DB/ContactModel.py index 8262c35..72b3223 100644 --- a/lib/DB/ContactModel.py +++ b/lib/DB/ContactModel.py @@ -10,6 +10,7 @@ class ContactModel(QObject): # print(f"*** File: {__file__}, __init__()") #self.logger = logging.getLogger() + self.__conf = ConfigLoader().getConfig() self.__key = self.__conf['pyqcrm']['ENCRYPTION_KEY'] @@ -30,7 +31,9 @@ class ContactModel(QObject): @Slot(dict) def addContact(self, contact): + i = ContactDAO().addContact(contact, self.__key) + self.contactIdReady.emit(i)