Merge branch 'schnacke'

Scrollview in all Forms, Debugged Error in AddEmployee.qml

.gitignore

@@ -210,7 +210,7 @@ dmypy.json
 # pytype static type analyzer
 .pytype/
 .qtcreator/
-*.pyproject.user
+*.pyproject.user*
 
 # Cython debug symbols
 cython_debug/

Gui/AddCustomer.qml

@@ -1,120 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
-import QtQuick.Dialogs
-import "../js/qmldict.js" as JsLib
-
-ColumnLayout
-{
-    property var new_business: null
-    Layout.fillWidth: true
-    Layout.fillHeight: true
-    spacing: 15
-    Label
-    {
-        text: qsTr("Kunden anlegen")
-        horizontalAlignment: Text.AlignHCenter
-        Layout.fillWidth: true
-        font.pixelSize: 35
-    }
-    CheckBox
-    {
-        id: checkAddContact
-        text: qsTr("Ansprechpartner hinzufügen")
-        Layout.alignment: Qt.AlignRight
-        checked: false
-        onCheckStateChanged:
-        {
-            checkFields()
-        }
-    }
-
-    RowLayout
-    {
-        id: addCustomer
-        Layout.fillWidth: true
-        Layout.fillHeight: true
-        spacing: 45
-        Frame
-        {
-            Layout.alignment: Qt.AlignTop
-            Layout.fillWidth: true
-            CustomerView
-            {
-                id: customerView
-                width: parent.width
-            }
-        }
-
-        AddContact
-        {
-                id: addContactFrame
-                visible: checkAddContact.checked
-        }
-    }
-    RowLayout
-    {
-        Layout.fillHeight: true
-        Layout.alignment: Qt.AlignRight
-        Button
-        {
-            text: qsTr("Abbrechen")
-            onClicked: contentStack.pop()
-        }
-        Button
-        {
-            id: saveBtn
-            text: qsTr("Speichern")
-            enabled: false
-            onClicked:
-            {
-                if (!checkAddContact.checked)
-                {
-                    new_business = JsLib.parseForm(customerView)
-                    business_model.addBusiness(new_business, 0)
-                    contentStack.pop()
-                }
-                else
-                {
-                    new_business = JsLib.parseForm(customerView)
-                    var new_contact = JsLib.parseForm(addContactFrame.contactGrid)
-                    contact_model.addContact(new_contact)
-                }
-            }
-        }
-    }
-    Item
-    {
-        id: spacer3
-        Layout.fillHeight: true
-    }
-
-    //Component.onCompleted: contact_model.contactIdReady.connect(onContactId)
-
-    Connections
-    {
-        target: contact_model
-
-        function onContactIdReady()
-        {
-            var con_id = arguments[0]
-            business_model.addBusiness(new_business, con_id)
-            contentStack.pop()
-        }
-    }
-
-    function checkFields()
-    {
-        if(checkAddContact.checked)
-        {
-            if(!customerView.checkBusinessField() || !addContactFrame.checkContactField())
-                saveBtn.enabled = false
-            else
-                saveBtn.enabled = true
-        }
-        else if (!customerView.checkBusinessField())
-            saveBtn.enabled = false
-        else
-            saveBtn.enabled = true
-    }
-}

Gui/AddObject.qml

@@ -2,7 +2,7 @@ import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
 import QtQuick.Dialogs
-import "../js/qmldict.js" as JsLib
+import Js
 
 ColumnLayout
 {
@@ -70,8 +70,13 @@ ColumnLayout
             text: qsTr("Speichern")
             enabled: false
             onClicked:
+
             {
+
                 new_object = JsLib.parseForm(newObject)
+                // For Debugging
+                console.log(JSON.stringify(new_object))
+                //
                 new_object['lift'] = new_object['lift'] === 'Ja' ? 1 : 0
                 new_object['mezzanin'] = new_object['mezzanin'] === 'Ja' ? 1 : 0
                 object_model.addObject(new_object)

Gui/BackupSettings.qml

@@ -3,7 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Dialogs
 import QtCore
-import "../js/qmldict.js" as JsLib
+import Js
 
 
 

Gui/Customer/AddCustomer.qml

@@ -0,0 +1,136 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import QtQuick.Dialogs
+import Js
+import Gui
+
+ScrollView
+{
+    id: scroll
+    width: parent.width
+    height: parent.height
+    property var new_business: null
+
+    ColumnLayout
+    {
+
+        height: Screen.desktopAvailableHeight
+        width: scroll.width
+        Layout.fillWidth: true
+        Layout.fillHeight: true
+        spacing: 15
+
+        Label
+        {
+            text: qsTr("Kunden anlegen")
+            horizontalAlignment: Text.AlignHCenter
+            Layout.fillWidth: true
+            font.pixelSize: 35
+        }
+        CheckBox
+        {
+            id: checkAddContact
+            text: qsTr("Ansprechpartner hinzufügen")
+            Layout.alignment: Qt.AlignRight
+            checked: false
+            onCheckStateChanged:
+            {
+                checkFields()
+            }
+        }
+
+        RowLayout
+        {
+            id: addCustomer
+            // Layout.fillWidth: true
+            // Layout.fillHeight: true
+
+            spacing: 45
+            Frame
+            {
+                Layout.alignment: Qt.AlignTop
+                Layout.fillWidth: true
+                CustomerView
+                {
+                    id: customerView
+                    width: parent.width
+                }
+            }
+
+            AddContact
+            {
+                    id: addContactFrame
+                    visible: checkAddContact.checked
+            }
+        }
+
+        RowLayout
+        {
+            Layout.fillHeight: true
+            Layout.alignment: Qt.AlignRight
+            Button
+            {
+                text: qsTr("Abbrechen")
+                onClicked: contentStack.pop()
+            }
+            Button
+            {
+                id: saveBtn
+                text: qsTr("Speichern")
+                enabled: false
+                onClicked:
+                {
+                    if (!checkAddContact.checked)
+                    {
+                        new_business = JsLib.parseForm(customerView)
+                        console.log(JSON.stringify(new_business))
+                        business_model.addBusiness(new_business, 0)
+                        contentStack.pop()
+                    }
+                    else
+                    {
+                        new_business = JsLib.parseForm(customerView)
+                        var new_contact = JsLib.parseForm(addContactFrame.contactGrid)
+                        contact_model.addContact(new_contact)
+                    }
+                }
+            }
+        }
+        Item
+        {
+            id: spacer3
+            Layout.fillHeight: true
+        }
+
+        //Component.onCompleted: contact_model.contactIdReady.connect(onContactId)
+
+        Connections
+        {
+            target: contact_model
+
+            function onContactIdReady()
+            {
+                var con_id = arguments[0]
+                business_model.addBusiness(new_business, con_id)
+                contentStack.pop()
+            }
+        }
+
+
+    }
+    function checkFields()
+    {
+        if(checkAddContact.checked)
+        {
+            if(!customerView.checkBusinessField() || !addContactFrame.checkContactField())
+                saveBtn.enabled = false
+            else
+                saveBtn.enabled = true
+        }
+        else if (!customerView.checkBusinessField())
+            saveBtn.enabled = false
+        else
+            saveBtn.enabled = true
+    }
+}

Gui/Customer/CustomerView.qml

@@ -30,40 +30,28 @@ GridLayout
         onTextChanged: checkFields()
         Layout.columnSpan: 3
     }
-
     Label
     {
-        text: qsTr("Straße*")
+        text: qsTr("Land")
         Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+        visible: false
     }
-
-    TextField
+    ComboBox
     {
-        property string name: "street"
-        id: streetid
+        property string name: "country"
+        id: country
         Layout.fillWidth: true
-        onTextChanged: checkFields()
-    }
+        editable: true
+        // onEditTextChanged: checkFields()
+        // onCurrentTextChanged: checkFields()
+        model: address_model
+        textRole: "country"
+        popup.height: 300
+        currentIndex: 37
+        Layout.columnSpan: 3
+        visible: false
 
-    Label
-    {
-        text: qsTr("Nr.*")
-        Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
     }
-
-    TextField
-    {
-        property string name: "houseno"
-        id: housenoid
-        Layout.fillWidth: true
-        onTextChanged: checkFields()
-        validator: RegularExpressionValidator
-        {
-            regularExpression: /([0-9a-zA-Z\-]{1,6})/
-        }
-    }
-
-
     Label
     {
         text: qsTr("PLZ")
@@ -114,6 +102,40 @@ GridLayout
         currentIndex: -1
         Layout.columnSpan: 3
     }
+    Label
+    {
+        text: qsTr("Straße*")
+        Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+    }
+
+    TextField
+    {
+        property string name: "street"
+        id: streetid
+        Layout.fillWidth: true
+        onTextChanged: checkFields()
+    }
+
+    Label
+    {
+        text: qsTr("Nr.*")
+        Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+    }
+
+    TextField
+    {
+        property string name: "houseno"
+        id: housenoid
+        Layout.fillWidth: true
+        onTextChanged: checkFields()
+        validator: RegularExpressionValidator
+        {
+            regularExpression: /([0-9a-zA-Z\-]{1,6})/
+        }
+    }
+
+
+
 
     Label
     {
@@ -254,7 +276,7 @@ GridLayout
     }
     function checkBusinessField()
     {
-        if (!firmenName.text.trim() || !streetid.text.trim())
+        if (!firmenName.text.trim() || !streetid.text.trim() || !housenoid.text.trim())
         {
             return false
 

Gui/Customer/CustomersTable.qml

@@ -13,10 +13,10 @@ ColumnLayout {
 
 
 
-    anchors.fill: parent
+
     spacing: Dimensions.l
 
-    Component.onCompleted: contentStack.pop()
+    // Component.onCompleted: contentStack.pop()
 
     RowLayout
     {

Gui/Customer/qmldir

@@ -0,0 +1 @@
+module Customer

Gui/Employees/AddApplicant.qml

@@ -1,11 +1,14 @@
 import QtQuick
 import QtQuick.Layouts
+import QtQuick.Controls
 import TeroStyle
+import Js
 
+ScrollView
+{
     ColumnLayout {
-    anchors.fill: parent
-    spacing: Dimensions.l
 
+        spacing: Dimensions.l
         Component.onCompleted: {
             employee_model.addedNewEmployee.connect(successful => {
                 if (successful)
@@ -13,31 +16,37 @@ ColumnLayout {
             });
         }
 
-    ApplicantForm {
+        ApplicantForm
+        {
             id: applicantForm
 
             Layout.alignment: Qt.AlignTop
             Layout.fillHeight: true
             Layout.verticalStretchFactor: 1
         }
-    RowLayout {
+        RowLayout
+        {
             Layout.alignment: Qt.AlignRight
             spacing: Dimensions.l
 
-        Button {
+            Button
+            {
                 icon.source: "qrc:/images/ArrowLeftCircle-Outline.svg"
                 text: qsTr("Verwerfen")
 
                 onClicked: contentStack.pop()
             }
-        Button {
+            Button
+            {
                 enabled: applicantForm.valid
                 icon.source: "qrc:/images/CheckCircle.svg"
                 text: qsTr("Speichern")
 
-            onClicked: {
+                onClicked:
+                {
                     employee_model.addApplicant(applicantForm.value);
                 }
             }
         }
     }
+}

Gui/Employees/AddEmployee.qml

@@ -1,11 +1,10 @@
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
-import "../../js/qmldict.js" as JsLib
-
-ColumnLayout {
-    id: colPar
+import Js
 
+ScrollView
+{
     function checkFields() {
         if (!personalData.checkPersonalField())
             saveBtn.enabled = false;
@@ -20,6 +19,10 @@ ColumnLayout {
             console.log('failedtoadd');
         }
     }
+    ColumnLayout {
+        id: colPar
+
+
 
         Layout.fillHeight: true
         Layout.fillWidth: true
@@ -41,12 +44,15 @@ ColumnLayout {
             Layout.fillWidth: true
             spacing: Dimensions.l
 
+
+
+
             Frame {
                 Layout.alignment: Qt.AlignTop
                 Layout.fillWidth: true
                 Layout.horizontalStretchFactor: 1
 
-            ApplicantPersonalData {
+                EmployeePersonalData {
                     id: personalData
 
                     implicitWidth: parent.width
@@ -61,14 +67,14 @@ ColumnLayout {
                     Layout.alignment: Qt.AlignTop
                     implicitWidth: parent.width
 
-                ApplicantBankData {
+                    EmployeeBankData {
                         id: bankAccount
 
                     }
-                ApplicantNationalInsurance {
+                    EmployeeNationalInsurance {
                         id: nationalInsurance
                     }
-                ApplicantVarious {
+                    EmployeeVarious {
                         id: applicantVarious
 
                     }
@@ -100,3 +106,4 @@ ColumnLayout {
             }
         }
     }
+}

Gui/Employees/ApplicantForm.qml

@@ -3,22 +3,25 @@ import QtQuick.Controls.impl
 import QtQuick.Layouts
 import TeroStyle
 
-ColumnLayout {
+ColumnLayout
+    {
         readonly property int fieldM: 235
         readonly property int fieldS: 110
         readonly property bool valid: city.acceptableInput && email.acceptableInput && firstname.acceptableInput && lastname.acceptableInput && mobile.acceptableInput && phone.acceptableInput && postcode.acceptableInput && formofaddress.acceptableInput && title.acceptableInput
-    readonly property var value: QtObject {
+        readonly property var value: QtObject
+        {
             readonly property string city: (city.editText ? city.editText : city.currentText) ?? ""
             readonly property string email: email.text
             readonly property string firstname: firstname.text
-        readonly property string formofaddress: formofaddress.currentText ?? ""
-        readonly property string houseno: houseno.text ?? ""
+            readonly property string formofaddress: formofaddress.text
+            readonly property string houseno: houseno.text
             readonly property string lastname: lastname.text
             readonly property string mobile: mobile.text
             readonly property string phone: phone.text
             readonly property string postcode: (postcode.editText ? postcode.editText : postcode.currentText) ?? ""
-        readonly property string street: (street.editText ? street.editText : street.currentText) ?? ""
+            readonly property string street: street.text
             readonly property string title: title.currentText
+            readonly property string country: (country.editText ? country.editText : country.currentText) ?? ""
         }
 
     spacing: Dimensions.l
@@ -40,6 +43,7 @@ ColumnLayout {
             label: qsTr("Anrede")
 
             ComboBox {
+                // property string name: "title"
                 id: title
 
                 implicitWidth: fieldM
@@ -59,11 +63,14 @@ ColumnLayout {
                 }
             }
         }
-        Field {
+        Field
+        {
             label: qsTr("Vorname")
             mandatory: true
 
-            TextField {
+            TextField
+            {
+                // property string name: "firstname"
                 id: firstname
 
                 implicitWidth: fieldM
@@ -78,6 +85,7 @@ ColumnLayout {
             mandatory: true
 
             TextField {
+                // property string name: "lastname"
                 id: lastname
 
                 implicitWidth: fieldM
@@ -91,39 +99,45 @@ ColumnLayout {
     RowLayout {
         spacing: Dimensions.m
 
-        Field {
-            id: street
-
+        Field
+        {
             label: qsTr("Straße")
             mandatory: true
 
-            TextField {
+            TextField
+            {
+                // property string name: "street"
+                id: street
                 implicitWidth: fieldM
                 placeholderText: qsTr("Musterstraße")
-
                 validator: NotEmptyValidator {
                 }
             }
         }
-        Field {
-            id: houseno
-            mandatory: true
+        Field
+        {
 
+            mandatory: true
             label: qsTr("Hausnummer")
 
-            TextField {
+            TextField
+            {
+                // property string name: "houseno"
+                id: houseno
                 implicitWidth: fieldS
                 placeholderText: qsTr("1a")
-
                 validator: NotEmptyValidator {
                 }
             }
         }
-        Field {
+        Field
+        {
             label: qsTr("PLZ")
             mandatory: true
 
-            ComboBox {
+            ComboBox
+            {
+                // property string name: "postcode"
                 id: postcode
 
                 currentIndex: -1
@@ -138,11 +152,14 @@ ColumnLayout {
                 validator: NotEmptyValidator {}
             }
         }
-        Field {
+        Field
+        {
             label: qsTr("Ort")
             mandatory: true
 
-            ComboBox {
+            ComboBox
+            {
+                // property string name: "city"
                 id: city
 
                 currentIndex: -1
@@ -155,6 +172,22 @@ ColumnLayout {
                 }
             }
         }
+        Field
+        {
+            label: qsTr("Land")
+            mandatory: true
+
+            ComboBox
+            {
+                // property string name: "country"
+                id: country
+                currentIndex: 37
+                editable: true
+                implicitWidth: fieldM
+                model: address_model
+                textRole: "country"
+            }
+        }
     }
     IconLabel {
         color: Colors.foreground
@@ -173,6 +206,7 @@ ColumnLayout {
             label: qsTr("Telefonnummer")
 
             TextField {
+                // property string name: "phone"
                 id: phone
 
                 implicitWidth: fieldM
@@ -182,10 +216,13 @@ ColumnLayout {
                 }
             }
         }
-        Field {
+        Field
+        {
             label: qsTr("Mobil")
 
-            TextField {
+            TextField
+            {
+                // property string name: "mobile"
                 id: mobile
 
                 implicitWidth: fieldM
@@ -195,10 +232,13 @@ ColumnLayout {
                 }
             }
         }
-        Field {
+        Field
+        {
             label: qsTr("E-Mail Adresse")
 
-            TextField {
+            TextField
+            {
+                // property string name: "email"
                 id: email
 
                 implicitWidth: fieldM
@@ -208,10 +248,13 @@ ColumnLayout {
                 }
             }
         }
-        Field {
+        Field
+        {
             label: qsTr("Briefanrede")
 
-            TextField {
+            TextField
+            {
+                // property string name: "formofaddress"
                 id: formofaddress
 
                 implicitWidth: fieldM

Gui/Employees/EmployeesTable.qml

@@ -4,7 +4,6 @@ import QtQuick.Controls
 import Qt.labs.qmlmodels
 
 ColumnLayout {
-    anchors.fill: parent
     spacing: Dimensions.l
 
     RowLayout {

Gui/LoginScreen.qml

@@ -19,8 +19,8 @@ Item {
         contentStack.replace("Dashboard.qml");
     }
 
-    anchors.fill: parent
-    anchors.topMargin: Dimensions.l
+    // anchors.fill: parent
+    // anchors.topMargin: Dimensions.l
 
     Component.onCompleted: {
         loggedin_user.loginOkay.connect(loggedin);

Gui/Navigation.qml

@@ -31,14 +31,14 @@ ColumnLayout {
     BarButton {
         ButtonGroup.group: mainNav
         icon.source: "qrc:/images/UserGroup-Outline.svg"
-        target: "/Gui/CustomersTable.qml"
+        target: "/Gui/Customer/CustomersTable.qml"
         text: qsTr("Kunden")
         visible: !onSubPage
     }
     BarButton {
         ButtonGroup.group: mainNav
         icon.source: "qrc:/images/BuildingOffice2-Outline.svg"
-        target: "/Gui/ObjectsTable.qml"
+        target: "/Gui/Objects/ObjectsTable.qml"
         text: qsTr("Objekt")
         visible: !onSubPage
     }
@@ -52,7 +52,7 @@ ColumnLayout {
     BarButton {
         ButtonGroup.group: mainNav
         icon.source: "qrc:/images/RectangleStack-Outline.svg"
-        target: "/Gui/OffersTable.qml"
+        target: "/Gui/Offers/OffersTable.qml"
         text: qsTr("Angebote")
         visible: !onSubPage
     }

Gui/ObjectAddOns.qml

@@ -1,7 +1,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
-import "../js/qmldict.js" as JsLib
+import Js
 
 Frame
 {

Gui/Objects/AddNewObject.qml

@@ -0,0 +1,255 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+GridLayout
+{
+    id: newObject
+
+    columns: 4
+    Layout.fillWidth: true
+    Layout.fillHeight: true
+    rowSpacing: 9
+
+
+    //// New grid row
+    Label
+    {
+        text: qsTr("Land")
+        Layout.alignment: Qt.AlignRight
+        visible: false
+
+    }
+
+    ComboBox
+    {
+        property string name: "country"
+        id: country
+        Layout.fillWidth: true
+        editable: true
+        // onEditTextChanged: checkFields()
+        // onCurrentTextChanged: checkFields()
+        model: address_model
+        textRole: "country"
+        popup.height: 300
+        currentIndex: 37
+        visible: false
+    }
+    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
+    }
+
+    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
+
+
+
+    // New grid row
+    Label
+    {
+        text: qsTr("Parteien")
+        Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+    }
+
+    SpinBox
+    {
+        property string name: "units"
+        id: partitions
+        Layout.fillWidth: true
+        from: 1
+        to: 100
+        value: 1
+        editable: true
+    }
+
+    Label
+    {
+        text: qsTr("Stockwerke")
+        Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+    }
+
+    SpinBox
+    {
+        property string name: "floors"
+        id: floors
+        Layout.fillWidth: true
+        from: 1
+        to: 100
+        value: 1
+        editable: true
+    }
+
+    // New grid row
+    Label
+    {
+        text: qsTr("Zwischenetage")
+        Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+    }
+
+    ComboBox
+    {
+        property string name: "mezzanin"
+        id: mezzanin
+        Layout.fillWidth: true
+        editable: false
+        model: [qsTr("Ja"), qsTr("Nein")]
+    }
+
+    Label
+    {
+        text: qsTr("Aufzug")
+        Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+    }
+
+    ComboBox
+    {
+        property string name: "lift"
+        id: lift
+        Layout.fillWidth: true
+        editable: false
+        model: [qsTr("Ja"), qsTr("Nein")]
+    }
+
+    //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
+        placeholderText: qsTr("0 oder leer um eine Nummer automatisch zu generieren")
+        placeholderTextColor: "pink"
+    }
+
+
+    Label
+    {
+        text: qsTr("Besonderheiten")
+        Layout.alignment: Qt.AlignRight
+    }
+    TextField
+    {
+        property string name: "remarks"
+        id: remarks
+        Layout.fillWidth: true
+    }
+
+    //// New grid row
+
+
+    Label
+    {
+        text: qsTr("Reinigungsmittel wo?*")
+        Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+    }
+
+    TextField
+    {
+        property string name: "cleaningproducts"
+        id: cleaningproducts
+        Layout.fillWidth: true
+        onTextChanged: checkFields()
+    }
+    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/Objects/AddObject.qml

@@ -0,0 +1,163 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import QtQuick.Dialogs
+import Js
+
+ScrollView
+{
+    id: scroll
+    width: parent.width
+    height: parent.height
+    ColumnLayout
+    {
+        height: Screen.desktopAvailableHeight
+        width: scroll.width
+        property var new_object: null
+        //property alias checkAddContact: checkAddContact
+
+        spacing: 15
+        Label
+        {
+            text: qsTr("Objekt anlegen")
+            horizontalAlignment: Text.AlignHCenter
+            Layout.fillWidth: true
+            font.pixelSize: 35
+        }
+        CheckBox
+        {
+            id: checkAddObjectContact
+            text: qsTr("Ansprechpartner hinzufügen")
+            Layout.alignment: Qt.AlignRight
+            checked: false
+            onCheckStateChanged:
+            {
+                checkFields()
+            }
+        }
+
+        RowLayout
+        {
+            id: addObject
+            Layout.fillWidth: true
+            Layout.fillHeight: true
+            spacing: 45
+
+            Frame
+            {
+                Layout.alignment: Qt.AlignTop
+                Layout.fillWidth: true
+                AddNewObject
+                {
+                    id: newObject
+                    width: parent.width
+                }
+            }
+
+            ObjectAddOns
+            {
+                id: addObjectLayout
+                visible: checkAddObjectContact.checked
+            }
+        }
+        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)
+                    // For Debugging
+                    console.log(JSON.stringify(new_object))
+                    //
+                    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")
+                }
+
+                contentStack.pop()
+            }
+        }
+
+        // function onObjectAdded(added, oid)
+        // {
+        //     if (!added)
+        //         console.log(qsTr("Fehler beim Objekt-Anlegen!"))
+        //     if (checkAddObjectContact.checked && oid)
+        //     {
+        //         var new_objecto = addObjectLayout.getForm()
+
+        //         contact_model.addObjectContact(new_objecto, oid)
+        //     }
+        //     else appLoader.source = "ObjectTable.qml"
+        // }
+
+        // function onObjectContact(added)
+        // {
+        //     if (!added)
+        //         console.log(qsTr("Fehler beim Objekt-Kontakt-Anlegen!"))
+        //     else
+        //     {
+        //         //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/Objects/AddObjectEmployee.qml

@@ -0,0 +1,130 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+ApplicationWindow
+{
+    id: addMitarbeiter
+    title: qsTr("Objekt - Neuer Mitarbeiter")
+
+    ColumnLayout
+    {
+        anchors.fill: parent
+        anchors.margins: 10
+        Label
+        {
+            text: qsTr("Mitarbeiter zuweisen")
+            Layout.alignment: Qt.AlignHCenter
+            font.pixelSize: 35
+        }
+
+        GridLayout
+        {
+           Layout.fillWidth: true
+           columns: 2
+           rowSpacing: 4
+           columnSpacing: 6
+
+           Label
+           {
+               text: qsTr("Eingesetzter Mitarbeiter")
+               Layout.alignment: Qt.AlignRight
+           }
+           ComboBox
+           {
+               id: assignee
+               Layout.fillWidth: true
+           }
+           Label
+           {
+               text: qsTr("Lohn Mitarbeiter pro Stunde")
+               Layout.alignment: Qt.AlignRight
+           }
+           TextField
+           {
+               id: wage
+               Layout.fillWidth: true
+           }
+           Label
+           {
+               text: qsTr("Einsatzdauer")
+               Layout.alignment: Qt.AlignRight
+           }
+           TextField
+           {
+               id: duration
+               Layout.fillWidth: true
+           }
+           Label
+           {
+               text: qsTr("Reinigungstage")
+               Layout.alignment: Qt.AlignRight
+           }
+           TextField
+           {
+               id: cleanDays
+               Layout.fillWidth: true
+           }
+           Label
+           {
+               text: qsTr("Tätigkeiten")
+               Layout.alignment: Qt.AlignRight
+           }
+           TextField
+           {
+               id: tasks
+               Layout.fillWidth: true
+           }
+           Label
+           {
+               text: qsTr("Ertrag")
+               Layout.alignment: Qt.AlignRight
+           }
+           TextField
+           {
+               id: output
+               Layout.fillWidth: true
+           }
+           Item
+           {
+               Layout.fillHeight: true
+               Layout.columnSpan: 2
+           }
+        }
+        RowLayout
+        {
+            Layout.fillWidth: true
+            spacing: 5
+            Item
+            {
+                Layout.fillWidth: true
+            }
+            Button
+            {
+                text: qsTr("Abbrechen")
+                onClicked: addMitarbeiter.close()
+            }
+            Button
+            {
+                text: qsTr("Hinzufügen")
+                onClicked:
+                {
+                    if (duration.text.trim() !== "" && wage.text.trim() !== "" && cleanDays.text.trim() !== "" && tasks.text.trim() !== "" && output.text.trim() !== "")
+                    {
+                        var ne = {
+                                    "assignee": assignee.currentText,
+                                    "duration": duration.text.trim(),
+                                    "wage": wage.text.trim(),
+                                    "cleandays": cleanDays.text.trim(),
+                                    "tasks": tasks.text.trim(),
+                                    "output": output.text.trim(),
+                                };
+                        addMitarbeiter.addNewEmployee(ne)
+                        addMitarbeiter.close()
+                    }
+                }
+            }
+        }
+    }
+
+    signal addNewEmployee(var new_employee)
+}

Gui/Objects/ObjectAddOnContactPerson.qml

@@ -0,0 +1,317 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+
+GridLayout
+{
+    property var contacts: null
+    columns: 2
+    Layout.fillWidth: true
+    Label
+    {
+        text: qsTr("Position")
+        Layout.alignment: Qt.AlignRight | Qt.AlignTop
+    }
+
+    ComboBox
+    {
+        //property string name: "contacttype"
+        id: posizion
+        Layout.fillWidth: true
+        editable: false
+        model: [qsTr("Beirat"), qsTr("Hausmeister"), qsTr("Hausbewohner"), qsTr("Sonstiges")]
+    }
+
+    Label
+    {
+        text: qsTr("Anrede")
+        Layout.alignment: Qt.AlignRight
+    }
+    ComboBox
+    {
+        id: title
+        model: [qsTr("Herr"), qsTr("Frau"), qsTr("Keine Angabe")]
+        Layout.fillWidth: true
+    }
+    Label
+    {
+        text: qsTr("Vorname*")
+        Layout.alignment: Qt.AlignRight
+    }
+    TextField
+    {
+        id: firstname
+        Layout.fillWidth: true
+    //     onTextChanged: checkContactFields()
+    }
+    Label
+    {
+        text: qsTr("Nachname*")
+        Layout.alignment: Qt.AlignRight
+    }
+    TextField
+    {
+        id: lastname
+        Layout.fillWidth: true
+    }
+    Label
+    {
+        text: mobile.text ? qsTr("Telefonnummer") : qsTr("Telefonnummer*")
+        Layout.alignment: Qt.AlignRight
+    }
+    TextField
+    {
+        id: phonenumber
+        Layout.fillWidth: true
+    }
+    Label
+    {
+        text: phonenumber.text ? qsTr("Mobil") : qsTr("Mobil*")
+        Layout.alignment: Qt.AlignRight
+    }
+    TextField
+    {
+        id: mobile
+        Layout.fillWidth: true
+    }
+
+    RowLayout
+    {
+        Layout.fillWidth: true
+        Layout.columnSpan: 2
+
+        Item
+        {
+            Layout.fillWidth: true
+        }
+
+        Button
+        {
+            id: removeContact
+            text: qsTr("Entfernen")
+            enabled: false
+            onClicked:
+            {
+
+                if (contactView.highlightFollowsCurrentItem)
+                {
+                    delete contacts[contactView.currentIndex]
+                    contacts = contacts.filter(elm => elm)
+                    contactModel.remove(contactView.currentIndex)
+                    contactView.highlightFollowsCurrentItem = false
+                    contactView.currentIndex = -1
+                    if (Object.keys(contacts).length === 0)
+                    {
+                        enabled = false
+                        console.log(contacts)
+                    }
+                    checkFields()
+                }
+            }
+        }
+
+        Button
+        {
+            id: addContact
+            text: qsTr("Hinzufügen")
+            enabled: firstname.text.trim() && lastname.text.trim() && (phonenumber.text.trim() || mobile.text.trim()) && (contacts === null || Object.keys(contacts).length < 3)
+            onClicked:
+            {
+                var num_contacts = 0
+                if (contacts !== null && contacts !== undefined) num_contacts = Object.keys(contacts).length
+                else contacts = []
+                if (num_contacts < 3 && firstname.text.trim() !== "" && lastname.text.trim() !== "" && (phonenumber.text.trim() !== ""  || mobile.text.trim() !== ""))
+                {
+                    contacts[num_contacts] = {}
+                    contacts[num_contacts]["title"] = title.currentText
+                    contacts[num_contacts]["position"] = posizion.currentText
+                    contacts[num_contacts]["fname"] = firstname.text.trim()
+                    contacts[num_contacts]["lname"] = lastname.text.trim()
+                    contacts[num_contacts]["phone"] = phonenumber.text.trim()
+                    contacts[num_contacts]["mobile"] = mobile.text.trim()
+                    contactModel.append({name: title.currentText + " " + firstname.text.trim() + " " + lastname.text.trim(), phone: phonenumber.text.trim(), mobile: mobile.text.trim(),  posizion: posizion.currentText})
+                    if (checkFields())
+                    {
+                        saveBtn.enabled = true
+                    }
+                    firstname.text = ""
+                    lastname.text = ""
+                    phonenumber.text = ""
+                    mobile.text = ""
+                    posizion.currentIndex = 0
+                    title.currentIndex = 0
+
+                    removeContact.enabled = true
+                    checkFields()
+                }
+            }
+        }
+    }
+
+    Label
+    {
+        text: qsTr("Ansprechpartner")
+        Layout.alignment: Qt.AlignRight | Qt.AlignTop
+    }
+
+    ListModel
+    {
+        id: contactModel
+    }
+
+    // Component
+    // {
+    //     id: headline
+    //     Row
+    //     {
+    //         spacing: 9
+    //         Text
+    //         {
+    //             id: cpname
+    //             text: qsTr("Name")
+    //             font.bold: true
+    //             horizontalAlignment: Text.AlignLeft
+    //             color: "white"
+    //         }
+
+    //         Text
+    //         {
+    //             id: cpphone
+    //             text: qsTr("Telefon")
+    //             font.bold: true
+    //             horizontalAlignment: Text.AlignLeft
+    //             color: "white"
+    //         }
+
+    //         Text
+    //         {
+    //             id: cpmobile
+    //             text: qsTr("Mobil")
+    //             font.bold: true
+    //             horizontalAlignment: Text.AlignLeft
+    //             color: "white"
+    //         }
+
+    //         Text
+    //         {
+    //             id: cppos
+    //             text: qsTr("Position")
+    //             font.bold: true
+    //             horizontalAlignment: Text.AlignLeft
+    //             color: "white"
+    //         }
+
+    //         Text
+    //         {
+    //             id: cttype
+    //             text: qsTr("Typ")
+    //             font.bold: true
+    //             horizontalAlignment: Text.AlignLeft
+    //             color: "white"
+    //         }
+    //     }
+    // }
+
+    Component
+    {
+        id: highlight
+        Rectangle
+        {
+            width: parent.width
+            color: "lightsteelblue"; radius: 5
+            y: contactView.currentItem.y
+            Behavior on y
+            {
+                SpringAnimation
+                {
+                    spring: 3
+                    damping: 0.2
+                }
+            }
+        }
+    }
+
+    Rectangle
+    {
+        id: mainRect
+        Layout.fillWidth: true
+        implicitHeight: 100
+        color: firstname.palette.base
+        border.color: firstname.activeFocus? firstname.palette.highlight: firstname.palette.base
+        clip: true
+
+        ScrollView
+        {
+            id: objContactView
+            // Layout.fillWidth: true
+            // Layout.preferredHeight: 100
+            //Layout.columnSpan: 3
+            anchors.fill: mainRect
+            ScrollBar.vertical.policy: ScrollBar.AlwaysOn
+
+
+            ListView
+            {
+                id: contactView
+                anchors.fill: objContactView
+                // implicitHeight: objContactView.height
+                // implicitWidth: objContactView.width
+                model: contactModel
+                // header: headline
+                highlight: Rectangle { color: "slategray"; radius: 3}
+                highlightFollowsCurrentItem: false
+                //focus: true test
+                onActiveFocusChanged: if(!focus) currentIndex = -1
+                delegate: Item
+                {
+                    width: contactView.width
+                    height: 77
+
+                    MouseArea
+                    {
+                        anchors.fill: parent
+                        onClicked:
+                        {
+                            contactView.currentIndex = index
+                            contactView.highlightFollowsCurrentItem = true
+                        }
+                    }
+
+
+                    Column
+                    {
+                        anchors.margins: 5
+
+                        //spacing: 3
+                        Text
+                        {
+                            text: '<b>' + qsTr('Name: ') + '</b>' + model.name
+                            horizontalAlignment: Text.AlignLeft
+                            color: "white"
+                        }
+                        Text
+                        {
+                            text: '<b>' + qsTr('Telefon: ') + '</b>' + model.phone
+                            horizontalAlignment: Text.AlignLeft
+                            color: "white"
+                        }
+                        Text
+                        {
+                            text: '<b>' + qsTr('Handy: ') + '</b>' + model.mobile
+                            horizontalAlignment: Text.AlignLeft
+                            color: "white"
+                        }
+                        Text
+                        {
+                            text: '<b>' + qsTr('Position: ') + '</b>' + model.posizion
+                            horizontalAlignment: Text.AlignLeft
+                            color: "white"
+                        }
+
+                    } // Column
+                } // delegate
+            } // Listview
+        } // Scrollview
+    }
+}
+

Gui/Objects/ObjectAddOnEmployee.qml

@@ -0,0 +1,125 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+
+GridLayout
+{
+    // property var employeeForm: null
+    // property var employees: null
+    // id: oaoemployee
+    // columns: 2
+    // rows: 4
+    // Label
+    // {
+    //     text: qsTr("Mitarbeiter")
+    //     Layout.alignment: Qt.AlignRight | Qt.AlignTop
+    // }
+
+    // ListModel
+    // {
+    //     id: employeeModel
+    // }
+
+    // Component
+    // {
+    //     id: employeesHeader
+    //     Row
+    //     {
+    //         Text
+    //         {
+    //             id: empName
+    //             text: qsTr("Mitarbeiter")
+    //             width: 175
+    //             font.bold: true
+    //             horizontalAlignment: Text.AlignLeft
+    //             color: "black"
+    //         }
+    //     }
+    // }
+
+    // Rectangle
+    // {
+    //     Layout.fillWidth: true
+    //     implicitHeight: 75
+    //     Layout.rowSpan: 2
+    //     color: mitarbeiterhin.palette.base
+    //     border.color: mitarbeiterhin.activeFocus? mitarbeiterhin.palette.highlight: mitarbeiterhin.palette.base
+    //     ListView
+    //     {
+    //         id: employeesList
+    //         //anchors.fill: parent
+    //         implicitHeight: parent.height
+
+    //         model: employeeModel
+
+    //         header: employeesHeader
+
+    //         delegate: Row
+    //         {
+    //             width: 200
+    //             height: 15
+    //             //padding: 7
+    //             Text
+    //             {
+    //                 text: model.namens
+    //             }
+    //         }
+
+    //     }
+    // }
+    // RowLayout
+    // {
+    //     Layout.columnSpan: 2
+    //     Layout.fillWidth: true
+    //     Item
+    //     {
+    //         Layout.fillWidth: true
+    //     }
+
+    //     Button
+    //     {
+    //         id: mitarbeiterraus
+    //         text: qsTr("Mitarbeiter entfernen")
+    //     }
+
+    //     Button
+    //     {
+    //         id: mitarbeiterhin
+    //         text: qsTr("Mitarbeiter hinzufügen")
+    //         onClicked:
+    //         {
+    //             var nm = Qt.createComponent("AddObjectEmployee.qml")
+    //             if (nm.status === Component.Ready)
+    //             {
+    //                 employeeForm = nm.createObject (appWindow, {width: 600, height: 400})
+    //                 employeeForm.addNewEmployee.connect(onAddEmployee)
+    //                 employeeForm.show()
+    //             }
+    //             else console.log(nm.errorString())
+    //         }
+    //     }
+    // }
+
+    // function onAddEmployee(new_employee)
+    // {
+    //     var num_employees = 0
+
+    //     if (employees === null || employees === undefined) employees = {}
+    //     else num_employees = Object.keys(employees).length;
+
+    //     employees[num_employees] = {}
+    //     employees[num_employees]["assignee"] = new_employee["assignee"];
+    //     employees[num_employees]["duration"] = new_employee["duration"];
+    //     employees[num_employees]["wage"] = new_employee["wage"];
+    //     employees[num_employees]["cleandays"] = new_employee["cleandays"];
+    //     employees[num_employees]["tasks"] = new_employee["tasks"];
+    //     employees[num_employees]["output"] = new_employee["output"];
+
+    //     employeeModel.append({namens: new_employee["assignee"]});
+
+    // }
+}
+
+
+
+

Gui/Objects/ObjectAddOns.qml

@@ -0,0 +1,28 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import Js
+
+Frame
+{
+    property alias contactPerson: oaocontactperson
+    Layout.alignment: Qt.AlignTop
+    Layout.fillWidth: true
+    ColumnLayout
+    {
+        id: addObjectLayout
+        width: parent.width
+        ObjectAddOnContactPerson
+        {
+            id: oaocontactperson
+        }
+        Item
+        {
+            Layout.fillHeight: true
+        }
+    }
+    function getForm()
+    {
+        return oaocontactperson.contacts
+    }
+}

Gui/Objects/ObjectDetails.qml

@@ -0,0 +1,27 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+Item
+{
+    property int selectedObject: -1
+    id: obDet
+    ColumnLayout
+    {
+        Label
+        {
+            text: qsTr("Ausgewählter Objekt " + selectedObject)
+        }
+
+        Button
+        {
+            text: qsTr("Zurück zu den Objekten")
+            onClicked: contentStack.pop()
+        }
+    }
+
+    Component.onCompleted:
+    {
+        object_model.onRowClicked(selectedObject)
+    }
+}

Gui/Objects/ObjectView.qml

@@ -0,0 +1,238 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+GridLayout
+{
+    id: objectView
+
+    columns: 4
+    Layout.fillWidth: true
+    Layout.fillHeight: true
+    rowSpacing: 9
+
+    Label
+    {
+        text: qsTr("Firma")
+        Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+    }
+    ComboBox
+    {
+        property string name: "business"
+        id: business
+        editable: true
+        Layout.fillWidth: true
+        Layout.columnSpan: 3
+    }
+
+    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()
+    }
+
+    Label
+    {
+        text: qsTr("PLZ*")
+        Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+    }
+
+    TextField
+    {
+        property string name: "postcode"
+        id: postcode
+        Layout.fillWidth: true
+        onTextChanged: checkFields()
+    }
+    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
+    }
+
+    Label
+    {
+        text: qsTr("Lohnanteil inkl. Fahrtkosten")
+        Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+    }
+
+    TextField
+    {
+        id: lohnanteil
+        Layout.fillWidth: true
+        Layout.columnSpan: 3
+    }
+
+    Label
+    {
+        text: qsTr("Materialanteil")
+        Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+    }
+
+    TextField
+    {
+        id: materialanteil
+        Layout.fillWidth: true
+        Layout.columnSpan: 3
+    }
+
+    Label
+    {
+        text: qsTr("Zusatz 1")
+        Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+    }
+
+    TextField
+    {
+        id: zusatz1
+        Layout.fillWidth: true
+        Layout.columnSpan: 3
+    }
+
+    Label
+    {
+        text: qsTr("Zusatz 2")
+        Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+    }
+
+    TextField
+    {
+        id: zusatz2
+        Layout.fillWidth: true
+        Layout.columnSpan: 3
+    }
+
+    Label
+    {
+        text: qsTr("Gesamt Netto")
+        Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+    }
+
+    TextField
+    {id: gesamtnetto
+        Layout.fillWidth: true
+        Layout.columnSpan: 3
+    }
+
+    Label
+    {
+        text: qsTr("MwSt")
+        Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+    }
+
+    TextField
+    {
+        id: mwst
+        Layout.fillWidth: true
+        Layout.columnSpan: 3
+    }
+
+    Label
+    {
+        text: qsTr("Gesamt(Netto+MwSt)")
+        Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+    }
+
+    TextField
+    {
+        id: gesamt
+        Layout.fillWidth: true
+        Layout.columnSpan: 3
+    }
+
+    Label
+    {
+        text: qsTr("Zahlungsziel")
+        Layout.alignment: Qt.AlignRight
+    }
+    ComboBox
+    {
+        property string name: "zahlungsziel"
+        id: zahlungsziel
+        Layout.fillWidth: true
+        editable: false
+        textRole: "display"
+        Layout.columnSpan: 3
+    }
+
+
+    Label
+    {
+        text: qsTr("Info")
+        Layout.alignment: Qt.AlignRight | Qt.AlignTop
+    }
+    ScrollView
+    {
+        id: infoview
+        Layout.fillWidth: true
+        Layout.preferredHeight: 110
+        Layout.columnSpan: 3
+        ScrollBar.horizontal: ScrollBar
+        {
+            policy: ScrollBar.AlwaysOn
+        }
+
+        TextArea
+        {
+            id: objectInfo
+            property string name: "objectinfo"
+            implicitWidth: parent.width
+            wrapMode: TextEdit.Wrap
+            background: Rectangle
+            {
+                color: objectInfo.palette.base
+                border.color: objectInfo.activeFocus? objectInfo.palette.highlight: objectInfo.palette.base
+                width: parent.width
+            }
+        }
+    }
+    Item
+    {
+        Layout.fillHeight: true
+    }
+}
+
+
+
+
+
+
+
+

Gui/Objects/ObjectsTable.qml

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

Gui/Objects/qmldir

@@ -0,0 +1 @@
+module Objects

Gui/Offers/AddNewOffer.qml

@@ -52,37 +52,6 @@ GridLayout
 
     //// 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")
@@ -102,7 +71,11 @@ GridLayout
         textRole: "display"
         popup.height: 300
         currentIndex: -1
-        onCurrentIndexChanged: city.currentIndex = postcode.currentIndex
+        onCurrentIndexChanged:
+        {
+            city.currentIndex = postcode.currentIndex
+
+        }
 
         validator: RegularExpressionValidator
         {
@@ -131,6 +104,41 @@ GridLayout
         currentIndex: -1
     }
 
+    Label
+    {
+        text: qsTr("Straße")
+        Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+    }
+
+    ComboBox
+    {
+        property string name: "street"
+        id: street
+        model: object_model
+        textRole: "StreetInPostcode"
+        Layout.fillWidth: true
+        Layout.alignment: Qt.AlignVCenter
+        // onTextChanged: checkFields()
+    }
+
+    Label
+    {
+        text: qsTr("Nr.*")
+        Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+    }
+
+    ComboBox
+    {
+        property string name: "houseno"
+        id: houseno
+        Layout.fillWidth: true
+        Layout.alignment: Qt.AlignVCenter
+        // onTextChanged: checkFields()
+    }
+
+    // New grid row
+
+
     //New Grid
     Label
     {
@@ -184,6 +192,7 @@ GridLayout
         Layout.fillWidth: true
         Layout.alignment: Qt.AlignVCenter
     }
+
     Item
     {
         Layout.columnSpan: 2
@@ -194,16 +203,13 @@ GridLayout
         text: qsTr("Leistungen:")
         Layout.alignment: Qt.AlignRight
         font: Typography.h2
-
-
     }
+
     Item
     {
         Layout.columnSpan: 3
     }
 
-
-
     Item
     {
         Layout.fillHeight: true

Gui/Offers/AddOffer.qml

@@ -2,7 +2,8 @@ import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
 import QtQuick.Dialogs
-import "../js/qmldict.js" as JsLib
+import Js
+
 
 ColumnLayout
 {
@@ -27,16 +28,13 @@ ColumnLayout
         Layout.fillHeight: true
         spacing: 45
 
-        Frame
-        {
-            Layout.alignment: Qt.AlignTop
-            Layout.fillWidth: true
+
         AddNewOffer
         {
             id: newOffer
             width: parent.width
         }
-        }
+
 
 
     }
@@ -51,16 +49,17 @@ ColumnLayout
         }
         Button
         {
-            property var new_object: null
+
             id: saveBtn
             text: qsTr("Speichern")
-            enabled: false
+            // 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)
+
             }
         }
     }

Gui/Offers/OffersTable.qml

@@ -5,7 +5,6 @@ import Qt.labs.qmlmodels
 
 ColumnLayout
 {
-    anchors.fill: parent
     spacing: Dimensions.l
     function viewOffers(criterion)
     {
@@ -57,7 +56,7 @@ ColumnLayout
             icon.source: "qrc:/images/PlusCircle.svg"
             Layout.alignment: Qt.AlignRight
             flat: true
-            onClicked: appLoader.source = "AddOffer.qml"
+            onClicked: contentStack.push("AddOffer.qml")
         }
     }
     Item {

Gui/Offers/qmldir

@@ -0,0 +1 @@
+module Offers

Gui/OffersTable.qml.orig

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

Gui/main.qml

@@ -18,13 +18,13 @@ ApplicationWindow {
     }
 
     font: Typography.body
-    height: Screen.height * .85
+    height: Screen.desktopAvailableHeight
     palette.window: Colors.mantle
     palette.placeholderText: Colors.interactive
     palette.text: Colors.foreground
     title: "TERO Personal"
     visible: true
-    width: Screen.width * .75
+    width: Screen.desktopAvailableWidth
 
     Component.onCompleted: {
         systray.activated.connect(showWindow);

Gui/qmldir

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

Js/JsLib.js

@@ -0,0 +1,73 @@
+.pragma library
+
+function firstConf(tabs)
+{
+    let pyqcrm_conf = {};
+    pyqcrm_conf[tabs.name] = {}
+    for (var i = 0; i < tabs.children.length; i++)
+    {
+        if (tabs.children[i].name)
+        {
+            if (!tabs.children[i].text.trim())
+            return false
+            if (pyqcrm_conf[tabs.name][tabs.children[i].name] !== "DB_PASS")
+                pyqcrm_conf[tabs.name] [tabs.children[i].name] = tabs.children[i].text.trim()
+            else
+                pyqcrm_conf[tabs.name] [tabs.children[i].name] = tabs.children[i].text
+        }
+    }
+    return pyqcrm_conf
+}
+
+
+function parseForm(...form)
+{
+
+    let data_form = {};
+    for (var i = 0; i < form.length; i++)
+    {
+
+        for (var j = 0; j < form[i].children.length; j++)
+        {
+            console.log(form[i].children[j])
+            if (form[i].children[j].toString().startsWith("Combo"))
+            {
+                if(form[i].children[j].editText)
+                {
+                    data_form[form[i].children[j].name] = form[i].children[j].editText
+                }
+                else
+                {
+                    data_form[form[i].children[j].name] = form[i].children[j].currentText
+                }
+            }
+            else if (form[i].children[j].toString().startsWith("TextField"))
+            {
+                data_form[form[i].children[j].name] = form[i].children[j].text.trim()
+            }
+            else if (form[i].children[j].toString().startsWith("Scroll"))
+            {
+                data_form[form[i].children[j].contentChildren[0].name] = form[i].children[j].contentChildren[0].text.trim()
+            }
+            else if (form[i].children[j].toString().startsWith("CheckBox"))
+            {
+                data_form[form[i].children[j].name] = form[i].children[j].checked
+            }
+            else if (form[i].children[j].toString().startsWith("SpinBox"))
+            {
+                data_form[form[i].children[j].name] = form[i].children[j].value
+            }
+            // else if (form[i].children[j].toString().startsWith("QQuickContentItem"))
+            // {
+            //     console.log(form[i].children[j].children.children)
+
+            //     for (var k = 0; k < form[i].children[j].length; k++)
+            //     {
+            //         console.log(form[i].children[j].name)
+            //     }
+            // }
+        }
+    }
+    return data_form
+}
+

Js/qmldir

@@ -0,0 +1,2 @@
+module Js
+JsLib 1.0 JsLib.js

TeroStyle/pushtest.qml

@@ -0,0 +1,5 @@
+import QtQuick
+
+Item {
+
+}

doc/AddZipcodeProcedure-Aktivität.drawio

@@ -0,0 +1,192 @@
+<mxfile host="app.diagrams.net" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.0.0 Safari/537.36" version="27.0.2">
+  <diagram name="Seite-1" id="riPTszubbY08c-Ci63mD">
+    <mxGraphModel dx="2951" dy="1541" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+      <root>
+        <mxCell id="0" />
+        <mxCell id="1" parent="0" />
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-1" value="" style="ellipse;html=1;shape=startState;fillColor=#000000;strokeColor=#ff0000;" vertex="1" parent="1">
+          <mxGeometry x="420" y="35" width="30" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-2" value="" style="edgeStyle=orthogonalEdgeStyle;html=1;verticalAlign=bottom;endArrow=open;endSize=8;strokeColor=#ff0000;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" source="NvYeTt0xDQWk2u7kX_r0-1" parent="1" target="NvYeTt0xDQWk2u7kX_r0-3">
+          <mxGeometry relative="1" as="geometry">
+            <mxPoint x="300" y="50" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-3" value="Check Country" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+          <mxGeometry x="500" y="20" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-4" value="" style="rhombus;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+          <mxGeometry x="520" y="125" width="80" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-5" value="" style="endArrow=classic;html=1;rounded=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="NvYeTt0xDQWk2u7kX_r0-3" target="NvYeTt0xDQWk2u7kX_r0-4">
+          <mxGeometry width="50" height="50" relative="1" as="geometry">
+            <mxPoint x="550" y="525" as="sourcePoint" />
+            <mxPoint x="600" y="475" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-6" value="" style="endArrow=classic;html=1;rounded=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="NvYeTt0xDQWk2u7kX_r0-4" target="NvYeTt0xDQWk2u7kX_r0-9">
+          <mxGeometry width="50" height="50" relative="1" as="geometry">
+            <mxPoint x="550" y="475" as="sourcePoint" />
+            <mxPoint x="740" y="205" as="targetPoint" />
+            <Array as="points">
+              <mxPoint x="680" y="165" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-8" value="Check City" style="rounded=1;whiteSpace=wrap;html=1;direction=east;" vertex="1" parent="1">
+          <mxGeometry x="399.5" y="345" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-9" value="addCountry" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+          <mxGeometry x="620" y="225" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-10" value="[exists]" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
+          <mxGeometry x="460" y="135" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-11" value="[not exists]" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
+          <mxGeometry x="610" y="135" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-12" value="" style="rhombus;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+          <mxGeometry x="419.5" y="445" width="80" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-13" value="addCity" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+          <mxGeometry x="539.5" y="535" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-14" value="Check Postcode" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+          <mxGeometry x="259.25" y="645" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-15" value="" style="endArrow=classic;html=1;rounded=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="NvYeTt0xDQWk2u7kX_r0-12" target="NvYeTt0xDQWk2u7kX_r0-13">
+          <mxGeometry width="50" height="50" relative="1" as="geometry">
+            <mxPoint x="649.5" y="565" as="sourcePoint" />
+            <mxPoint x="600" y="530" as="targetPoint" />
+            <Array as="points">
+              <mxPoint x="599.5" y="485" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-16" value="" style="endArrow=classic;html=1;rounded=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="NvYeTt0xDQWk2u7kX_r0-12">
+          <mxGeometry width="50" height="50" relative="1" as="geometry">
+            <mxPoint x="649.5" y="565" as="sourcePoint" />
+            <mxPoint x="319.5" y="545" as="targetPoint" />
+            <Array as="points">
+              <mxPoint x="319.5" y="485" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-17" value="" style="endArrow=classic;html=1;rounded=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="NvYeTt0xDQWk2u7kX_r0-8" target="NvYeTt0xDQWk2u7kX_r0-12">
+          <mxGeometry width="50" height="50" relative="1" as="geometry">
+            <mxPoint x="649.5" y="605" as="sourcePoint" />
+            <mxPoint x="699.5" y="555" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-19" value="[exists]" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
+          <mxGeometry x="329.5" y="455" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-20" value="[not exists]" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
+          <mxGeometry x="529.5" y="455" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-21" value="" style="rhombus;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+          <mxGeometry x="279.25" y="745" width="80" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-22" value="addPostcode" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+          <mxGeometry x="399.5" y="845" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-24" value="" style="endArrow=classic;html=1;rounded=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="NvYeTt0xDQWk2u7kX_r0-21" target="NvYeTt0xDQWk2u7kX_r0-22">
+          <mxGeometry width="50" height="50" relative="1" as="geometry">
+            <mxPoint x="509.25" y="865" as="sourcePoint" />
+            <mxPoint x="559.25" y="815" as="targetPoint" />
+            <Array as="points">
+              <mxPoint x="459.25" y="785" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-25" value="" style="endArrow=classic;html=1;rounded=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="NvYeTt0xDQWk2u7kX_r0-21" target="NvYeTt0xDQWk2u7kX_r0-39">
+          <mxGeometry width="50" height="50" relative="1" as="geometry">
+            <mxPoint x="509.25" y="865" as="sourcePoint" />
+            <mxPoint x="179.25" y="855" as="targetPoint" />
+            <Array as="points">
+              <mxPoint x="179.25" y="785" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-26" value="[exists]" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
+          <mxGeometry x="189.25" y="755" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-27" value="[not exists]" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
+          <mxGeometry x="389.25" y="755" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-28" value="" style="endArrow=classic;html=1;rounded=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="NvYeTt0xDQWk2u7kX_r0-14" target="NvYeTt0xDQWk2u7kX_r0-21">
+          <mxGeometry width="50" height="50" relative="1" as="geometry">
+            <mxPoint x="649.25" y="985" as="sourcePoint" />
+            <mxPoint x="699.25" y="935" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-30" value="" style="ellipse;html=1;shape=endState;fillColor=#000000;strokeColor=#ff0000;" vertex="1" parent="1">
+          <mxGeometry x="159.5" y="1085" width="41" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-31" value="" style="rhombus;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+          <mxGeometry x="420" y="215" width="80" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-32" value="" style="endArrow=classic;html=1;rounded=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="NvYeTt0xDQWk2u7kX_r0-4" target="NvYeTt0xDQWk2u7kX_r0-31">
+          <mxGeometry width="50" height="50" relative="1" as="geometry">
+            <mxPoint x="550" y="355" as="sourcePoint" />
+            <mxPoint x="600" y="305" as="targetPoint" />
+            <Array as="points">
+              <mxPoint x="460" y="165" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-33" value="" style="endArrow=classic;html=1;rounded=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="NvYeTt0xDQWk2u7kX_r0-9" target="NvYeTt0xDQWk2u7kX_r0-31">
+          <mxGeometry width="50" height="50" relative="1" as="geometry">
+            <mxPoint x="540" y="255" as="sourcePoint" />
+            <mxPoint x="600" y="305" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-34" value="" style="endArrow=classic;html=1;rounded=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="NvYeTt0xDQWk2u7kX_r0-31" target="NvYeTt0xDQWk2u7kX_r0-8">
+          <mxGeometry width="50" height="50" relative="1" as="geometry">
+            <mxPoint x="719.5" y="225" as="sourcePoint" />
+            <mxPoint x="699.5" y="285" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-36" value="" style="rhombus;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+          <mxGeometry x="279.5" y="525" width="80" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-37" value="" style="endArrow=classic;html=1;rounded=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="NvYeTt0xDQWk2u7kX_r0-13" target="NvYeTt0xDQWk2u7kX_r0-36">
+          <mxGeometry width="50" height="50" relative="1" as="geometry">
+            <mxPoint x="649.5" y="875" as="sourcePoint" />
+            <mxPoint x="699.5" y="825" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-38" value="" style="endArrow=classic;html=1;rounded=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="NvYeTt0xDQWk2u7kX_r0-36" target="NvYeTt0xDQWk2u7kX_r0-14">
+          <mxGeometry width="50" height="50" relative="1" as="geometry">
+            <mxPoint x="649.5" y="935" as="sourcePoint" />
+            <mxPoint x="699.5" y="885" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-39" value="" style="rhombus;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+          <mxGeometry x="140" y="835" width="80" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-40" value="" style="endArrow=classic;html=1;rounded=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="NvYeTt0xDQWk2u7kX_r0-22" target="NvYeTt0xDQWk2u7kX_r0-39">
+          <mxGeometry width="50" height="50" relative="1" as="geometry">
+            <mxPoint x="649.5" y="765" as="sourcePoint" />
+            <mxPoint x="699.5" y="715" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-41" value="addID&#39;s to Adress" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+          <mxGeometry x="120" y="955" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-42" value="" style="endArrow=classic;html=1;rounded=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="1" source="NvYeTt0xDQWk2u7kX_r0-39" target="NvYeTt0xDQWk2u7kX_r0-41">
+          <mxGeometry width="50" height="50" relative="1" as="geometry">
+            <mxPoint x="649.25" y="865" as="sourcePoint" />
+            <mxPoint x="699.25" y="815" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="NvYeTt0xDQWk2u7kX_r0-43" value="" style="endArrow=classic;html=1;rounded=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="NvYeTt0xDQWk2u7kX_r0-41" target="NvYeTt0xDQWk2u7kX_r0-30">
+          <mxGeometry width="50" height="50" relative="1" as="geometry">
+            <mxPoint x="649.5" y="755" as="sourcePoint" />
+            <mxPoint x="699.5" y="705" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+      </root>
+    </mxGraphModel>
+  </diagram>
+</mxfile>

doc/ER-Offer.drawio

@@ -0,0 +1,320 @@
+<mxfile host="app.diagrams.net" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/135.0.0.0 Safari/537.36" version="27.0.2">
+  <diagram name="Seite-1" id="-Jvt9mGG8Li5CNeMcOU4">
+    <mxGraphModel dx="2066" dy="1107" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+      <root>
+        <mxCell id="0" />
+        <mxCell id="1" parent="0" />
+        <mxCell id="r5czroBNAvCpoAouLHI1-1" value="Street" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;" vertex="1" parent="1">
+          <mxGeometry x="60" y="800" width="180" height="90" as="geometry" />
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-2" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-1">
+          <mxGeometry y="30" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-3" value="PK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-2">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-4" value="streetID" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-2">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-5" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="r5czroBNAvCpoAouLHI1-1">
+          <mxGeometry y="60" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-6" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-5">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-7" value="name" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-5">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-14" value="City" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;" vertex="1" parent="1">
+          <mxGeometry x="370" y="80" width="180" height="90" as="geometry" />
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-15" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-14">
+          <mxGeometry y="30" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-16" value="PK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-15">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-17" value="cityID" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-15">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-18" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="r5czroBNAvCpoAouLHI1-14">
+          <mxGeometry y="60" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-19" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-18">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-20" value="name" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-18">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-27" value="Country" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;" vertex="1" parent="1">
+          <mxGeometry x="80" y="90" width="180" height="150" as="geometry" />
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-28" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-27">
+          <mxGeometry y="30" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-29" value="PK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-28">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-30" value="countryID" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-28">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-31" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="r5czroBNAvCpoAouLHI1-27">
+          <mxGeometry y="60" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-32" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-31">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-33" value="country" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-31">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-34" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="r5czroBNAvCpoAouLHI1-27">
+          <mxGeometry y="90" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-35" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-34">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-36" value="countryshort" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-34">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-37" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="r5czroBNAvCpoAouLHI1-27">
+          <mxGeometry y="120" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-38" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-37">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-39" value="nationality" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-37">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-40" value="Country/City/Postcode" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;" vertex="1" parent="1">
+          <mxGeometry x="260" y="290" width="180" height="150" as="geometry" />
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-41" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-40">
+          <mxGeometry y="30" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-42" value="PK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-41">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-43" value="ccpID" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-41">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-44" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="r5czroBNAvCpoAouLHI1-40">
+          <mxGeometry y="60" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-45" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-44">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-46" value="countryID" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-44">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-47" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="r5czroBNAvCpoAouLHI1-40">
+          <mxGeometry y="90" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-48" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-47">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-49" value="cityID" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-47">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-50" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="r5czroBNAvCpoAouLHI1-40">
+          <mxGeometry y="120" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-51" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-50">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-52" value="postcodeID" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-50">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-53" value="House" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;" vertex="1" parent="1">
+          <mxGeometry x="480" y="800" width="180" height="90" as="geometry" />
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-54" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-53">
+          <mxGeometry y="30" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-55" value="PK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-54">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-56" value="houseID" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-54">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-57" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="r5czroBNAvCpoAouLHI1-53">
+          <mxGeometry y="60" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-58" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-57">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-59" value="number" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-57">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-66" value="Postcode" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;" vertex="1" parent="1">
+          <mxGeometry x="520" y="230" width="180" height="90" as="geometry" />
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-67" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-66">
+          <mxGeometry y="30" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-68" value="PK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-67">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-69" value="postcodeID" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-67">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-70" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="r5czroBNAvCpoAouLHI1-66">
+          <mxGeometry y="60" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-71" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-70">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-72" value="number" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-70">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-79" value="Street/House" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;" vertex="1" parent="1">
+          <mxGeometry x="260" y="650" width="180" height="120" as="geometry" />
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-80" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-79">
+          <mxGeometry y="30" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-81" value="PK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-80">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-82" value="streetHouseID" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-80">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-83" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="r5czroBNAvCpoAouLHI1-79">
+          <mxGeometry y="60" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-84" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-83">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-85" value="streetID" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-83">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-86" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="r5czroBNAvCpoAouLHI1-79">
+          <mxGeometry y="90" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-87" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-86">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-88" value="houseID" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-86">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-92" value="FullAddress" style="shape=table;startSize=30;container=1;collapsible=1;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=1;align=center;resizeLast=1;html=1;" vertex="1" parent="1">
+          <mxGeometry x="260" y="470" width="180" height="120" as="geometry" />
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-93" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-92">
+          <mxGeometry y="30" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-94" value="PK" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;fontStyle=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-93">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-95" value="fullAddressID" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;fontStyle=5;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-93">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-96" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="r5czroBNAvCpoAouLHI1-92">
+          <mxGeometry y="60" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-97" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-96">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-98" value="ccpID" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-96">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-99" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;fillColor=none;collapsible=0;dropTarget=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;top=0;left=0;right=0;bottom=0;" vertex="1" parent="r5czroBNAvCpoAouLHI1-92">
+          <mxGeometry y="90" width="180" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-100" value="" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;editable=1;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-99">
+          <mxGeometry width="30" height="30" as="geometry">
+            <mxRectangle width="30" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="r5czroBNAvCpoAouLHI1-101" value="streetHouseID" style="shape=partialRectangle;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;whiteSpace=wrap;html=1;" vertex="1" parent="r5czroBNAvCpoAouLHI1-99">
+          <mxGeometry x="30" width="150" height="30" as="geometry">
+            <mxRectangle width="150" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+      </root>
+    </mxGraphModel>
+  </diagram>
+</mxfile>

doc/db_schemer_v1.1-pyqcrm-202505091403_clean.sql

@@ -0,0 +1,40 @@
+/*M!999999\- enable the sandbox mode */ 
+-- MariaDB dump 10.19  Distrib 10.11.11-MariaDB, for Linux (x86_64)
+--
+-- Host: bearybot.selfhost.co    Database: pyqcrm
+-- ------------------------------------------------------
+-- Server version	10.11.11-MariaDB-0ubuntu0.24.04.2-log
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8mb4 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `address`
+--
+
+DROP TABLE IF EXISTS `address`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8mb4 */;
+CREATE TABLE `address` (
+  `addressid` int(11) NOT NULL AUTO_INCREMENT,
+  `countryid` int(11) NOT NULL,
+  `cityid` int(11) NOT NULL,
+  `postcodeid` int(11) NOT NULL,
+  PRIMARY KEY (`addressid`),
+  KEY `address_country_FK` (`countryid`)
+) ENGINE=InnoDB AUTO_INCREMENT=6956 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Temporary table structure for view `addressesview`
+--
+
+DROP TABLE IF EXISTS `addressesview`;

doc/db_schemer_v1.1-pyqcrm-202505091404_clean.sql

@@ -0,0 +1,40 @@
+/*M!999999\- enable the sandbox mode */ 
+-- MariaDB dump 10.19  Distrib 10.11.11-MariaDB, for Linux (x86_64)
+--
+-- Host: bearybot.selfhost.co    Database: pyqcrm
+-- ------------------------------------------------------
+-- Server version	10.11.11-MariaDB-0ubuntu0.24.04.2-log
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8mb4 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `address`
+--
+
+DROP TABLE IF EXISTS `address`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8mb4 */;
+CREATE TABLE `address` (
+  `addressid` int(11) NOT NULL AUTO_INCREMENT,
+  `countryid` int(11) NOT NULL,
+  `cityid` int(11) NOT NULL,
+  `postcodeid` int(11) NOT NULL,
+  PRIMARY KEY (`addressid`),
+  KEY `address_country_FK` (`countryid`)
+) ENGINE=InnoDB AUTO_INCREMENT=6956 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Temporary table structure for view `addressesview`
+--
+
+DROP TABLE IF EXISTS `addressesview`;

doc/db_schemer_v1.1-pyqcrm-202505091406_clean.sql

@@ -0,0 +1,40 @@
+/*M!999999\- enable the sandbox mode */ 
+-- MariaDB dump 10.19  Distrib 10.11.11-MariaDB, for Linux (x86_64)
+--
+-- Host: bearybot.selfhost.co    Database: pyqcrm
+-- ------------------------------------------------------
+-- Server version	10.11.11-MariaDB-0ubuntu0.24.04.2-log
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8mb4 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `address`
+--
+
+DROP TABLE IF EXISTS `address`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8mb4 */;
+CREATE TABLE `address` (
+  `addressid` int(11) NOT NULL AUTO_INCREMENT,
+  `countryid` int(11) NOT NULL,
+  `cityid` int(11) NOT NULL,
+  `postcodeid` int(11) NOT NULL,
+  PRIMARY KEY (`addressid`),
+  KEY `address_country_FK` (`countryid`)
+) ENGINE=InnoDB AUTO_INCREMENT=6956 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Temporary table structure for view `addressesview`
+--
+
+DROP TABLE IF EXISTS `addressesview`;

doc/db_schemer_v1.1-pyqcrm-202505091407_clean.sql

@@ -0,0 +1,40 @@
+/*M!999999\- enable the sandbox mode */ 
+-- MariaDB dump 10.19  Distrib 10.11.11-MariaDB, for Linux (x86_64)
+--
+-- Host: bearybot.selfhost.co    Database: pyqcrm
+-- ------------------------------------------------------
+-- Server version	10.11.11-MariaDB-0ubuntu0.24.04.2-log
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8mb4 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `address`
+--
+
+DROP TABLE IF EXISTS `address`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8mb4 */;
+CREATE TABLE `address` (
+  `addressid` int(11) NOT NULL AUTO_INCREMENT,
+  `countryid` int(11) NOT NULL,
+  `cityid` int(11) NOT NULL,
+  `postcodeid` int(11) NOT NULL,
+  PRIMARY KEY (`addressid`),
+  KEY `address_country_FK` (`countryid`)
+) ENGINE=InnoDB AUTO_INCREMENT=6956 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Temporary table structure for view `addressesview`
+--
+
+DROP TABLE IF EXISTS `addressesview`;

lib/ConfigLoader.py

@@ -165,7 +165,6 @@ class ConfigLoader(QObject):
             else:
                 return None
 
-
     def __invalidateEncryptionKey(self):
         # print(f"In {__file__} file, __invalidateEncryptionKey()")
         self.__config['pyqcrm']['ENCRYPTION_KEY_VALID'] = 'No'
@@ -200,11 +199,6 @@ class ConfigLoader(QObject):
         except Exception as e:
             print(str(e))
 
-
-
-
-
-
     def __configLoad(self):
         # print(f"In {__file__} file, __configLoad()")
         try:

lib/DB/AddressDAO.py

@@ -14,11 +14,11 @@ class AddressDAO:
 
 
 
-
     def __importPlz(self):
-        with open("pfad zur datei", "r") as plz:
+        with open("/home/dstoppek/Coden/Projekte/pyqcrm/doc/postleitzahl.json", "r") as plz:
             postcodes = json.load(plz)
-            irgendwas = ""
+            country = "Deutschland"
+
             try:
                 for i in postcodes:
                     test =i["plz_name"].split(",")
@@ -28,8 +28,8 @@ class AddressDAO:
                         town = town.strip()
                         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("importLocation", (country, town, i["name"],))
+
             except mariadb.OperationalError as e:
                 print(f"Database Error: {e}")
             finally:
@@ -37,7 +37,7 @@ class AddressDAO:
                 print("FINISHED")#
 
     def __importCountry(self):
-        with open("pfad zur datei", "r") as country:
+        with open("/home/dstoppek/Coden/Projekte/pyqcrm/doc/staaten.json", "r") as country:
             countries = json.load(country)
             old = ""
             try:
@@ -78,3 +78,4 @@ class AddressDAO:
             print(str(e))
 
 
+

lib/DB/AddressModel.py

@@ -14,9 +14,12 @@ class AddressModel(QAbstractListModel):
     def data(self, index, role = Qt.DisplayRole):
         row = index.row()
         if role == Qt.DisplayRole:
-            data = self.__address_data[row][2]
+            data = self.__address_data[row][5]
             return data
         elif role == PyqcrmDataRoles.CITY_ROLE:
+            data = self.__address_data[row][4]
+            return data
+        elif role == PyqcrmDataRoles.COUNTRY_ROLE:
             data = self.__address_data[row][3]
             return data
         return None
@@ -25,6 +28,7 @@ class AddressModel(QAbstractListModel):
         return {
             Qt.DisplayRole: b"display",
             PyqcrmDataRoles.CITY_ROLE: b"city",
+            PyqcrmDataRoles.COUNTRY_ROLE: b"country"
         }
 
     def setData(self):

lib/DB/ContactDAO.py

@@ -61,3 +61,4 @@ class ContactDAO(QObject):
             print(str(e))
 
 
+

lib/DB/EmployeeModel.py

@@ -1,8 +1,6 @@
 import json
-
 from PySide6.QtCore import QAbstractTableModel, QModelIndex, Qt, Slot, Signal, QJsonDocument
-from PySide6.QtQml import QJSValue
-
+from PySide6.QtQml import QJSValue, QJSValueIterator
 from .EmployeeDAO import EmployeeDAO
 # from ..PyqcrmFlags import PyqcrmFlags, PyqcrmAppliEmpyFlags
 from ..ConfigLoader import ConfigLoader
@@ -35,20 +33,31 @@ class EmployeeModel(QAbstractTableModel):
         self.__employee_dao.addEmployee(new_employee, self.__key, False)
 
     @Slot(QJSValue)
-    def addApplicant(self, applicant: QJSValue):
-        self.__employee_dao.addEmployee({
-            "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)
+    def addApplicant(self, new_applicant):
+        data = {}
+        it = QJSValueIterator(new_applicant)
+        while it.hasNext():
+            it.next()
+            if "function" in it.value().toString() or "objectName" == it.name():
+                continue
+            data[it.name()] = it.value().toString()
+        self.__employee_dao.addEmployee(data, self.__key)
+
+    # @Slot(QJSValue)
+    # def addApplicant(self, applicant: QJSValue):
+    #     self.__employee_dao.addEmployee({
+    #         "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):

lib/DB/ObjectModel.py

@@ -1,6 +1,7 @@
 from PySide6.QtCore import QAbstractTableModel, QModelIndex, Qt, Slot, Signal
 from .ObjectDAO import ObjectDAO
 from ..ConfigLoader import ConfigLoader
+from ..PyqcrmDataRoles import PyqcrmDataRoles
 import re
 import json
 
@@ -66,8 +67,16 @@ class ObjectModel(QAbstractTableModel):
             if object_col > 4 and tr:
                 tr = re.sub("Keine Angabe ","", tr)
             return tr
+        elif role == PyqcrmDataRoles.STREET_IN_POSTCODE:
+            pass
         return None
 
+    def roleNames(self):
+        return {
+            Qt.DisplayRole: b"display",
+            PyqcrmDataRoles.STREET_IN_POSTCODE: b"StreetInPostcode",
+        }
+
     def headerData(self, section, orientation, role = Qt.DisplayRole):
         if orientation == Qt.Horizontal and role == Qt.DisplayRole:
             self.__col_name = self.__visible_columns[section + self.__col_skip]

lib/PyqcrmDataRoles.py

@@ -5,5 +5,7 @@ from enum import IntEnum
 
 class PyqcrmDataRoles(IntEnum):
     CITY_ROLE = Qt.UserRole + 100
+    STREET_IN_POSTCODE = CITY_ROLE + 1
+    COUNTRY_ROLE = CITY_ROLE + 100
 
 

main.py

@@ -22,7 +22,6 @@ from lib.Printers import Printers
 
 os.environ['QML_XHR_ALLOW_FILE_READ'] = '1'
 
-
 # [pyqcrm]
 # program-name=""
 # version=

pyqcrm.pyproject.user.6c31db7

@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorProject>
+<!-- Written by QtCreator 15.0.0, 2025-02-05T15:48:35. -->
+<qtcreator>
+ <data>
+  <variable>EnvironmentId</variable>
+  <value type="QByteArray">{6c31db7b-2c94-4111-b0dc-25005cece3f8}</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.ActiveTarget</variable>
+  <value type="qlonglong">0</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.EditorSettings</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
+   <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
+   <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
+    <value type="QString" key="language">Cpp</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
+    </valuemap>
+   </valuemap>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
+    <value type="QString" key="language">QmlJS</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
+    </valuemap>
+   </valuemap>
+   <value type="qlonglong" key="EditorConfiguration.CodeStyle.Count">2</value>
+   <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
+   <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
+   <value type="int" key="EditorConfiguration.IndentSize">4</value>
+   <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
+   <value type="int" key="EditorConfiguration.LineEndingBehavior">0</value>
+   <value type="int" key="EditorConfiguration.MarginColumn">80</value>
+   <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
+   <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
+   <value type="int" key="EditorConfiguration.PaddingMode">1</value>
+   <value type="int" key="EditorConfiguration.PreferAfterWhitespaceComments">0</value>
+   <value type="bool" key="EditorConfiguration.PreferSingleLineComments">false</value>
+   <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
+   <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
+   <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">2</value>
+   <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value>
+   <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
+   <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
+   <value type="int" key="EditorConfiguration.TabSize">8</value>
+   <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
+   <value type="bool" key="EditorConfiguration.UseIndenter">false</value>
+   <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
+   <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
+   <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
+   <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
+   <value type="QString" key="EditorConfiguration.ignoreFileTypes">*.md, *.MD, Makefile</value>
+   <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
+   <value type="bool" key="EditorConfiguration.skipTrailingWhitespace">true</value>
+   <value type="bool" key="EditorConfiguration.tintMarginArea">true</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.PluginSettings</variable>
+  <valuemap type="QVariantMap">
+   <valuemap type="QVariantMap" key="AutoTest.ActiveFrameworks">
+    <value type="bool" key="AutoTest.Framework.Boost">true</value>
+    <value type="bool" key="AutoTest.Framework.CTest">false</value>
+    <value type="bool" key="AutoTest.Framework.Catch">true</value>
+    <value type="bool" key="AutoTest.Framework.GTest">true</value>
+    <value type="bool" key="AutoTest.Framework.QtQuickTest">true</value>
+    <value type="bool" key="AutoTest.Framework.QtTest">true</value>
+   </valuemap>
+   <value type="bool" key="AutoTest.ApplyFilter">false</value>
+   <valuemap type="QVariantMap" key="AutoTest.CheckStates"/>
+   <valuelist type="QVariantList" key="AutoTest.PathFilters"/>
+   <value type="int" key="AutoTest.RunAfterBuild">0</value>
+   <value type="bool" key="AutoTest.UseGlobal">true</value>
+   <valuemap type="QVariantMap" key="ClangTools">
+    <value type="bool" key="ClangTools.AnalyzeOpenFiles">true</value>
+    <value type="bool" key="ClangTools.BuildBeforeAnalysis">true</value>
+    <value type="QString" key="ClangTools.DiagnosticConfig">Builtin.DefaultTidyAndClazy</value>
+    <value type="int" key="ClangTools.ParallelJobs">4</value>
+    <value type="bool" key="ClangTools.PreferConfigFile">true</value>
+    <valuelist type="QVariantList" key="ClangTools.SelectedDirs"/>
+    <valuelist type="QVariantList" key="ClangTools.SelectedFiles"/>
+    <valuelist type="QVariantList" key="ClangTools.SuppressedDiagnostics"/>
+    <value type="bool" key="ClangTools.UseGlobalSettings">true</value>
+   </valuemap>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Target.0</variable>
+  <valuemap type="QVariantMap">
+   <value type="QString" key="DeviceType">Desktop</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Python 3.13.1</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Python 3.13.1</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{bd928902-6673-464d-b976-4a1ba0e13d34}</value>
+   <value type="qlonglong" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+   <value type="qlonglong" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+   <value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/dstoppek/anaconda3/envs/pyqcrm</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Python.PysideBuildStep</value>
+      <value type="QString" key="Python.PySideProjectTool">/home/dstoppek/anaconda3/envs/pyqcrm/bin/pyside6-project</value>
+      <value type="QString" key="Python.PySideUic">/home/dstoppek/anaconda3/envs/pyqcrm/bin/pyside6-uic</value>
+     </valuemap>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Erstellen</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Erstellen</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Bereinigen</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Bereinigen</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ParseStandardOutput">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Python 3.13.1 virtuelle Umgebung</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Python.PySideBuildConfiguration</value>
+    <value type="QString" key="python">/home/dstoppek/anaconda3/envs/pyqcrm/bin/python</value>
+    <value type="QString" key="venv">/home/dstoppek/anaconda3/envs/pyqcrm</value>
+   </valuemap>
+   <value type="qlonglong" key="ProjectExplorer.Target.BuildConfigurationCount">1</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deployment</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deployment</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.DeployConfiguration.CustomData"/>
+    <value type="bool" key="ProjectExplorer.DeployConfiguration.CustomDataEnabled">false</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
+   </valuemap>
+   <value type="qlonglong" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
+    <value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
+    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
+    <value type="int" key="Analyzer.Valgrind.Callgrind.CostFormat">0</value>
+    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
+    <valuelist type="QVariantList" key="CustomOutputParsers"/>
+    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
+    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
+    <value type="bool" key="PE.EnvironmentAspect.PrintOnRun">false</value>
+    <value type="QString" key="PerfRecordArgsId">-e cpu-cycles --call-graph dwarf,4096 -F 250</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">main.py</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">PythonEditor.RunConfiguration.</value>
+    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">/home/dstoppek/Coden/Projekte/pyqcrm/main.py</value>
+    <value type="bool" key="ProjectExplorer.RunConfiguration.Customized">false</value>
+    <value type="QString" key="PythonEditor.RunConfiguation.Script">/home/dstoppek/Coden/Projekte/pyqcrm/main.py</value>
+    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/dstoppek/Coden/Projekte/pyqcrm</value>
+    <value type="QString" key="RunConfiguration.X11Forwarding">:0</value>
+   </valuemap>
+   <value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.TargetCount</variable>
+  <value type="qlonglong">1</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
+  <value type="int">22</value>
+ </data>
+ <data>
+  <variable>Version</variable>
+  <value type="int">22</value>
+ </data>
+</qtcreator>

qml.qrc

@@ -6,11 +6,8 @@
         <file>Gui/DbConfiguration.qml</file>
         <file>Gui/LoginScreen.qml</file>
         <file>Gui/AddContact.qml</file>
-        <file>Gui/AddCustomer.qml</file>
         <file>Gui/Dashboard.qml</file>
         <file>Gui/main.qml</file>
-        <file>js/qmldict.js</file>
-        <file>Gui/CustomerView.qml</file>
         <file>Gui/NoDbConnection.qml</file>
         <file>Gui/Notifications.qml</file>
         <file>Gui/AddObject.qml</file>
@@ -19,15 +16,10 @@
         <file>Gui/ObjectAddOnContactPerson.qml</file>
         <file>Gui/ObjectAddOnEmployee.qml</file>
         <file>Gui/AddObjectEmployee.qml</file>
-        <file>Gui/CustomersTable.qml</file>
-        <file>Gui/CustomerDetails.qml</file>
         <file>Gui/ObjectsTable.qml</file>
         <file>Gui/ObjectDetails.qml</file>
         <file>Gui/AddNewObject.qml</file>
         <file>Gui/PrinterDialog.qml</file>
-        <file>Gui/CustomerContactDetails.qml</file>
-        <file>Gui/NoCustomerContact.qml</file>
-        <file>Gui/CustomerDetailsView.qml</file>
         <file>Gui/ReadMe.qml</file>
         <file>Gui/UsersPage.qml</file>
         <file>Gui/PyqcrmConf.qml</file>
@@ -36,14 +28,13 @@
         <file>Gui/BackupSettings.qml</file>
         <file>Gui/MiscConf.qml</file>
         <file>Gui/UtilityDialogs.qml</file>
-        <file>Gui/OffersTable.qml</file>
         <file>Gui/Employees/AddApplicant.qml</file>
         <file>Gui/Employees/AddEmployee.qml</file>
-        <file>Gui/Employees/ApplicantPersonalData.qml</file>
-        <file>Gui/Employees/ApplicantBankData.qml</file>
+        <file>Gui/Employees/EmployeePersonalData.qml</file>
+        <file>Gui/Employees/EmployeeBankData.qml</file>
         <file>Gui/Employees/ApplicantForm.qml</file>
-        <file>Gui/Employees/ApplicantNationalInsurance.qml</file>
-        <file>Gui/Employees/ApplicantVarious.qml</file>
+        <file>Gui/Employees/EmployeeNationalInsurance.qml</file>
+        <file>Gui/Employees/EmployeeVarious.qml</file>
         <file>Gui/Employees/EmployeeDetails.qml</file>
         <file>Gui/Employees/EmployeesTable.qml</file>
         <file>Gui/Employees/qmldir</file>
@@ -67,9 +58,33 @@
         <file>TeroStyle/SearchBar.qml</file>
         <file>TeroStyle/TextField.qml</file>
         <file>TeroStyle/Typography.qml</file>
-        <file>Gui/AddOffer.qml</file>
-        <file>Gui/AddNewOffer.qml</file>
+        <file>Gui/qmldir</file>
+        <file>Gui/test.qml</file>
+        <file>Gui/Offers/OffersTable.qml</file>
+        <file>Gui/Offers/qmldir</file>
+        <file>Gui/Offers/AddOffer.qml</file>
+        <file>Gui/Offers/AddNewOffer.qml</file>
+        <file>Js/qmldir</file>
+        <file>Js/JsLib.js</file>
+        <file>Js/qmldict.js</file>
+        <file>Gui/Customer/AddCustomer.qml</file>
+        <file>Gui/Customer/CustomerContactDetails.qml</file>
+        <file>Gui/Customer/CustomerDetails.qml</file>
+        <file>Gui/Customer/CustomerDetailsView.qml</file>
+        <file>Gui/Customer/CustomersTable.qml</file>
+        <file>Gui/Customer/CustomerView.qml</file>
+        <file>Gui/Customer/qmldir</file>
+        <file>Gui/Customer/NoCustomerContact.qml</file>
+        <file>Gui/Objects/AddNewObject.qml</file>
+        <file>Gui/Objects/AddObject.qml</file>
+        <file>Gui/Objects/AddObjectEmployee.qml</file>
+        <file>Gui/Objects/ObjectAddOnContactPerson.qml</file>
+        <file>Gui/Objects/ObjectAddOnEmployee.qml</file>
+        <file>Gui/Objects/ObjectAddOns.qml</file>
+        <file>Gui/Objects/ObjectDetails.qml</file>
+        <file>Gui/Objects/ObjectsTable.qml</file>
+        <file>Gui/Objects/ObjectView.qml</file>
+        <file>Gui/Objects/qmldir</file>
     </qresource>
-    <qresource prefix="/Common"/>
     <qresource prefix="/TeroStyle"/>
 </RCC>

requirements.txt

@@ -7,3 +7,5 @@ mariadb
 soundfile
 sounddevice
 reportlab
+tomlkit
+bcrypt