connection between c++ and qml works.

- reworked slots to use normal datatypes again
- added dialogs to add customers and services
- use native style

diff --git a/CleaningService.pro b/CleaningService.pro
index eeb56078eabfb587c2a0c30690b98502b92ab4c9..a450a1d23d53aa8fa7107455895feb23f50e0053 100644 (file)
--- a/CleaningService.pro
+++ b/CleaningService.pro
@@ -1,6 +1,7 @@
 TEMPLATE = app
 
 QT += qml quick sql
+!android: QT += widgets
 CONFIG += c++11
 
 SOURCES += main.cpp \

diff --git a/MainForm.ui.qml b/MainForm.ui.qml
deleted file mode 100644 (file)
index f2cd99e..0000000
--- a/MainForm.ui.qml
+++ /dev/null
@@ -1,29 +0,0 @@
-import QtQuick 2.7
-
-Rectangle {
-    property alias mouseArea: mouseArea
-    property alias textEdit: textEdit
-
-    width: 360
-    height: 360
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: parent
-    }
-
-    TextEdit {
-        id: textEdit
-        text: qsTr("Enter some text...")
-        verticalAlignment: Text.AlignVCenter
-        anchors.top: parent.top
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.topMargin: 20
-        Rectangle {
-            anchors.fill: parent
-            anchors.margins: -10
-            color: "transparent"
-            border.width: 1
-        }
-    }
-}

diff --git a/dbconn.cpp b/dbconn.cpp
index da9e69055cb237335e313ba7e0279d2f0562ec36..9720e29e3acdffcbe6d32d2572f346664100f1f1 100644 (file)
--- a/dbconn.cpp
+++ b/dbconn.cpp
@@ -2,6 +2,7 @@
 #include "logging.h"
 #include <QtSql/QSqlQuery>
 #include <QStringList>
+#include <QVariantList>
 
 DbConn::DbConn (QObject* parent) : QObject (parent)
 {
@@ -36,20 +37,65 @@ QSqlError DbConn::initDB() const
   return QSqlError();
 }
 
-void DbConn::addService (const QVariant& name, const QVariant& cost) const
+void DbConn::addService (const QString& name, const int& cost) const
 {
-
+  QSqlQuery q;
+  if (!q.prepare (this->sqlAddService) ) qCCritical (dbase) << "error while preparing: " << q.lastError();
+  q.addBindValue (name );
+  q.addBindValue (cost );
+  if (!q.exec() ) qCCritical (dbase) << "error: " << q.lastError();
+  else {
+    emit servicesChanged();
+    qCDebug (dbase) << "added new service " << name << ", costing " << cost;
+  }
 }
-void DbConn::addCustomer (const QVariant& name, const QVariant& street, const QVariant& number,
-                          const QVariant& city, const QVariant& zip) const
+void DbConn::addCustomer (const QString& name, const QString& street, const QString& number,
+                          const QString& city, const uint8_t& zip) const
 {
-
+  QSqlQuery q;
+  if (!q.prepare (this->sqlAddCustomer) ) qCCritical (dbase) << "error while preparing: " << q.lastError();
+  q.addBindValue (name );
+  q.addBindValue (street);
+  q.addBindValue (number );
+  q.addBindValue (city);
+  q.addBindValue (zip );
+  if (!q.exec() ) qCCritical (dbase) << "error: " << q.lastError();
+  else {
+    emit customersChanged();
+    qCDebug (dbase) << "added new customer " << name << " in "
+                    << street << " " << number << ", " << zip << " " << city;
+  }
 }
-void DbConn::addOrder (const QVariant& customerID, QVariant& date, QVariant& items) const
+void DbConn::addOrder (const int& customerID, const QDate& date, const QList<int>& items) const
 {
+  QSqlQuery q;
+  if (!q.prepare (this->sqlAddOrder) ) qCCritical (dbase) << "error while preparing: " << q.lastError();
+  q.addBindValue (customerID );
+  q.addBindValue (date );
+
+  if (!q.exec() ) qCCritical (dbase) << "error: " << q.lastError();
+  else emit ordersChanged();
+  QVariant orderID = q.lastInsertId();
+  q.clear();
+  if (!q.prepare (this->sqlAddOrderItem) ) qCCritical (dbase) << "error while preparing: " << q.lastError();
 
+  QList<QVariant> orderIDList;
+  for (int i = 0; i < items.length(); i++) {
+    orderIDList.append (orderID);
+  }
+  QVariantList variantItems;
+  for (int item : items) variantItems.append (item);
+  q.addBindValue (orderIDList);
+  q.addBindValue (variantItems);
+  if (!q.execBatch() ) qCCritical (dbase) << "error: " << q.lastError();
+  else emit orderitemsChanged();
 }
-void DbConn::addInvoice (const QVariant& date, QVariant& OrderID) const
+void DbConn::addInvoice (const QDate& date, const int& orderID) const
 {
-
+  QSqlQuery q;
+  if (!q.prepare (this->sqlAddInvoice) ) qCCritical (dbase) << "error while preparing: " << q.lastError();
+  q.addBindValue (date );
+  q.addBindValue (orderID );
+  if (!q.exec() ) qCCritical (dbase) << "error: " << q.lastError();
+  else emit invoicesChanged();
 }

diff --git a/dbconn.h b/dbconn.h
index d562f6eea08ed9c3609d34add7efa59496786f33..8c8065c74fb26b0c4be221cd52f683d93a45a419 100644 (file)
--- a/dbconn.h
+++ b/dbconn.h
@@ -5,6 +5,7 @@
 #include <QVariant>
 #include <QtSql/QSqlDatabase>
 #include <QtSql/QSqlError>
+#include <QList>
 
 class DbConn : public QObject
 {
@@ -26,6 +27,13 @@ class DbConn : public QObject
     "zip integer"
     ")"
   };
+  const QLatin1String sqlAddCustomer {
+    "insert or ignore into"
+    " customers "
+    "(name, street, number, city, zip)"
+    " values "
+    "(?,?,?,?,?)"
+  };
   const QLatin1String sqlCreateServicesTable {
     "create table services("
     "id integer primary key autoincrement,"
@@ -33,6 +41,13 @@ class DbConn : public QObject
     "costs integer"
     ")"
   };
+  const QLatin1String sqlAddService {
+    "insert or ignore into"
+    " services "
+    "(name, costs)"
+    " values "
+    "(?,?)"
+  };
   const QLatin1String sqlCreateOrdersTable {
     "create table orders("
     "id integer primary key autoincrement,"
@@ -41,6 +56,13 @@ class DbConn : public QObject
     "foreign key(customerid) references customers(id)"
     ")"
   };
+  const QLatin1String sqlAddOrder {
+    "insert or ignore into"
+    " orders "
+    "(customerid, date)"
+    " values "
+    "(?,?)"
+  };
   const QLatin1String sqlCreateOrderItemsTable {
     "create table orderitems("
     "id integer primary key autoincrement,"
@@ -50,6 +72,13 @@ class DbConn : public QObject
     "foreign key(serviceid) references services(id)"
     ")"
   };
+  const QLatin1String sqlAddOrderItem {
+    "insert or ignore into"
+    " orderitems "
+    "(orderid, serviceid)"
+    " values "
+    "(?,?)"
+  };
   const QLatin1String sqlCreateInvoiceTable {
     "create table invoices("
     "id integer primary key autoincrement,"
@@ -58,17 +87,29 @@ class DbConn : public QObject
     "foreign key(orderid) references orders(id)"
     ")"
   };
+  const QLatin1String sqlAddInvoice {
+    "insert or ignore into"
+    " invoices "
+    "(orderid, date)"
+    " values "
+    "(?,?)"
+  };
 public:
   explicit DbConn (QObject* parent = nullptr);
 
 signals:
+  void servicesChanged() const;
+  void customersChanged() const;
+  void ordersChanged() const;
+  void orderitemsChanged() const;
+  void invoicesChanged() const;
 
 public slots:
-  void addService (const QVariant& name, const QVariant& cost) const;
-  void addCustomer (const QVariant& name, const QVariant& street, const QVariant& number,
-                    const QVariant& city, const QVariant& zip) const;
-  void addOrder (const QVariant& customerID, QVariant& date, QVariant& items) const;
-  void addInvoice (const QVariant& date, QVariant& OrderID) const;
+  void addService (const QString& name, const int& cost) const;
+  void addCustomer (const QString& name, const QString& street, const QString& number,
+                    const QString& city, const uint8_t& zip) const;
+  void addOrder (const int& customerID, const QDate& date, const QList<int>& items) const;
+  void addInvoice (const QDate& date, const int& OrderID) const;
 };
 
 #endif // DBCONN_H

diff --git a/dialogs/AddCustomer.qml b/dialogs/AddCustomer.qml
new file mode 100644 (file)
index 0000000..57a5356
--- /dev/null
+++ b/dialogs/AddCustomer.qml
@@ -0,0 +1,30 @@
+import QtQuick 2.9
+import QtQuick.Dialogs 1.2
+import QtQuick.Controls 1.4
+import QtQuick.Layouts 1.3
+
+Dialog {
+  id: addcustomer
+  //visible: true
+  modality: Qt.WindowModal
+  title: qsTr("Add Customer")
+  standardButtons: StandardButton.Save | StandardButton.Cancel
+  onAccepted: dbconn.addCustomer(nameIn.text, streetIn.text, numberIn.text, cityIn.text, zipIn.text)
+  GridLayout {
+    columns: 2
+    Label {text: qsTr("Name")}
+    TextField {id: textIn}
+
+    Label {text: qsTr("Street")}
+    TextField {id: streetIn}
+
+    Label {text: qsTr("Number")}
+    TextField {id: numberIn}
+
+    Label {text: qsTr("City")}
+    TextField {id: cityIn}
+
+    Label {text: qsTr("Zip")}
+    TextField {id: zipIn; validator: IntValidator {bottom: 0;top: 99999}}
+  }
+}

diff --git a/dialogs/AddService.qml b/dialogs/AddService.qml
new file mode 100644 (file)
index 0000000..f24c3eb
--- /dev/null
+++ b/dialogs/AddService.qml
@@ -0,0 +1,33 @@
+import QtQuick 2.9
+import QtQuick.Dialogs 1.2
+import QtQuick.Controls 1.4
+import QtQuick.Layouts 1.3
+
+
+Dialog {
+  id: addservice
+  //visible: true
+  modality: Qt.WindowModal
+  title: qsTr("Add Service")
+  standardButtons: StandardButton.Save | StandardButton.Cancel
+  onAccepted: dbconn.addService(nameIn.text, costIn.text)
+
+  GridLayout {
+    anchors.fill: parent
+    columns: 2
+    Label {
+      text: qsTr("Name:")
+    }
+    TextField {
+      id: nameIn
+    }
+
+    Label {
+      text: qsTr("Cost:")
+    }
+    TextField {
+      id: costIn
+      validator: IntValidator {bottom: 0}
+    }
+  }
+}

diff --git a/main.cpp b/main.cpp
index 82fa785c787a04b215e2a98b7b4b99a67fa6b4c9..5116242e064e64b71fd8e3a78df2a27e750af381 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -1,13 +1,22 @@
-#include <QGuiApplication>
+#include <QApplication>
 #include <QQmlApplicationEngine>
+#include <QQmlContext>
+#include <QtGlobal>
 
-int main(int argc, char *argv[])
+#include "dbconn.h"
+
+int main (int argc, char* argv[])
 {
-  QGuiApplication app(argc, argv);
+
+  QApplication app (argc, argv);
 
   QQmlApplicationEngine engine;
-  engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
-  if (engine.rootObjects().isEmpty())
+  auto root_context = engine.rootContext();
+  DbConn db;
+  root_context->setContextProperty ("dbconn", &db);
+
+  engine.load (QUrl (QStringLiteral ("qrc:/main.qml") ) );
+  if (engine.rootObjects().isEmpty() )
     return -1;
 
   return app.exec();

diff --git a/main.qml b/main.qml
index 518666f1a9cc70fed848abea20908a11c92e2026..725c05e49539eda287632ffb19d24ab3a554af0b 100644 (file)
--- a/main.qml
+++ b/main.qml
@@ -1,16 +1,34 @@
-import QtQuick 2.7
-import QtQuick.Window 2.2
+import QtQuick 2.9
+import QtQuick.Controls 1.4
 
-Window {
+import "AddBaseData/dialogs"
+
+ApplicationWindow {
+  id: root
   visible: true
   width: 640
   height: 480
-  title: qsTr("Hello World")
+  title: qsTr("Cleaning Service")
+  AddService { id: addservice }
+  AddCustomer { id: addcustomer }
 
-  MainForm {
-    anchors.fill: parent
-    mouseArea.onClicked: {
-      console.log(qsTr('Clicked on background. Text: "' + textEdit.text + '"'))
+  menuBar: MenuBar {
+    Menu {
+      title: qsTr("&File")
+      MenuItem {
+        text: qsTr("Add Service")
+        onTriggered: addservice.open()
+      }
+      MenuItem {
+        text: qsTr("Add Customer")
+        onTriggered: addcustomer.open()
+      }
+      MenuItem {
+        text: qsTr("&Quit")
+        onTriggered: Qt.quit()
+      }
     }
+
   }
+
 }

diff --git a/qml.qrc b/qml.qrc
index 7684346a52bbc152bbdded183bf689240570ba88..acb7d014366299bbbcd1d2878d87e72700494cba 100644 (file)
--- a/qml.qrc
+++ b/qml.qrc
@@ -1,6 +1,9 @@
 <RCC>
     <qresource prefix="/">
         <file>main.qml</file>
-        <file>MainForm.ui.qml</file>
+    </qresource>
+    <qresource prefix="/AddBaseData">
+        <file>dialogs/AddService.qml</file>
+        <file>dialogs/AddCustomer.qml</file>
     </qresource>
 </RCC>