diff --git a/Gui/AddContact.qml b/Gui/AddContact.qml index 9373fe1..e05bde2 100644 --- a/Gui/AddContact.qml +++ b/Gui/AddContact.qml @@ -23,6 +23,7 @@ GridLayout id: title Layout.fillWidth: true editable: false + model: ["Herr", "Frau"] } Label { @@ -82,6 +83,18 @@ GridLayout id: telephonecontact Layout.fillWidth: true } + + Label + { + text: qsTr("Handy") + Layout.alignment: Qt.AlignRight | Qt.AlignVCenter + } + TextField + { + property string name: "cellphone" + id: cellphone + Layout.fillWidth: true + } Label { text: qsTr("Geburtsdatum") @@ -105,6 +118,7 @@ GridLayout id: rank Layout.fillWidth: true editable: false + model: ["Nein", "Ja"] } Label { diff --git a/Gui/AddCustomer.qml b/Gui/AddCustomer.qml index 324b4d7..c2ad4d1 100644 --- a/Gui/AddCustomer.qml +++ b/Gui/AddCustomer.qml @@ -131,6 +131,18 @@ ColumnLayout Layout.fillWidth: true } + Label + { + text: qsTr("Handy") + Layout.alignment: Qt.AlignRight | Qt.AlignVCenter + } + TextField + { + property string name: "cellphone" + id: cellphone + Layout.fillWidth: true + } + Label { text: qsTr("E-Mail") @@ -241,8 +253,8 @@ ColumnLayout if (!checkAddContact.checked) { new_business = JsLib.addBusiness(businessGrid) - bm.addBusiness(new_business) - appLoader.source = "CustomerTables.qml" + business_model.addBusiness(new_business) + appLoader.source = "CustomerTable.qml" } else { @@ -252,9 +264,9 @@ ColumnLayout var new_contact = JsLib.addBusiness(addContactLayout) // bm.setContact(new_contact, contact_id) // bm.addBusiness(new_business, contact_id) - contact_model.getContacts() - - appLoader.source = "CustomerTables.qml" + contact_id = contact_model.addContact(new_contact) + console.log(contact_id) + appLoader.source = "CustomerTable.qml" } } diff --git a/lib/DB/BTypeDAO.py b/lib/DB/BTypeDAO.py index ae5bc97..af7eda5 100644 --- a/lib/DB/BTypeDAO.py +++ b/lib/DB/BTypeDAO.py @@ -7,6 +7,6 @@ class BTypeDAO: self.__cur = self.__con.cursor() def getBType(self): - self.__cur.callproc("getBType") + self.__cur.callproc("getBtype", (None, None, )) data = self.__cur.fetchall() return(data) diff --git a/lib/DB/BusinessDAO.py b/lib/DB/BusinessDAO.py index 349c82e..165c08f 100644 --- a/lib/DB/BusinessDAO.py +++ b/lib/DB/BusinessDAO.py @@ -15,7 +15,7 @@ class BusinessDAO: def addBusiness(self, data): try: - + print(data) self.__cur.callproc("addBusiness", (json.dumps(data),)) self.__con.commit() diff --git a/lib/DB/ContactDAO.py b/lib/DB/ContactDAO.py index a188e63..329858c 100644 --- a/lib/DB/ContactDAO.py +++ b/lib/DB/ContactDAO.py @@ -11,3 +11,15 @@ class ContactDAO: def getContacts(self): print(f"*** File: {__file__}, getContacts()") + + def addContact(self, contact): + try: + contact_id = self.__cur.callproc("addContactPerson", (contact, 0, )) + self.__con.commit() + return contact_id[1] + #except mariadb.Error as e: + #print(str (e)) + except Exception as e: + print(str (e)) + + diff --git a/lib/DB/ContactModel.py b/lib/DB/ContactModel.py index 18b660c..8d88eda 100644 --- a/lib/DB/ContactModel.py +++ b/lib/DB/ContactModel.py @@ -1,8 +1,9 @@ -from PySide6.QtCore import QAbstractTableModel, QModelIndex, Qt, Slot +from PySide6.QtCore import QAbstractTableModel, QModelIndex, Qt, Slot, QObject from .ContactDAO import ContactDAO import logging +import json -class ContactModel: +class ContactModel(QObject): def __init__(self): super().__init__() #self.logger = logging.getLogger() @@ -18,3 +19,10 @@ class ContactModel: print(f"*** File: {__file__}, __getData()") ContactDAO().getContacts() + @Slot(dict) + def addContact(self, contact): + addC = ContactDAO() + j = json.dumps(contact) + a = addC.addContact(j) + return a +