From 9ea0c946747dc16df83a808d59e4460a0272a676e106bb0375ae8202c4da8576 Mon Sep 17 00:00:00 2001 From: linuxero Date: Wed, 11 Dec 2024 18:50:18 +0100 Subject: [PATCH] Adding customer done..still the GUI needs retouches --- Gui/AddCustomer.qml | 2 +- Gui/CustomerTable.qml | 14 +++++++------- lib/DB/BusinessDAO.py | 1 - lib/DB/BusinessModel.py | 5 ++--- lib/DB/ContactDAO.py | 1 - 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/Gui/AddCustomer.qml b/Gui/AddCustomer.qml index a36db2b..d4f1184 100644 --- a/Gui/AddCustomer.qml +++ b/Gui/AddCustomer.qml @@ -253,7 +253,7 @@ ColumnLayout if (!checkAddContact.checked) { new_business = JsLib.addBusiness(businessGrid) - business_model.addBusiness(new_business) + business_model.addBusiness(new_business, 0) appLoader.source = "CustomerTable.qml" } else diff --git a/Gui/CustomerTable.qml b/Gui/CustomerTable.qml index 05515e5..e11ea36 100644 --- a/Gui/CustomerTable.qml +++ b/Gui/CustomerTable.qml @@ -74,7 +74,7 @@ Item { Layout.fillWidth: true implicitHeight: 40 movableColumns: true //@disable-check M16 - syncView: testTable + syncView: customerTable delegate: Rectangle { color: addBusinessBtn.palette.alternateBase @@ -99,7 +99,7 @@ Item { { //property var customWidths: [0.2, 0.5, 0.3, 05, 0.2, 0.2] property real newWidth: 0 - id: testTable + id: customerTable Layout.fillHeight: true Layout.fillWidth: true columnSpacing: 1 @@ -111,7 +111,7 @@ Item { selectionModel: ItemSelectionModel { id: selModel - model: testTable.model + model: customerTable.model } // columnWidthProvider: function(column) @@ -137,7 +137,7 @@ Item { repeat: false onTriggered: { - testTable.forceLayout(); + customerTable.forceLayout(); } } @@ -147,11 +147,11 @@ Item { { required property bool selected required property bool current - implicitWidth: testTable.width / testTable.columns + implicitWidth: customerTable.width / customerTable.columns implicitHeight: 25 color: selected ? addBusinessBtn.palette.highlight //palette.highlight - : (testTable.alternatingRows && row % 2 !== 0 + : (customerTable.alternatingRows && row % 2 !== 0 ? addBusinessBtn.palette.base // palette.base : addBusinessBtn.palette.alternateBase) //palette.alternateBase) @@ -178,7 +178,7 @@ Item { } onEntered: { - testTable.selectionModel.select(testTable.model.index(row, 0), ItemSelectionModel.SelectCurrent | ItemSelectionModel.Rows) + customerTable.selectionModel.select(customerTable.model.index(row, 0), ItemSelectionModel.SelectCurrent | ItemSelectionModel.Rows) } } } diff --git a/lib/DB/BusinessDAO.py b/lib/DB/BusinessDAO.py index 3b0d9af..4a6e144 100644 --- a/lib/DB/BusinessDAO.py +++ b/lib/DB/BusinessDAO.py @@ -15,7 +15,6 @@ class BusinessDAO: def addBusiness(self, data, contact_id): try: - print(data) self.__cur.callproc("addBusiness", (json.dumps(data), contact_id)) self.__con.commit() diff --git a/lib/DB/BusinessModel.py b/lib/DB/BusinessModel.py index 77cf0ad..c9d2ee6 100644 --- a/lib/DB/BusinessModel.py +++ b/lib/DB/BusinessModel.py @@ -1,5 +1,5 @@ # This Python file uses the following encoding: utf-8 -from PySide6.QtCore import QAbstractTableModel, QModelIndex, Qt, Slot +from PySide6.QtCore import QAbstractTableModel, QModelIndex, Qt, Slot, Signal from .BusinessDAO import BusinessDAO # USERS TABLE @@ -109,8 +109,7 @@ class BusinessModel(QAbstractTableModel): @Slot(dict, int) def addBusiness(self, business, contact_id): BusinessDAO().addBusiness(business, contact_id) - #BusinessDAO().addPlz() - + self.__data = self.__getData() @Slot(dict) def setContact(self, contact): diff --git a/lib/DB/ContactDAO.py b/lib/DB/ContactDAO.py index 02daa19..6d055f2 100644 --- a/lib/DB/ContactDAO.py +++ b/lib/DB/ContactDAO.py @@ -18,7 +18,6 @@ class ContactDAO: self.__con.commit() self.__cur.callproc("getLastInsertId") contact_id = self.__cur.fetchone() - print(contact_id) return contact_id[0] except mariadb.Error as e: print("MDB: " + str(e))