Implement search

merge main

.idea/dataSources.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
+    <data-source source="LOCAL" name="pyqcrm@bearybot.selfhost.co" uuid="ed28331b-481b-40e7-9295-d9cdae9fd4f2">
+      <driver-ref>mariadb</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>org.mariadb.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mariadb://bearybot.selfhost.co:8080/pyqcrm</jdbc-url>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
+  </component>
+</project>

.idea/discord.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DiscordProjectSettings">
-    <option name="show" value="APPLICATION" />
+    <option name="show" value="PROJECT_FILES" />
+    <option name="nameOverrideEnabled" value="true" />
+    <option name="nameOverrideText" value="the qml thing (╯°□°）╯︵ ┻━┻" />
     <option name="description" value="" />
     <option name="applicationTheme" value="default" />
     <option name="iconsTheme" value="default" />

.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>

.idea/inspectionProfiles/profiles_settings.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="USE_PROJECT_PROFILE" value="false" />
-    <version value="1.0" />
-  </settings>
-</component>

.idea/qmlSettings.xml

@@ -6,6 +6,11 @@
         <entry key="">
           <value>
             <PerProfileState>
+              <option name="myExtraQmlPaths">
+                <list>
+                  <option value="$PROJECT_DIR$/TeroStyle" />
+                </list>
+              </option>
               <option name="myLSPEnabled" value="true" />
               <option name="myQmlFormatEnabled" value="true" />
             </PerProfileState>

.idea/sqldialects.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="SqlDialectMappings">
+    <file url="file://$PROJECT_DIR$/doc/db_schemer_v1.1-pyqcrm-202503171158_clean.sql" dialect="MariaDB" />
+  </component>
+</project>

Gui/AddApplicant.qml

@@ -1,180 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import "../js/qmldict.js" as JsLib
-
-
-ColumnLayout
-{
-    id: colPar
-    anchors.fill: parent
-    Layout.fillWidth: true
-    Layout.fillHeight: true
-    implicitWidth: parent.width
-    Label
-    {
-        Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
-        id: headline
-        text: qsTr("Mitarbeiter / Bewerber hinzufügen")
-        font.pixelSize: 35
-    }
-    ButtonGroup
-    {
-        buttons: radio.children
-        onClicked:
-        {
-            checkFields()
-            personalData.requiredField()
-        }
-    }
-
-    Row
-    {
-        Layout.fillWidth: true
-        id: radio
-        //Layout.columnSpan: 2
-        RadioButton
-        {
-            checked: true
-            text: qsTr("Bewerber")
-        }
-        RadioButton
-        {
-            text: qsTr("Mitarbeiter")
-        }
-    }
-
-    // ScrollView
-    // {
-    //     Layout.fillHeight: true
-    //     Layout.fillWidth: true
-    //     implicitWidth: parent.width
-
-    //     ColumnLayout
-    //     {
-    //         anchors.fill: parent
-    //         //implicitWidth: parent.width
-    //         //width: parent.width
-    //         //height: parent.height
-    RowLayout
-    {
-        Layout.fillWidth: true
-        //implicitWidth: parent.width
-        spacing: 50
-
-        Frame
-        {
-            Layout.alignment: Qt.AlignTop
-            Layout.fillWidth: true
-            //implicitWidth: parent.width
-            ApplicantPersonalData
-            {
-                id: personalData
-                width: parent.width
-            }
-        }
-
-        Frame
-        {
-            Layout.alignment: Qt.AlignTop
-            Layout.fillWidth: true
-            visible: radio.children[1].checked
-            ColumnLayout
-            {
-                Layout.alignment: Qt.AlignTop
-                implicitWidth: parent.width
-
-                ApplicantBankData
-                {
-                    id: bankAccount
-                }
-
-                ApplicantNationalInsurance
-                {
-                    id: nationalInsurance
-                }
-
-                ApplicantVarious
-                {
-                    id: applicantVarious
-                }
-            }
-        }
-    }
-
-    Item
-    {
-        Layout.fillHeight: true
-    }
-
-    RowLayout
-    {
-        Layout.fillWidth: true
-        Layout.alignment: Qt.AlignRight
-        Button
-        {
-            text: qsTr("Abbrechen")
-            onClicked: appLoader.source = "EmployeeTable.qml"
-        }
-        Button
-        {
-            id: saveBtn
-            text: qsTr("Speichern")
-            enabled: false
-            onClicked:
-            {
-                var new_applicant
-                if (radio.children[0].checked)
-                {
-                    // Ein Bewerber
-                    new_applicant = JsLib.parseForm(personalData)
-                    employee_model.addEmployee(new_applicant, true)
-                    // appLoader.source = "EmployeeTable.qml"
-                    // console.log(JSON.stringify (new_applicant))
-                }
-                else
-                {
-                    // Ein Mitarbeiter
-                    // console.log(personalData, bankAccount, nationalInsurance, applicantVarious)
-                    new_applicant = JsLib.parseForm(personalData, bankAccount, nationalInsurance, applicantVarious)
-                    employee_model.addEmployee(new_applicant, false)
-                    // var new_contact = JsLib.addApplicant(addContactLayout)
-                    // contact_model.addContact(new_contact)
-                    // console.log(JSON.stringify (new_applicant))
-                }
-            }
-        }
-    }
-    Component.onCompleted:
-    {
-        employee_model.addedNewEmployee.connect(onAddNewEmployee)
-    }
-
-//        }
-//     }  // ScrollView
-    function onAddNewEmployee(added)
-    {
-        if (added)
-            console.log('addedsuccesfully')
-        else
-            console.log('failedtoadd')
-        appLoader.source = 'EmployeeTable.qml'
-    }
-
-    function checkFields()
-    {
-        if(radio.children[1].checked)
-        {
-            if(!personalData.checkPersonalField())
-                saveBtn.enabled = false
-            else
-                saveBtn.enabled = true
-        }
-        else if (!personalData.checkPersonalField())
-            saveBtn.enabled = false
-        else
-            saveBtn.enabled = true
-    }
-}
-
-

Gui/AddCustomer.qml

@@ -59,7 +59,7 @@ ColumnLayout
         Button
         {
             text: qsTr("Abbrechen")
-            onClicked: appLoader.source = "CustomerTable.qml"
+            onClicked: contentStack.pop()
         }
         Button
         {
@@ -72,7 +72,7 @@ ColumnLayout
                 {
                     new_business = JsLib.parseForm(customerView)
                     business_model.addBusiness(new_business, 0)
-                    appLoader.source = "CustomerTable.qml"
+                    contentStack.pop()
                 }
                 else
                 {
@@ -99,7 +99,7 @@ ColumnLayout
         {
             var con_id = arguments[0]
             business_model.addBusiness(new_business, con_id)
-            appLoader.source = "CustomerTable.qml"
+            contentStack.pop()
         }
     }
 

Gui/AddNewOffer.qml

@@ -0,0 +1,213 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+GridLayout
+{
+    id: newObject
+
+    columns: 4
+    Layout.fillWidth: true
+    Layout.fillHeight: true
+    rowSpacing: 9
+
+    //New Grid
+    Label
+    {
+        text: qsTr("Objekt:")
+        Layout.alignment: Qt.AlignRight
+        font: Typography.h2
+
+
+    }
+    Item
+    {
+        Layout.columnSpan: 3
+    }
+
+    //New grid row
+    Label
+    {
+        text: qsTr("Objekt-Nr.")
+        Layout.alignment: Qt.AlignRight
+    }
+    TextField
+    {
+        property string name: "objectno"
+        id: objectno
+        Layout.fillWidth: true
+        Layout.alignment: Qt.AlignVCenter
+    }
+
+    Button
+    {
+        text: qsTr("Objekt hinzufügen")
+        icon.source: "qrc:/images/PlusCircle.svg"
+    }
+    Item
+    {
+
+    }
+
+
+    //// New grid row
+
+    Label
+    {
+        text: qsTr("Straße")
+        Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+    }
+
+    TextField
+    {
+        property string name: "street"
+        id: street
+        Layout.fillWidth: true
+        Layout.alignment: Qt.AlignVCenter
+        // onTextChanged: checkFields()
+    }
+
+    Label
+    {
+        text: qsTr("Nr.*")
+        Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+    }
+
+    TextField
+    {
+        property string name: "houseno"
+        id: houseno
+        Layout.fillWidth: true
+        Layout.alignment: Qt.AlignVCenter
+        // onTextChanged: checkFields()
+    }
+
+    // New grid row
+    Label
+    {
+        text: qsTr("PLZ")
+        Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+    }
+
+    ComboBox
+    {
+        property string name: "postcode"
+        id: postcode
+        Layout.fillWidth: true
+        editable: true
+        // onCurrentTextChanged: checkFields()
+        // onEditTextChanged: checkFields()
+        onActivated: currentValue
+        model: address_model
+        textRole: "display"
+        popup.height: 300
+        currentIndex: -1
+        onCurrentIndexChanged: city.currentIndex = postcode.currentIndex
+
+        validator: RegularExpressionValidator
+        {
+            regularExpression: /([0-9]{1,5})/
+        }
+    }
+
+    Label
+    {
+        text: qsTr("Ort")
+        Layout.alignment: Qt.AlignRight
+
+    }
+
+    ComboBox
+    {
+        property string name: "city"
+        id: city
+        Layout.fillWidth: true
+        editable: true
+        // onEditTextChanged: checkFields()
+        // onCurrentTextChanged: checkFields()
+        model: address_model
+        textRole: "city"
+        popup.height: 300
+        currentIndex: -1
+    }
+
+    //New Grid
+    Label
+    {
+        text: qsTr("Kunde:")
+        Layout.alignment: Qt.AlignRight
+        font: Typography.h2
+
+
+    }
+    Item
+    {
+        Layout.columnSpan: 3
+    }
+
+    //New grid row
+    Label
+    {
+        text: qsTr("Kunden-Nr.")
+        Layout.alignment: Qt.AlignRight
+    }
+
+    TextField
+    {
+        property string name: "customerno"
+        id: customerno
+        Layout.fillWidth: true
+        Layout.alignment: Qt.AlignVCenter
+    }
+    Button
+    {
+        text: qsTr("Kunde hinzufügen")
+        icon.source: "qrc:/images/PlusCircle.svg"
+    }
+    Item
+    {
+
+    }
+
+
+    // New grid row
+    Label
+    {
+        text: qsTr("Kunden-Name")
+        Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+    }
+
+    TextField
+    {
+
+        id: customerName
+        Layout.fillWidth: true
+        Layout.alignment: Qt.AlignVCenter
+    }
+
+
+
+    Item
+    {
+        Layout.fillHeight: true
+    }
+
+    // function checkObjectField()
+    // {
+
+    //     return  street.text.trim() && houseno.text.trim() &&
+
+    //             (postcode.editText.trim() || postcode.currentText.trim()) &&
+    //             (city.editText.trim() || city.currentText.trim()) &&
+    //             cleaningproducts.text.trim()
+    // }
+}
+
+
+
+
+
+
+
+
+

Gui/AddObject.qml

@@ -61,7 +61,7 @@ ColumnLayout
         Button
         {
             text: qsTr("Abbrechen")
-            onClicked: appLoader.source = "ObjectTable.qml"
+            onClicked: contentStack.pop()
         }
         Button
         {
@@ -105,7 +105,7 @@ ColumnLayout
                 object_model.viewCriterion("Alle")
             }
 
-            appLoader.source = "ObjectTable.qml"
+            contentStack.pop()
         }
     }
 

Gui/AddOffer.qml

@@ -0,0 +1,112 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import QtQuick.Dialogs
+import "../js/qmldict.js" as JsLib
+
+ColumnLayout
+{
+    property var new_object: null
+    //property alias checkAddContact: checkAddContact
+    Layout.fillWidth: true
+    Layout.fillHeight: true
+    spacing: 15
+    Label
+    {
+        text: qsTr("Angebot anlegen")
+        horizontalAlignment: Text.AlignHCenter
+        Layout.fillWidth: true
+        font.pixelSize: 35
+    }
+
+
+    RowLayout
+    {
+        id: addObject
+        Layout.fillWidth: true
+        Layout.fillHeight: true
+        spacing: 45
+
+        Frame
+        {
+            Layout.alignment: Qt.AlignTop
+            Layout.fillWidth: true
+            AddNewOffer
+            {
+                id: newOffer
+                width: parent.width
+            }
+        }
+
+
+    }
+    RowLayout
+    {
+        Layout.fillHeight: true
+        Layout.alignment: Qt.AlignRight
+        Button
+        {
+            text: qsTr("Abbrechen")
+            onClicked: contentStack.pop()
+        }
+        Button
+        {
+            property var new_object: null
+            id: saveBtn
+            text: qsTr("Speichern")
+            enabled: false
+            onClicked:
+            {
+                // new_object = JsLib.parseForm(newObject)
+                // new_object['lift'] = new_object['lift'] === 'Ja' ? 1 : 0
+                // new_object['mezzanin'] = new_object['mezzanin'] === 'Ja' ? 1 : 0
+                // object_model.addObject(new_object)
+            }
+        }
+    }
+    Item
+    {
+        id: spacer3
+        Layout.fillHeight: true
+    }
+
+    Component.onCompleted:
+    {
+        //object_model.objectAdded.connect(onObjectAdded)
+        //contact_model.objectContactAdded.connect(onObjectContact)
+    }
+
+
+    // Connections
+    // {
+    //     target: object_model
+
+    //     function onObjectIdReady()
+    //     {
+    //         var obj_id = arguments[0]
+    //         if (checkAddObjectContact.checked && obj_id)
+    //         {
+    //             var new_objecto = addObjectLayout.getForm()
+    //             contact_model.addObjectContact(new_objecto, obj_id)
+    //             object_model.viewCriterion("Alle")
+    //         }
+
+    //         appLoader.source = "ObjectTable.qml"
+    //     }
+    // }
+
+    // function checkFields()
+    // {
+    //     if(checkAddObjectContact.checked)
+    //     {
+    //         if(!newObject.checkObjectField() || !addObjectLayout.contactPerson.contacts || !addObjectLayout.contactPerson.contacts.length)
+    //             saveBtn.enabled = false
+    //         else
+    //             saveBtn.enabled = true
+    //     }
+    //     else if (!newObject.checkObjectField())
+    //         saveBtn.enabled = false
+    //     else
+    //         saveBtn.enabled = true
+    // }
+}

Gui/CustomerDetails.qml

@@ -12,8 +12,7 @@ ColumnLayout
     Button
     {
         text: qsTr("Zurück")
-        //Layout.columnSpan: 2
-        onClicked: customersStack.pop()
+        onClicked: contentStack.pop()
     }
 
     SplitView

Gui/CustomerTable.qml

@@ -1,21 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
-import Qt.labs.qmlmodels
-
-
-Item {
-    anchors.fill: parent
-    property var availableFilters: ["Name", "Adresse", "PLZ", "Ort"]
-
-    StackView
-    {
-        id: customersStack
-        anchors.fill: parent
-        initialItem: "CustomersTable.qml"
-    }
-}
-
-
-
-

Gui/CustomersTable.qml

@@ -4,6 +4,7 @@ import QtQuick.Controls
 import Qt.labs.qmlmodels
 
 ColumnLayout {
+    property var availableFilters: ["Name", "Adresse", "PLZ", "Ort"]
 
     function viewCriterion(criterion)
     {
@@ -15,7 +16,7 @@ ColumnLayout {
     anchors.fill: parent
     spacing: Dimensions.l
 
-    Component.onCompleted: customersStack.pop()
+    Component.onCompleted: contentStack.pop()
 
     RowLayout
     {
@@ -67,7 +68,7 @@ ColumnLayout {
             Layout.alignment: Qt.AlignRight
             icon.source: "qrc:/images/PlusCircle.svg"
             text: qsTr("Kunde Hinzufügen")
-            onClicked: appLoader.source = "AddCustomer.qml"
+            onClicked: contentStack.push("AddCustomer.qml")
         }
     }
     ColumnLayout
@@ -153,7 +154,7 @@ ColumnLayout {
 
                     onDoubleClicked: {
                         business_model.onRowClicked(row);
-                        customersStack.push("CustomerDetails.qml", {
+                        contentStack.push("CustomerDetails.qml", {
                             selectedClient: row
                         });
                     }

Gui/Dashboard.qml

@@ -2,127 +2,106 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
-ColumnLayout
-{
-    anchors.top: TopBar.bottom
+ColumnLayout {
+    anchors.top: Navigation.bottom
 
-    Rectangle
-    {
-        color: "dimgrey"
+    Rectangle {
+        Layout.bottomMargin: 3
         Layout.fillHeight: true
         Layout.fillWidth: true
-        Layout.bottomMargin: 3
+        color: "dimgrey"
         radius: 45
 
-        RowLayout
-        {
+        RowLayout {
             anchors.fill: parent
 
-            Rectangle
-            {
+            Rectangle {
                 id: contractButton
-                width: 300
-                height: 145
-                color: "darkslategray"
-                radius: 45
+
                 Layout.alignment: Qt.AlignHCenter
                 border.color: "steelblue"
                 border.width: 1
-                Text
-                {
-                    text: qsTr("Aufträge")
-                    anchors.centerIn: parent
-                    font.pixelSize: 45
-                    font.bold: true
-                    color: "lightgoldenrodyellow"
-                }
+                color: "darkslategray"
+                height: 145
+                radius: 45
+                width: 300
 
-                MouseArea
-                {
+                Text {
+                    anchors.centerIn: parent
+                    color: "lightgoldenrodyellow"
+                    font.bold: true
+                    font.pixelSize: 45
+                    text: qsTr("Aufträge")
+                }
+                MouseArea {
                     anchors.fill: parent
                     cursorShape: Qt.PointingHandCursor
                     hoverEnabled: true
-                    onPressed:
-                    {
-                        contractButton.color = "darkolivegreen"
-                        contractButton.border.width = 3
-                        contractButton.border.color = "skyblue"
-                        console.log("Aufträge...")
+
+                    onExited: {
+                        contractButton.color = "darkslategray";
+                        contractButton.border.color = "steelblue";
+                        contractButton.border.width = 1;
                     }
-
-                    onReleased:
-                    {
-                        contractButton.color = "darkslategray"
-                        contractButton.border.width = 1
-                        contractButton.border.color = "steelblue"
+                    onHoveredChanged: {
+                        var w = contractButton.border.width === 3 ? 1 : 3;
+                        contractButton.border.width = w;
                     }
-
-                    onHoveredChanged:
-                    {
-                        var w = contractButton.border.width === 3? 1: 3
-                        contractButton.border.width = w
+                    onPressed: {
+                        contractButton.color = "darkolivegreen";
+                        contractButton.border.width = 3;
+                        contractButton.border.color = "skyblue";
+                        console.log("Aufträge...");
                     }
-
-                    onExited:
-                    {
-
-                        contractButton.color = "darkslategray"
-                        contractButton.border.color = "steelblue"
-                        contractButton.border.width = 1
+                    onReleased: {
+                        contractButton.color = "darkslategray";
+                        contractButton.border.width = 1;
+                        contractButton.border.color = "steelblue";
                     }
                 }
             }
-
-            Rectangle
-            {
+            Rectangle {
                 id: offerButton
-                width: 300
-                height: 145
-                color: "darkslategray"
-                radius: 45
+
                 Layout.alignment: Qt.AlignHCenter
                 border.color: "steelblue"
                 border.width: 1
-                Text
-                {
-                    text: qsTr("Angebote")
+                color: "darkslategray"
+                height: 145
+                radius: 45
+                width: 300
+
+                Text {
                     anchors.centerIn: parent
-                    font.pixelSize: 45
-                    font.bold: true
                     color: "lightgoldenrodyellow"
+                    font.bold: true
+                    font.pixelSize: 45
+                    text: qsTr("Angebote")
                 }
-                MouseArea
-                {
+                MouseArea {
                     anchors.fill: parent
                     cursorShape: Qt.PointingHandCursor
                     hoverEnabled: true
 
-                    onPressed:
-                    {
-                        offerButton.color = "darkolivegreen"
-                        offerButton.border.width = 3
-                        offerButton.border.color = "skyblue"
-                        console.log("Angebote...")
+                    onExited: {
+                        offerButton.color = "darkslategray";
+                        offerButton.border.color = "steelblue";
+                        offerButton.border.width = 1;
                     }
-                    onReleased:
-                    {
-                        offerButton.color = "darkslategray"
-                        offerButton.border.width = 1
-                        offerButton.border.color = "steelblue"
+                    onHoveredChanged: {
+                        var w = offerButton.border.width === 3 ? 1 : 3;
+                        offerButton.border.width = w;
                     }
-
-                    onHoveredChanged:
-                    {
-                        var w = offerButton.border.width === 3? 1: 3
-                        offerButton.border.width = w
+                    onPressed: {
+                        offerButton.color = "darkolivegreen";
+                        offerButton.border.width = 3;
+                        offerButton.border.color = "skyblue";
+                        console.log("Angebote...");
                     }
-
-                    onExited:
-                    {
-
-                        offerButton.color = "darkslategray"
-                        offerButton.border.color = "steelblue"
-                        offerButton.border.width = 1
+                    onReleased: {
+                        offerButton.color = "darkslategray";
+                        offerButton.border.width = 1;
+                        offerButton.border.color = "steelblue";
                     }
                 }
             }

Gui/EmployeeDetails.qml

@@ -1,27 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-
-Item
-{
-    property int selectedEmployee: -1
-    id: emDet
-    ColumnLayout
-    {
-        Label
-        {
-            text: qsTr("Ausgewählter Mitarbeiter " + selectedEmployee)
-        }
-
-        Button
-        {
-            text: qsTr("Mitarbeiter zeigen")
-            onClicked: employeesStack.pop()
-        }
-    }
-
-    Component.onCompleted:
-    {
-        employee_model.onRowClicked(selectedEmployee)
-    }
-}

Gui/EmployeeTable.qml

@@ -1,16 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
-import Qt.labs.qmlmodels
-
-Item {
-    anchors.fill: parent
-
-    StackView {
-        id: employeesStack
-
-        anchors.fill: parent
-        initialItem: "EmployeesTable.qml"
-    }
-}
-

Gui/Employees/AddApplicant.qml

@@ -0,0 +1,37 @@
+import QtQuick
+import QtQuick.Layouts
+import TeroStyle
+
+ColumnLayout {
+    anchors.fill: parent
+    spacing: Dimensions.l
+
+    ApplicantForm {
+        id: applicantForm
+
+        Layout.alignment: Qt.AlignTop
+        Layout.fillHeight: true
+        Layout.verticalStretchFactor: 1
+    }
+    RowLayout {
+        Layout.alignment: Qt.AlignRight
+        spacing: Dimensions.l
+
+        Button {
+            icon.source: "qrc:/images/ArrowLeftCircle-Outline.svg"
+            text: qsTr("Verwerfen")
+
+            onClicked: contentStack.pop()
+        }
+        Button {
+            enabled: applicantForm.valid
+            icon.source: "qrc:/images/CheckCircle.svg"
+            text: qsTr("Speichern")
+
+            onClicked: {
+                applicantModel.createApplicant(applicantForm.value);
+                contentStack.pop();
+            }
+        }
+    }
+}

Gui/Employees/AddEmployee.qml

@@ -0,0 +1,102 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import "../../js/qmldict.js" as JsLib
+
+ColumnLayout {
+    id: colPar
+
+    function checkFields() {
+        if (!personalData.checkPersonalField())
+            saveBtn.enabled = false;
+        else
+            saveBtn.enabled = true;
+    }
+    function onAddNewEmployee(added) {
+        if (added) {
+            console.log('addedsuccesfully');
+            contentStack.pop();
+        } else {
+            console.log('failedtoadd');
+        }
+    }
+
+    Layout.fillHeight: true
+    Layout.fillWidth: true
+    anchors.fill: parent
+    implicitWidth: parent.width
+
+    Component.onCompleted: {
+        employee_model.addedNewEmployee.connect(onAddNewEmployee);
+    }
+
+    Label {
+        id: headline
+
+        Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
+        font.pixelSize: 35
+        text: qsTr("Mitarbeiter / Bewerber hinzufügen")
+    }
+    RowLayout {
+        Layout.fillWidth: true
+        spacing: Dimensions.l
+
+        Frame {
+            Layout.alignment: Qt.AlignTop
+            Layout.fillWidth: true
+            Layout.horizontalStretchFactor: 1
+
+            EmployeePersonalData {
+                id: personalData
+
+                implicitWidth: parent.width
+            }
+        }
+        Frame {
+            Layout.alignment: Qt.AlignTop
+            Layout.fillWidth: true
+            Layout.horizontalStretchFactor: 1
+
+            ColumnLayout {
+                Layout.alignment: Qt.AlignTop
+                implicitWidth: parent.width
+
+                EmployeeBankData {
+                    id: bankAccount
+
+                }
+                EmployeeNationalInsurance {
+                    id: nationalInsurance
+                }
+                EmployeeVarious {
+                    id: applicantVarious
+
+                }
+            }
+        }
+    }
+    Item {
+        Layout.fillHeight: true
+    }
+    RowLayout {
+        Layout.alignment: Qt.AlignRight
+        Layout.fillWidth: true
+
+        Button {
+            text: qsTr("Abbrechen")
+
+            onClicked: contentStack.pop()
+        }
+        Button {
+            id: saveBtn
+
+            enabled: false
+            text: qsTr("Speichern")
+
+            onClicked: {
+                const new_applicant = JsLib.parseForm(personalData, bankAccount, nationalInsurance, applicantVarious);
+                employee_model.addEmployee(new_applicant);
+            }
+        }
+    }
+}

Gui/Employees/ApplicantForm.qml

@@ -0,0 +1,218 @@
+import QtQuick
+import QtQuick.Controls.impl
+import QtQuick.Layouts
+import TeroStyle
+
+ColumnLayout {
+    readonly property int fieldM: 235
+    readonly property int fieldS: 110
+    readonly property bool valid: emailAddress.acceptableInput && firstName.acceptableInput && houseNumber.acceptableInput && lastName.acceptableInput && mobileNumber.acceptableInput && phoneNumber.acceptableInput && salutation.acceptableInput&& street.acceptableInput && title.acceptableInput && zipCode.acceptableInput
+    readonly property var value: QtObject {
+        readonly property string emailAddress: emailAddress.text ?? ""
+        readonly property string firstName: firstName.text ?? ""
+        readonly property string houseNumber: houseNumber.text ?? ""
+        readonly property string lastName: lastName.text ?? ""
+        readonly property string mobileNumber: mobileNumber.text ?? ""
+        readonly property string phoneNumber: phoneNumber.text ?? ""
+        readonly property string salutation: salutation.text ?? ""
+        readonly property string street: street.text ?? ""
+        readonly property string title: title.currentText
+        readonly property int zipCode: zipCode.currentIndex
+    }
+
+    function setValue(value) {
+        title.currentIndex = value.title ?? 0;
+        firstName.text = value.firstName ?? "";
+        lastName.text = value.lastName ?? "";
+        street.text = value.street ?? "";
+        houseNumber.text = value.houseNumber ?? "";
+        zipCode.currentIndex = value.zipCode ?? -1;
+        phoneNumber.text = value.phoneNumber ?? "";
+        mobileNumber.text = value.mobileNumber ?? "";
+        emailAddress.text = value.emailAddress ?? "";
+        salutation.text = value.salutation ?? 0;
+    }
+
+    spacing: Dimensions.l
+
+    IconLabel {
+        color: Colors.foreground
+        font: Typography.h2
+        icon.color: Colors.foreground
+        icon.height: Typography.h2.pixelSize
+        icon.source: "qrc:/images/UserCircle"
+        icon.width: Typography.h2.pixelSize
+        spacing: Dimensions.m
+        text: qsTr("Stammdaten")
+    }
+    RowLayout {
+        spacing: Dimensions.m
+
+        Field {
+            label: qsTr("Anrede")
+
+            ComboBox {
+                id: title
+
+                implicitWidth: fieldM
+                model: [qsTr("Keine Angabe"), qsTr("Herr"), qsTr("Frau")]
+
+                onCurrentTextChanged: {
+                    switch (title.currentIndex) {
+                    case 1:
+                        salutation.text = "Sehr geehrter Herr ";
+                        break;
+                    case 2:
+                        salutation.text = "Sehr geehrte Frau ";
+                        break;
+                    default:
+                        salutation.text = "Guten Tag ";
+                    }
+                }
+            }
+        }
+        Field {
+            label: qsTr("Vorname")
+            mandatory: true
+
+            TextField {
+                id: firstName
+
+                implicitWidth: fieldM
+                placeholderText: qsTr("Max")
+
+                validator: NotEmptyValidator {
+                }
+            }
+        }
+        Field {
+            label: qsTr("Nachname")
+            mandatory: true
+
+            TextField {
+                id: lastName
+
+                implicitWidth: fieldM
+                placeholderText: qsTr("Mustermann")
+
+                validator: NotEmptyValidator {
+                }
+            }
+        }
+    }
+    RowLayout {
+        spacing: Dimensions.m
+
+        Field {
+            label: qsTr("Straße")
+
+            TextField {
+                id: street
+
+                implicitWidth: fieldM
+                placeholderText: qsTr("Musterstraße")
+            }
+        }
+        Field {
+            label: qsTr("Hausnummer")
+
+            TextField {
+                id: houseNumber
+
+                implicitWidth: fieldS
+                placeholderText: qsTr("1a")
+            }
+        }
+        Field {
+            label: qsTr("PLZ")
+
+            ComboBox {
+                id: zipCode
+
+                currentIndex: -1
+                editable: true
+                implicitWidth: fieldS
+                model: address_model
+                textRole: "display"
+
+                onActivated: currentValue
+                onCurrentIndexChanged: city.currentIndex = zipCode.currentIndex
+            }
+        }
+        Field {
+            label: qsTr("Ort")
+
+            ComboBox {
+                id: city
+
+                currentIndex: -1
+                editable: true
+                implicitWidth: fieldM
+                model: address_model
+                textRole: "city"
+            }
+        }
+    }
+    IconLabel {
+        color: Colors.foreground
+        font: Typography.h2
+        icon.color: Colors.foreground
+        icon.height: Typography.h2.pixelSize
+        icon.source: "qrc:/images/Phone"
+        icon.width: Typography.h2.pixelSize
+        spacing: Dimensions.m
+        text: qsTr("Kontakt")
+    }
+    RowLayout {
+        spacing: Dimensions.m
+
+        Field {
+            label: qsTr("Telefonnummer")
+
+            TextField {
+                id: phoneNumber
+
+                implicitWidth: fieldM
+                placeholderText: "+49 1234 567890"
+
+                validator: OptionalPhoneNumberValidator {
+                }
+            }
+        }
+        Field {
+            label: qsTr("Mobil")
+
+            TextField {
+                id: mobileNumber
+
+                implicitWidth: fieldM
+                placeholderText: "+49 123 4567891011"
+
+                validator: OptionalPhoneNumberValidator {
+                }
+            }
+        }
+        Field {
+            label: qsTr("E-Mail Adresse")
+
+            TextField {
+                id: emailAddress
+
+                implicitWidth: fieldM
+                placeholderText: "tero@example.org"
+
+                validator: OptionalEmailAddressValidator {
+                }
+            }
+        }
+        Field {
+            label: qsTr("Briefanrede")
+
+            TextField {
+                id: salutation
+
+                implicitWidth: fieldM
+            }
+        }
+    }
+}

Gui/Employees/EmployeeDetails.qml

@@ -0,0 +1,34 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import TeroStyle
+
+ColumnLayout {
+    property int row: -1
+
+    anchors.fill: parent
+    spacing: Dimensions.l
+
+    onRowChanged: {
+        if (row !== -1) {
+            applicantForm.setValue(applicantModel.applicant(row))
+        }
+    }
+
+    ApplicantForm {
+        id: applicantForm
+
+        Layout.alignment: Qt.AlignTop
+        Layout.fillHeight: true
+        Layout.verticalStretchFactor: 1
+    }
+
+    RowLayout {
+        spacing: Dimensions.l
+
+        Button {
+            text: qsTr("Als Mitarbeiter:in Einstellen")
+            icon.source: "qrc:/images/InboxArrowDown.svg"
+        }
+    }
+}

Gui/Employees/EmployeePersonalData.qml

@@ -1,444 +1,409 @@
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
+import TeroStyle
 
-GridLayout
-{
+GridLayout {
     id: personalData
-    columns: 4
-    Label
-    {
-        text: qsTr("Anrede")
-        Layout.alignment: Qt.AlignRight
+
+    function checkPersonalField() {
+        return (firstname.text.trim() && lastname.text.trim() && street.text.trim() && houseno.text.trim() && (postcode.editText.trim() || postcode.currentText.trim()) && (city.editText.trim() || city.currentText.trim()) && birthday.text.trim() && phonenumber.text.trim() && cellphone.text.trim() && email.text.trim() && jobdescription.text.trim() && contractstart.text.trim() && contractend.text.trim() && briefAnrede.text.trim());
     }
-    ComboBox
-    {
-        property string name: "title"
+    function requiredField() {
+        const pf = "Pflichtfeld";
+        street.placeholderText = pf;
+        phonenumber.placeholderText = pf;
+        cellphone.placeholderText = pf;
+        email.placeholderText = pf;
+        jobdescription.placeholderText = pf;
+        contractstart.placeholderText = pf;
+        contractend.placeholderText = pf;
+        briefAnrede.placeholderText = pf;
+        houseno.placeholderText = pf;
+    }
+
+    columns: 4
+
+    Label {
+        Layout.alignment: Qt.AlignRight
+        text: qsTr("Anrede")
+    }
+    ComboBox {
         id: title
+
+        property string name: "title"
+
+        Layout.columnSpan: 3
         Layout.fillWidth: true
         editable: false
-        Layout.columnSpan: 3
         model: [qsTr("Keine Angabe"), qsTr("Herr"), qsTr("Frau")]
-        onCurrentTextChanged:
-        {
-            switch (title.currentIndex)
-            {
-                case 1:
-                    briefAnrede.text = "Sehr geehrter Herr "
-                    break
-                case 2:
-                    briefAnrede.text = "Sehr geehrte Frau "
-                    break
-                default:
-                    briefAnrede.text = "Guten Tag "
+
+        onCurrentTextChanged: {
+            switch (title.currentIndex) {
+            case 1:
+                briefAnrede.text = "Sehr geehrter Herr ";
+                break;
+            case 2:
+                briefAnrede.text = "Sehr geehrte Frau ";
+                break;
+            default:
+                briefAnrede.text = "Guten Tag ";
             }
         }
-
     }
-    Label
-    {
+    Label {
+        Layout.alignment: Qt.AlignRight
         text: qsTr("Vorname*")
-        Layout.alignment: Qt.AlignRight
     }
-    TextField
-    {
-        property string name: "firstname"
+    TextField {
         id: firstname
-        Layout.fillWidth: true
-        onTextChanged: checkFields()
-        Layout.columnSpan: 3
-    }
-    Label
-    {
-        text: qsTr("Nachname*")
-        Layout.alignment: Qt.AlignRight
-    }
-    TextField
-    {
-        property string name: "lastname"
-        id: lastname
-        Layout.fillWidth: true
-        onTextChanged: checkFields()
-        Layout.columnSpan: 3
-    }
-    Label
-    {
-        text: qsTr("Straße")
-        Layout.alignment: Qt.AlignRight
-    }
-    TextField
-    {
-        property string name: "street"
-        id: street
-        Layout.fillWidth: true
-        placeholderTextColor: "red"
-        onTextChanged: checkFields()
 
+        property string name: "firstname"
+
+        Layout.columnSpan: 3
+        Layout.fillWidth: true
+
+        onTextChanged: checkFields()
     }
-    Label
-    {
-        text: qsTr("Nr.")
+    Label {
         Layout.alignment: Qt.AlignRight
+        text: qsTr("Nachname*")
     }
-    TextField
-    {
-        property string name: "houseno"
-        id: houseno
+    TextField {
+        id: lastname
+
+        property string name: "lastname"
+
+        Layout.columnSpan: 3
+        Layout.fillWidth: true
+
+        onTextChanged: checkFields()
+    }
+    Label {
+        Layout.alignment: Qt.AlignRight
+        text: qsTr("Straße")
+    }
+    TextField {
+        id: street
+
+        property string name: "street"
+
         Layout.fillWidth: true
         placeholderTextColor: "red"
+
         onTextChanged: checkFields()
-        validator: RegularExpressionValidator
-        {
+    }
+    Label {
+        Layout.alignment: Qt.AlignRight
+        text: qsTr("Nr.")
+    }
+    TextField {
+        id: houseno
+
+        property string name: "houseno"
+
+        Layout.fillWidth: true
+        placeholderTextColor: "red"
+
+        validator: RegularExpressionValidator {
             regularExpression: /([0-9a-zA-Z\-]{1,6})/
         }
 
+        onTextChanged: checkFields()
     }
-    Label
-    {
+    Label {
+        Layout.alignment: Qt.AlignRight
         text: qsTr("PLZ")
-        Layout.alignment: Qt.AlignRight
     }
-
-
-
-
-    ComboBox
-    {
-        property string name: "postcode"
+    ComboBox {
         id: postcode
+
+        property string name: "postcode"
+
         Layout.fillWidth: true
+        currentIndex: -1
         editable: true
-        onEditTextChanged: checkFields()
-        onCurrentTextChanged: checkFields()
-        onActivated: currentValue
         model: address_model
+        popup.height: 300
         textRole: "display"
-        popup.height: 300
-        currentIndex: -1
-        onCurrentIndexChanged: city.currentIndex = postcode.currentIndex
-        validator: RegularExpressionValidator
-        {
-            regularExpression: /([^$][0-9]{1,4})/
+
+        validator: PostcodeValidator {
         }
-    }
 
-
-    Label
-    {
-        text: qsTr("Ort")
-        Layout.alignment: Qt.AlignRight
-
-    }
-    ComboBox
-    {
-        property string name: "city"
-        id: city
-        Layout.fillWidth: true
-        editable: true
-        onEditTextChanged: checkFields()
+        onActivated: currentValue
+        onCurrentIndexChanged: city.currentIndex = postcode.currentIndex
         onCurrentTextChanged: checkFields()
-        model: address_model
-        textRole: "city"
-        popup.height: 300
-        currentIndex: -1
+        onEditTextChanged: checkFields()
+    }
+    Label {
+        Layout.alignment: Qt.AlignRight
+        text: qsTr("Ort")
+    }
+    ComboBox {
+        id: city
 
+        property string name: "city"
+
+        Layout.fillWidth: true
+        currentIndex: -1
+        editable: true
+        model: address_model
+        popup.height: 300
+        textRole: "city"
+
+        onCurrentTextChanged: checkFields()
+        onEditTextChanged: checkFields()
     }
-    Label
-    {
+    Label {
+        Layout.alignment: Qt.AlignRight
         text: qsTr("Geburtsname")
-        Layout.alignment: Qt.AlignRight
-        visible: radio.children[1].checked
     }
-    TextField
-    {
-        property string name: "birthname"
+    TextField {
         id: birthname
-        Layout.fillWidth: true
-        onTextChanged: checkFields()
+
+        property string name: "birthname"
+
         Layout.columnSpan: 3
-        visible: radio.children[1].checked
+        Layout.fillWidth: true
+
+        onTextChanged: checkFields()
     }
-    Label
-    {
-        text: qsTr("Geburtsdatum*")
+    Label {
         Layout.alignment: Qt.AlignRight
-        visible: radio.children[1].checked
+        text: qsTr("Geburtsdatum*")
     }
-    TextField
-    {
-        property string name: "birthday"
+    TextField {
         id: birthday
-        Layout.fillWidth: true
-        onTextChanged: checkFields()
+
+        property string name: "birthday"
+
         Layout.columnSpan: 3
-        visible: radio.children[1].checked
-        validator: RegularExpressionValidator
-        {
+        Layout.fillWidth: true
+
+        validator: RegularExpressionValidator {
             regularExpression: /((^|)(0[1-9]{1}|[1-2]{1}[0-9]{1}|3[0-1]))\.((^|)(0[1-9]{1}|1[0-2]{1}))\.((^|)(196[0-9]{1}|19[7-9]{1}[0-9]{1}|20[0-9]{2}))/
         }
-        Keys.onPressed: (event)=>
-        {
-            if (event.key !== Qt.Key_Backspace)
-            {
-                var len = birthday.length
-                var bd = birthday.text
-                if (len === 2 || len === 5) birthday.text = bd + "."
+
+        Keys.onPressed: event => {
+            if (event.key !== Qt.Key_Backspace) {
+                var len = birthday.length;
+                var bd = birthday.text;
+                if (len === 2 || len === 5)
+                    birthday.text = bd + ".";
             }
         }
+        onTextChanged: checkFields()
     }
-
-    Label
-    {
+    Label {
+        Layout.alignment: Qt.AlignRight
         text: qsTr("Geburtsort*")
-        Layout.alignment: Qt.AlignRight
-        visible: radio.children[1].checked
     }
-    TextField
-    {
-        property string name: "placeofbirth"
+    TextField {
         id: placeofbirth
-        Layout.fillWidth: true
-        onTextChanged: checkFields()
-        Layout.columnSpan: 3
-        visible: radio.children[1].checked
-    }
 
-    Label
-    {
+        property string name: "placeofbirth"
+
+        Layout.columnSpan: 3
+        Layout.fillWidth: true
+
+        onTextChanged: checkFields()
+    }
+    Label {
+        Layout.alignment: Qt.AlignRight
         text: qsTr("Telefonnummer")
-        Layout.alignment: Qt.AlignRight
     }
-    TextField
-    {
-        property string name: "phone"
+    TextField {
         id: phonenumber
+
+        property string name: "phone"
+
+        Layout.columnSpan: 3
         Layout.fillWidth: true
         placeholderTextColor: "red"
-        Layout.columnSpan: 3
-        onTextChanged: checkFields()
-        validator: RegularExpressionValidator
-        {
+
+        validator: RegularExpressionValidator {
             regularExpression: /([+0-9]{1})([0-9]{1,17})/
         }
+
+        onTextChanged: checkFields()
     }
-    Label
-    {
+    Label {
+        Layout.alignment: Qt.AlignRight
         text: qsTr("Mobil")
-        Layout.alignment: Qt.AlignRight
     }
-    TextField
-    {
-        property string name: "mobile"
+    TextField {
         id: cellphone
+
+        property string name: "mobile"
+
+        Layout.columnSpan: 3
         Layout.fillWidth: true
         placeholderTextColor: "red"
-        Layout.columnSpan: 3
-        onTextChanged: checkFields()
-        validator: RegularExpressionValidator
-        {
+
+        validator: RegularExpressionValidator {
             regularExpression: /([+0-9]{1})([0-9]{1,17})/
         }
-    }
-    Label
-    {
-        text: qsTr("E-Mail")
-        Layout.alignment: Qt.AlignRight
-    }
-    TextField
-    {
-        property string name: "email"
-        id: email
-        Layout.fillWidth: true
-        placeholderTextColor: "red"
-        Layout.columnSpan: 3
+
         onTextChanged: checkFields()
-        placeholderText: qsTr("beispiel@domain.de")
-        validator: RegularExpressionValidator
-        {
-            regularExpression: /([\+!#$%&‘\*\–\/\=?\^_`\.{|}\~\-\_0-9A-Za-z]{1,185})@([0-9A-Za-z\.\-\_]{1,64})\.([a-zA-z]{2,5})/
-        }
     }
-    Label
-    {
-        text: qsTr("Familienstand")
+    Label {
         Layout.alignment: Qt.AlignRight
-        visible: radio.children[1].checked
+        text: qsTr("E-Mail")
     }
-    ComboBox
-    {
-        property string name: "maritalstatus"
+    TextField {
+        id: email
+
+        property string name: "email"
+
+        Layout.columnSpan: 3
+        Layout.fillWidth: true
+        placeholderText: qsTr("beispiel@domain.de")
+        placeholderTextColor: "red"
+
+        validator: EmailAddressValidator {
+        }
+
+        onTextChanged: checkFields()
+    }
+    Label {
+        Layout.alignment: Qt.AlignRight
+        text: qsTr("Familienstand")
+    }
+    ComboBox {
         id: maritalstatus
+
+        property string name: "maritalstatus"
+
+        Layout.columnSpan: 3
         Layout.fillWidth: true
         editable: false
         model: [qsTr("ledig"), qsTr("verheiratet"), qsTr("verwitwet"), qsTr("geschieden")]
-        visible: radio.children[1].checked
-        Layout.columnSpan: 3
     }
-    Label
-    {
+    Label {
+        Layout.alignment: Qt.AlignRight
         text: qsTr("Stundenlohn")
-        Layout.alignment: Qt.AlignRight
-        visible: radio.children[1].checked
     }
-    TextField
-    {
-        property string name: "salary"
+    TextField {
         id: salary
-        Layout.fillWidth: true
-        visible: radio.children[1].checked
-        placeholderTextColor: "red"
-        Layout.columnSpan: 3
-        onTextChanged: checkFields()
-    }
-    Label
-    {
-        text: qsTr("Jobbeschreibung")
-        Layout.alignment: Qt.AlignRight
-        visible: radio.children[1].checked
-    }
-    TextField
-    {
-        property string name: "jobdesc"
-        id: jobdescription
-        Layout.fillWidth: true
-        visible: radio.children[1].checked
-        placeholderTextColor: "red"
-        Layout.columnSpan: 3
-        onTextChanged: checkFields()
-    }
-    Label
-    {
-        text: qsTr("Vertragsbeginn")
-        Layout.alignment: Qt.AlignRight
-        visible: radio.children[1].checked
-    }
-    TextField
-    {
-        property string name: "contractstart"
-        id: contractstart
-        Layout.fillWidth: true
-        visible: radio.children[1].checked
-        placeholderTextColor: "red"
-        Layout.columnSpan: 3
-        onTextChanged: checkFields()
-        validator: RegularExpressionValidator
-        {
-            regularExpression: /((^|)(0[1-9]{1}|[1-2]{1}[0-9]{1}|3[0-1]))\.((^|)(0[1-9]{1}|1[0-2]{1}))\.((^|)(196[0-9]{1}|19[7-9]{1}[0-9]{1}|20[0-9]{2}))/
-        }
-        Keys.onPressed: (event)=>
-        {
-            if (event.key !== Qt.Key_Backspace)
-            {
-                var len = contractstart.length
-                var bd = contractstart.text
-                if (len === 2 || len === 5) contractstart.text = bd + "."
-            }
-        }
-    }
-    Label
-    {
-        text: qsTr("Vertragsende")
-        Layout.alignment: Qt.AlignRight
-        visible: radio.children[1].checked
-    }
-    TextField
-    {
-        property string name: "contractend"
-        id: contractend
-        Layout.fillWidth: true
-        visible: radio.children[1].checked
-        placeholderTextColor: "red"
-        Layout.columnSpan: 3
-        onTextChanged: checkFields()
-        validator: RegularExpressionValidator
-        {
-            regularExpression: /((^|)(0[1-9]{1}|[1-2]{1}[0-9]{1}|3[0-1]))\.((^|)(0[1-9]{1}|1[0-2]{1}))\.((^|)(196[0-9]{1}|19[7-9]{1}[0-9]{1}|20[0-9]{2}))/
-        }
-        Keys.onPressed: (event)=>
-        {
-            if (event.key !== Qt.Key_Backspace)
-            {
-                var len = contractend.length
-                var bd = contractend.text
-                if (len === 2 || len === 5) contractend.text = bd + "."
-            }
-        }
-    }
-    Label
-    {
-        text: qsTr("Arbeitszeiten Tage")
-        Layout.alignment: Qt.AlignRight
-        visible: radio.children[1].checked
-    }
-    ComboBox
-    {
-        property string name: "workdays"
-        id: workdays
-        Layout.fillWidth: true
-        visible: radio.children[1].checked
-        model: ["1","2","3","4","5","6","7"]
-    }
-    Label
-    {
-        text: qsTr("Stunden")
-        Layout.alignment: Qt.AlignRight
-        visible: radio.children[1].checked
-    }
-    ComboBox
-    {
-        property string name: "workhours"
-        id: workhours
-        Layout.fillWidth: true
-        visible: radio.children[1].checked
-        model: ["1","2","3","4","5","6","7","8"]
-    }
-    Label
-    {
-        text: qsTr("Briefanrede")
-        Layout.alignment: Qt.AlignRight
-    }
-    TextField
-    {
-        property string name: "formofaddress"
-        id: briefAnrede
-        Layout.fillWidth: true
-        placeholderTextColor: "red"
-        Layout.columnSpan: 3
-        onTextChanged: checkFields()
-    }
 
-    Item
-    {
-        Layout.fillHeight: true
+        property string name: "salary"
+
+        Layout.columnSpan: 3
+        Layout.fillWidth: true
+        placeholderTextColor: "red"
+
+        onTextChanged: checkFields()
+    }
+    Label {
+        Layout.alignment: Qt.AlignRight
+        text: qsTr("Jobbeschreibung")
+    }
+    TextField {
+        id: jobdescription
+
+        property string name: "jobdesc"
+
+        Layout.columnSpan: 3
+        Layout.fillWidth: true
+        placeholderTextColor: "red"
+
+        onTextChanged: checkFields()
+    }
+    Label {
+        Layout.alignment: Qt.AlignRight
+        text: qsTr("Vertragsbeginn")
+    }
+    TextField {
+        id: contractstart
+
+        property string name: "contractstart"
+
+        Layout.columnSpan: 3
+        Layout.fillWidth: true
+        placeholderTextColor: "red"
+
+        validator: RegularExpressionValidator {
+            regularExpression: /((^|)(0[1-9]{1}|[1-2]{1}[0-9]{1}|3[0-1]))\.((^|)(0[1-9]{1}|1[0-2]{1}))\.((^|)(196[0-9]{1}|19[7-9]{1}[0-9]{1}|20[0-9]{2}))/
+        }
+
+        Keys.onPressed: event => {
+            if (event.key !== Qt.Key_Backspace) {
+                var len = contractstart.length;
+                var bd = contractstart.text;
+                if (len === 2 || len === 5)
+                    contractstart.text = bd + ".";
+            }
+        }
+        onTextChanged: checkFields()
+    }
+    Label {
+        Layout.alignment: Qt.AlignRight
+        text: qsTr("Vertragsende")
+    }
+    TextField {
+        id: contractend
+
+        property string name: "contractend"
+
+        Layout.columnSpan: 3
+        Layout.fillWidth: true
+        placeholderTextColor: "red"
+
+        validator: RegularExpressionValidator {
+            regularExpression: /((^|)(0[1-9]{1}|[1-2]{1}[0-9]{1}|3[0-1]))\.((^|)(0[1-9]{1}|1[0-2]{1}))\.((^|)(196[0-9]{1}|19[7-9]{1}[0-9]{1}|20[0-9]{2}))/
+        }
+
+        Keys.onPressed: event => {
+            if (event.key !== Qt.Key_Backspace) {
+                var len = contractend.length;
+                var bd = contractend.text;
+                if (len === 2 || len === 5)
+                    contractend.text = bd + ".";
+            }
+        }
+        onTextChanged: checkFields()
+    }
+    Label {
+        Layout.alignment: Qt.AlignRight
+        text: qsTr("Arbeitszeiten Tage")
+    }
+    ComboBox {
+        id: workdays
+
+        property string name: "workdays"
+
+        Layout.fillWidth: true
+        model: ["1", "2", "3", "4", "5", "6", "7"]
+    }
+    Label {
+        Layout.alignment: Qt.AlignRight
+        text: qsTr("Stunden")
+    }
+    ComboBox {
+        id: workhours
+
+        property string name: "workhours"
+
+        Layout.fillWidth: true
+        model: ["1", "2", "3", "4", "5", "6", "7", "8"]
+    }
+    Label {
+        Layout.alignment: Qt.AlignRight
+        text: qsTr("Briefanrede")
+    }
+    TextField {
+        id: briefAnrede
+
+        property string name: "formofaddress"
+
+        Layout.columnSpan: 3
+        Layout.fillWidth: true
+        placeholderTextColor: "red"
+
+        onTextChanged: checkFields()
+    }
+    Item {
         Layout.columnSpan: 4
-    }
-    function checkPersonalField()
-    {
-        if (radio.children[0].checked)
-        {
-            return (firstname.text.trim() && lastname.text.trim())
-        }
-        else
-        {
-            return (firstname.text.trim() && lastname.text.trim() && street.text.trim() && houseno.text.trim()
-                    && (postcode.editText.trim() || postcode.currentText.trim())
-                    && (city.editText.trim() || city.currentText.trim())
-                    && birthday.text.trim() && phonenumber.text.trim()
-                    && cellphone.text.trim() && email.text.trim() && jobdescription.text.trim()
-                    && contractstart.text.trim() && contractend.text.trim() && briefAnrede.text.trim())
-        }
-    }
-    function requiredField()
-    {
-        var pf = (radio.children[1].checked)?"Pflichtfeld":""
-        street.placeholderText = pf
-        phonenumber.placeholderText = pf
-        cellphone.placeholderText = pf
-        email.placeholderText = pf
-        jobdescription.placeholderText = pf
-        contractstart.placeholderText = pf
-        contractend.placeholderText = pf
-        briefAnrede.placeholderText = pf
-        houseno.placeholderText = pf
+        Layout.fillHeight: true
     }
 }

Gui/Employees/EmployeesTable.qml

@@ -0,0 +1,143 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import Qt.labs.qmlmodels
+
+ColumnLayout {
+    anchors.fill: parent
+    spacing: Dimensions.l
+
+    RowLayout {
+        Layout.fillWidth: true
+        spacing: Dimensions.l
+
+        SearchBar {
+            onSubmitted: (query) => {
+                applicantModel.searchQuery = query
+            }
+        }
+        QuickFilter {
+            model: ListModel {
+                ListElement {
+                    name: "Alle"
+                    selected: true
+                    text: qsTr("Alle")
+                }
+                ListElement {
+                    name: "Bewerber"
+                    selected: false
+                    text: qsTr("Bewerber")
+                }
+                ListElement {
+                    name: "Mitarbeiter"
+                    selected: false
+                    text: qsTr("Kunde")
+                }
+                ListElement {
+                    name: "Erledigt"
+                    selected: false
+                    text: qsTr("Erledigt")
+                }
+            }
+
+            onSelectedChanged: name => {
+                employee_model.viewCriterion(name);
+            }
+        }
+        Button {
+            Layout.alignment: Qt.AlignRight
+            flat: true
+            icon.source: "qrc:/images/PlusCircle.svg"
+            text: qsTr("Bewerber Hinzufügen")
+
+            onClicked: contentStack.push("AddApplicant.qml")
+        }
+        Button {
+            Layout.alignment: Qt.AlignRight
+            flat: true
+            icon.source: "qrc:/images/PlusCircle.svg"
+            text: qsTr("Mitarbeiter Hinzufügen")
+
+            onClicked: contentStack.push("AddEmployee.qml")
+        }
+    }
+    ColumnLayout {
+        Layout.fillHeight: true
+        Layout.fillWidth: true
+        spacing: 2
+
+        HorizontalHeaderView {
+            movableColumns: true
+            syncView: employeesTable
+
+            delegate: Rectangle {
+                Layout.fillWidth: true
+                color: Colors.primary
+                implicitHeight: 33
+                implicitWidth: 1
+
+                Text {
+                    color: Colors.primaryContrast
+                    elide: Text.ElideRight
+                    font: Typography.smallBold
+                    height: parent.height
+                    horizontalAlignment: Text.AlignLeft
+                    padding: Dimensions.s
+                    text: model.display
+                    verticalAlignment: Text.AlignVCenter
+                    width: parent.width
+                }
+            }
+        }
+        TableView {
+            id: employeesTable
+
+            Layout.fillHeight: true
+            Layout.fillWidth: true
+            columnSpacing: 2
+            model: applicantModel
+            resizableColumns: true
+            rowSpacing: 2
+            selectionBehavior: TableView.SelectRows
+            z: 1
+
+            ScrollBar.vertical: ScrollBar {
+                policy: ScrollBar.AsNeeded
+            }
+            delegate: Rectangle {
+                required property bool selected
+
+                color: selected ? Colors.primaryHighlight : Colors.transparent
+                implicitHeight: 33
+                implicitWidth: employeesTable.width / employeesTable.columns
+
+                Text {
+                    color: Colors.foreground
+                    elide: Text.ElideRight
+                    font: Typography.small
+                    height: parent.height
+                    padding: Dimensions.s
+                    text: (model.display === null || model.display === undefined) ? "" : model.display
+                    verticalAlignment: Text.AlignVCenter
+                    width: parent.width
+                }
+                MouseArea {
+                    anchors.fill: parent
+                    cursorShape: Qt.PointingHandCursor
+                    hoverEnabled: true
+
+                    onClicked: {
+                        contentStack.push("EmployeeDetails.qml", { row });
+                    }
+                    onEntered: {
+                        employeesTable.selectionModel.select(employeesTable.model.index(row, 0), ItemSelectionModel.SelectCurrent | ItemSelectionModel.Rows);
+                    }
+                }
+            }
+            selectionModel: ItemSelectionModel {
+                model: employeesTable.model
+            }
+        }
+    }
+}
+

Gui/Employees/qmldir

@@ -0,0 +1 @@
+module Employees

Gui/EmployeesTable.qml

@@ -1,187 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
-import Qt.labs.qmlmodels
-
-ColumnLayout
-{
-
-    function viewEmployees(criterion)
-    {
-        employee_model.viewCriterion(criterion)
-        // employee_model.viewCriterion(criterion, showProcessed.checked, showFired.checked, showEveryone.checked)
-    }
-
-    anchors.fill: parent
-    spacing: Dimensions.l
-
-    Component.onCompleted: employeesStack.pop()
-    // property var availableFilters: ["Name", "Adresse", "PLZ", "Ort", "Status"]
-    RowLayout
-    {
-        Layout.fillWidth: true
-        spacing: Dimensions.l
-        SearchBar
-        {
-            id:searchBar
-        }
-        QuickFilter
-        {
-            onSelectedChanged: (name) =>
-                               {
-                business_model.viewCriterion(name)
-            }
-
-            model: ListModel
-            {
-                ListElement
-                {
-
-                    name: "Alle"
-                    text: qsTr("Alle")
-                    selected: true
-                }
-                ListElement
-                {
-                    name: "Bewerber"
-                    text: qsTr("Bewerber")
-                    selected: false
-                }
-                ListElement
-                {
-                    name: "Mitarbeiter"
-                    text: qsTr("Kunde")
-                    selected: false
-                }
-
-                ListElement
-                {
-                    name: "Erledigt"
-                    text: qsTr("Erledigt")
-                    selected: false
-                }
-            }
-        }
-        Button
-        {
-            id: addEmployeeBtn
-            text: qsTr("Mitarbeiter Hinzufügen")
-            icon.source: "qrc:/images/PlusCircle.svg"
-            Layout.alignment: Qt.AlignRight
-            flat: true
-            onClicked: appLoader.source = "AddApplicant.qml"
-        }
-    }
-
-
-        HorizontalHeaderView
-        {
-            id: employeeTableHeader
-            Layout.fillWidth: true
-            syncView: appliEmpTable
-            implicitHeight: 40
-            movableColumns: true //@disable-check M16
-            delegate: Rectangle
-            {
-                color:  addEmployeeBtn.palette.alternateBase
-                border.color: palette.base
-                implicitHeight: 40
-                Layout.fillWidth: true
-                implicitWidth: 1
-                Text
-                {
-                    text: model.display
-                    elide: Text.ElideRight
-                    width: parent.width
-                    height: parent.height
-                    horizontalAlignment: Text.AlignHCenter
-                    verticalAlignment: Text.AlignVCenter
-                    color: palette.text
-                }
-            }
-        }
-
-        TableView
-        {
-            id: appliEmpTable
-            //Layout.fillHeight: true
-            //height: tableParent.height - (viewCriterion.height + employeeTableHeader.height)
-            Layout.fillWidth: true
-            Layout.fillHeight: true
-            columnSpacing: 1
-            rowSpacing: 2
-            alternatingRows: true
-            resizableColumns: true
-            model: employee_model
-            selectionBehavior: TableView.SelectRows
-            z: 1
-            ScrollBar.vertical: ScrollBar
-            {
-                policy: appliEmpTable.contentHeight > appliEmpTable.height ? ScrollBar.AlwaysOn : ScrollBar.AlwaysOff
-            }
-
-            selectionModel: ItemSelectionModel
-            {
-                id: selModel
-                model: appliEmpTable.model
-            }
-
-
-            delegate:Rectangle
-            {
-                required property bool selected
-                required property bool current
-                implicitWidth: appliEmpTable.width / appliEmpTable.columns
-                implicitHeight: 25
-                color: selected
-                           ? addEmployeeBtn.palette.highlight //palette.highlight
-                           : (appliEmpTable.alternatingRows && row % 2 !== 0
-                           ? addEmployeeBtn.palette.base // palette.base
-                           : addEmployeeBtn.palette.alternateBase) //palette.alternateBase)
-
-                Text
-                {
-                    text: (model.display === null || model.display === undefined)? "": model.display
-                    elide: Text.ElideRight
-                    width: parent.width
-                    height: parent.height
-                    verticalAlignment: Text.AlignVCenter
-                    leftPadding: 9 //@d isable-check M16
-                    color: palette.text
-
-                }
-
-                MouseArea
-                {
-                    id: mouseArea
-                    property bool hovered:false
-
-                    anchors.fill: parent
-                    hoverEnabled: true
-
-                    onDoubleClicked:
-                    {
-                        employeesStack.push("EmployeeDetails.qml", {selectedEmployee: row});
-                    }
-
-                    onEntered:
-                    {
-                        appliEmpTable.selectionModel.select(appliEmpTable.model.index(row, 0), ItemSelectionModel.SelectCurrent | ItemSelectionModel.Rows)
-                    }
-
-                }
-            }
-        }
-
-        Item
-        {
-            Layout.fillWidth: true
-        }
-    }
-
-    // function viewEmployees(criterion)
-    // {
-    //     employee_model.viewCriterion(criterion, showProcessed.checked, showFired.checked, showEveryone.checked)
-    // }
-    // Component.onCompleted: employeesStack.pop()
-

Gui/Firststart.qml

@@ -77,7 +77,7 @@ Item
         title: qsTr("Wiederherstellen")
         buttons: MessageDialog.Yes | MessageDialog.No
         onAccepted: recoveryPaswordDialog.open()
-        onRejected: gotoLogin()
+        onRejected: contentStack.replace("LoginSreen.qml")
     }
 
     MessageDialog
@@ -147,7 +147,7 @@ Item
             if (!adminAvailable) config.saveRecoveryKey(saveRecoveryDialog.currentFile, recpass)
             else config.getRecoveryKey(saveRecoveryDialog.currentFile, recpass)
 
-            gotoLogin()
+            contentStack.replace("LoginSreen.qml")
         }
 
         onRejected:

Gui/LoginScreen.qml

@@ -4,20 +4,19 @@ import QtQuick.Controls
 import QtQuick.Dialogs
 import QtQuick.Layouts
 
-
 Item {
     property string recpass: ""
 
     function dbConnectionFailed(msg) {
-        oschkar.notificationBox.informativeText = msg;
-        oschkar.notificationBox.text = "Verbindung zum Datenbankserver verloren";
-        oschkar.notificationBox.open();
+        notifications.notificationDialog.informativeText = msg;
+        notifications.notificationDialog.text = "Verbindung zum Datenbankserver verloren";
+        notifications.notificationDialog.open();
     }
     function getEncryptionKey() {
         recoveryPaswordDialog.open();
     }
     function loggedin() {
-        appLoader.source = "Dashboard.qml";
+        contentStack.replace("Dashboard.qml");
     }
 
     anchors.fill: parent
@@ -79,8 +78,8 @@ Item {
         }
         Button {
             Layout.topMargin: Dimensions.m
-            implicitWidth: parent.width
             icon.source: "qrc:/images/ArrowRightEndOnRectangle.svg"
+            implicitWidth: parent.width
             text: qsTr("Login")
 
             onClicked: {
@@ -132,8 +131,7 @@ Item {
             onRejected: quit()
         }
         Notifications {
-            id: oschkar
-
+            id: notifications
         }
     }
 }

Gui/Navigation.qml

@@ -0,0 +1,120 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+ColumnLayout {
+    property bool onSubPage: false
+
+    height: parent.height
+    spacing: 0
+    z: 3
+
+    Component.onCompleted: {
+        onSubPage = Qt.binding(() => contentStack.depth > 1);
+    }
+
+    anchors {
+        left: parent.left
+        top: parent.top
+    }
+    ButtonGroup {
+        id: mainNav
+
+    }
+    BarButton {
+        ButtonGroup.group: mainNav
+        icon.source: "qrc:/images/Square3Stack3D-Outline.svg"
+        target: "/Gui/Dashboard.qml"
+        text: qsTr("Dashboard")
+        visible: !onSubPage
+    }
+    BarButton {
+        ButtonGroup.group: mainNav
+        icon.source: "qrc:/images/UserGroup-Outline.svg"
+        target: "/Gui/CustomersTable.qml"
+        text: qsTr("Kunden")
+        visible: !onSubPage
+    }
+    BarButton {
+        ButtonGroup.group: mainNav
+        icon.source: "qrc:/images/BuildingOffice2-Outline.svg"
+        target: "/Gui/ObjectsTable.qml"
+        text: qsTr("Objekt")
+        visible: !onSubPage
+    }
+    BarButton {
+        ButtonGroup.group: mainNav
+        icon.source: "qrc:/images/Identification-Outline.svg"
+        target: "/Gui/Employees/EmployeesTable.qml"
+        text: qsTr("Mitarbeiter")
+        visible: !onSubPage
+    }
+    BarButton {
+        ButtonGroup.group: mainNav
+        icon.source: "qrc:/images/RectangleStack-Outline.svg"
+        target: "/Gui/OffersTable.qml"
+        text: qsTr("Angebote")
+        visible: !onSubPage
+    }
+    BarButton {
+        ButtonGroup.group: mainNav
+        icon.source: "qrc:/images/Wallet-Outline.svg"
+        text: qsTr("Abrechnung")
+        visible: !onSubPage
+    }
+    BarButton {
+        icon.source: "qrc:/images/ArrowLeftCircle-Outline.svg"
+        text: qsTr("Zurück")
+        visible: onSubPage
+        checkable: false
+
+        onClicked: contentStack.pop();
+    }
+    Item {
+        Layout.fillHeight: true
+    }
+    BarButton {
+        checkable: false
+        icon.source: "qrc:/images/Bars3.svg"
+
+        onClicked: mainMenu.open()
+
+        Menu {
+            id: mainMenu
+
+            MenuItem {
+                text: qsTr("Einstellungen")
+
+                onTriggered: {
+                    // TODO: Check if logged-in user is admin first!!
+
+                    contentStack.push("PyqcrmConf.qml");
+
+                }
+            }
+            MenuSeparator {
+            }
+            MenuItem {
+                text: qsTr("Als PDF exportieren")
+            }
+            MenuSeparator {
+            }
+            MenuItem {
+                text: qsTr("Drucken")
+            }
+            MenuItem {
+                text: qsTr("Erweiterter Druck")
+
+                onTriggered: printerDialog.show()
+            }
+            MenuSeparator {
+            }
+            MenuItem {
+                text: qsTr("Über PYQCRM")
+
+                onTriggered: readMeWin.show()
+            }
+        }
+    }
+}
+

Gui/NoDbConnection.qml

@@ -1,74 +1,27 @@
 import QtQuick
 import QtQuick.Controls
+import QtQuick.Layouts
 
-Rectangle
-{
-    anchors.fill: parent
-    color: "slateblue"
+ColumnLayout {
+    anchors.centerIn: parent
+    spacing: Dimensions.s
+    height: implicitHeight
 
-    Rectangle
-    {
-        id: info
-        anchors.horizontalCenter: parent.horizontalCenter
-        color: "slateblue"
-        implicitHeight: 55
-        implicitWidth: parent.width / 4
-        y: parent.height / 4
-        Text
-        {
-            anchors.centerIn: parent
-            text: qsTr("Keine Verbindung zur Datenbank!")
-            color: "moccasin"
-            font.bold: true
-            font.pixelSize: 45
-        }
+    H1 {
+        Layout.alignment: Qt.AlignCenter
+        text: qsTr("Keine Verbindung zur Datenbank!")
+        color: Colors.foreground
     }
-
-    Rectangle
-    {
-        id: nostart
-        anchors.top: info.bottom
-        color: "slateblue"
-        anchors.horizontalCenter: parent.horizontalCenter
-        implicitHeight: 55
-        implicitWidth: parent.width / 4
-        Text
-        {
-            text: qsTr("Programm kann nicht starten..")
-            color: "moccasin"
-            anchors.centerIn: parent
-            font.bold: true
-            font.pixelSize: 45
-        }
+    H2 {
+        Layout.alignment: Qt.AlignCenter
+        text: qsTr("Programm kann nicht starten…")
+        color: Colors.foreground
     }
+    Button {
+        Layout.topMargin: Dimensions.l
+        Layout.alignment: Qt.AlignCenter
+        text: qsTr("Beenden")
 
-    Rectangle
-    {
-        anchors.top: nostart.bottom
-        anchors.topMargin: 25
-        anchors.horizontalCenter: parent.horizontalCenter
-        color: "slateblue"
-        implicitHeight: 55
-        implicitWidth: parent.width / 4
-        Button
-        {
-            width: parent.width
-            height: 75
-            Text
-            {
-                text: qsTr("Beenden")
-                color: "moccasin"
-                anchors.centerIn: parent
-                font.bold: true
-                font.pixelSize: 45
-            }
-            anchors.centerIn: parent
-            background: Rectangle
-            {
-                color: "dodgerblue"
-                radius: 50
-            }
-            onClicked: Qt.quit()
-        }
+        onClicked: Qt.quit()
     }
 }

Gui/Notifications.qml

@@ -3,8 +3,6 @@ import QtQuick.Dialogs
 
 Item
 {
-    id: oschkar
-    property alias notificationBox: notificationDialog
     MessageDialog
     {
         id: notificationDialog

Gui/ObjectDetails.qml

@@ -16,7 +16,7 @@ Item
         Button
         {
             text: qsTr("Zurück zu den Objekten")
-            onClicked: objectsStack.pop()
+            onClicked: contentStack.pop()
         }
     }
 

Gui/ObjectTable.qml

@@ -1,22 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
-import Qt.labs.qmlmodels
-
-Item {
-    property var availableFilters: [""]
-    anchors.fill: parent
-
-    StackView
-    {
-        id: objectsStack
-        anchors.fill: parent
-        initialItem: "ObjectsTable.qml"
-    }
-}
-
-
-
-
-
-

Gui/ObjectTable.qml.orig

@@ -1,26 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
-import Qt.labs.qmlmodels
-
-Item {
-    property var availableFilters: [""]
-    anchors.fill: parent
-
-    StackView
-    {
-        id: objectsStack
-        anchors.fill: parent
-        initialItem: "ObjectsTable.qml"
-<<<<<<< HEAD
-        anchors.topMargin: Dimensions.m
-=======
->>>>>>> 7f5675c06d72728a2249b66dc18d56221ad5a0c97791edbc86afeb57dcb3392d
-    }
-}
-
-
-
-
-
-

Gui/ObjectTable_BACKUP_93344.qml

@@ -1,26 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
-import Qt.labs.qmlmodels
-
-Item {
-    property var availableFilters: [""]
-    anchors.fill: parent
-
-    StackView
-    {
-        id: objectsStack
-        anchors.fill: parent
-        initialItem: "ObjectsTable.qml"
-<<<<<<< HEAD
-        anchors.topMargin: Dimensions.m
-=======
->>>>>>> 7f5675c06d72728a2249b66dc18d56221ad5a0c97791edbc86afeb57dcb3392d
-    }
-}
-
-
-
-
-
-

Gui/ObjectTable_BASE_93344.qml

@@ -1,22 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
-import Qt.labs.qmlmodels
-
-Item {
-    property var availableFilters: [""]
-
-    StackView
-    {
-        id: objectsStack
-        anchors.fill: parent
-        initialItem: "ObjectsTable.qml"
-        anchors.margins: 9
-    }
-}
-
-
-
-
-
-

Gui/ObjectTable_LOCAL_93344.qml

@@ -1,22 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
-import Qt.labs.qmlmodels
-
-Item {
-    property var availableFilters: [""]
-
-    StackView
-    {
-        id: objectsStack
-        anchors.fill: parent
-        initialItem: "ObjectsTable.qml"
-        anchors.topMargin: Dimensions.m
-    }
-}
-
-
-
-
-
-

Gui/ObjectTable_REMOTE_93344.qml

@@ -1,22 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
-import Qt.labs.qmlmodels
-
-Item {
-    property var availableFilters: [""]
-    anchors.fill: parent
-
-    StackView
-    {
-        id: objectsStack
-        anchors.fill: parent
-        initialItem: "ObjectsTable.qml"
-    }
-}
-
-
-
-
-
-

Gui/ObjectsTable.qml

@@ -5,9 +5,11 @@ import Qt.labs.qmlmodels
 
 ColumnLayout
 {
+    property var availableFilters: [""]
+
     anchors.fill: parent
     spacing: Dimensions.l
-    
+
     function viewCriterion(criterion)
     {
         business_model.viewCriterion(criterion.text);
@@ -21,7 +23,7 @@ ColumnLayout
     Component.onCompleted:
     {
         contact_model.objectContactAdded.connect(onObjectContactAdded)
-        objectsStack.pop()
+        contentStack.pop()
     }
     RowLayout
     {
@@ -70,7 +72,7 @@ ColumnLayout
             icon.source: "qrc:/images/PlusCircle.svg"
             text: qsTr("Objekt Hinzufügen")
             Layout.alignment: Qt.AlignRight
-            onClicked: appLoader.source = "AddObject.qml"
+            onClicked: contentStack.push("AddObject.qml")
         }
     }
 
@@ -172,7 +174,7 @@ ColumnLayout
                     hoverEnabled: true
                     onDoubleClicked:
                     {
-                        objectsStack.push("ObjectDetails.qml", {selectedObject: row});
+                        contentStack.push("ObjectDetails.qml", {selectedObject: row});
                     }
                     onEntered:
                     {

Gui/ObjectsTable.qml.orig

@@ -1,257 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
-import Qt.labs.qmlmodels
-
-<<<<<<< HEAD
-ColumnLayout
-{
-    function viewCriterion(criterion)
-    {
-        business_model.viewCriterion(criterion.text);
-    }
-    function onObjectContactAdded(added)
-    {
-        console.log(added)
-        if (added) object_model.viewCriterion("")
-    }
-
-    anchors.fill: parent
-
-    Component.onCompleted:
-    {
-        contact_model.objectContactAdded.connect(onObjectContactAdded)
-        objectsStack.pop()
-    }
-    RowLayout
-    {
-        SearchBar
-        {
-
-        }
-        QuickFilter {
-            onSelectedChanged: (name) => {
-                business_model.viewCriterion(name)
-            }
-
-            model: ListModel {
-                ListElement {
-
-                    name: "Alle"
-                    text: qsTr("Alle")
-                    selected: true
-                }
-                ListElement {
-                    name: "Interessent"
-                    text: qsTr("Interessent")
-                    selected: false
-                }
-                ListElement {
-                    name: "Kunde"
-                    text: qsTr("Kunde")
-                    selected: false
-                }
-                ListElement {
-                    name: "Lieferant"
-                    text: qsTr("Lieferant")
-                    selected: false
-                }
-                ListElement {
-                    name: "Erledigt"
-                    text: qsTr("Erledigt")
-                    selected: false
-                }
-            }
-        }
-        Button
-        {
-            id: addObjectBtn
-            icon.source: "qrc:/images/PlusCircle.svg"
-            text: qsTr("Objekt Hinzufügen")
-            Layout.alignment: Qt.AlignRight
-            onClicked: appLoader.source = "AddObject.qml"
-        }
-=======
-ColumnLayout {
-    spacing: Dimensions.l
-    function onObjectContactAdded(added) {
-        console.log(added);
-        if (added)
-            object_model.viewCriterion("");
-    }
-
-    Component.onCompleted: {
-        contact_model.objectContactAdded.connect(onObjectContactAdded);
-        objectsStack.pop();
->>>>>>> 7f5675c06d72728a2249b66dc18d56221ad5a0c97791edbc86afeb57dcb3392d
-    }
-
-    RowLayout {
-        Layout.fillWidth: true
-        spacing: Dimensions.l
-
-<<<<<<< HEAD
-    ColumnLayout
-    {
-        id: tableColumn
-        clip: true
-        // anchors
-        // {
-        //     top: searchBar.bottom
-        //     bottom: parent.bottom
-        //     left: parent.left
-        //     right: parent.right
-        //     topMargin: 15
-        // }
-        HorizontalHeaderView
-        {
-=======
-        SearchBar {
-        }
-
-        Button {
-            id: addObjectBtn
-            Layout.alignment: Qt.AlignRight
-
-            icon.source: "qrc:/images/PlusCircle.svg"
-            text: qsTr("Objekt Hinzufügen")
-
-            onClicked: appLoader.source = "AddObject.qml"
-        }
-    }
-    ColumnLayout {
-        id: tableColumn
-        Layout.fillWidth: true
-        Layout.fillHeight: true
-        Layout.verticalStretchFactor: 1
-
-        clip: true
-
-        HorizontalHeaderView {
->>>>>>> 7f5675c06d72728a2249b66dc18d56221ad5a0c97791edbc86afeb57dcb3392d
-            id: horizontalHeaderview
-
-            Layout.fillWidth: true
-            implicitHeight: 40
-            movableColumns: true //@disable-check M16
-            syncView: objectTable
-
-            delegate: Rectangle {
-                Layout.fillWidth: true
-                border.color: addObjectBtn.palette.base
-                color: addObjectBtn.palette.alternateBase
-                implicitHeight: 40
-                implicitWidth: 1
-
-                Text {
-                    color: addObjectBtn.palette.text
-                    elide: Text.ElideRight
-                    height: parent.height
-                    horizontalAlignment: Text.AlignHCenter
-                    text: model.display
-                    verticalAlignment: Text.AlignVCenter
-                    width: parent.width
-                }
-            }
-        }
-        TableView {
-            id: objectTable
-
-            property real newWidth: 0
-
-            Layout.fillWidth: true
-            Layout.fillHeight: true
-            alternatingRows: true
-            columnSpacing: 1
-            height: parent.height - horizontalHeaderview.height
-            model: object_model
-            resizableColumns: true // @disable-check M16
-            rowSpacing: 2
-            selectionBehavior: TableView.SelectRows
-            z: 0
-
-            ScrollBar.vertical: ScrollBar {
-                policy: objectTable.contentHeight > objectTable.height ? ScrollBar.AlwaysOn : ScrollBar.AlwaysOff
-            }
-            delegate: Rectangle {
-                required property bool current
-                required property bool selected
-
-                color: selected ? addObjectBtn.palette.highlight
-                 : (objectTable.alternatingRows && row % 2 !== 0 ? addObjectBtn.palette.base
-                     : addObjectBtn.palette.alternateBase)
-
-                implicitHeight: 25
-                implicitWidth: objectTable.width / objectTable.columns
-
-                Text {
-                    color: addObjectBtn.palette.text
-                    elide: Text.ElideRight
-                    height: parent.height
-                    leftPadding: 9 //@disable-check M16
-                    text: (model.display === null || model.display === undefined) ? "" : model.display
-                    verticalAlignment: Text.AlignVCenter
-                    width: parent.width
-                }
-                MouseArea {
-                    id: mouseArea
-
-                    property bool hovered: false
-
-                    anchors.fill: parent
-                    hoverEnabled: true
-
-                    onDoubleClicked: {
-                        objectsStack.push("ObjectDetails.qml", {
-                            selectedObject: row
-                        });
-                    }
-                    onEntered: {
-                        objectTable.selectionModel.select(objectTable.model.index(row, 0), ItemSelectionModel.SelectCurrent | ItemSelectionModel.Rows);
-                    }
-                }
-            }
-
-            selectionModel: ItemSelectionModel {
-                id: obmodel
-
-                model: objectTable.model
-            }
-        }
-<<<<<<< HEAD
-
-
-    }
-    Item
-    {
-
-        Layout.fillHeight: true
-    }
-    // function onObjectContactAdded(added)
-    // {
-    //     console.log(added)
-    //     if (added) object_model.viewCriterion("")
-    // }
-    // function viewCriterion(criterion)
-    // {
-    //     object_model.viewCriterion(criterion.text)
-    // }
-
-    // Component.onCompleted:
-    // {
-    //     contact_model.objectContactAdded.connect(onObjectContactAdded)
-    //     objectsStack.pop()
-    // }
-
-    // function onObjectContactAdded(added)
-    // {
-    //     console.log(added)
-    //     if (added) object_model.viewCriterion("")
-    // }
-=======
-        Item {
-            Layout.fillWidth: true
-        }
-    }
->>>>>>> 7f5675c06d72728a2249b66dc18d56221ad5a0c97791edbc86afeb57dcb3392d
-}

Gui/OfferTable.qml

@@ -1,17 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
-import Qt.labs.qmlmodels
-
-
-Item
-{
-    anchors.fill: parent
-    StackView
-    {
-        id: offersStack
-        anchors.fill: parent
-        initialItem: "OffersTable.qml"
-    }
-}
-

Gui/OfferTable.qml.orig

@@ -1,22 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
-import Qt.labs.qmlmodels
-
-
-Item
-{
-    anchors.fill: parent
-    StackView
-    {
-        id: offersStack
-
-        anchors.fill: parent
-        initialItem: "OffersTable.qml"
-<<<<<<< HEAD
-        anchors.topMargin: Dimensions.m
-=======
->>>>>>> 7f5675c06d72728a2249b66dc18d56221ad5a0c97791edbc86afeb57dcb3392d
-    }
-}
-

Gui/OffersTable.qml

@@ -3,75 +3,64 @@ import QtQuick.Layouts
 import QtQuick.Controls
 import Qt.labs.qmlmodels
 
-ColumnLayout
-{
-    anchors.fill: parent
-    spacing: Dimensions.l
-    function viewOffers(criterion)
-    {
-        //offer_model.viewCriterion(criterion)
+ColumnLayout {
+    function viewOffers(criterion) {
+    //offer_model.viewCriterion(criterion)
     }
 
-    RowLayout
-    {
+    anchors.fill: parent
+    spacing: Dimensions.l
+
+    RowLayout {
         Layout.fillWidth: true
         spacing: Dimensions.l
-        SearchBar
-        {
+
+        SearchBar {
             id: searchBar
+
         }
-        QuickFilter
-        {
-            onSelectedChanged: (name) =>
-                               {
-                business_model.viewCriterion(name)
-            }
-
-            model: ListModel
-            {
-                ListElement
-                {
-
+        QuickFilter {
+            model: ListModel {
+                ListElement {
                     name: "Alle"
-                    text: qsTr("Alle")
                     selected: true
+                    text: qsTr("Alle")
                 }
-                ListElement
-                {
+                ListElement {
                     name: "Offen"
+                    selected: false
                     text: qsTr("Offen")
-                    selected: false
                 }
-                ListElement
-                {
+                ListElement {
                     name: "Abgeschlossen"
+                    selected: false
                     text: qsTr("Abgeschlossen")
-                    selected: false
                 }
-
-                ListElement
-                {
+                ListElement {
                     name: "Erledigt"
-                    text: qsTr("Erledigt")
                     selected: false
+                    text: qsTr("Erledigt")
                 }
             }
+
+            onSelectedChanged: name => {
+                business_model.viewCriterion(name);
+            }
         }
-        Button
-        {
+        Button {
             id: addOfferBtn
-            text: qsTr("Angebote Hinzufügen")
-            icon.source: "qrc:/images/PlusCircle.svg"
+
             Layout.alignment: Qt.AlignRight
             flat: true
-            //onClicked: appLoader.source = "AddOffer.qml"
+            icon.source: "qrc:/images/PlusCircle.svg"
+            text: qsTr("Angebote Hinzufügen")
+
+            onClicked: contentStack.push("AddOffer.qml")
         }
     }
     Item {
         id: spacer
+
         Layout.fillHeight: true
-
     }
-
-
 }

Gui/OffersTable.qml.orig

@@ -1,90 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
-import Qt.labs.qmlmodels
-
-<<<<<<< HEAD
-ColumnLayout
-{
-    anchors.fill: parent
-    function viewOffers(criterion)
-    {
-        //offer_model.viewCriterion(criterion)
-=======
-ColumnLayout {
-    property var availableFilters: []
-
-    Layout.fillWidth: true
-    anchors.fill: parent
-
-    RowLayout {
-        spacing: Dimensions.l
-        SearchBar {
-        }
-    }
-    Item {
-        Layout.fillHeight: true
->>>>>>> 7f5675c06d72728a2249b66dc18d56221ad5a0c97791edbc86afeb57dcb3392d
-    }
-
-    RowLayout
-    {
-        SearchBar
-        {
-            id:searchBar
-        }
-        QuickFilter
-        {
-            onSelectedChanged: (name) =>
-                               {
-                business_model.viewCriterion(name)
-            }
-
-            model: ListModel
-            {
-                ListElement
-                {
-
-                    name: "Alle"
-                    text: qsTr("Alle")
-                    selected: true
-                }
-                ListElement
-                {
-                    name: "Offen"
-                    text: qsTr("Offen")
-                    selected: false
-                }
-                ListElement
-                {
-                    name: "Abgeschlossen"
-                    text: qsTr("Abgeschlossen")
-                    selected: false
-                }
-
-                ListElement
-                {
-                    name: "Erledigt"
-                    text: qsTr("Erledigt")
-                    selected: false
-                }
-            }
-        }
-        Button
-        {
-            id: addOfferBtn
-            text: qsTr("Angebote Hinzufügen")
-            icon.source: "qrc:/images/PlusCircle.svg"
-            Layout.alignment: Qt.AlignRight
-            flat: true
-            //onClicked: appLoader.source = "AddOffer.qml"
-        }
-    }
-    Item {
-        id: spacer
-        Layout.fillHeight: true
-
-    }
-
-
-}

Gui/PyqcrmConf.qml

@@ -101,7 +101,7 @@ Item
         Button
         {
             text: qsTr("Ablehnen")
-            onClicked: appLoader.source = "Dashboard.qml"
+            onClicked: contentStack.pop()
         }
 
         Button

Gui/TopBar.qml

@@ -1,270 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-
-
-ColumnLayout
-{
-    id: topBar
-    spacing: 0
-    height: parent.height
-    anchors
-    {
-        top: parent.top
-        left: parent.left
-
-
-    }
-    ButtonGroup
-    {
-        id: buttonBar
-    }
-
-    BarButton
-    {
-        id: dashBoard
-        flat: true
-        text: qsTr("Dashboard")
-        implicitWidth: 90
-        implicitHeight: 90
-        Layout.margins: 3
-        Layout.topMargin: Dimensions.s
-        icon.source: "qrc:/images/dash.svg"
-        ButtonGroup.group: buttonBar
-        // background: Rectangle
-        // {
-        //     id: dashiBackie
-        //     border.width: dashBoard.activeFocus ? 2 : 1
-        //     border.color: "#888"
-        //     radius: 4
-        //     gradient: Gradient
-        //     {
-        //         GradientStop { position: 0 ; color: dashBoard.pressed ? "#000" : "#001" }
-        //         GradientStop { position: 1 ; color: dashBoard.pressed ? "#100" : "#000" }
-        //     }
-        // }
-        onClicked:
-        {
-            appLoader.source = "Dashboard.qml"
-
-
-            // dashiBackie.border.width = 2
-            // kundiBackie.border.width = 1
-            // mitoBackie.border.width = 1
-            // invoBackie.border.width = 1
-            // objBackie.border.width = 1
-        }
-    }
-
-    BarButton
-    {
-        id: kunden
-        flat: true
-        text: qsTr("Kunden")
-        implicitWidth: 90
-        implicitHeight: 90
-        Layout.margins: 3
-        icon.source: "qrc:/images/customer.svg"
-        ButtonGroup.group: buttonBar
-        // background: Rectangle
-        // {
-        //     id: kundiBackie
-        //     border.width: kunden.activeFocus ? 2 : 1
-        //     border.color: "#888"
-        //     radius: 4
-        //     gradient: Gradient
-        //     {
-        //         GradientStop { position: 0 ; color: kunden.pressed ? "#000" : "#001" }
-        //         GradientStop { position: 1 ; color: kunden.pressed ? "#100" : "#000" }
-        //     }
-        // }
-        onClicked:
-        {
-            // TODO: here we should call the model
-            appLoader.source = "CustomerTable.qml"
-            // kundiBackie.border.width = 2
-            // dashiBackie.border.width = 1
-            // mitoBackie.border.width = 1
-            // invoBackie.border.width = 1
-            // objBackie.border.width = 1
-        }
-    }
-
-    BarButton
-    {
-        id: objekt
-        flat: true
-        text: qsTr("Objekt")
-        implicitWidth: 90
-        implicitHeight: 90
-        Layout.margins: 3
-        icon.source: "qrc:/images/object.svg"
-        ButtonGroup.group: buttonBar
-        // background: Rectangle
-        // {
-        //     id: objBackie
-        //     border.width: objekt.activeFocus ? 2 : 1
-        //     border.color: "#888"
-        //     radius: 4
-        //     gradient: Gradient
-        //     {
-        //         GradientStop { position: 0 ; color: objekt.pressed ? "#000" : "#001" }
-        //         GradientStop { position: 1 ; color: objekt.pressed ? "#100" : "#000" }
-        //     }
-        // }
-        onClicked:
-        {
-            appLoader.source = "ObjectTable.qml"
-            // objBackie.border.width = 2
-            // dashiBackie.border.width = 1
-            // kundiBackie.border.width = 1
-            // mitoBackie.border.width = 1
-            // invoBackie.border.width = 1
-        }
-
-    }
-
-    BarButton
-    {
-        id: mitarbeiter
-        flat: true
-        text: qsTr("Mitarbeiter")
-        implicitWidth: 90
-        implicitHeight: 90
-        Layout.margins: 3
-        icon.source: "qrc:/images/employee.svg"
-
-        ButtonGroup.group: buttonBar
-        // background: Rectangle
-        // {
-        //     id: mitoBackie
-        //     border.width: mitarbeiter.activeFocus ? 2 : 1
-        //     border.color: "#888"
-        //     radius: 4
-        //     gradient: Gradient
-        //     {
-        //         GradientStop { position: 0 ; color: mitarbeiter.pressed ? "#000" : "#001" }
-        //         GradientStop { position: 1 ; color: mitarbeiter.pressed ? "#100" : "#000" }
-        //     }
-        // }
-        onClicked:
-        {
-            appLoader.source = "EmployeeTable.qml"
-            // mitoBackie.border.width = 2
-            // dashiBackie.border.width = 1
-            // kundiBackie.border.width = 1
-            // invoBackie.border.width = 1
-            // objBackie.border.width = 1
-        }
-    }
-
-    BarButton
-    {
-        id: offers
-        flat: true
-        text: qsTr("Angebote")
-        implicitWidth: 90
-        implicitHeight: 90
-        Layout.margins: 3
-        icon.source: "qrc:/images/offer.svg"
-        ButtonGroup.group: buttonBar
-        // background: Rectangle
-        // {
-        //     id: offersBackie
-        //     border.width: offers.activeFocus ? 2 : 1
-        //     border.color: "#888"
-        //     radius: 4
-        //     gradient: Gradient
-        //     {
-        //         GradientStop { position: 0 ; color: offers.pressed ? "#000" : "#001" }
-        //         GradientStop { position: 1 ; color: offers.pressed ? "#100" : "#000" }
-        //     }
-        // }
-        onClicked:
-        {
-            appLoader.source = "OfferTable.qml"
-            // mitoBackie.border.width = 2
-            // dashiBackie.border.width = 1
-            // kundiBackie.border.width = 1
-            // invoBackie.border.width = 1
-            // objBackie.border.width = 1
-            // offersBackie.border.width = 1
-        }
-    }
-
-    BarButton
-    {
-        id: abrechnung
-        flat: true
-        text: qsTr("Abrechnung")
-        implicitWidth: 90
-        implicitHeight: 90
-        Layout.margins: 3
-        icon.source: "qrc:/images/invoice.svg"
-        ButtonGroup.group: buttonBar
-        // background: Rectangle
-        // {
-        //     id: invoBackie
-        //     border.width: abrechnung.activeFocus ? 2 : 1
-        //     border.color: "#888"
-        //     radius: 4
-        //     gradient: Gradient
-        //     {
-        //         GradientStop { position: 0 ; color: abrechnung.pressed ? "#000" : "#001" }
-        //         GradientStop { position: 1 ; color: abrechnung.pressed ? "#100" : "#000" }
-        //     }
-        // }
-    }
-
-    Item
-    {
-        id: hspacer
-        Layout.fillHeight: true
-    }
-
-    BarButton
-    {
-        id: atajos
-        implicitWidth: 90
-        implicitHeight: 90
-        checkable: false
-        icon.source: "qrc:/images/Bars3.svg"
-
-        flat: true
-        Layout.bottomMargin: Dimensions.s
-        onClicked: mainMenu.open()
-
-        Menu {
-                id: mainMenu
-                MenuItem
-                {
-                    //text: qsTr("Benutzer-Verwaltung")
-                    //onTriggered: appLoader.source = "UsersPage.qml"
-                    text: qsTr("Einstellungen")
-                    onTriggered:
-                    {
-                        // TODO: Check if logged-in user is admin first!!
-
-                        appLoader.source = "PyqcrmConf.qml"
-                    }
-                }
-                MenuSeparator {}
-                MenuItem { text: qsTr("Als PDF exportieren") }
-                MenuSeparator {}
-                MenuItem { text: qsTr("Drucken") }
-                MenuItem
-                {
-                    text: qsTr("Erweiterter Druck")
-                    onTriggered: printerDialog.show()
-                }
-                MenuSeparator {}
-                MenuItem
-                {
-                    text: qsTr("Über PYQCRM")
-                    onTriggered: readMeWin.show()
-                }
-            }
-    }
-}
-
-

Gui/UtilityDialogs.qml

@@ -97,7 +97,7 @@ Item
         title: qsTr("Wiederherstellen")
         buttons: MessageDialog.Yes | MessageDialog.No
         onAccepted: recoveryPasswordDialog.open()
-        onRejected: gotoLogin()
+        onRejected: contentStack.replace("LoginSreen.qml")
     }
 
     MessageDialog

Gui/main.qml

@@ -4,173 +4,142 @@ import QtQuick.Controls
 import QtQuick.Dialogs
 import QtCore
 
-ApplicationWindow
-{
+ApplicationWindow {
     id: appWindow
-    width: Screen.width * .75
-    height: Screen.height * .85
-    visible: true
-    title: "TERO Personal"
-    font: Typography.body
-    color: Colors.mantle
+
     property string confile: ""
     property alias settingsFileDialog: settingsFiledialog
 
+    function showWindow(why) {
+        if (why === 3) {
+            systray.setVisible(false);
+            appWindow.show();
+        }
+    }
+
+    font: Typography.body
+    height: Screen.height * .85
+    palette.window: Colors.mantle
+    palette.placeholderText: Colors.interactive
     palette.text: Colors.foreground
+    title: "TERO Personal"
+    visible: true
+    width: Screen.width * .75
 
+    Component.onCompleted: {
+        systray.activated.connect(showWindow);
 
-    TopBar
-    {
-        id:topBar
-        visible: bad_config || !db_con ? false: true
+        if (bad_config) {
+            importDialog.open();
+        } else {
+            if (db_con)
+                contentStack.replace("LoginScreen.qml")
+            else
+                contentStack.replace("NoDbConnection.qml");
+        }
+    }
+    onClosing: close => {
+        if (false) {
+            console.log("Main window closed!! Was soll ich tun? kann ich mich beenden?!");
+        }
+    }
+    onVisibilityChanged: {
+        if (appWindow.visibility === Window.Minimized && config.systray()) {
+            systray.setVisible(true);
+            appWindow.hide();
+        }
+    }
+    onWindowStateChanged: windowState => {
+        if (windowState !== Qt.WindowMinimized) {
+            systray.setVisible(false);
+            appWindow.show();
+        }
     }
 
-    PrinterDialog
-    {
+    Navigation {
+        id: navigation
+
+        visible: !(bad_config || !db_con)
+    }
+    PrinterDialog {
         id: printerDialog
-    }
 
-    ReadMe
-    {
+    }
+    ReadMe {
         id: readMeWin
-    }
 
-    Item
-    {
+    }
+    Item {
         id: mainView
+
     }
 
-    Loader
-    {
-        id: appLoader
-
-        anchors
-        {
-            left: topBar.right
+    Rectangle {
+        id: contentBackground
+        anchors {
+            bottom: parent.bottom
+            left: navigation.visible ? navigation.right : parent.left
             right: parent.right
             top: parent.top
-            bottom: parent.bottom
-
-
-
-            topMargin: Dimensions.l
-            bottomMargin: Dimensions.l
-            rightMargin: Dimensions.l
-            leftMargin: Dimensions.l
-
         }
-
-        property alias window: appWindow
+        color: Colors.background
     }
 
+    StackView {
+        id: contentStack
 
-    Dialog
-    {
+        anchors {
+            fill: contentBackground
+            margins: Dimensions.l
+        }
+    }
+
+    Dialog {
         id: importDialog
-        modal: true
+
         anchors.centerIn: parent
+        modal: true
         standardButtons: Dialog.Yes | Dialog.No
-        onAccepted: settingsFiledialog.open()
-        onRejected: appLoader.source= "Firststart.qml"
         title: qsTr("Einstellungen importieren")
+
+        onAccepted: settingsFiledialog.open()
+        onRejected: contentStack.replace("Firststart.qml")
     }
-
-    FileDialog
-    {
-
+    FileDialog {
         id: settingsFiledialog
-        title: qsTr("PYQCRM Einstellungen")
+
         currentFolder: StandardPaths.standardLocations(StandardPaths.DocumentsLocation)[0]
         modality: "ApplicationModal"
         nameFilters: [qsTr("PYQCRM Einstellungen (*.pyqrec)")]
-        onAccepted:
-        {
-            exportFilePassword.open()
-            confile = selectedFile
+        title: qsTr("PYQCRM Einstellungen")
+
+        onAccepted: {
+            exportFilePassword.open();
+            confile = selectedFile;
         }
     }
-
-    Dialog
-    {
+    Dialog {
         id: exportFilePassword
-        modal: true
-        title: qsTr("PYQCRM Einstellungen")
+
         anchors.centerIn: parent
+        modal: true
         standardButtons: Dialog.Ok | Dialog.Cancel
+        title: qsTr("PYQCRM Einstellungen")
+
         onAccepted: config.importConfig(confile, exportPasswordInput.text)
-        ColumnLayout
-        {
-            RowLayout
-            {
-                Label
-                {
+
+        ColumnLayout {
+            RowLayout {
+                Label {
                     text: qsTr("Passwort eingeben:")
                 }
-
-                TextField
-                {
+                TextField {
                     id: exportPasswordInput
+
                     echoMode: TextInput.Password
                     implicitWidth: 300
                 }
             }
         }
     }
-
-    Component.onCompleted:
-    {
-        config.configurationReady.connect(goToLogin)
-        systray.activated.connect(showWindow)
-
-        if(bad_config)
-        {
-            importDialog.open()
-        }
-        else
-        {
-            if (db_con) appLoader.source= "LoginScreen.qml"
-            else appLoader.source= "NoDbConnection.qml"
-        }
-    }
-
-
-    function showWindow(why)
-    {
-        if (why === 3)
-        {
-            systray.setVisible(false)
-            appWindow.show()
-        }
-    }
-    onVisibilityChanged:
-    {
-        if (appWindow.visibility === Window.Minimized && config.systray())
-        {
-            systray.setVisible(true)
-            appWindow.hide()
-        }
-    }
-
-    onWindowStateChanged: (windowState) =>
-    {
-        if (windowState !== Qt.WindowMinimized)
-        {
-            systray.setVisible(false)
-            appWindow.show()
-        }
-    }
-
-    onClosing: (close) =>
-    {
-        if (false)
-        {
-            console.log("Main window closed!! Was soll ich tun? kann ich mich beenden?!")
-        }
-    }
-
-    function goToLogin()
-    {
-        appLoader.source= "LoginScreen.qml"
-        topBar.visible = true
-    }
 }

Gui/qmldir

@@ -1,2 +1,2 @@
 module gui
-TopBar 1.0 TopBar.qml
+Navigation 1.0 Navigation.qml

TeroStyle/BarButton.qml

@@ -6,82 +6,56 @@ import QtQuick.Templates as T
 T.ToolButton {
     id: control
 
-    implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-                            implicitContentWidth + leftPadding + rightPadding)
-    implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-                             implicitContentHeight + topPadding + bottomPadding)
+    property string target
+
     checkable: true
     icon.color: Colors.foreground
     icon.height: 36
     icon.width: 36
+    implicitHeight: 90
+    implicitWidth: 100
     topPadding: 20
-    // horizontalPadding: padding + 2
-    // spacing: 6
-    // display: AbstractButton.TextUnderIcon
-
-    // icon.color: control.checked || control.highlighted ? control.palette.brightText :
-    //            control.flat && !control.down ? (control.visualFocus ? control.palette.highlight : control.palette.windowText) : control.palette.buttonText
-
-    contentItem: Column
-    {
-
-        IconLabel
-        {
 
+    contentItem: Column {
+        readonly property color color: control.checked ? Colors.primaryShade : control.hovered ? Colors.primary : Colors.foreground
 
+        IconLabel {
+            color: parent.color
+            icon.color: parent.color
+            icon.height: control.icon.height
+            icon.source: control.icon.source
+            icon.width: control.icon.width
             x: parent.width * .5 - width * .5
-            // height: icon.height
-            // width: icon.width
-            icon: control.icon
-
-            // display: control.display
-
-
         }
-        Label
-        {
+        Label {
+            color: parent.color
+            font: Typography.smaller
             text: control.text
-            font: Typography.dash
-
-            color: Colors.foreground
             x: parent.width * .5 - width * .5
-
-
-
-        }
-
-        // spacing: control.spacing
-        // mirrored: control.mirrored
-        // display: control.TextUnderIcon
-
-        // icon: control.icon
-        // text: control.text
-        // font: control.font
-        // color: control.checked || control.highlighted ? control.palette.brightText :
-        //        control.flat && !control.down ? (control.visualFocus ? control.palette.highlight : control.palette.windowText) : control.palette.buttonText
-
-    }
-
-    background: Rectangle {
-        id: mainrect
-        implicitWidth: control.width
-        implicitHeight: control.height
-        visible: !control.flat || control.down || control.checked || control.highlighted
-        x: control.left
-        y: control.top
-        color: Color.blend(control.checked || control.highlighted ? control.palette.dark : control.palette.button,
-                                                                    control.palette.mid, control.down ? 0.5 : 0.0)
-        border.color: control.palette.highlight
-        border.width: control.visualFocus ? 2 : 0
-        Rectangle
-        {
-            implicitHeight: control.height
-            implicitWidth: 6
-            x: mainrect.left
-            y: mainrect.top
-            color: "yellow"
-
         }
     }
 
+    Rectangle {
+        anchors.bottom: parent.bottom
+        anchors.left: parent.left
+        anchors.top: parent.top
+        color: control.checked ? Colors.primaryShade : Colors.primary
+        implicitWidth: 6
+        visible: control.checked || control.hovered
+    }
+    MouseArea {
+        id: mouseArea
+
+        anchors.fill: parent
+        cursorShape: Qt.PointingHandCursor
+
+        onPressed: mouse => mouse.accepted = false
+    }
+
+    onClicked: {
+        if(!target) {
+            return
+        }
+        contentStack.replace(target)
+    }
 }

TeroStyle/Button.qml

@@ -25,6 +25,7 @@ T.Button {
      */
     property bool isFieldButton: false
 
+
     height: isFieldButton ? parent.height : null
     icon.color: Colors.primaryContrast
     icon.height: 21
@@ -43,12 +44,12 @@ T.Button {
         border.color: Colors.interactive
         border.width: isFieldButton ? 1 : 0
         bottomLeftRadius: topLeftRadius
-        color: !control.hovered ? Colors.primary : Colors.primaryLighter
+        color: !control.enabled ? Colors.disabled : !control.hovered ? Colors.primary : Colors.primaryLighter
         radius: Dimensions.radius
         topLeftRadius: isFieldButton ? 0 : radius
     }
     contentItem: I.IconLabel {
-        color: Colors.primaryContrast
+        color: !control.enabled ? Colors.disabledForeground : Colors.primaryContrast
         display: control.display
         font: control.font
         icon: control.icon

TeroStyle/Colors.qml

@@ -11,11 +11,15 @@ QtObject {
     readonly property color primary: "#b81a34"
     readonly property color primaryContrast: "#fdfdfd"
     readonly property color primaryLighter: Qt.lighter(primary, 1.5)
+    readonly property color primaryShade: theme === dark ? primaryLighter : Qt.darker(primary, 1.5)
+    readonly property color primaryHighlight: theme === dark ? Qt.darker(primary, 2- Colors.highlightOpacity) : Qt.lighter(primary, 2- Colors.highlightOpacity)
     readonly property color foreground: theme === dark ? "#fdfdfd" : "#110b0c"
     readonly property color background: theme === dark ? "#303136" : "#eff1f5"
-    readonly property color mantle: theme === dark ? "#1e1f22" : "#e7e9ef"
+    readonly property color mantle: theme === dark ? "#1E1E23" : "#e7e9ef"
     readonly property color interactive: theme === dark ? "#878b97" : "#d9d9da"
     readonly property color error: theme === dark ? "#ff2264" : "#ff004b"
+    readonly property color disabled: theme === dark ? Qt.darker(interactive, 1.9) : Qt.darker(interactive, 1.3)
+    readonly property color disabledForeground: theme === dark ? Qt.darker(foreground, 1.4) : Qt.lighter(foreground, 1.9)
     readonly property color transparent: "transparent"
 
     readonly property double highlightOpacity: .3

TeroStyle/ComboBox.qml

@@ -1,21 +1,41 @@
-pragma ComponentBehavior: Bound
-
 import QtQuick
-import QtQuick.Controls.impl
-import QtQuick.Controls
 import QtQuick.Templates as T
+import QtQuick.Controls
+import QtQuick.Controls.impl
 
 T.ComboBox {
     id: control
 
-    implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-                            implicitContentWidth + leftPadding + rightPadding)
+    font: Typography.body
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
                              implicitContentHeight + topPadding + bottomPadding,
                              implicitIndicatorHeight + topPadding + bottomPadding)
 
-    leftPadding: padding + (!control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing)
-    rightPadding: padding + (control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing)
+
+    contentItem: T.TextField {
+        id: test
+        autoScroll: control.editable
+        color: Colors.foreground
+        enabled: control.editable
+
+        font: Typography.body
+        implicitHeight: Typography.body.pixelSize + topPadding + bottomPadding
+        inputMethodHints: control.inputMethodHints
+        padding: Dimensions.m
+        readOnly: control.down
+        selectByMouse: control.selectTextByMouse
+        text: control.editable ? control.editText : control.displayText
+        validator: control.validator
+        width: control.width - indicator.width
+        verticalAlignment: Text.AlignVCenter
+    }
+    background: Rectangle {
+        border.color: Colors.interactive
+        border.width: 1
+        color: Colors.mantle
+        radius: Dimensions.radius
+        width: parent.width
+    }
 
     delegate: ItemDelegate {
         required property var model
@@ -23,224 +43,66 @@ T.ComboBox {
 
         width: ListView.view.width
         text: model[control.textRole]
-        // palette.text: control.palette.text
-        // palette.highlightedText: control.palette.highlightedText
-        font.weight: control.currentIndex === index ? Font.DemiBold : Font.Normal
         highlighted: control.highlightedIndex === index
         hoverEnabled: control.hoverEnabled
     }
+    indicator: Rectangle {
+        id: indicator
 
-    indicator: ColorImage {
-        x: control.mirrored ? control.padding : control.width - width - control.padding
-        y: control.topPadding + (control.availableHeight - height) / 2
+        border.color: Colors.interactive
+        bottomRightRadius: Dimensions.radius
+        color: Colors.primary
+        height: control.height
+        topRightRadius: Dimensions.radius
+        width: 20 + Dimensions.s * 2
+        x: control.width - width
+        y: 0
+        z: 2
 
-        source: "qrc:/images/ChevronDown.svg"
-        opacity: enabled ? 1 : 0.3
-    }
-
-    contentItem: T.TextField {
-        // leftPadding: !control.mirrored ? 12 : control.editable && activeFocus ? 3 : 1
-        // rightPadding: control.mirrored ? 12 : control.editable && activeFocus ? 3 : 1
-        // topPadding: 6 - control.padding
-        // bottomPadding: 6 - control.padding
-        implicitHeight: Typography.body.pixelSize + bottomPadding + topPadding
-        text: control.editable ? control.editText : control.displayText
-        padding: Dimensions.m
-        enabled: control.editable
-        autoScroll: control.editable
-        readOnly: control.down
-        inputMethodHints: control.inputMethodHints
-        validator: control.validator
-        selectByMouse: control.selectTextByMouse
-
-        color: Colors.foreground
-        // selectionColor: control.palette.highlight
-        // selectedTextColor: control.palette.highlightedText
-        verticalAlignment: Text.AlignVCenter
-
-        background: Rectangle {
-            visible: control.enabled && control.editable && !control.flat
-            border.width: parent && parent.activeFocus ? 2 : 1
-            border.color: Colors.interactive
-            radius: Dimensions.radius
-            color: Colors.mantle
+        IconLabel {
+            anchors.fill: parent
+            bottomPadding: Dimensions.s
+            icon.color: Colors.foreground
+            icon.source: "qrc:/images/ChevronDown.svg"
+            leftPadding: Dimensions.s
+            rightPadding: Dimensions.s
+            topPadding: Dimensions.s
+        }
+        MouseArea {
+            anchors.fill: parent
+            cursorShape: Qt.PointingHandCursor
 
+            onPressed: () => {
+                control.popup.visible = true;
+                control.popup.forceActiveFocus()
+            }
         }
     }
-
-    background: Rectangle {
-        implicitWidth: 140
-        implicitHeight: 40
-        radius: Dimensions.radius
-        color: Colors.mantle
-        border.color: Colors.interactive
-        border.width: 1
-        visible: !control.flat || control.down
-    }
-
     popup: T.Popup {
-        y: control.height
-        width: control.width
-        height: Math.min(contentItem.implicitHeight, control.Window.height - topMargin - bottomMargin)
-        topMargin: 6
         bottomMargin: 6
-        palette: control.palette
+        height: Math.min(contentItem.implicitHeight + 2, control.Window.height - topMargin - bottomMargin)
+        padding: 1
+        topMargin: 6
+        width: control.width
+        y: control.height
 
+        background: Rectangle {
+            border.color: Colors.interactive
+            color: Colors.mantle
+            radius: Dimensions.radius
+        }
         contentItem: ListView {
             clip: true
-            implicitHeight: contentHeight
-            model: control.delegateModel
             currentIndex: control.highlightedIndex
-            highlightMoveDuration: 0
+            implicitHeight: contentHeight
+            model: control.popup.visible ? control.delegateModel : null
 
-            Rectangle {
-                z: 10
-                width: parent.width
-                height: parent.height
-                color: "transparent"
-                border.color: control.palette.mid
+            T.ScrollBar.vertical: ScrollBar {
+            }
+            highlight: Rectangle {
+                color: Colors.primary
+                opacity: Colors.highlightOpacity
             }
-
-            T.ScrollIndicator.vertical: ScrollIndicator { }
         }
-
-        background: Rectangle {
-            color: control.palette.window
-        }
-
     }
 }
-
-
-// import QtQuick
-// import QtQuick.Templates as T
-// import QtQuick.Controls
-// import QtQuick.Controls.impl
-
-// T.ComboBox {
-//     id: control
-
-//     font: Typography.body
-//     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-//                              implicitContentHeight + topPadding + bottomPadding,
-//                              implicitIndicatorHeight + topPadding + bottomPadding)
-
-
-//     contentItem: T.TextField {
-//         id: test
-//         autoScroll: control.editable
-//         color: Colors.foreground
-//         enabled: control.editable
-
-//         font: Typography.body
-//         implicitHeight: Typography.body.pixelSize + topPadding + bottomPadding
-//         inputMethodHints: control.inputMethodHints
-//         padding: Dimensions.m
-//         readOnly: control.down
-//         selectByMouse: control.selectTextByMouse
-//         text: control.editable ? control.editText : control.displayText
-//         validator: control.validator
-//         width: control.width - indicator.width
-//         verticalAlignment: Text.AlignVCenter
-//     }
-//     background: Rectangle {
-//         border.color: Colors.interactive
-//         border.width: 1
-//         color: Colors.mantle
-//         // height: parent.height
-//         radius: Dimensions.radius
-//         width: parent.width
-//     }
-//     // delegate: MenuItem {
-//     //     id: menuItem
-
-//     //     required property int index
-//     //     required property var model
-
-//     //     highlighted: control.highlightedIndex === index
-//     //     hoverEnabled: control.hoverEnabled
-//     //     text: model[control.textRole]
-//     //     width: control.width
-
-//     //     background: Rectangle {
-//     //         color: menuItem.down || menuItem.highlighted ? Colors.primary : "transparent"
-//     //         height: menuItem.height
-//     //         width: menuItem.width
-//     //     }
-//     // }
-//     delegate: ItemDelegate {
-//         required property var model
-//         required property int index
-
-//         width: ListView.view.width
-//         text: model[control.textRole]
-//         // palette.text: control.palette.text
-//         // palette.highlightedText: control.palette.highlightedText
-//         // font.weight: control.currentIndex === index ? Font.DemiBold : Font.Normal
-//         highlighted: control.highlightedIndex === index
-//         hoverEnabled: control.hoverEnabled
-//     }
-//     indicator: Rectangle {
-//         id: indicator
-
-//         border.color: Colors.interactive
-//         bottomRightRadius: Dimensions.radius
-//         color: Colors.primary
-//         height: control.height
-//         topRightRadius: Dimensions.radius
-//         width: 20 + Dimensions.s * 2
-//         x: control.width - width
-//         y: 0
-//         z: 2
-
-//         IconLabel {
-//             anchors.fill: parent
-//             bottomPadding: Dimensions.s
-//             icon.color: Colors.foreground
-//             icon.source: "qrc:/images/ChevronDown.svg"
-//             leftPadding: Dimensions.s
-//             rightPadding: Dimensions.s
-//             topPadding: Dimensions.s
-//         }
-//         MouseArea {
-//             anchors.fill: parent
-//             cursorShape: Qt.PointingHandCursor
-
-//             onPressed: () => {
-//                 control.popup.visible = true;
-//                 control.popup.forceActiveFocus()
-//             }
-//         }
-//     }
-//     popup: T.Popup {
-//         bottomMargin: 6
-//         height: Math.min(contentItem.implicitHeight + 2, control.Window.height - topMargin - bottomMargin)
-//         padding: 1
-//         topMargin: 6
-//         width: control.width
-//         y: control.height
-
-//         background: Rectangle {
-//             border.color: Colors.interactive
-//             color: Colors.mantle
-//             radius: Dimensions.radius
-//         }
-//         contentItem: ListView {
-//             clip: true
-//             currentIndex: control.highlightedIndex
-//             implicitHeight: contentHeight
-//             model: control.popup.visible ? control.delegateModel : null
-
-//             T.ScrollBar.vertical: ScrollBar {
-//             }
-//             highlight: Rectangle {
-//                 color: Colors.primary
-//                 opacity: Colors.highlightOpacity
-//             }
-//         }
-//     }
-//     Component.onCompleted:
-//     {
-//         console.log(control.implicitContentHeight)
-//     }
-// }

TeroStyle/EmailAddressValidator.qml

@@ -0,0 +1,5 @@
+import QtQuick
+
+RegularExpressionValidator {
+    regularExpression: /([\+!#$%&‘\*\–\/\=?\^_`\.{|}\~\-\_0-9A-Za-z]{1,185})@([0-9A-Za-z\.\-\_]{1,64})\.([a-zA-z]{2,5})/
+}

TeroStyle/Field.qml

@@ -5,11 +5,16 @@ import QtQuick.Layouts
 ColumnLayout
 {
     required property string label
+    /**
+     * Adds an asterisk after the label, informing the user that this field
+     * is mandatory.
+     */
+    property bool mandatory: false
     spacing: Dimensions.s
 
     Label
     {
-        text: label
+        text: label + (mandatory ? "*" : "")
         font: Typography.body
     }
 }

TeroStyle/H1.qml

@@ -0,0 +1,5 @@
+import QtQuick
+
+Text {
+    font: Typography.h1
+}

TeroStyle/H2.qml

@@ -0,0 +1,5 @@
+import QtQuick
+
+Text {
+    font: Typography.h2
+}

TeroStyle/NotEmptyValidator.qml

@@ -0,0 +1,5 @@
+import QtQuick
+
+RegularExpressionValidator {
+    regularExpression: /^\S+.*\S+$/
+}

TeroStyle/OptionalEmailAddressValidator.qml

@@ -0,0 +1,5 @@
+import QtQuick
+
+RegularExpressionValidator {
+    regularExpression: /^$|([\+!#$%&‘\*\–\/\=?\^_`\.{|}\~\-\_0-9A-Za-z]{1,185})@([0-9A-Za-z\.\-\_]{1,64})\.([a-zA-z]{2,5})/
+}

TeroStyle/OptionalPhoneNumberValidator.qml

@@ -0,0 +1,5 @@
+import QtQuick
+
+RegularExpressionValidator {
+    regularExpression: /^$|([+0-9])([0-9\s]{1,17})/
+}

TeroStyle/PhoneNumberValidator.qml

@@ -0,0 +1,5 @@
+import QtQuick
+
+RegularExpressionValidator {
+    regularExpression: /([+0-9])([0-9\s]{1,17})/
+}

TeroStyle/PostcodeValidator.qml

@@ -0,0 +1,5 @@
+import QtQuick
+
+RegularExpressionValidator {
+    regularExpression: /([^$][0-9]{1,4})/
+}

TeroStyle/SearchBar.qml

@@ -4,11 +4,23 @@ import QtQuick.Layouts
 
 
 TextField {
+    id: field
+
+    signal submitted(query: string)
+
     Layout.preferredWidth: 300
     placeholderText: qsTr("Suche")
 
+    Keys.onReturnPressed: {
+        field.submitted(field.text);
+    }
+
     Button {
         icon.source: "qrc:/images/MagnifyingGlass.svg"
         isFieldButton: true
+
+        onClicked: {
+            field.submitted(field.text)
+        }
     }
 }

TeroStyle/TextField.qml

@@ -4,6 +4,7 @@ import QtQuick.Templates as T
 T.TextField
 {
     id: control
+
     background: Rectangle
     {
         id: background

TeroStyle/Typography.qml

@@ -3,38 +3,54 @@ pragma Singleton
 import QtCore
 import QtQuick
 
-Item
-{
-    readonly property FontLoader robotoCondensed: FontLoader
-    {
+Item {
+    readonly property font body: ({
+            family: robotoCondensed.font,
+            pointSize: 16,
+            weight: Font.Medium,
+            letterSpacing: 0,
+            kerning: true
+        })
+
+    readonly property font small: ({
+            family: body.family,
+            pointSize: 14,
+            weight: Font.Medium,
+            letterSpacing: body.letterSpacing,
+            kerning: body.kerning
+    })
+
+
+    readonly property font smallBold: ({
+            family: small.family,
+            pointSize: small.pointSize,
+            weight: Font.Bold,
+            letterSpacing: small.letterSpacing,
+            kerning: small.kerning
+    })
+
+    readonly property font smaller: ({
+            family: body.family,
+            pointSize: 11,
+            weight: Font.DemiBold,
+            letterSpacing: body.letterSpacing,
+            kerning: body.kerning
+        })
+    readonly property font h1: ({
+            family: body.family,
+            pointSize: 38,
+            weight: body.weight,
+            letterSpacing: body.letterSpacing,
+            kerning: body.kerning
+        })
+    readonly property font h2: ({
+        family: body.family,
+        pointSize: 28,
+        weight: body.weight,
+        letterSpacing: body.letterSpacing,
+        kerning: body.kerning,
+    })
+    readonly property FontLoader robotoCondensed: FontLoader {
         source: "qrc:/fonts/RobotoCondensed.otf"
     }
-
-    readonly property font body:
-    ({
-        family: robotoCondensed.font,
-        pointSize: 16,
-        weight: Font.Medium,
-        letterSpacing: 0,
-        kerning: true,
-    })
-
-    readonly property font h1:
-    ({
-        family: body.family,
-        pointSize: 38,
-        weight: body.weight,
-        letterSpacing: body.letterSpacing,
-        kerning: body.kerning,
-    })
-
-    readonly property font dash:
-    ({
-        family: body.family,
-        pointSize: 10,
-        weight: body.weight,
-        letterSpacing: body.letterSpacing,
-        kerning: body.kerning,
-    })
-
 }

TeroStyle/qmldir

@@ -2,13 +2,19 @@ module TeroStyle
 singleton Colors Colors.qml
 singleton Dimensions Dimensions.qml
 singleton Typography Typography.qml
+BarButton BarButton.qml
 Button Button.qml
 ComboBox ComboBox.qml
+EmailAddressValidator EmailAddressValidator.qml
 Field Field.qml
-TextField TextField.qml
-BarButton BarButton.qml
+H1 H1.qml
+H2 H2.qml
 Label Label.qml
+NotEmptyValidator NotEmptyValidator.qml
+OptionalEmailAddressValidator OptionalEmailAddressValidator.qml
+PhoneNumberValidator PhoneNumberValidator.qml
+OptionalPhoneNumberValidator OptionalPhoneNumberValidator.qml
+PostcodeValidator PostcodeValidator.qml
 QuickFilter QuickFilter.qml
-
-
-
+SearchBar SearchBar.qml
+TextField TextField.qml

doc/README.md

@@ -1,4 +0,0 @@
-# pyqcrm
-
-CRM - Tero 
-Python +  QML

docker-compose.yml

@@ -0,0 +1,14 @@
+services:
+  mariadb:
+    image: mariadb:latest
+    volumes:
+      - mariadb:/var/lib/mysql
+    ports:
+      - 127.0.0.1:8000:3306
+    environment:
+      MARIADB_ROOT_PASSWORD: pyqcrm
+      MARIADB_USER: pyqcrm
+      MARIADB_PASSWORD: pyqcrm
+      MARIADB_DATABASE: pyqcrm
+volumes:
+  mariadb:

enc_key_backup.txt

@@ -1 +1 @@
-Lj30yFOP7hJmY5Cub1Go8fJz0UE+Zyo9cEqNxfY23Sc=
+Lj30yFOP7hJmY5Cub1Go8fJz0UE+Zyo9cEqNxfY23Sc=

images/ArrowLeftCircle-Outline.svg

@@ -0,0 +1,3 @@
+<svg fill="none" stroke-width="2" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" data-slot="icon">
+  <path stroke-linecap="round" stroke-linejoin="round" d="m11.25 9-3 3m0 0 3 3m-3-3h7.5M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z"></path>
+</svg>

images/CheckCircle.svg

@@ -0,0 +1,3 @@
+<svg fill="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" data-slot="icon">
+  <path clip-rule="evenodd" fill-rule="evenodd" d="M2.25 12c0-5.385 4.365-9.75 9.75-9.75s9.75 4.365 9.75 9.75-4.365 9.75-9.75 9.75S2.25 17.385 2.25 12Zm13.36-1.814a.75.75 0 1 0-1.22-.872l-3.236 4.53L9.53 12.22a.75.75 0 0 0-1.06 1.06l2.25 2.25a.75.75 0 0 0 1.14-.094l3.75-5.25Z"></path>
+</svg>

images/InboxArrowDown.svg

@@ -0,0 +1,4 @@
+<svg fill="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" data-slot="icon">
+  <path clip-rule="evenodd" fill-rule="evenodd" d="M5.478 5.559A1.5 1.5 0 0 1 6.912 4.5H9A.75.75 0 0 0 9 3H6.912a3 3 0 0 0-2.868 2.118l-2.411 7.838a3 3 0 0 0-.133.882V18a3 3 0 0 0 3 3h15a3 3 0 0 0 3-3v-4.162c0-.299-.045-.596-.133-.882l-2.412-7.838A3 3 0 0 0 17.088 3H15a.75.75 0 0 0 0 1.5h2.088a1.5 1.5 0 0 1 1.434 1.059l2.213 7.191H17.89a3 3 0 0 0-2.684 1.658l-.256.513a1.5 1.5 0 0 1-1.342.829h-3.218a1.5 1.5 0 0 1-1.342-.83l-.256-.512a3 3 0 0 0-2.684-1.658H3.265l2.213-7.191Z"></path>
+  <path clip-rule="evenodd" fill-rule="evenodd" d="M12 2.25a.75.75 0 0 1 .75.75v6.44l1.72-1.72a.75.75 0 1 1 1.06 1.06l-3 3a.75.75 0 0 1-1.06 0l-3-3a.75.75 0 0 1 1.06-1.06l1.72 1.72V3a.75.75 0 0 1 .75-.75Z"></path>
+</svg>

images/Phone.svg

@@ -0,0 +1,3 @@
+<svg fill="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" data-slot="icon">
+  <path clip-rule="evenodd" fill-rule="evenodd" d="M1.5 4.5a3 3 0 0 1 3-3h1.372c.86 0 1.61.586 1.819 1.42l1.105 4.423a1.875 1.875 0 0 1-.694 1.955l-1.293.97c-.135.101-.164.249-.126.352a11.285 11.285 0 0 0 6.697 6.697c.103.038.25.009.352-.126l.97-1.293a1.875 1.875 0 0 1 1.955-.694l4.423 1.105c.834.209 1.42.959 1.42 1.82V19.5a3 3 0 0 1-3 3h-2.25C8.552 22.5 1.5 15.448 1.5 6.75V4.5Z"></path>
+</svg>

images/UserCircle.svg

@@ -0,0 +1,3 @@
+<svg fill="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" data-slot="icon">
+  <path clip-rule="evenodd" fill-rule="evenodd" d="M18.685 19.097A9.723 9.723 0 0 0 21.75 12c0-5.385-4.365-9.75-9.75-9.75S2.25 6.615 2.25 12a9.723 9.723 0 0 0 3.065 7.097A9.716 9.716 0 0 0 12 21.75a9.716 9.716 0 0 0 6.685-2.653Zm-12.54-1.285A7.486 7.486 0 0 1 12 15a7.486 7.486 0 0 1 5.855 2.812A8.224 8.224 0 0 1 12 20.25a8.224 8.224 0 0 1-5.855-2.438ZM15.75 9a3.75 3.75 0 1 1-7.5 0 3.75 3.75 0 0 1 7.5 0Z"></path>
+</svg>

lib/Config.py

@@ -0,0 +1,19 @@
+from typing import TypedDict
+
+
+class EncryptionConfig(TypedDict):
+    ENCRYPTION_KEY_VALID: str
+    ENCRYPTION_KEY: str
+
+
+class DatabaseConfig(TypedDict):
+    DB_HOST: str
+    DB_USER: str
+    DB_PASS: str
+    DB_NAME: str
+    DB_PORT: str
+
+
+class Config(TypedDict):
+    database: DatabaseConfig
+    pyqcrm: EncryptionConfig

lib/ConfigLoader.py

@@ -1,27 +1,28 @@
 # This Python file uses the following encoding: utf-8
-import toml
-from platformdirs import user_config_dir
-from pathlib import Path
-from PySide6.QtCore import QObject, Slot, Signal
-from .Vermasseln import Vermasseln
-import shutil
-from urllib.parse import urlparse
-from .DB.DbManager import DbManager
 import os
-from Crypto.Random import get_random_bytes
 from base64 import b64encode
+from pathlib import Path
+from typing import Optional
+from urllib.parse import urlparse
+
+import toml
+from Crypto.Random import get_random_bytes
+from PySide6.QtCore import QObject, Slot, Signal
+from peewee import OperationalError
+from platformdirs import user_config_dir
+
+from .Config import Config, DatabaseConfig
 from .DB.UserManager import UserManager
 from .PyqcrmFlags import PyqcrmFlags
-
-
+from .Vermasseln import Vermasseln
+from .domain.BaseModel import init_database_from_config
 
 
 class ConfigLoader(QObject):
-    __config = None
+    __config: Optional[Config] = None
     __version = "0.1-alpha"
     __check_enc_key = True
 
-
     dbConnectionError = Signal(str, bool)
     adminUserError = Signal(str, bool)
     adminNotAsvailable = Signal()
@@ -31,7 +32,6 @@ class ConfigLoader(QObject):
 
     def __init__(self):
         super().__init__()
-        # print(f"In {__file__} file, __init__()")
         self.config_dir = user_config_dir() + '/pyqcrm'
         config_dir = Path(self.config_dir)
         if config_dir.exists():
@@ -41,69 +41,63 @@ class ConfigLoader(QObject):
         else:
             config_dir.mkdir(0o750, True, True)
 
-
-    @Slot(dict, result = bool)
-    def setConfig(self, app_config):
-        # print(f"In {__file__} file, setConfig()")
+    @Slot(dict, result=bool)
+    def setConfig(self, app_config: Config):
         if not self.__config:
             base_conf = self.__initializeConfig()
-            conf = self.__checkDbConnection(app_config)
-            app_config = toml.dumps(app_config)
-            if  conf:
-                app_config = base_conf + app_config
-                self.__config = toml.loads(app_config)
-                self.__saveConfig()
-                conf = self.__checkAdminUser()
-                if conf:
-                    self.configurationReady.emit()
+        conf = self._is_db_connectable(app_config['database'])
+        app_config = toml.dumps(app_config)
+        if conf:
+            app_config = base_conf + app_config
+            self.__config = toml.loads(app_config)
+            self.__saveConfig()
+            conf = self.__checkAdminUser()
+            if conf:
+                self.configurationReady.emit()
 
     def __initializeConfig(self):
-        # print(f"In {__file__} file, __initializeConfig()")
         self.__encrypt_key = b64encode(get_random_bytes(32)).decode("utf-8")
         conf = f"[pyqcrm]\nVERSION = \"{self.__version}\"\n"
         conf = conf + f"ENCRYPTION_KEY_VALID = \"No\"\n"
         conf = conf + f"ENCRYPTION_KEY = \"{self.__encrypt_key}\"\n\n"
         return conf
 
-    def __checkDbConnection(self, db_config):
-        # print(f"In {__file__} file, __checkDbConnection()")
-        con = DbManager(db_config['database']).getConnection()
-        if con:
+    def _is_db_connectable(self, config: DatabaseConfig):
+        try:
+            init_database_from_config(config)
             self.dbConnectionError.emit("Connection OK", True)
             return True
-        else:
+        except OperationalError as e:
             self.dbConnectionError.emit("Connection fehlgeschlagen", False)
-        return False
-
+            return False
 
     def __saveConfig(self):
         # print(f"In {__file__} file, saveConfig()")
         try:
-            with open (self.config_dir + '/pyqcrm.toml', 'w') as f:
+            with open(self.config_dir + '/pyqcrm.toml', 'w') as f:
                 # print(self.__config)
                 config = Vermasseln().oscarVermasseln(toml.dumps(self.__config))
                 f.write(config)
         except FileNotFoundError:
             print("Konnte die Konfiguration nicht speichern.")
 
-
     def __checkAdminUser(self):
         # print(f"In {__file__} file, __checkAdminUser()")
         result = UserManager().checkAdmin()
         if not result:
-            #if not result[0][0] == 1:
+            # if not result[0][0] == 1:
             self.adminUserError.emit("Kein Admin vorhanden", False)
             return False
         else:
             self.adminUserError.emit("Admin vorhanden", True)
         return True
 
-    @Slot(dict, result= bool)
+    @Slot(dict, result=bool)
     def addAdminUser(self, user_config):
         # print(f"In {__file__} file, addAdminUser()")
         admin = UserManager(user_config["user"], PyqcrmFlags.ADMIN).createUser()
         if not admin:
-            #self.adminNotAvailable.emit()
+            # self.adminNotAvailable.emit()
             self.adminUserError.emit("Benutzername nich verfügbar", False)
         else:
             self.__config['pyqcrm']['ENCRYPTION_KEY_VALID'] = 'Yes'
@@ -111,7 +105,6 @@ class ConfigLoader(QObject):
             self.backupEncryptionKey.emit()
         return admin
 
-
     @Slot(str, str)
     def __saveData(self, recovery_file, recovery_password, data):
         # print(f"In {__file__} file, __saveData()")
@@ -121,7 +114,7 @@ class ConfigLoader(QObject):
         rf = Vermasseln().oscarVermasseln(rf, local)
         rec_file = urlparse(recovery_file)
         if os.name == "nt":
-            rec_file = rec_file [1:]
+            rec_file = rec_file[1:]
         else:
             rec_file = rec_file.path + ".pyqrec"
         try:
@@ -136,7 +129,7 @@ class ConfigLoader(QObject):
         rec_file = urlparse(recovery_file)
         rec_file = rec_file.path
         if os.name == "nt":
-            rec_file = rec_file [1:]
+            rec_file = rec_file[1:]
         try:
             ek = self.__parseImport(rec_file, recovery_password)
 
@@ -165,7 +158,6 @@ class ConfigLoader(QObject):
             else:
                 return None
 
-
     def __invalidateEncryptionKey(self):
         # print(f"In {__file__} file, __invalidateEncryptionKey()")
         self.__config['pyqcrm']['ENCRYPTION_KEY_VALID'] = 'No'
@@ -182,7 +174,7 @@ class ConfigLoader(QObject):
         rp = self.__setRecoveryPassword(recovery_password, salt)
         return rp[1] == password
 
-    @Slot(str, str) # todo: non local encryption
+    @Slot(str, str)  # todo: non local encryption
     def importConfig(self, confile, password):
         confile = urlparse(confile)
         confile = confile.path
@@ -200,15 +192,9 @@ class ConfigLoader(QObject):
         except Exception as e:
             print(str(e))
 
-
-
-
-
-
     def __configLoad(self):
-        # print(f"In {__file__} file, __configLoad()")
         try:
-            with open (self.config_dir + '/pyqcrm.toml', 'r') as f:
+            with open(self.config_dir + '/pyqcrm.toml', 'r') as f:
                 config = f.read()
                 self.__config = toml.loads(Vermasseln().entschluesseln(config))
                 self.configurationReady.emit()
@@ -216,17 +202,11 @@ class ConfigLoader(QObject):
             print("Konnte die Konfiguration nicht laden.")
         except TypeError:
             print(f"Invalid Configuration: {__file__}")
-        except Exception as e:
-            print(str(e))
 
-
-    def getConfig(self):
-        # print(f"In {__file__} file, getConfig()")
-        # print(self.__config)
+    def get_config(self) -> Optional[Config]:
         return self.__config
 
-    def __setRecoveryPassword(self, key, salt = None):
-        # print(f"In {__file__} file, __setRecoveryPassword()")
+    def __setRecoveryPassword(self, key, salt=None):
         key = Vermasseln.userPasswordHash(key, salt)
         return key.split("$")
 
@@ -239,29 +219,28 @@ class ConfigLoader(QObject):
 
     @Slot(str, str)
     def backupConfig(self, filename, password):
-        conf_file = toml.dumps(self.getConfig())
+        conf_file = toml.dumps(self.get_config())
         self.__saveData(filename, password, conf_file)
 
-
     @Slot(dict)
-    def saveDbConf(self, db = None):
+    def saveDbConf(self, db=None):
         self.__config.update(db)
         self.__saveConfig()
 
-    @Slot(result = dict)
+    @Slot(result=dict)
     def getDbConf(self):
         try:
-            return self.__config['database']
+            return self.__config['database'] if self.__config is not None else None
         except KeyError as ex:
             print(f"Missing database configuration: {ex}")
             return None
 
     @Slot(dict)
-    def saveCompanyInfo(self, company = None):
+    def saveCompanyInfo(self, company=None):
         self.__config.update(company)
         self.__saveConfig()
 
-    @Slot(result = dict)
+    @Slot(result=dict)
     def getCompanyInfo(self):
         try:
             return self.__config['company']
@@ -270,11 +249,11 @@ class ConfigLoader(QObject):
             return None
 
     @Slot(dict)
-    def saveMiscConf(self, misc_conf = None):
+    def saveMiscConf(self, misc_conf=None):
         self.__config.update(misc_conf)
         self.__saveConfig()
 
-    @Slot(result = bool)
+    @Slot(result=bool)
     def systray(self):
         try:
             return self.__config['misc']['SYSTRAY']
@@ -282,9 +261,7 @@ class ConfigLoader(QObject):
             print(f"Missing configuration: {ex}")
             return False
 
-
     @Slot(str, str)
     def backupEncryptkey(self, filename, password):
         encrypt_key = self.__config['pyqcrm']['ENCRYPTION_KEY']
         self.__saveData(filename, password, encrypt_key)
-

lib/DB/AddressDAO.py

@@ -1,27 +1,26 @@
-from .DbManager import DbManager
-import mariadb
 import json
 
+import mariadb
+
+from lib.domain.BaseModel import database
+
 
 class AddressDAO:
     __cur = None
+
     def __init__(self):
-        #print(f"*** File: {__file__}, init()")
-        self.__con = DbManager().getConnection()
+        self.__con = database.connection()
 
         if self.__con:
             self.__cur = self.__con.cursor()
 
-
-
-
     def __importPlz(self):
         with open("pfad zur datei", "r") as plz:
             postcodes = json.load(plz)
             irgendwas = ""
             try:
                 for i in postcodes:
-                    test =i["plz_name"].split(",")
+                    test = i["plz_name"].split(",")
                     for town in test:
                         if "u.a" in town:
                             town = town[:-4]
@@ -29,12 +28,12 @@ class AddressDAO:
                         if town:
                             print(f"PROCESSING {i['name']} {town}")
                             self.__cur.callproc("addZipCodes", (i["name"], town, irgendwas,))
-                #self.__cur.callproc("addZipCodes", ("56271", "Kleinmaischeid", irgendwas,))
+                # self.__cur.callproc("addZipCodes", ("56271", "Kleinmaischeid", irgendwas,))
             except mariadb.OperationalError as e:
                 print(f"Database Error: {e}")
             finally:
                 self.__con.commit()
-                print("FINISHED")#
+                print("FINISHED")  #
 
     def __importCountry(self):
         with open("pfad zur datei", "r") as country:
@@ -55,18 +54,17 @@ class AddressDAO:
 
                     print(i[4], i[3], i[2], i[8], i[7])
 
-                    self.__cur.execute("INSERT INTO country (country, countryshort, nationality, iso2, iso3) VALUES (%s, %s, %s, %s, %s)", (i[4], i[3], i[2], i[8], i[7]))
+                    self.__cur.execute(
+                        "INSERT INTO country (country, countryshort, nationality, iso2, iso3) VALUES (%s, %s, %s, %s, %s)",
+                        (i[4], i[3], i[2], i[8], i[7]))
                     old = i[4]
             except mariadb.OperationalError as e:
                 print(f"Database Error: {e}")
             finally:
                 self.__con.commit()
-                print("FINISHED")#
+                print("FINISHED")  #
 
-
-
-
-    def getAddressData(self, all = True, zipcode = None):
+    def getAddressData(self, all=True, zipcode=None):
         try:
             if self.__cur:
                 self.__cur.callproc("getAddress", (all, zipcode,))
@@ -76,5 +74,3 @@ class AddressDAO:
                 return None
         except mariadb.Error as e:
             print(str(e))
-
-

lib/DB/AddressModel.py

@@ -2,18 +2,19 @@ from PySide6.QtCore import QAbstractListModel, Qt, Slot, QModelIndex
 from .AddressDAO import AddressDAO
 from ..PyqcrmDataRoles import PyqcrmDataRoles
 
+
 class AddressModel(QAbstractListModel):
 
     def __init__(self):
         super().__init__()
         self.__address_data = AddressDAO().getAddressData()
 
-    def rowCount(self, parent = QModelIndex()):
+    def rowCount(self, parent=QModelIndex()):
         return len(self.__address_data)
 
-    def data(self, index, role = Qt.DisplayRole):
+    def data(self, index, role=Qt.ItemDataRole.DisplayRole):
         row = index.row()
-        if role == Qt.DisplayRole:
+        if role == Qt.ItemDataRole.DisplayRole:
             data = self.__address_data[row][2]
             return data
         elif role == PyqcrmDataRoles.CITY_ROLE:
@@ -23,20 +24,11 @@ class AddressModel(QAbstractListModel):
 
     def roleNames(self):
         return {
-            Qt.DisplayRole: b"display",
+            Qt.ItemDataRole.DisplayRole: b"display",
             PyqcrmDataRoles.CITY_ROLE: b"city",
         }
 
-    def setData(self):
-        pass
-
     @Slot(bool, str)
     def getAddresses(self, all, zipcode):
         data = AddressDAO().getAddressData(all, zipcode)
         return data
-
-
-
-
-
-

lib/DB/ApplicantModel.py

@@ -0,0 +1,91 @@
+import uuid
+from typing import List, Callable, Any
+
+from PySide6.QtCore import QModelIndex, Qt, QAbstractTableModel, Slot, Property, Signal
+from PySide6.QtQml import QJSValue
+from peewee import Select
+
+from lib.domain.Applicant import Applicant
+
+COLUMNS: list[Callable[[Applicant], Any]] = [
+    lambda applicant: applicant.first_name,
+    lambda applicant: applicant.last_name,
+    lambda applicant: applicant.zip_code.zip_code or None,
+    lambda applicant: applicant.zip_code.town.town if applicant.zip_code.id is not None else None
+]
+
+COLUMN_NAMES = ["Vorname", "Nachname", "PLZ", "Ort"]
+
+
+class ApplicantModel(QAbstractTableModel):
+    _applicants: Select
+    _search_query: str = ""
+    search_query_changed = Signal(str)
+
+    def __init__(self) -> None:
+        super().__init__()
+        self._query_applicants()
+
+    def rowCount(self, /, parent=...):
+        return len(self._applicants)
+
+    def columnCount(self, /, parent=...):
+        return len(COLUMNS)
+
+    def data(self, index: QModelIndex, role: int = Qt.ItemDataRole.DisplayRole):
+        if role == Qt.ItemDataRole.DisplayRole:
+            applicant = self._applicants[index.row()]
+            return COLUMNS[index.column()](applicant)
+        return None
+
+    @Property(str, notify=search_query_changed)
+    def searchQuery(self):
+        return self._search_query
+
+    @searchQuery.setter
+    def searchQuery(self, value: str):
+        self._search_query = value
+        self._query_applicants()
+
+    @Slot(int, result=dict)
+    def applicant(self, row) -> dict:
+        applicant = Applicant.get_by_id(self._applicants[row].id)
+        return {
+            'title': applicant.title,
+            "firstName": applicant.first_name,
+            "lastName": applicant.last_name,
+            "street": applicant.street,
+            "houseNumber": applicant.house_number,
+            "zipCode": applicant.zip_code_id,
+            "phoneNumber": applicant.phone_number,
+            "mobileNumber": applicant.mobile_number,
+            "emailAddress": applicant.email_address,
+            "salutation": applicant.salutation
+        }
+
+    @Slot(QJSValue)
+    def createApplicant(self, values: QJSValue):
+        applicant = Applicant()
+        applicant.id = uuid.uuid4()
+        applicant.title = values.property("title").toInt()
+        applicant.first_name = values.property("firstName").toString()
+        applicant.last_name = values.property("lastName").toString()
+        applicant.street = values.property("street").toString() or None
+        applicant.house_number = values.property("houseNumber").toString() or None
+        if values.property("zipCode").toInt() != -1:
+            applicant.zip_code = values.property("zipCode").toInt()
+        applicant.phone_number = values.property("phoneNumber").toString() or None
+        applicant.mobile_number = values.property("mobileNumber").toString() or None
+        applicant.email_address = values.property("emailAddress").toString() or None
+        applicant.salutation = values.property("salutation").toString() or None
+        applicant.save(force_insert=True)
+        self._query_applicants()
+
+    def headerData(self, section: int, orientation: Qt.Orientation, role: int = Qt.ItemDataRole.DisplayRole):
+        if role == Qt.ItemDataRole.DisplayRole:
+            return COLUMN_NAMES[section]
+        return None
+
+    def _query_applicants(self):
+        self._applicants = Applicant.select_table_data(self._search_query)
+        self.layoutChanged.emit()

lib/DB/BTypeDAO.py

@@ -1,20 +1,20 @@
-from .DbManager import DbManager
+from lib.domain.BaseModel import database
 
 
 class BTypeDAO:
     __cur = None
+
     def __init__(self):
-        #print(f"*** File: {__file__}, init()")
-        self.__con = DbManager().getConnection()
+        self.__con = database.connection()
         if self.__con:
             self.__cur = self.__con.cursor()
 
     def getBType(self):
         try:
             if self.__cur:
-                self.__cur.callproc("getBtype", (None, None, ))
+                self.__cur.callproc("getBtype", (None, None,))
                 data = self.__cur.fetchall()
-                return(data)
+                return data
             else:
                 return None
         except mariadb.Error as e:

lib/DB/BusinessDAO.py

@@ -1,7 +1,7 @@
-from .DbManager import DbManager
 import json
 import mariadb
 from PySide6.QtCore import QObject, Signal
+from lib.domain.BaseModel import database
 
 
 class BusinessDAO(QObject):
@@ -12,11 +12,11 @@ class BusinessDAO(QObject):
 
     def __init__(self):
         super().__init__()
-        self.__con = DbManager().getConnection()
+        self.__con = database.connection()
         if self.__con:
             self.__cur = self.__con.cursor()
 
-    def getBusiness(self, enc_key, criterion = "Alle"):
+    def getBusiness(self, enc_key, criterion="Alle"):
         try:
             if self.__cur:
                 self.__cur.callproc("getCustomerView", (enc_key, criterion,))
@@ -27,14 +27,14 @@ class BusinessDAO(QObject):
         except mariadb.Error as e:
             print(str(e))
 
-    def getOneBusiness(self, business_id, enc_key = None):
+    def getOneBusiness(self, business_id, enc_key=None):
         try:
             if self.__cur:
                 self.__cur.callproc("getCustomer", (business_id, enc_key,))
-                #self.__all_cols = [desc[0] for desc in self.__cur.description]
-                return  self.__cur.fetchall() #, self.__all_cols
+                # self.__all_cols = [desc[0] for desc in self.__cur.description]
+                return self.__cur.fetchall()  # , self.__all_cols
             else:
-                return None #, None
+                return None  # , None
         except mariadb.Error as e:
             print(str(e))
 
@@ -47,10 +47,3 @@ class BusinessDAO(QObject):
 
         except mariadb.Error as e:
             print(str(e))
-
-
-
-
-
-
-

lib/DB/BusinessModel.py

@@ -73,7 +73,7 @@ class BusinessModel(QAbstractTableModel):
         super().__init__()
         self.__business_dao = BusinessDAO()
         self.__business_dao.newBusinessAdded.connect(self.__refreshView)
-        self.__conf = ConfigLoader().getConfig()
+        self.__conf = ConfigLoader().get_config()
         self.__key = self.__conf['pyqcrm']['ENCRYPTION_KEY']
         self.__getData()
 

lib/DB/ContactDAO.py

@@ -1,7 +1,9 @@
-from .DbManager import DbManager
-from PySide6.QtCore import QObject, Signal
 import json
+
 import mariadb
+from PySide6.QtCore import QObject, Signal
+
+from lib.domain.BaseModel import database
 
 
 class ContactDAO(QObject):
@@ -9,8 +11,7 @@ class ContactDAO(QObject):
 
     def __init__(self):
         super().__init__()
-        #print(f"*** File: {__file__}, __init__()")
-        self.__con = DbManager().getConnection()
+        self.__con = database.connection()
         if self.__con:
             self.__cur = self.__con.cursor()
 

lib/DB/ContactModel.py

@@ -14,7 +14,7 @@ class ContactModel(QObject):
         super().__init__()
         # print(f"*** File: {__file__}, __init__()")
         #self.logger = logging.getLogger()
-        self.__conf = ConfigLoader().getConfig()
+        self.__conf = ConfigLoader().get_config()
         self.__key = self.__conf['pyqcrm']['ENCRYPTION_KEY']
         self.__contact_dao = ContactDAO()
         self.__contact_dao.newObjectContactAdded.connect(self.objectContactAdded)

lib/DB/DbManager.py

@@ -1,46 +0,0 @@
-import mariadb
-
-class DbManager():
-    __connection = None
-    __con_param = None
-    __dbmanager = None
-
-    def __new__(cls, dbconf = None):
-
-        if cls.__dbmanager is None:
-            cls.__dbmanager = super(DbManager, cls).__new__(cls)
-            cls.__dbmanager.__initializeConfig(dbconf)
-
-        return cls.__dbmanager
-
-    def getConnection(cls):
-            #print(f"DB Manager: {cls.__dbmanager}")
-            #print(f"DB Connection: {cls.__connection}")
-            try:
-                if not cls.__connection  or not cls.__connection.ping():
-                    cls.__failure_notified = False
-                    cls.__connection = mariadb.connect(**cls.__con_param)
-            except mariadb.InterfaceError as e:
-                cls.__connection = mariadb.connect(**cls.__con_param)
-                print(f"DbManager Connection (INTERFACE ERROR): {e}..reconnecting...")
-            except mariadb.Error as e:
-                if '(110)' in str(e):
-                    print(f"File: {__file__}\n      Database connection timed out (Check connection parameters or server running): {e}")
-                elif '(138)' in str(e):
-                    print(f"File: {__file__}\n      Database connection timed out (Check connection parameters or server running - initial handshake): {e}")
-                else:
-                    print(f"File: {__file__}\n      Database connection error: {e}")
-                cls.__connection = None
-
-            return cls.__connection
-
-    def __initializeConfig(cls, dbconf):
-        cls.__con_param = { 'user': dbconf['DB_USER'], 'password': dbconf['DB_PASS'],
-                      'port': int (dbconf['DB_PORT']), 'host': dbconf['DB_HOST'],
-                      'database': dbconf['DB_NAME'], 'connect_timeout': 5, 'autocommit': True,
-                    }
-
-
-
-
-

lib/DB/EmployeeDAO.py

@@ -1,51 +1,41 @@
-from .DbManager import DbManager
 import json
-import mariadb
+
 from PySide6.QtCore import QObject, Signal
-# from ..PyqcrmFlags import PyqcrmAppliEmpyFlags
+
+from lib.domain.BaseModel import database
 
 
 class EmployeeDAO(QObject):
     newEmployeeAdded = Signal(bool)
 
-    __cur = None
-    __all_cols = None
-
     def __init__(self):
         super().__init__()
-        self.__con = DbManager().getConnection()
-        if self.__con:
-            self.__cur = self.__con.cursor()
+        self._connection = database.connection()
 
-    def getEmployees(self, enc_key, criterion = "Alle", processed = False, fired = False, every_state = True):
+    def getEmployees(self, enc_key, criterion="Alle", processed=False, fired=False, every_state=True):
+        cursor = self._connection.cursor()
         try:
-            if self.__cur:
-                self.__cur.callproc("getEmployeeTable", (criterion, processed, fired, every_state, enc_key, ))
-                self.__all_cols = [desc[0] for desc in self.__cur.description]
-                return  self.__cur.fetchall(), self.__all_cols
-            else:
-                return None, None
-        except mariadb.Error as e:
-            print(str(e))
+            cursor.callproc("getEmployeeTable", (criterion, processed, fired, every_state, enc_key,))
+            all_cols = [desc[0] for desc in cursor.description]
+            result = cursor.fetchall(), all_cols
+            return result
+        finally:
+            cursor.close()
 
-    def getEmployee(self, employee_id, enc_key = None):
+    def fetchApplicant(self, employee_id, enc_key=None) -> dict:
+        cursor = self._connection.cursor(dictionary=True)
         try:
-            if self.__cur:
-                self.__cur.callproc("getEmployee", (employee_id, enc_key,))
-                #self.__all_cols = [desc[0] for desc in self.__cur.description]
-                return  self.__cur.fetchall() #, self.__all_cols
-            else:
-                return None #, None
-        except mariadb.Error as e:
-            print(str(e))
+            cursor.callproc("getApplicant", (employee_id, enc_key))
+            it = cursor.fetchone()
+            return it
+        finally:
+            cursor.close()
 
-    def addEmployee(self, data, enc_key, applicant = True):
+    def addApplicant(self, data, enc_key, applicant=True):
+        cursor = self._connection.cursor()
         try:
-            if self.__cur:
-                self.__cur.callproc("addApplicant", (json.dumps(data), applicant, enc_key,))
-                self.__con.commit()
-                self.newEmployeeAdded.emit(True)
-
-        except mariadb.Error as e:
-            print(str(e))
-            self.newEmployeeAdded.emit(False)
+            cursor.callproc("addApplicant", (json.dumps(data), applicant, enc_key,))
+            self._connection.commit()
+            self.newEmployeeAdded.emit(True)
+        finally:
+            cursor.close()

lib/DB/EmployeeModel.py

@@ -1,6 +1,7 @@
 from PySide6.QtCore import QAbstractTableModel, QModelIndex, Qt, Slot, Signal
+from PySide6.QtQml import QJSValue
+
 from .EmployeeDAO import EmployeeDAO
-# from ..PyqcrmFlags import PyqcrmFlags, PyqcrmAppliEmpyFlags
 from ..ConfigLoader import ConfigLoader
 import re
 
@@ -9,27 +10,41 @@ class EmployeeModel(QAbstractTableModel):
     addedNewEmployee = Signal(bool)
     __data = None
     __employee_dao = None
-    __visible_index = None
     __visible_columns = None
     __col_name = ""
-    __employee_dao = None
     __col_skip = 2
     __everyone = True
 
     def __init__(self):
         super().__init__()
-        self.__employee_dao = EmployeeDAO()
+        self.__employee_dao = EmployeeDAO() 
         self.__employee_dao.newEmployeeAdded.connect(self.__refreshView)
-        self.__conf = ConfigLoader().getConfig()
+        self.__conf = ConfigLoader().get_config()
         self.__key = self.__conf['pyqcrm']['ENCRYPTION_KEY']
         self.__getData()
 
-    @Slot(dict, bool)
-    def addEmployee(self, new_employee, applicant = True):
+    @Slot(dict)
+    def addEmployee(self, new_employee):
         if 'worklicense' in new_employee:
             new_employee['worklicense'] = int(new_employee['worklicense'])
             new_employee['residencetype'] = int(new_employee['residencetype'])
-        self.__employee_dao.addEmployee(new_employee, self.__key, applicant)
+        self.__employee_dao.addApplicant(new_employee, self.__key, False)
+
+    @Slot(QJSValue)
+    def addApplicant(self, applicant: QJSValue):
+        self.__employee_dao.addApplicant({
+            "city": applicant.property("city").toString(),
+            "email": applicant.property("email").toString(),
+            "firstname": applicant.property("firstname").toString(),
+            "formofaddress": applicant.property("formofaddress").toString(),
+            "houseno": applicant.property("houseno").toString(),
+            "lastname": applicant.property("lastname").toString(),
+            "mobile": applicant.property("mobile").toString(),
+            "phone": applicant.property("phone").toString(),
+            "postcode": applicant.property("postcode").toInt(),
+            "street": applicant.property("street").toString(),
+            "title": applicant.property("title").toString(),
+        }, self.__key, True)
 
     @Slot(bool)
     def __refreshView(self, added):
@@ -37,55 +52,40 @@ class EmployeeModel(QAbstractTableModel):
             self.__getData()
         self.addedNewEmployee.emit(added)
 
-    def __getData(self, criterion = "Alle", processed = False, fired = False, every_state = True):
+    def __getData(self, criterion="Alle", processed=False, fired=False, every_state=True):
         self.beginResetModel()
-        rows, self.__visible_columns = self.__employee_dao.getEmployees(self.__key, criterion, processed, fired, every_state)
+        rows, self.__visible_columns = self.__employee_dao.getEmployees(self.__key, criterion, processed, fired,
+                                                                        every_state)
         self.__data = rows
         self.endResetModel()
 
-    def rowCount(self, parent= QModelIndex()):
-        return len (self.__data)
+    def rowCount(self, parent=QModelIndex()):
+        return len(self.__data)
 
-    def columnCount(self, parent= QModelIndex()):
+    def columnCount(self, parent=QModelIndex()):
         return len(self.__visible_columns) - self.__col_skip
 
-    @Slot(str, bool, bool, bool)
-    def viewCriterion(self, criterion, processed, fired, every_state):
-        self.__everyone = True if criterion == 'Alle' else False
-        if self.__everyone and criterion != "Alle":
-            self.__col_skip = 2
-        else:
-            self.__col_skip = 2
-        self.__getData(criterion, processed, fired, every_state)
+    @Slot(str)
+    def viewCriterion(self, criterion):
+        self.__everyone = criterion == 'Alle'
+        self.__col_skip = 2
+        self.__getData(criterion, criterion == 'Erledigt', False, criterion == 'Alle')
 
-    def data(self, index, role= Qt.DisplayRole):
-        if role == Qt.DisplayRole:
+    def data(self, index, role=Qt.ItemDataRole.DisplayRole):
+        if role == Qt.ItemDataRole.DisplayRole:
             row = self.__data[index.row()]
             applicant_col = index.column() + self.__col_skip
-            tr = row[applicant_col] #if type(row[index.column() + 2]) is str else str(row[index.column() + 2], "utf-8")
+            tr = row[applicant_col]
             if applicant_col == 2 and self.__everyone:
                 tr = 'Ja' if tr == 1 else 'Nein'
             else:
                 if tr:
-                    tr = re.sub("Keine Angabe ","", tr)
-            #print(f"Data: {tr}")
-            # return row[index.column() + 2]
+                    tr = re.sub("Keine Angabe ", "", tr)
             return tr
         return None
 
-    def headerData(self, section, orientation, role = Qt.DisplayRole):
-        if orientation == Qt.Horizontal and role == Qt.DisplayRole:
+    def headerData(self, section, orientation, role=Qt.ItemDataRole.DisplayRole):
+        if orientation == Qt.Orientation.Horizontal and role == Qt.ItemDataRole.DisplayRole:
             self.__col_name = self.__visible_columns[section + self.__col_skip]
             return self.__col_name
         return super().headerData(section, orientation, role)
-
-    @Slot(int)
-    def onRowClicked(self, row):
-        #print(self.__data)
-        print(f"Selected table row: {row}, corresponding DB ID: {self.__data[row][0]}")
-        #if not self.__employee_dict['employee'] or self.__data[row][0] != self.__employee_dict['employee']['id']:
-            #self.__employee = self.__employee_dao.getEmployee(self.__data[row][0], self.__key)
-            #print(self.__business)
-            #self.__getEmployeeInfo()
-            # self.__getContactInfo()
-            # print(self.__business_dict)

lib/DB/ObjectDAO.py

@@ -1,17 +1,14 @@
-from .DbManager import DbManager
 import json
 import mariadb
 from PySide6.QtCore import QObject, Signal
-# from ..PyqcrmFlags import PyqcrmAppliEmpyFlags
-
+from lib.domain.BaseModel import database
 
 class ObjectDAO(QObject):
     newObjectAdded = Signal(bool, int)
 
     def __init__(self):
         super().__init__()
-        #print(f"*** File: {__file__}, __init__()")
-        self.__con = DbManager().getConnection()
+        self.__con = database.connection()
         if self.__con:
             self.__cur = self.__con.cursor()
 

lib/DB/ObjectModel.py

@@ -1,6 +1,5 @@
 from PySide6.QtCore import QAbstractTableModel, QModelIndex, Qt, Slot, Signal
 from .ObjectDAO import ObjectDAO
-# from ..PyqcrmFlags import PyqcrmFlags, PyqcrmAppliEmpyFlags
 from ..ConfigLoader import ConfigLoader
 import re
 import json
@@ -23,7 +22,7 @@ class ObjectModel(QAbstractTableModel):
         super().__init__()
         self.__object_dao = ObjectDAO()
         self.__object_dao.newObjectAdded.connect(self.__refreshView)
-        self.__conf = ConfigLoader().getConfig()
+        self.__conf = ConfigLoader().get_config()
         self.__key = self.__conf['pyqcrm']['ENCRYPTION_KEY']
         self.__object_dao.newObjectAdded.connect(self.objectAdded)
         self.__getData()