hallo

.gitignore

@@ -228,4 +228,3 @@ cython_debug/
 
 
 rc_*.py
-.DS_STORE

.idea/.gitignore

@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml

.idea/QtSettings.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="QtSettings">
-    <option name="mySettingsPerProfile">
-      <map>
-        <entry key="">
-          <value>
-            <PerProfileState>
-              <option name="myCustomQmlPath" value="/opt/homebrew/share/qt/qml" />
-              <option name="myCustomQtBinPath" value="/opt/homebrew/bin" />
-            </PerProfileState>
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-</project>

.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>

.idea/dataSources.xml

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

.idea/discord.xml

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

.idea/misc.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Black">
-    <option name="sdkName" value="Python 3.12 (pyqcrm)" />
-  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.12 (pyqcrm)" project-jdk-type="Python SDK" />
-</project>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/pyqcrm.iml" filepath="$PROJECT_DIR$/.idea/pyqcrm.iml" />
-    </modules>
-  </component>
-</project>

.idea/pyqcrm.iml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.venv" />
-    </content>
-    <orderEntry type="jdk" jdkName="Python 3.12 (pyqcrm)" jdkType="Python SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.idea/qmlSettings.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="QmlSettings">
-    <option name="mySettingsPerProfile">
-      <map>
-        <entry key="">
-          <value>
-            <PerProfileState>
-              <option name="myExtraQmlPaths">
-                <list>
-                  <option value="$PROJECT_DIR$/TeroStyle" />
-                </list>
-              </option>
-              <option name="myLSPEnabled" value="true" />
-              <option name="myQmlFormatEnabled" value="true" />
-            </PerProfileState>
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-</project>

.idea/runConfigurations/Compile_pyqcrm_qrc.xml

@@ -1,17 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Compile pyqcrm.qrc" type="ShConfigurationType">
-    <option name="SCRIPT_TEXT" value=".venv/bin/pyside6-rcc -o rc_pyqcrm.py pyqcrm.qrc" />
-    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
-    <option name="SCRIPT_PATH" value=".venv/bin/pyside6-rcc" />
-    <option name="SCRIPT_OPTIONS" value="-o rc_qml.py qml.qrc" />
-    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
-    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
-    <option name="INTERPRETER_PATH" value="/bin/zsh" />
-    <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="EXECUTE_IN_TERMINAL" value="false" />
-    <option name="EXECUTE_SCRIPT_FILE" value="false" />
-    <envs />
-    <method v="2" />
-  </configuration>
-</component>

.idea/runConfigurations/Compile_qml_qrc.xml

@@ -1,17 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Compile qml.qrc" type="ShConfigurationType">
-    <option name="SCRIPT_TEXT" value=".venv/bin/pyside6-rcc -o rc_qml.py qml.qrc" />
-    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
-    <option name="SCRIPT_PATH" value=".venv/bin/pyside6-rcc" />
-    <option name="SCRIPT_OPTIONS" value="-o rc_qml.py qml.qrc" />
-    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
-    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
-    <option name="INTERPRETER_PATH" value="/bin/zsh" />
-    <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="EXECUTE_IN_TERMINAL" value="false" />
-    <option name="EXECUTE_SCRIPT_FILE" value="false" />
-    <envs />
-    <method v="2" />
-  </configuration>
-</component>

.idea/runConfigurations/main.xml

@@ -1,31 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="main" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true">
-    <module name="pyqcrm" />
-    <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="PARENT_ENVS" value="true" />
-    <envs>
-      <env name="PYTHONUNBUFFERED" value="1" />
-      <env name="QT_LOGGING_RULES" value="*.debug=true; qt.*.debug=false" />
-      <env name="QT_LOGGING_TO_CONSOLE" value="1" />
-      <env name="QT_QML_DEBUG" value="1" />
-    </envs>
-    <option name="SDK_HOME" value="" />
-    <option name="SDK_NAME" value="Python 3.12 (pyqcrm)" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="IS_MODULE_SDK" value="false" />
-    <option name="ADD_CONTENT_ROOTS" value="true" />
-    <option name="ADD_SOURCE_ROOTS" value="true" />
-    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/main.py" />
-    <option name="PARAMETERS" value="" />
-    <option name="SHOW_COMMAND_LINE" value="false" />
-    <option name="EMULATE_TERMINAL" value="false" />
-    <option name="MODULE_MODE" value="false" />
-    <option name="REDIRECT_INPUT" value="false" />
-    <option name="INPUT_FILE" value="" />
-    <method v="2">
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Compile qml.qrc" run_configuration_type="ShConfigurationType" />
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Compile pyqcrm.qrc" run_configuration_type="ShConfigurationType" />
-    </method>
-  </configuration>
-</component>

.idea/sqldialects.xml

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

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

Gui/AddContact.qml

@@ -2,21 +2,15 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
-Frame
-{
-    id: addContactFrame
-    property alias contactGrid: addContactLayout
-    Layout.alignment: Qt.AlignTop
-    Layout.fillWidth: true
 GridLayout
 {
     id: addContactLayout
-        anchors.fill: parent
+    Layout.fillWidth: true
-        // Layout.fillWidth: true
+    Layout.fillHeight: true
-        // Layout.fillHeight: true
+    Layout.alignment: Qt.AlignTop
-        // Layout.alignment: Qt.AlignTop
     columns: 2
     rowSpacing: 9
+    visible: false
     property alias fname: firstname
     property alias lname: lastname
 
@@ -83,7 +77,7 @@ Frame
         placeholderText: qsTr("beispiel@domain.de")
         validator: RegularExpressionValidator
         {
-                regularExpression: /([\+!#$%&‘\*\–\/\=?\^_`\.{|}\~\-\_0-9A-Za-z]{1,185})@([0-9A-Za-z\.\-\_]{1,64})\.([a-zA-z]{2,5})/
+            regularExpression: /([\+!#$%&‘\*\–\/\=?\^_`\.{|}\~0-9A-Za-z]{1,185})@([0-9A-Za-z\.]{1,64})\.([a-zA-z]{2,5})/
         }
     }
 
@@ -105,7 +99,7 @@ Frame
 
     Label
     {
-            text: qsTr("Mobil")
+        text: qsTr("Handy")
         Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
     }
     TextField
@@ -123,7 +117,6 @@ Frame
         text: qsTr("Geburtsdatum")
         Layout.alignment: Qt.AlignRight
     }
-
     TextField
     {
         property string name: "birthday"
@@ -131,18 +124,15 @@ Frame
         Layout.fillWidth: true
         placeholderText: qsTr("TT.MM.JJJJ")
         validator: RegularExpressionValidator
-
         {
-                regularExpression: /((^|)(0[1-9]{1}|[1-2]{1}[0-9]{1}|3[0-1]))\.((^|)(0[1-9]{1}|1[0-2]{1}))\.((^|)(196[0-9]{1}|19[7-9]{1}[0-9]{1}|20[0-9]{2}))/
+            regularExpression: /((^|)([0-2]{1}[0-9]{1}|3[0-1]))\.((^|)(0[1-9]{1}|1[0-2]{1}))\.((^|)(196[0-9]{1}|19[7-9]{1}[0-9]{1}|20[0-9]{2}))/
         }
-            Keys.onPressed: (event)=>
+
-            {
+        onTextChanged:
-                if (event.key !== Qt.Key_Backspace)
         {
             var len = birthday.length
             var bd = birthday.text
-                    if (len === 2 || len === 5) birthday.text = bd + "."
+            if (len == 2 || len == 5) birthday.text = bd + "."
-                }
         }
     }
 
@@ -186,7 +176,6 @@ Frame
         editable: false
         model: ["Nein", "Ja"]
     }
-    }
 
     function checkContactField()
     {

Gui/AddCustomer.qml

@@ -1,6 +1,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
+import QtQuick.Controls.Fusion
 import QtQuick.Dialogs
 import "../js/qmldict.js" as JsLib
 
@@ -25,6 +26,7 @@ ColumnLayout
         checked: false
         onCheckStateChanged:
         {
+            addContactLayout.visible = checked
             checkFields()
         }
     }
@@ -35,21 +37,15 @@ ColumnLayout
         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
+            id: addContactLayout
-                visible: checkAddContact.checked
         }
     }
     RowLayout
@@ -59,7 +55,7 @@ ColumnLayout
         Button
         {
             text: qsTr("Abbrechen")
-            onClicked: contentStack.pop()
+            onClicked: appLoader.source = "CustomerTable.qml"
         }
         Button
         {
@@ -70,14 +66,14 @@ ColumnLayout
             {
                 if (!checkAddContact.checked)
                 {
-                    new_business = JsLib.parseForm(customerView)
+                    new_business = JsLib.addBusiness(customerView)
                     business_model.addBusiness(new_business, 0)
-                    contentStack.pop()
+                    appLoader.source = "CustomerTable.qml"
                 }
                 else
                 {
-                    new_business = JsLib.parseForm(customerView)
+                    new_business = JsLib.addBusiness(customerView)
-                    var new_contact = JsLib.parseForm(addContactFrame.contactGrid)
+                    var new_contact = JsLib.addBusiness(addContactLayout)
                     contact_model.addContact(new_contact)
                 }
             }
@@ -94,12 +90,11 @@ ColumnLayout
     Connections
     {
         target: contact_model
-
+        onContactIdReady:
-        function onContactIdReady()
         {
             var con_id = arguments[0]
             business_model.addBusiness(new_business, con_id)
-            contentStack.pop()
+            appLoader.source = "CustomerTable.qml"
         }
     }
 
@@ -107,7 +102,7 @@ ColumnLayout
     {
         if(checkAddContact.checked)
         {
-            if(!customerView.checkBusinessField() || !addContactFrame.checkContactField())
+            if(!customerView.checkBusinessField() || !addContactLayout.checkContactField())
                 saveBtn.enabled = false
             else
                 saveBtn.enabled = true

Gui/AddNewObject.qml

@@ -1,230 +0,0 @@
-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("Straße*")
-        Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
-    }
-
-    TextField
-    {
-        property string name: "street"
-        id: street
-        Layout.fillWidth: true
-        Layout.alignment: Qt.AlignVCenter
-        onTextChanged: checkFields()
-    }
-
-    Label
-    {
-        text: qsTr("Nr.*")
-        Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
-    }
-
-    TextField
-    {
-        property string name: "houseno"
-        id: houseno
-        Layout.fillWidth: true
-        Layout.alignment: Qt.AlignVCenter
-        onTextChanged: checkFields()
-    }
-
-    // New grid row
-    Label
-    {
-        text: qsTr("PLZ")
-        Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
-    }
-
-    ComboBox
-    {
-        property string name: "postcode"
-        id: postcode
-        Layout.fillWidth: true
-        editable: true
-        onCurrentTextChanged: checkFields()
-        onEditTextChanged: checkFields()
-        onActivated: currentValue
-        model: address_model
-        textRole: "display"
-        popup.height: 300
-        currentIndex: -1
-        onCurrentIndexChanged: city.currentIndex = postcode.currentIndex
-
-        validator: RegularExpressionValidator
-        {
-            regularExpression: /([0-9]{1,5})/
-        }
-    }
-
-    Label
-    {
-        text: qsTr("Ort")
-        Layout.alignment: Qt.AlignRight
-
-    }
-
-    ComboBox
-    {
-        property string name: "city"
-        id: city
-        Layout.fillWidth: true
-        editable: true
-        onEditTextChanged: checkFields()
-        onCurrentTextChanged: checkFields()
-        model: address_model
-        textRole: "city"
-        popup.height: 300
-        currentIndex: -1
-    }
-
-    // New grid 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/AddNewOffer.qml

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

Gui/AddObject.qml

@@ -1,150 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
-import QtQuick.Dialogs
-import "../js/qmldict.js" as JsLib
-
-ColumnLayout
-{
-    property var new_object: null
-    //property alias checkAddContact: checkAddContact
-    Layout.fillWidth: true
-    Layout.fillHeight: true
-    spacing: 15
-    Label
-    {
-        text: qsTr("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)
-                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/AddObjectEmployee.qml

@@ -1,130 +0,0 @@
-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/AddOffer.qml

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

Gui/BackupSettings.qml

@@ -1,57 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import QtQuick.Dialogs
-import QtCore
-import "../js/qmldict.js" as JsLib
-
-
-
-GridLayout
-{
-    anchors.fill: parent
-    anchors.topMargin: 150
-    columns: 2
-    Label
-    {
-        Layout.columnSpan: 2
-        Layout.alignment: Qt.AlignHCenter
-        text: qsTr("Sicherung")
-        font.pixelSize: 35
-    }
-
-    Label
-    {
-        text: qsTr("Konfiguration")
-        Layout.alignment: Qt.AlignRight
-
-    }
-    Button
-    {
-        id: saveConfig
-        text: qsTr("Jetzt sichern!")
-        onClicked: utilityDialogs.item.backup_config.open()
-    }
-    Label
-    {
-       text: qsTr("Verschlüsselung")
-       Layout.alignment: Qt.AlignRight
-    }
-    Button
-    {
-        id: saveEncryption
-        text: qsTr("Jetzt sichern!")
-        onClicked: utilityDialogs.item.backup_encrypt_pw.open()
-    }
-    Item
-    {
-        id: spacer
-        Layout.fillHeight: true
-    }
-
-    Loader
-    {
-        id: utilityDialogs
-        source: "UtilityDialogs.qml"
-    }
-}

Gui/CompanyConf.qml

@@ -1,122 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
-
-ColumnLayout
-{
-    property alias name: companyName
-    property alias street: street
-    property alias house: houseno
-    property alias zipcode: zipcode
-    property alias city: city
-    anchors.fill: parent
-    anchors.topMargin: 50
-
-    RowLayout
-    {
-        Layout.fillWidth: true
-        Label
-        {
-            text: qsTr("Namen")
-            // font.pixelSize: 57
-            // font.bold: true
-        }
-
-        TextField
-        {
-            id: companyName
-            Layout.fillWidth: true
-        }
-    }
-
-    RowLayout
-    {
-        Layout.fillWidth: true
-        Label
-        {
-            text: qsTr("Straße")
-            // font.pixelSize: 57
-            // font.bold: true
-        }
-
-        TextField
-        {
-            id: street
-            Layout.fillWidth: true
-        }
-
-        Label
-        {
-            text: qsTr("Haus-Nr.")
-            // font.pixelSize: 57
-            // font.bold: true
-        }
-
-        TextField
-        {
-            id: houseno
-            Layout.fillWidth: true
-        }
-    }
-
-
-    RowLayout
-    {
-        Layout.fillWidth: true
-        Label
-        {
-            text: qsTr("PLZ")
-        }
-
-        ComboBox
-        {
-            id: zipcode
-            Layout.fillWidth: true
-            editable: true
-            model: address_model
-            textRole: "display"
-            popup.height: 300
-            onCurrentIndexChanged: city.currentIndex = zipcode.currentIndex
-            validator: RegularExpressionValidator
-            {
-                regularExpression: /([0-9]{1,5})/
-            }
-        }
-
-        Label
-        {
-            text: qsTr("Stadt")
-            // font.pixelSize: 57
-            // font.bold: true
-        }
-
-        ComboBox
-        {
-            id: city
-            Layout.fillWidth: true
-            editable: true
-            model: address_model
-            textRole: "city"
-            popup.height: 300
-            currentIndex: -1
-        }
-    }
-
-    Item
-    {
-        Layout.fillHeight: true
-    }
-
-    Component.onCompleted:
-    {
-        var c = config.getCompanyInfo()
-        if (Object.keys(c).length)
-        {
-          companyName.text = c['NAME']
-          street.text = c['STREET']
-          houseno.text = c['HOUSE']
-          zipcode.editText = c['ZIPCODE']
-          city.editText = c['CITY']
-        }
-    }
-}

Gui/CustomerContactDetails.qml

@@ -1,174 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-
-GridLayout
-{
-    columns: 2
-    rowSpacing: 25
-    Layout.leftMargin: 7
-
-    // Grid row
-    ColumnLayout
-    {
-        Layout.columnSpan: 2
-        Label
-        {
-            id: contactLabel
-            color: "darksalmon"
-            font.bold: true
-            text: qsTr("Ansprechpartner")
-        }
-
-        Label
-        {
-            color: "goldenrod"
-            text: contact? contact['contact']['salute'] + " " + contact['contact']['fname'] + " " + contact['contact']['lname']: ""
-        }
-    }
-
-    // Grid row
-    ColumnLayout
-    {
-        Label
-        {
-            color: "darksalmon"
-            text: qsTr("Geburtsdatum")
-            font.bold: true
-        }
-
-        Label
-        {
-            color: "goldenrod"
-            text: contact? contact['contact']['birthday']: ""
-        }
-    }
-
-    ColumnLayout
-    {
-        Label
-        {
-            color: "darksalmon"
-            text: qsTr("E-Mail")
-            font.bold: true
-        }
-
-        Label
-        {
-            color: "goldenrod"
-            text: contact? contact['contact']['email']: ""
-        }
-    }
-
-    // Grid row
-    ColumnLayout
-    {
-        Label
-        {
-            color: "darksalmon"
-            text: qsTr("Position")
-            font.bold: true
-        }
-
-        Label
-        {
-            color: "goldenrod"
-            text: contact? contact['contact']['position']: ""
-        }
-    }
-
-    ColumnLayout
-    {
-        Label
-        {
-            color: "darksalmon"
-            text: qsTr("Priorität")
-            font.bold: true
-        }
-
-        Label
-        {
-            color: "goldenrod"
-            text: contact? contact['contact']['priority']: ""
-        }
-    }
-
-    // Grid row
-    ColumnLayout
-    {
-        Label
-        {
-            color: "darksalmon"
-            text: qsTr("Telefon")
-            font.bold: true
-        }
-
-        Label
-        {
-            color: "goldenrod"
-            text: contact? contact['contact']['phone']: ""
-        }
-    }
-
-    ColumnLayout
-    {
-        Label
-        {
-            color: "darksalmon"
-            text: qsTr("Handy")
-            font.bold: true
-        }
-
-        Label
-        {
-            color: "goldenrod"
-            text: contact? contact['contact']['cell']: ""
-        }
-    }
-
-    // Grid row
-    ColumnLayout
-    {
-        Label
-        {
-            color: "darksalmon"
-            text: qsTr("Abrechnung")
-            font.bold: true
-        }
-
-        Label
-        {
-            color: "goldenrod"
-            text: contact? contact['contact']['invoice']: ""
-        }
-    }
-
-    ColumnLayout
-    {
-        Label
-        {
-            color: "darksalmon"
-            text: qsTr("Mahnung")
-            font.bold: true
-        }
-
-        Label
-        {
-            color: "goldenrod"
-            text: contact? contact['contact']['reminder']: ""
-        }
-    }
-
-    // Grid row
-    Item
-    {
-        Layout.columnSpan: 2
-        Layout.fillHeight: true
-    }
-
-    Component.onCompleted:
-    {
-        if (contact && contact['contact']['salute'] === "Frau")
-            contactLabel.text = qsTr("Ansprechpartnerin")
-    }
-}

Gui/CustomerDetails.qml

@@ -1,61 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-
-ColumnLayout
-{
-    property int selectedClient: -1
-    property var client: null
-    property var contact: null
-    id: clDet
-
-    Button
-    {
-        text: qsTr("Zurück")
-        onClicked: contentStack.pop()
-    }
-
-    SplitView
-    {
-        id: clDetView
-        Layout.fillHeight: true
-        Layout.fillWidth: true
-        leftPadding: 9
-        rightPadding: 9
-
-        CustomerDetailsView
-        {
-            id: customerDetails
-        }
-
-        CustomerContactDetails
-        {
-            id: contactDetails
-            visible: false
-        }
-
-        NoCustomerContact
-        {
-            id: noCustomerContact
-            visible: false
-        }
-    }
-
-    Item
-    {
-        //Layout.columnSpan: 2
-        Layout.fillHeight: true
-    }
-
-    Component.onCompleted:
-    {
-        //business_model.onRowClicked(selectedClient)
-        client = business_model.getClientDetails()
-        if (client['business']['contactid'] > 0)
-        {
-            contact = contact_model.getContactDetails(client['business']['contactid'])
-            contactDetails.visible = true
-        }
-        else noCustomerContact.visible = true
-    }
-}

Gui/CustomerDetailsView.qml

@@ -1,225 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-
-GridLayout
-{
-    columns: 2
-    rowSpacing: 25
-    SplitView.preferredWidth: clDetView.width / 3 * 1.8
-
-    // Grid row
-    ColumnLayout
-    {
-        Label
-        {
-            color: "darksalmon"
-            text: qsTr("Steuer-ID")
-            font.bold: true
-        }
-
-        Label
-        {
-            color: "goldenrod"
-            text: client['business']['tax']? client['business']['tax']: ""
-        }
-    }
-
-    ColumnLayout
-    {
-        Label
-        {
-            color: "darksalmon"
-            text: qsTr("Anmerkungen")
-            font.bold: true
-        }
-
-        Label
-        {
-            color: "goldenrod"
-            text: client['business']['info']? client['business']['info']: ""
-        }
-    }
-
-    // Grid row
-    ColumnLayout
-    {
-        Label
-        {
-            color: "darksalmon"
-            text: qsTr("Kundenname")
-            font.bold: true
-        }
-
-        Label
-        {
-            color: "goldenrod"
-            text: client['business']['company']
-        }
-    }
-
-    ColumnLayout
-    {
-        Label
-        {
-            color: "darksalmon"
-            text: qsTr("CEO")
-            font.bold: true
-        }
-
-        Label
-        {
-            color: "goldenrod"
-            text: client['business']['ceo']
-        }
-    }
-
-    // Grid row
-    ColumnLayout
-    {
-        Label
-        {
-            color: "darksalmon"
-            text: qsTr("Telefon")
-            font.bold: true
-        }
-
-        Label
-        {
-            color: "goldenrod"
-            text: client['business']['phone']? client['business']['phone']: ""
-        }
-    }
-
-    ColumnLayout
-    {
-        Label
-        {
-            color: "darksalmon"
-            text: qsTr("Handy")
-            font.bold: true
-        }
-
-        Label
-        {
-            color: "goldenrod"
-            text: client['business']['cell']? client['business']['cell']: ""
-        }
-    }
-
-    // Grid row
-    ColumnLayout
-    {
-        Label
-        {
-            color: "darksalmon"
-            text: qsTr("Webseite")
-            font.bold: true
-        }
-
-        Label
-        {
-            id: clientWebsite
-            color: "goldenrod"
-            font.underline: false
-            text: client['business']['website']? '<a href="' + client['business']['website'] + '">' +  client['business']['website'] + '</a>': ""
-            onLinkActivated:
-            {
-                var web_protocol = /^((http|https):\/\/)/;
-                var client_website = !web_protocol.test(client['business']['website'])? "https://" + client['business']['website']: client['business']['website'];
-                Qt.openUrlExternally(client_website)
-            }
-        }
-    }
-
-    ColumnLayout
-    {
-        Label
-        {
-            color: "darksalmon"
-            text: qsTr("E-Mail")
-            font.bold: true
-        }
-
-        Label
-        {
-            id: clientEmail
-            color: "goldenrod"
-            text: client['business']['email']? '<a href="mailto:' + client['business']['email'] + '">' + client['business']['email'] + '</a>': ""
-            onLinkActivated: Qt.openUrlExternally('mailto:' + client['business']['email'])
-        }
-    }
-
-    // Grid row
-    ColumnLayout
-    {
-        Label
-        {
-            color: "darksalmon"
-            text: qsTr("Straße")
-            font.bold: true
-        }
-
-        Label
-        {
-            color: "goldenrod"
-            text: client['business']['street']? client['business']['tax']: ""
-        }
-    }
-
-    ColumnLayout
-    {
-        Label
-        {
-            color: "darksalmon"
-            text: qsTr("Haus-Nr.")
-            font.bold: true
-        }
-
-        Label
-        {
-            color: "goldenrod"
-            text: client['business']['house']? client['business']['house']: ""
-        }
-    }
-
-    // Grid row
-    ColumnLayout
-    {
-        Label
-        {
-            color: "darksalmon"
-            text: qsTr("PLZ")
-            font.bold: true
-        }
-
-        Label
-        {
-            color: "goldenrod"
-            text: client['business']['zip']? client['business']['zip']: ""
-        }
-    }
-
-    ColumnLayout
-    {
-        Label
-        {
-            color: "darksalmon"
-            text: qsTr("Stadt")
-            font.bold: true
-        }
-
-        Label
-        {
-            color: "goldenrod"
-            text: client['business']['city']? client['business']['city']: ""
-        }
-    }
-
-    // Grid row
-    // Item
-    // {
-    //     Layout.columnSpan: 2
-    //     Layout.fillHeight: true
-    // }
-}

Gui/CustomerTable.qml

@@ -0,0 +1,217 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import Qt.labs.qmlmodels
+import QtQuick.Controls.Fusion
+
+Item {
+    anchors.fill: parent
+    property var availableFilters: ["Name", "Adresse", "PLZ", "Ort"]
+    id: test
+
+    SearchBar
+    {
+        id:searchBar
+        anchors.margins: 9
+    }
+
+    Button
+    {
+        id: addBusinessBtn
+        icon.source: "qrc:/images/addbusiness.svg"
+        icon.color: "olive"
+        anchors.right: parent.right
+        flat: true
+        onClicked: appLoader.source = "AddCustomer.qml"
+    }
+
+
+    ColumnLayout
+    {
+        id: tableColumn
+        anchors
+        {
+            top: searchBar.bottom
+            bottom: parent.bottom
+            left: parent.left
+            right: parent.right
+        }
+
+        RowLayout
+        {
+            RadioButton
+            {
+                id: showAll
+                checked: true
+                text: qsTr("Alle")
+                onClicked: viewCriterion(showAll)
+            }
+            RadioButton
+            {
+                id: showInterested
+                 text: qsTr("Interessent")
+                 onClicked: viewCriterion(showInterested)
+            }
+            RadioButton
+            {
+                id: showClientele
+                text: qsTr("Kunden")
+                onClicked: viewCriterion(showClientele)
+            }
+            RadioButton
+            {
+                id: showProvider
+                text: qsTr("Lieferant")
+                onClicked: viewCriterion(showProvider)
+            }
+            RadioButton
+            {
+                id: showFinished
+                text: qsTr("Erledigt")
+                onClicked: viewCriterion(showFinished)
+            }
+
+        }
+
+        HorizontalHeaderView
+        {
+            id: horizontalHeader
+            Layout.fillWidth: true
+            implicitHeight: 40
+            movableColumns: true //@disable-check M16
+            syncView: customerTable
+
+            delegate: Rectangle {
+                    color: addBusinessBtn.palette.alternateBase
+                    border.color: addBusinessBtn.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: addBusinessBtn.palette.text
+                    }
+            }
+        }
+
+        TableView
+        {
+            //property var customWidths: [0.2, 0.5, 0.3, 05, 0.2, 0.2]
+            property real newWidth: 0
+            id: customerTable
+            Layout.fillHeight: true
+            Layout.fillWidth: true
+            ScrollBar.vertical: ScrollBar
+            {
+                policy: customerTable.contentHeight > customerTable.height ? ScrollBar.AlwaysOn : ScrollBar.AlwaysOff
+            }
+            columnSpacing: 1
+            rowSpacing: 2
+            model: business_model
+            alternatingRows: true
+            resizableColumns: true // @disable-check M16
+            selectionBehavior: TableView.SelectRows
+            selectionModel: ItemSelectionModel
+            {
+                id: selModel
+                model: customerTable.model
+            }
+
+            // columnWidthProvider: function(column)
+            // {
+                // switch (column)
+                // {
+                //     case 0: return width * 0.2;
+                //     case 1: return width * 0.5;
+                //     case 2: return width * 0.3;
+                //     default: return width / model.columnCount();
+                // }
+                //return customWidths[column] * width;
+                //return tableColumn.content.implicitWidth // model.columnCount()
+            //      newWidth = columnWidth(column)
+            //      return newWidth
+            // }
+
+            Timer
+            {
+                id: redrawTable
+                running: true
+                interval: 1
+                repeat: false
+                onTriggered:
+                {
+                    customerTable.forceLayout();
+                }
+            }
+
+
+
+            delegate:Rectangle
+            {
+                required property bool selected
+                required property bool current
+                implicitWidth: customerTable.width / customerTable.columns
+                implicitHeight: 25
+                color: selected
+                           ? addBusinessBtn.palette.highlight //palette.highlight
+                           : (customerTable.alternatingRows && row % 2 !== 0
+                           ? addBusinessBtn.palette.base // palette.base
+                           : addBusinessBtn.palette.alternateBase) //palette.alternateBase)
+
+                Text
+                {
+                    text: model.display == null? "": model.display
+                    elide: Text.ElideRight
+                    width: parent.width
+                    height: parent.height
+                    verticalAlignment: Text.AlignVCenter
+                    leftPadding: 9 //@d isable-check M16
+                    color: addBusinessBtn.palette.text
+                }
+
+                MouseArea
+                {
+                    property bool hovered: false
+                    id: mouseArea
+                    anchors.fill: parent
+                    hoverEnabled: true
+                    onClicked:
+                    {
+                        business_model.onRowClicked(row)
+                    }
+                    onEntered:
+                    {
+                        customerTable.selectionModel.select(customerTable.model.index(row, 0), ItemSelectionModel.SelectCurrent | ItemSelectionModel.Rows)
+                    }
+                }
+            }
+
+            onContentWidthChanged:
+            {
+                //console.log("Model changed!!")
+                redrawTable.start()
+            }
+        }
+
+        Item
+        {
+            //Layout.fillHeight: true
+            Layout.fillWidth: true
+        }
+    }
+
+    function viewCriterion(criterion)
+    {
+        business_model.viewCriterion(criterion.text)
+    }
+}
+
+
+
+

Gui/CustomerView.qml

@@ -5,7 +5,7 @@ import QtQuick.Layouts
 GridLayout
 {
     id: customerView
-    columns: 4
+    columns: 2
     Layout.fillWidth: true
     Layout.fillHeight: true
     rowSpacing: 9
@@ -16,10 +16,10 @@ GridLayout
     Label
     {
         id: lblFirmenName
-        text: qsTr("Firmenname*")
+        text: qsTr("Firmenname")
         Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
-
     }
+
     TextField
     {
         property string name: "business"
@@ -28,12 +28,15 @@ GridLayout
         Layout.fillWidth: true
         Layout.alignment: Qt.AlignVCenter
         onTextChanged: checkFields()
-        Layout.columnSpan: 3
+        placeholderText: "Pflichtfeld"
+        placeholderTextColor: "red"
+
+
     }
 
     Label
     {
-        text: qsTr("Straße*")
+        text: qsTr("Straße")
         Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
     }
 
@@ -43,36 +46,15 @@ GridLayout
         id: streetid
         Layout.fillWidth: true
         onTextChanged: checkFields()
+        placeholderText: "Pflichtfeld"
+        placeholderTextColor: "red"
     }
-
-    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")
         Layout.alignment: Qt.AlignRight
     }
 
-
-
-
     ComboBox
     {
         property string name: "postcode"
@@ -85,9 +67,9 @@ GridLayout
         model: address_model
         textRole: "display"
         popup.height: 300
+        popup.y: postcode.y + 5 - (postcode.height * 2)
         currentIndex: -1
         onCurrentIndexChanged: city.currentIndex = postcode.currentIndex
-        Layout.columnSpan: 3
         validator: RegularExpressionValidator
         {
             regularExpression: /([0-9]{1,5})/
@@ -111,8 +93,9 @@ GridLayout
         model: address_model
         textRole: "city"
         popup.height: 300
+        popup.y: postcode.y + 5 - (postcode.height * 2)
         currentIndex: -1
-        Layout.columnSpan: 3
+        // onCurrentIndexChanged: postcode.currentIndex = city.currentIndex
     }
 
     Label
@@ -125,7 +108,6 @@ GridLayout
         property string name: "telephone"
         id: telephone
         Layout.fillWidth: true
-        Layout.columnSpan: 3
         validator: RegularExpressionValidator
         {
             regularExpression: /([+0-9]{1})([0-9]{1,17})/
@@ -135,7 +117,7 @@ GridLayout
 
     Label
     {
-        text: qsTr("Mobil")
+        text: qsTr("Handy")
         Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
     }
     TextField
@@ -143,7 +125,6 @@ GridLayout
         property string name: "cellphone"
         id: cellphone
         Layout.fillWidth: true
-        Layout.columnSpan: 3
         validator: RegularExpressionValidator
         {
             regularExpression: /([+0-9]{1})([0-9]{1,17})/
@@ -161,10 +142,9 @@ GridLayout
         id: email
         Layout.fillWidth: true
         placeholderText: qsTr("beispiel@domain.de")
-        Layout.columnSpan: 3
         validator: RegularExpressionValidator
         {
-            regularExpression: /([\+!#$%&‘\*\–\/\=?\^_`\.{|}\~\-\_0-9A-Za-z]{1,185})@([0-9A-Za-z\.\-\_]{1,64})\.([a-zA-z]{2,5})/
+            regularExpression: /([\+!#$%&‘\*\–\/\=?\^_`\.{|}\~0-9A-Za-z]{1,185})@([0-9A-Za-z\.]{1,64})\.([a-zA-z]{2,5})/
         }
     }
 
@@ -178,7 +158,6 @@ GridLayout
         property string name: "homepage"
         id: homepage
         Layout.fillWidth: true
-        Layout.columnSpan: 3
         placeholderText: "www.oschkarischtverhaftetwegensexy.jinx"
     }
 
@@ -192,7 +171,6 @@ GridLayout
         property string name: "ceo"
         id: ceo
         Layout.fillWidth: true
-        Layout.columnSpan: 3
     }
 
     Label
@@ -205,7 +183,6 @@ GridLayout
         property string name: "taxno"
         id: taxno
         Layout.fillWidth: true
-        Layout.columnSpan: 3
     }
     Label
     {
@@ -220,7 +197,6 @@ GridLayout
         editable: false
         model: business_type
         textRole: "display"
-        Layout.columnSpan: 3
     }
     Label
     {
@@ -233,7 +209,6 @@ GridLayout
         id: infoView
         Layout.fillWidth: true
         Layout.preferredHeight: 100
-        Layout.columnSpan: 3
         ScrollBar.horizontal: ScrollBar
         {
             policy: ScrollBar.AlwaysOn

Gui/CustomersTable.qml

@@ -1,177 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
-import Qt.labs.qmlmodels
-
-ColumnLayout {
-    property var availableFilters: ["Name", "Adresse", "PLZ", "Ort"]
-
-    function viewCriterion(criterion)
-    {
-        business_model.viewCriterion(criterion.text);
-    }
-
-
-
-    anchors.fill: parent
-    spacing: Dimensions.l
-
-    Component.onCompleted: 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: "Interessent"
-                    text: qsTr("Interessent")
-                    selected: false
-                }
-                ListElement {
-                    name: "Kunde"
-                    text: qsTr("Kunde")
-                    selected: false
-                }
-                ListElement {
-                    name: "Lieferant"
-                    text: qsTr("Lieferant")
-                    selected: false
-                }
-                ListElement {
-                    name: "Erledigt"
-                    text: qsTr("Erledigt")
-                    selected: false
-                }
-            }
-        }
-        Button
-        {
-            id: addCustomer
-
-            Layout.alignment: Qt.AlignRight
-            icon.source: "qrc:/images/PlusCircle.svg"
-            text: qsTr("Kunde Hinzufügen")
-            onClicked: contentStack.push("AddCustomer.qml")
-        }
-    }
-    ColumnLayout
-    {
-        Layout.fillWidth: true
-        Layout.fillHeight: true
-        Layout.verticalStretchFactor: 1
-        clip: true
-
-        HorizontalHeaderView
-        {
-            id: horizontalHeader
-
-            Layout.fillWidth: true
-            implicitHeight: 40
-            movableColumns: true //@disable-check M16
-            syncView: customerTable
-
-            delegate: Rectangle
-            {
-                Layout.fillWidth: true
-                border.color: addCustomer.palette.base
-                color: addCustomer.palette.alternateBase
-                implicitHeight: 40
-                implicitWidth: 1
-
-                Text
-                {
-                    color: addCustomer.palette.text
-                    elide: Text.ElideRight
-                    height: parent.height
-                    horizontalAlignment: Text.AlignHCenter
-                    text: model.display
-                    verticalAlignment: Text.AlignVCenter
-                    width: parent.width
-                }
-            }
-        }
-        TableView {
-            id: customerTable
-
-            property real newWidth: 0
-
-            Layout.fillHeight: true
-            Layout.fillWidth: true
-            alternatingRows: true
-            columnSpacing: 1
-            model: business_model
-            resizableColumns: true
-            rowSpacing: 2
-            selectionBehavior: TableView.SelectRows
-            z: 1
-
-            ScrollBar.vertical: ScrollBar {
-                policy: customerTable.contentHeight > customerTable.height ? ScrollBar.AlwaysOn : ScrollBar.AlwaysOff
-            }
-            delegate: Rectangle {
-                required property bool current
-                required property bool selected
-
-                color: selected ? addCustomer.palette.highlight //palette.highlight
-                 : (customerTable.alternatingRows && row % 2 !== 0 ? addCustomer.palette.base // palette.base
-                     : addCustomer.palette.alternateBase) //palette.alternateBase)
-                implicitHeight: 25
-                implicitWidth: customerTable.width / customerTable.columns
-
-                Text {
-                    color: addCustomer.palette.text
-                    elide: Text.ElideRight
-                    height: parent.height
-                    leftPadding: 9
-                    text: model.display == null ? "" : model.display // @disable-check M126
-                    verticalAlignment: Text.AlignVCenter
-                    width: parent.width
-                }
-                MouseArea {
-                    id: mouseArea
-
-                    property bool hovered: false
-
-                    anchors.fill: parent
-                    hoverEnabled: true
-
-                    onDoubleClicked: {
-                        business_model.onRowClicked(row);
-                        contentStack.push("CustomerDetails.qml", {
-                            selectedClient: row
-                        });
-                    }
-                    onEntered: {
-                        customerTable.selectionModel.select(customerTable.model.index(row, 0), ItemSelectionModel.SelectCurrent | ItemSelectionModel.Rows);
-                    }
-                }
-            }
-            selectionModel: ItemSelectionModel {
-                id: selModel
-
-                model: customerTable.model
-            }
-        }
-
-    }
-    Item {
-        Layout.fillHeight: true
-    }
-}

Gui/Dashboard.qml

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

Gui/DbConfiguration.qml

@@ -5,11 +5,7 @@ import QtQuick.Layouts
 
 GridLayout
 {
-    property alias dbHost: dbHost
+    // property alias firstStart: firstStartGrid
-    property alias dbPort: dbPort
-    property alias dbName: dbName
-    property alias dbUserName: dbUserName
-    property alias dbPassword: dbPassword
     id: dbGrid
     columns: 2
     columnSpacing: 5
@@ -106,17 +102,4 @@ GridLayout
     {
         Layout.fillHeight: true
     }
-
-    Component.onCompleted:
-    {
-        var db = config.getDbConf()
-        if (Object.keys(db).length)
-        {
-          dbHost.text = db['DB_HOST']
-          dbPort.text = db['DB_PORT']
-          dbName.text = db['DB_NAME']
-          dbUserName.text = db['DB_USER']
-          dbPassword.text = db['DB_PASS']
-        }
-    }
 }

Gui/EmployeeTable.qml

@@ -0,0 +1,126 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import Qt.labs.qmlmodels
+
+
+Item {
+    property var availableFilters: ["Name", "Adresse", "PLZ", "Ort", "Status"]
+
+    SearchBar
+    {
+        id:searchBar
+        anchors.margins: 9
+    }
+
+    ColumnLayout
+    {
+        anchors
+        {
+
+            top: searchBar.bottom
+            bottom: parent.bottom
+            left: parent.left
+            right: parent.right
+
+        }
+
+        RowLayout
+        {
+
+            RadioButton
+            {
+
+                checked: true
+                text: qsTr("Alle")
+            }
+            RadioButton
+            {
+
+                text: qsTr("Bewerber")
+            }
+            RadioButton
+            {
+
+                text: qsTr("Mitarbeiter")
+            }
+            RadioButton
+            {
+
+                text: qsTr("Erledigt")
+            }
+            RadioButton
+            {
+
+                text: qsTr("Ausgeschieden")
+            }
+
+        }
+
+        HorizontalHeaderView
+        {
+            id: horizontalHeader
+            Layout.fillWidth: true
+            syncView: testTable
+
+        }
+
+        TableView
+        {
+            id: testTable
+            Layout.fillHeight: true
+            Layout.fillWidth: true
+            columnSpacing: 1
+            rowSpacing: 2
+            model: business_model
+            selectionBehavior: TableView.SelectRows
+            selectionModel: ItemSelectionModel
+
+
+                            {
+                                id: selModel
+                                model: testTable.model
+                            }
+
+
+            delegate:Rectangle
+            {
+                required property bool selected
+                required property bool current
+                implicitWidth: 200
+                implicitHeight: 25
+                color: selected? "lightblue": palette.base
+
+                Text
+                {
+                    Layout.fillWidth: true
+                    text: model.display
+
+                }
+
+                MouseArea
+                {
+                    id: mouseArea
+                    property bool hovered:false
+
+                    anchors.fill: parent
+                    hoverEnabled: true
+
+
+                    onClicked:
+                    {
+                        business_model.onRowClicked(row)
+                        testTable.selectionModel.select(testTable.model.index(row, 0), ItemSelectionModel.SelectCurrent | ItemSelectionModel.Rows)
+
+
+                    }
+
+                }
+            }
+        }
+
+    }
+}
+
+
+

Gui/Employees/AddApplicant.qml

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

Gui/Employees/AddEmployee.qml

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

Gui/Employees/ApplicantForm.qml

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

Gui/Employees/EmployeeBankData.qml

@@ -1,51 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-
-GridLayout
-{
-    id: bankAccount
-    columns: 2
-    property alias jobstatus: title
-    property alias longest: longest
-    Label
-    {
-        id: longest
-        text: qsTr("Beschäftigungsverhältnis")
-        Layout.alignment: Qt.AlignRight
-    }
-
-    ComboBox
-    {
-        property string name: "jobstatus"
-        id: title
-        Layout.fillWidth: true
-        editable: false
-        model: [qsTr("Vollzeit"), qsTr("Teilzeit"), qsTr("Minijob"), qsTr("Ausgeschieden")]
-    }
-    Label
-    {
-        text: qsTr("IBAN")
-        Layout.alignment: Qt.AlignRight
-    }
-    TextField
-    {
-        property string name: "iban"
-        id: iban
-        Layout.fillWidth: true
-    }
-    Label
-    {
-        text: qsTr("Bank")
-        Layout.alignment: Qt.AlignRight
-    }
-    ComboBox
-    {
-        property string name: "bank"
-        id: bankname
-        Layout.fillWidth: true
-        model: ["",qsTr("Sparkasse"),qsTr("Volksbank")]
-        editable: true
-    }
-}
-

Gui/Employees/EmployeeDetails.qml

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

Gui/Employees/EmployeeNationalInsurance.qml

@@ -1,263 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-
-GridLayout
-{
-    id: nationalInsurance
-    columns: 2
-
-
-    Label
-    {
-        Layout.preferredWidth: bankAccount.longest.width
-        text: qsTr("Herkunftsland")
-        horizontalAlignment: Text.AlignRight
-    }
-
-    ComboBox
-    {
-        property string name: "country"
-        id: nation
-        Layout.fillWidth: true
-        editable: true
-        model: [qsTr("Deutschland"), qsTr("Syrien")]
-    }
-
-    Label
-    {
-        text: qsTr("Sozialversicherungs-Nr")
-        Layout.alignment: Qt.AlignRight
-    }
-
-    TextField
-    {
-        property string name: "socialno"
-        id: socialno
-        Layout.fillWidth: true
-    }
-
-    Label
-    {
-        text: qsTr("Steuer-ID")
-        Layout.alignment: Qt.AlignRight
-    }
-
-    TextField
-    {
-        property string name: "taxno"
-        id: taxnumber
-        Layout.fillWidth: true
-    }
-
-    Label
-    {
-        text: qsTr("Krankenkasse")
-        Layout.alignment: Qt.AlignRight
-    }
-
-    TextField
-    {
-        property string name: "medicalinsurance"
-        id: medicalinsurance
-        Layout.fillWidth: true
-    }
-    Label
-    {
-        text: qsTr("Knappschaft")
-        Layout.alignment: Qt.AlignRight
-        visible: bankAccount.jobstatus.currentText === "Minijob" ? 1:0
-    }
-
-    TextField
-    {
-        property string name: "knappschaft"
-        id: knappschaft
-        Layout.fillWidth: true
-        visible: bankAccount.jobstatus.currentText === "Minijob" ? 1:0
-    }
-
-
-    Label
-    {
-        text: qsTr("Ausweistyp")
-        Layout.alignment: Qt.AlignRight
-    }
-
-    ComboBox
-    {
-        property string name: "idtype"
-        id: idtype
-        Layout.fillWidth: true
-        editable: true
-        model: [qsTr("Personalausweis"), qsTr("Reisepass")]
-    }
-    Label
-    {
-        text: qsTr("Ausweis Nr.")
-        Layout.alignment: Qt.AlignRight
-    }
-    TextField
-    {
-        property string name: "idnumber"
-        id: idnumber
-        Layout.fillWidth: true
-    }
-
-    Label
-    {
-        text: qsTr("Ausweis gültig bis")
-        Layout.alignment: Qt.AlignRight
-    }
-    TextField
-    {
-        property string name: "idexpiry"
-        id: idexpiry
-        Layout.fillWidth: true
-        validator: RegularExpressionValidator
-        {
-            regularExpression: /((^|)(0[1-9]{1}|[1-2]{1}[0-9]{1}|3[0-1]))\.((^|)(0[1-9]{1}|1[0-2]{1}))\.((^|)(196[0-9]{1}|19[7-9]{1}[0-9]{1}|20[0-9]{2}))/
-        }
-        Keys.onPressed: (event)=>
-        {
-            if (event.key !== Qt.Key_Backspace)
-            {
-                var len = idexpiry.length
-                var bd = idexpiry.text
-                if (len === 2 || len === 5) idexpiry.text = bd + "."
-            }
-        }
-    }
-    Label
-    {
-        text: qsTr("Ausstellungsort")
-        Layout.alignment: Qt.AlignRight
-    }
-    TextField
-    {
-        property string name: "idauthority"
-        id: idauthority
-        Layout.fillWidth: true
-    }
-    Label
-    {
-        id: test
-        text: qsTr("Ausgestellt am")
-        Layout.alignment: Qt.AlignRight
-    }
-    TextField
-    {
-        property string name: "idissued"
-        id: idissued
-        Layout.fillWidth: true
-        validator: RegularExpressionValidator
-        {
-            regularExpression: /((^|)(0[1-9]{1}|[1-2]{1}[0-9]{1}|3[0-1]))\.((^|)(0[1-9]{1}|1[0-2]{1}))\.((^|)(196[0-9]{1}|19[7-9]{1}[0-9]{1}|20[0-9]{2}))/
-        }
-        Keys.onPressed: (event)=>
-        {
-            if (event.key !== Qt.Key_Backspace)
-            {
-                var len = idissued.length
-                var bd = idissued.text
-                if (len === 2 || len === 5) idissued.text = bd + "."
-            }
-        }
-    }
-    CheckBox
-    {
-        Layout.preferredWidth: bankAccount.longest.width
-        property string name: "worklicense"
-        id: worklicense
-        text: qsTr("Arbeitserlaubnis <font color='red'><b>?</b></font>")
-        visible: nation.currentText === "Deutschland"? false:true
-    }
-    CheckBox
-    {
-        property string name: "residencetype"
-        id: residencetype
-        text: qsTr("Aufenthaltstitel")
-        visible: nation.currentText === "Deutschland"? false:true
-    }
-    Label
-    {
-        text: qsTr("Aufenthaltstitel Nr.")
-        visible: residencetype.checked
-        Layout.alignment: Qt.AlignRight
-    }
-    TextField
-    {
-        property string name: "residenceno"
-        id: residenceno
-        visible: residencetype.checked
-        Layout.fillWidth: true
-    }
-    Label
-    {
-        text: qsTr("Ausgestellt von")
-        visible: residencetype.checked
-        Layout.alignment: Qt.AlignRight
-    }
-    TextField
-    {
-        property string name: "residenceauthority"
-        id: residenceauthority
-        visible: residencetype.checked
-        Layout.fillWidth: true
-    }
-    Label
-    {
-        text: qsTr("Ausgestellt am")
-        visible: residencetype.checked
-        Layout.alignment: Qt.AlignRight
-    }
-    TextField
-    {
-        property string name: "residenceissued"
-        id: residenceissued
-        visible: residencetype.checked
-        Layout.fillWidth: true
-        validator: RegularExpressionValidator
-        {
-            regularExpression: /((^|)(0[1-9]{1}|[1-2]{1}[0-9]{1}|3[0-1]))\.((^|)(0[1-9]{1}|1[0-2]{1}))\.((^|)(196[0-9]{1}|19[7-9]{1}[0-9]{1}|20[0-9]{2}))/
-        }
-        Keys.onPressed: (event)=>
-        {
-            if (event.key !== Qt.Key_Backspace)
-            {
-                var len = residenceissued.length
-                var bd = residenceissued.text
-                if (len === 2 || len === 5) residenceissued.text = bd + "."
-            }
-        }
-    }
-    Label
-    {
-        text: qsTr("Gültig bis")
-        visible: residencetype.checked
-        Layout.alignment: Qt.AlignRight
-    }
-    TextField
-    {
-        property string name: "residenceexpiry"
-        id: residenceexpiry
-        visible: residencetype.checked
-        Layout.fillWidth: true
-        validator: RegularExpressionValidator
-        {
-            regularExpression: /((^|)(0[1-9]{1}|[1-2]{1}[0-9]{1}|3[0-1]))\.((^|)(0[1-9]{1}|1[0-2]{1}))\.((^|)(196[0-9]{1}|19[7-9]{1}[0-9]{1}|20[0-9]{2}))/
-        }
-        Keys.onPressed: (event)=>
-        {
-            if (event.key !== Qt.Key_Backspace)
-            {
-                var len = residenceexpiry.length
-                var bd = residenceexpiry.text
-                if (len === 2 || len === 5) residenceexpiry.text = bd + "."
-            }
-        }
-    }
-
-}
-
-

Gui/Employees/EmployeePersonalData.qml

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

Gui/Employees/EmployeeVarious.qml

@@ -1,63 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-
-GridLayout
-{
-    id: applicantVarious
-    columns: 2
-
-    Label
-    {
-        Layout.preferredWidth: bankAccount.longest.width
-        text: qsTr("Grad der Behinderung")
-        horizontalAlignment: Text.AlignRight
-    }
-
-    TextField
-    {
-        property string name: "disability"
-        id: disability
-        placeholderText: "0,0"
-    }
-
-    Label
-    {
-        text: qsTr("Disponent")
-        Layout.alignment: Qt.AlignRight
-    }
-
-    TextField
-    {
-        property string name: "disponent"
-        id: disponent
-        Layout.fillWidth: true
-    }
-
-    Label
-    {
-        text: qsTr("Kostenstelle")
-        Layout.alignment: Qt.AlignRight
-    }
-
-    TextField
-    {
-        property string name: "office"
-        id: office
-        Layout.fillWidth: true
-    }
-
-    Label
-    {
-        text: qsTr("Fremdlohn-Nr.")
-        Layout.alignment: Qt.AlignRight
-    }
-
-    TextField
-    {
-        property string name: "empreference"
-        id: empreference
-        Layout.fillWidth: true
-    }
-}
-

Gui/Employees/EmployeesTable.qml

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

Gui/Employees/qmldir

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

Gui/LoginScreen.qml

@@ -4,134 +4,199 @@ import QtQuick.Controls
 import QtQuick.Dialogs
 import QtQuick.Layouts
 
-Item {
-    property string recpass: ""
 
-    function dbConnectionFailed(msg) {
+Item
-        notifications.notificationDialog.informativeText = msg;
+{
-        notifications.notificationDialog.text = "Verbindung zum Datenbankserver verloren";
+    property string recpass: ""
-        notifications.notificationDialog.open();
+    anchors.fill: parent
-    }
+
-    function getEncryptionKey() {
+    ColumnLayout
-        recoveryPaswordDialog.open();
+    {
-    }
-    function loggedin() {
-        contentStack.replace("Dashboard.qml");
-    }
 
         anchors.fill: parent
-    anchors.topMargin: Dimensions.l
 
-    Component.onCompleted: {
+        FontLoader
-        loggedin_user.loginOkay.connect(loggedin);
+        {
-        config.invalidEncryptionKey.connect(getEncryptionKey);
+            id: helloStranger
-        config.checkEncryptionKey();
+            source: "qrc:/fonts/HelloStranger.otf"
-        loggedin_user.noDbConnection.connect(dbConnectionFailed);
-        benutzerName.forceActiveFocus();
         }
 
-    ColumnLayout {
+        FontLoader
-        anchors.centerIn: parent
+        {
-        spacing: Dimensions.m
+            id: damarWulan
+            source: "qrc:/fonts/Damarwulan.ttf"
+        }
 
-        Label {
+        FontLoader
+        {
+            id: hussarPrint
+            source: "qrc:/fonts/HussarPrintA.otf"
+        }
+
+        FontLoader
+        {
+            id: reginaldScript
+            source: "qrc:/fonts/ReginaldScript.ttf"
+        }
+
+        Item
+        {
+            height: 65
+        }
+
+        Label
+        {
+            text: qsTr ("Login*****")
+            font.family: helloStranger.font.family
+            font.weight: helloStranger.font.weight
+            font.styleName: helloStranger.font.styleName
+            font.pixelSize: 89
+            font.bold: true
             Layout.alignment: Qt.AlignHCenter
-            Layout.bottomMargin: Dimensions.l
-            font: Typography.h1
-            text: qsTr("Login")
         }
-        Field {
-            label: qsTr("Benutzername")
 
-            TextField {
+        Item
+        {
+            height: 25
+        }
+
+        RowLayout
+        {
+            Layout.alignment: Qt.AlignHCenter
+            spacing: 15
+
+            Label
+            {
+                text: qsTr ("Benutzername")
+                minimumPixelSize: 20
+                Layout.preferredWidth: 150
+                horizontalAlignment: Text.AlignRight
+                font.family: damarWulan.font.family
+                font.weight: damarWulan.font.weight
+                font.styleName: damarWulan.font.styleName
+                font.pixelSize: 21
+            }
+
+            TextField
+            {
                 id: benutzerName
-
-                focus: true
-                implicitWidth: 300
                 placeholderText: qsTr ("Benutzernamen eingeben")
-
-                onAccepted: {
-                    if (benutzerName.text.trim() && passwort.text.trim())
-                        loggedin_user.login(benutzerName.text.trim(), passwort.text);
-                    else if (benutzerName.text.trim())
-                        passwort.forceActiveFocus();
-                }
-            }
-        }
-        Field {
-            label: qsTr("Passwort")
-
-            TextField {
-                id: passwort
-
-                echoMode: TextInput.Password
                 implicitWidth: 300
+                font: hussarPrint.font
+            }
+        }
+
+        RowLayout
+        {
+            Layout.alignment: Qt.AlignHCenter
+            spacing: 15
+
+            Label
+            {
+                minimumPixelSize: 20
+                Layout.preferredWidth: 150
+                text: qsTr ("Passwort")
+                font.family: damarWulan.font.family
+                font.weight: damarWulan.font.weight
+                font.styleName: damarWulan.font.styleName
+                font.pixelSize: 21
+                horizontalAlignment: Text.AlignRight
+            }
+
+            TextField
+            {
+                id: passwort
                 placeholderText: qsTr  ("Passwort eingeben")
+                implicitWidth: 300
+                font: hussarPrint.font
+                echoMode: TextInput.Password
+            }
+        }
 
-                onAccepted: {
+        RowLayout
-                    if (benutzerName.text.trim() && passwort.text.trim())
+        {
-                        loggedin_user.login(benutzerName.text.trim(), passwort.text);
+            Layout.preferredWidth: 465
-                    else if (passwort.text.trim())
+            Layout.alignment: Qt.AlignHCenter
-                        benutzerName.forceActiveFocus();
-                }
-            }
-        }
-        Button {
-            Layout.topMargin: Dimensions.m
-            icon.source: "qrc:/images/ArrowRightEndOnRectangle.svg"
-            implicitWidth: parent.width
-            text: qsTr("Login")
 
-            onClicked: {
+            Button
+            {
+                text: qsTr ("Feierabend für heute!")
+                Layout.alignment: Qt.AlignRight
+                font: reginaldScript.font
+                onClicked:
+                {
                     if (benutzerName.text.trim() && passwort.text.trim())
-                    loggedin_user.login(benutzerName.text.trim(), passwort.text);
+                        loggedin_user.login(benutzerName.text.trim(), passwort.text)
                 }
             }
-        Item {
+        }
+
+        Item
+        {
             Layout.fillHeight: true
+
         }
-        Dialog {
+
+        Dialog
+        {
             id: recoveryPaswordDialog
-
-            anchors.centerIn: parent
             modal: true
-            standardButtons: Dialog.Ok | Dialog.Cancel
             title: qsTr("Wiederherstellung")
-
+            anchors.centerIn: parent
-            onAccepted: {
+            standardButtons: Dialog.Ok | Dialog.Cancel
-                recpass = recoveryPaswordInput.text;
+            onAccepted:
-                getRecoveryDialog.open();
+            {
+                recpass = recoveryPaswordInput.text
+                getRecoveryDialog.open()
             }
 
-            ColumnLayout {
+            ColumnLayout
-                RowLayout {
+            {
-                    Label {
+                RowLayout
+                {
+                    Label
+                    {
                         text: qsTr("Wiederherstellungspasswort eingeben: ")
                     }
-                    TextField {
-                        id: recoveryPaswordInput
 
+                    TextField
+                    {
+                        id: recoveryPaswordInput
+                        text: ""
                         echoMode: TextInput.Password
                         implicitWidth: 300
                         placeholderText: qsTr("Hier Wiederherstellungspasswort eingeben")
-                        text: ""
                     }
                 }
             }
         }
-        FileDialog {
-            id: getRecoveryDialog
 
-            currentFolder: StandardPaths.standardLocations(StandardPaths.DocumentsLocation)[0]
+        FileDialog
+        {
+            id: getRecoveryDialog
+            title: qsTr("Wiederherstellungsdatei")
             fileMode: FileDialog.OpenFile
             nameFilters: ["PYQCRM Recovery files (*.pyqrec)"]
-            title: qsTr("Wiederherstellungsdatei")
+            currentFolder: StandardPaths.standardLocations(StandardPaths.DocumentsLocation)[0]
-
             onAccepted: config.getRecoveryKey(getRecoveryDialog.currentFile, recpass)
             onRejected: quit()
         }
-        Notifications {
+    }
-            id: notifications
+
-        }
+    Component.onCompleted:
+    {
+        loggedin_user.loginOkay.connect(loggedin)
+        config.invalidEncryptionKey.connect(getEncryptionKey)
+        config.checkEncryptionKey()
+    }
+
+    function loggedin()
+    {
+        appLoader.source = "Dashboard.qml"
+    }
+
+    function getEncryptionKey()
+    {
+        recoveryPaswordDialog.open()
     }
 }

Gui/MiscConf.qml

@@ -1,22 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-
-ColumnLayout
-{
-    property alias sysTray: sysTray
-    anchors.fill: parent
-    anchors.topMargin: 35
-
-    Switch
-    {
-        id: sysTray
-        text: qsTr("Beim minimieren, in der Taskleiste anzeigen")
-        checked: config.systray()
-    }
-
-    Item
-    {
-        Layout.fillHeight: true
-    }
-}

Gui/Navigation.qml

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

Gui/NoCustomerContact.qml

@@ -1,33 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-
-GridLayout
-{
-    columns: 2
-    rowSpacing: 25
-
-    // Grid row
-    ColumnLayout
-    {
-        Label
-        {
-            color: "darksalmon"
-            font.bold: true
-            text: qsTr("Kein Ansprechpartner gefunden")
-        }
-
-        Label
-        {
-            color: "goldenrod"
-            text: qsTr("Was willst du tun?")
-        }
-    }
-
-    // Grid row
-    Item
-    {
-        Layout.columnSpan: 2
-        Layout.fillHeight: true
-    }
-}

Gui/NoDbConnection.qml

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

Gui/Notifications.qml

@@ -1,12 +0,0 @@
-import QtQuick
-import QtQuick.Dialogs
-
-Item
-{
-    MessageDialog
-    {
-        id: notificationDialog
-        buttons: MessageDialog.Ok
-    }
-
-}

Gui/ObjectAddOnContactPerson.qml

@@ -1,317 +0,0 @@
-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/ObjectAddOnEmployee.qml

@@ -1,125 +0,0 @@
-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/ObjectAddOns.qml

@@ -1,28 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
-import "../js/qmldict.js" as JsLib
-
-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/ObjectDetails.qml

@@ -1,27 +0,0 @@
-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/ObjectView.qml

@@ -1,238 +0,0 @@
-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/ObjectsTable.qml

@@ -1,191 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
-import Qt.labs.qmlmodels
-
-ColumnLayout
-{
-    property var availableFilters: [""]
-
-    anchors.fill: parent
-    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: "Interessent"
-                    text: qsTr("Interessent")
-                    selected: false
-                }
-                ListElement {
-                    name: "Kunde"
-                    text: qsTr("Kunde")
-                    selected: false
-                }
-                ListElement {
-                    name: "Lieferant"
-                    text: qsTr("Lieferant")
-                    selected: false
-                }
-                ListElement {
-                    name: "Erledigt"
-                    text: qsTr("Erledigt")
-                    selected: false
-                }
-            }
-        }
-        Button
-        {
-            id: addObjectBtn
-            icon.source: "qrc:/images/PlusCircle.svg"
-            text: qsTr("Objekt Hinzufügen")
-            Layout.alignment: Qt.AlignRight
-            onClicked: 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/OffersTable.qml

@@ -1,66 +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
-
-        }
-        QuickFilter {
-            model: ListModel {
-                ListElement {
-                    name: "Alle"
-                    selected: true
-                    text: qsTr("Alle")
-                }
-                ListElement {
-                    name: "Offen"
-                    selected: false
-                    text: qsTr("Offen")
-                }
-                ListElement {
-                    name: "Abgeschlossen"
-                    selected: false
-                    text: qsTr("Abgeschlossen")
-                }
-                ListElement {
-                    name: "Erledigt"
-                    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/PrinterDialog.qml

@@ -1,143 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-
-Window
-{
-    property alias printerDialog: printDialog
-    property var printers: null
-
-    id: printDialog
-    title: qsTr("PYQCRM - Drucker")
-    color: palette.base
-    minimumWidth: 300
-    maximumWidth: 600
-    minimumHeight: 150
-    maximumHeight: 150
-    ColumnLayout
-    {
-        spacing: 9
-        y: 15
-        implicitWidth: parent.width
-        RowLayout
-        {
-            Layout.fillWidth: true
-            Layout.leftMargin: 5
-            Layout.rightMargin: 5
-            Label
-            {
-                id: printersLabel
-                Layout.alignment: Qt.AlignRight
-                text: qsTr("Drucker")
-            }
-
-            ComboBox
-            {
-                id: allPrinters
-                model: printers
-                Layout.fillWidth: true
-            }
-        }
-
-        RowLayout
-        {
-            Layout.leftMargin: 5
-            Layout.rightMargin: 5
-            Layout.fillWidth: true
-
-            Label
-            {
-                Layout.minimumWidth: printersLabel.width
-                Layout.alignment: Qt.AlignRight
-                text: qsTr("Kopie")
-            }
-
-            SpinBox
-            {
-                id: copiesSpinBox
-                from: 1
-                to: 10
-                value: 1
-            }
-
-            Item
-            {
-                Layout.fillWidth: true
-            }
-        }
-
-        RowLayout
-        {
-            Layout.leftMargin: 5
-            Layout.rightMargin: 5
-            Layout.fillWidth: true
-            CheckBox
-            {
-                id: colorPrint
-                text: qsTr("Farbe")
-                Layout.minimumWidth: printersLabel.width
-            }
-
-            Item
-            {
-                Layout.fillWidth: true
-            }
-        }
-
-        RowLayout
-        {
-            Layout.leftMargin: 5
-            Layout.rightMargin: 5
-            Layout.fillWidth: true
-            Item
-            {
-                Layout.fillWidth: true
-            }
-
-            Button
-            {
-                id: printButton
-                text: qsTr("Drucken")
-                onClicked:
-                {
-                    var copies = copiesSpinBox.value > 1? copiesSpinBox.value + " copies": "one copy"
-                    console.log("Printing ", copies, " using ", allPrinters.currentText);
-                    printDialog.close();
-                }
-            }
-
-            Button
-            {
-                text: qsTr("Ablehnen")
-                onClicked: printDialog.close();
-            }
-        }
-
-        Item
-        {
-            Layout.fillHeight: true
-        }
-    }
-
-    onVisibleChanged:
-    {
-        copiesSpinBox.value = 1
-        colorPrint.checked = true
-        if (!sys_printers)
-        {
-            printers = sys_printers.getPrinters()
-            if (sys_printers.getDefaultPrinter())
-                allPrinters.currentIndex = allPrinters.indexOfValue(sys_printers.getDefaultPrinter())
-        }
-    }
-
-    Component.onCompleted:
-    {
-        if (sys_printers)
-        {
-            printers = sys_printers.getPrinters()
-            if (sys_printers.getDefaultPrinter())
-                allPrinters.currentIndex = allPrinters.indexOfValue(sys_printers.getDefaultPrinter())
-        }
-    }
-}

Gui/PyqcrmConf.qml

@@ -1,171 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-
-Item
-{
-    property alias companyConf: companyConf
-    property alias miscConf: miscConf
-    anchors.fill: parent
-    TabBar
-    {
-        id: bar
-        width: parent.width
-        TabButton
-        {
-            text: qsTr("Benutzer")
-        }
-        TabButton
-        {
-            text: qsTr("Datenbank")
-        }
-        TabButton
-        {
-            text: qsTr("Das Unternehmen")
-        }
-
-        TabButton
-        {
-            text: qsTr("Sicherung")
-        }
-
-        TabButton
-        {
-            text: qsTr("Sonstiges")
-        }
-    }
-
-    StackLayout
-    {
-        id: confContainer
-        anchors.fill: parent
-        currentIndex: bar.currentIndex
-        Item
-        {
-            id: userTab
-            UsersPage
-            {
-                id: usersPage
-                anchors.fill: parent
-            }
-        }
-        Item
-        {
-            id: dbTab
-            DbConfiguration
-            {
-                id: dbConf
-                anchors.fill: parent
-            }
-        }
-        Item
-        {
-            id: companyTab
-            CompanyConf
-            {
-                id: companyConf
-                anchors.fill: parent
-            }
-        }
-
-        Item
-        {
-            id: backup
-            BackupSettings
-            {
-                id: backupSettings
-                anchors.fill: parent
-            }
-        }
-
-        Item
-        {
-            id: miscelanea
-            MiscConf
-            {
-                id: miscConf
-                anchors.fill: parent
-            }
-        }
-    }
-
-    RowLayout
-    {
-        width: parent.width
-        anchors.bottom: parent.bottom
-        Item
-        {
-            Layout.fillWidth: true
-        }
-
-        Button
-        {
-            text: qsTr("Ablehnen")
-            onClicked: contentStack.pop()
-        }
-
-        Button
-        {
-            text: qsTr("Speichern")
-            onClicked:
-            {
-                switch (confContainer.currentIndex)
-                {
-                    case 1:
-                        updateDbConf()
-                        break
-
-                    case 2:
-                        updateCompanyInfo()
-                        break
-                    case 4:
-                        updateMiscConf()
-                        break
-                    default:
-                        console.log("Need to handle users")
-                }
-            }
-        }
-    }
-
-    function updateDbConf()
-    {
-        var db = {}
-        db['database'] = {}
-        db['database']['DB_HOST'] = dbConf.dbHost.text.trim()
-        db['database']['DB_PORT'] = dbConf.dbPort.text.trim()
-        db['database']['DB_NAME'] = dbConf.dbName.text.trim()
-        db['database']['DB_USER'] = dbConf.dbUserName.text.trim()
-        db['database']['DB_PASS'] = dbConf.dbPassword.text.trim()
-
-
-        if (db['database']['DB_HOST'] === '' || db['database']['DB_PORT'] === '' ||
-                db['database']['DB_NAME'] === '' || db['database']['DB_USER'] === '' ||
-                db['database']['DB_PASS'] === '');
-        else config.saveDbConf(db)
-    }
-
-    function updateCompanyInfo()
-    {
-        var company = {}
-        company['company'] = {}
-        company['company']['NAME'] = companyConf.name.text.trim()
-        company['company']['STREET'] = companyConf.street.text.trim()
-        company['company']['HOUSE'] = companyConf.house.text.trim()
-        company['company']['ZIPCODE'] = companyConf.zipcode.editText? companyConf.zipcode.editText.trim(): companyConf.zipcode.currentText
-        company['company']['CITY'] = companyConf.city.editText? companyConf.city.editText.trim(): companyConf.city.currentText
-
-        if (company['company']['NAME'] === '' || company['company']['STREET'] === '' ||
-                company['company']['HOUSE'] === '' || company['company']['ZIPCODE'] === '' ||
-                company['company']['CITY'] === '');
-        else config.saveCompanyInfo(company)
-    }
-
-    function updateMiscConf()
-    {
-        var misc = {}
-        misc['misc'] = {}
-        misc['misc']['SYSTRAY'] = miscConf.sysTray.checked
-        config.saveMiscConf(misc)
-    }
-}

Gui/ReadMe.qml

@@ -1,47 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-
-Window
-{
-    property alias readMeWin: readMeWin
-    id: readMeWin
-    width: 400
-    height: 300
-    title: "PYQCRM - README"
-    color: palette.base
-
-    ScrollView
-    {
-        anchors.fill: parent
-        TextArea
-        {
-            id: readMe
-            anchors.fill: parent
-            readOnly: true
-            wrapMode: TextArea.Wrap
-            color: "darksalmon"
-
-            Component.onCompleted:
-            {
-                var filePath = "qrc:/README";
-                var xhr = new XMLHttpRequest();
-                xhr.open("GET", filePath, true);
-                xhr.onreadystatechange = function() {
-                    if (xhr.readyState === XMLHttpRequest.DONE)
-                    {
-                        if (xhr.status === 200)
-                        {
-                            readMe.text = xhr.responseText;
-                        }
-                        else
-                        {
-                            readMe.text = qsTr("Datei nicht gefunden!");
-                        }
-                    }
-                };
-                xhr.send();
-            }
-        }
-    }
-}

Gui/SearchBar.qml

@@ -0,0 +1,82 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+
+RowLayout
+{
+    id: searchBar
+
+
+    TextField
+    {
+        id: searchField
+        placeholderText: qsTr("Suche")
+        leftPadding: 3
+        rightPadding: 3
+        Layout.preferredWidth: 300
+
+        Button
+        {
+            icon.source: "qrc:/images/search.svg"
+            icon.color: "olive"
+            x: parent.x + parent.width - width
+            height: parent.height
+            flat: true
+        }
+
+
+        Button
+        {
+            id: filterBtn
+            icon.source: "qrc:/images/filter.svg"
+            icon.color: "olive"
+            x: parent.x + parent.width
+            height: searchField.height
+            flat: true
+            onClicked: filterPopup.open()
+        }
+    }
+
+    Popup
+    {
+        id: filterPopup
+        x: filterBtn.x + filterBtn.width
+        y: filterBtn.y
+        width: 100
+        height: 150
+        modal: true
+        focus: true
+        closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent
+        contentItem: Item
+        {
+            ColumnLayout
+            {
+                anchors.fill: parent
+                //id: filterContent
+
+                Repeater
+                {
+                    model: availableFilters
+
+                    CheckBox
+                    {
+                        text: model.modelData
+                        onClicked:
+                        {
+                            setFilter(text, checkState)
+                        }
+                    }
+
+                }
+            }
+        }
+    }
+
+    function setFilter(filter,activated)
+    {
+        console.log(filter)
+        console.log(activated)
+
+    }
+}

Gui/TopBar.qml

@@ -0,0 +1,92 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+RowLayout
+{
+    id: topBar
+    spacing: 0
+    height: 35
+    width: parent.width
+    anchors
+    {
+        top: parent.top
+        left: parent.left
+
+
+    }
+
+    Button
+    {
+        id: dashBoard
+        flat: true
+        text: qsTr("Dashboard")
+        implicitWidth: dashBoard.implicitContentWidth + 10
+        onClicked:
+        {
+            appLoader.source = "Dashboard.qml"
+        }
+
+    }
+
+    Button
+    {
+        id: kunden
+        flat: true
+        text: qsTr("Kunden")
+        implicitWidth: kunden.implicitContentWidth + 10
+        onClicked:
+        {
+            // TODO: here we should call the model
+            appLoader.source = "CustomerTable.qml"
+        }
+    }
+
+    Button
+    {
+        id: objekt
+        flat: true
+        text: qsTr("Objekt")
+        implicitWidth: objekt.implicitContentWidth + 10
+
+    }
+
+    Button
+    {
+        id: mitarbeiter
+        flat: true
+        text: qsTr("Mitarbeiter")
+        implicitWidth: mitarbeiter.implicitContentWidth + 10
+        onClicked:
+        {
+            appLoader.source = "EmployeeTable.qml"
+        }
+    }
+
+    Button
+    {
+        id: abrechnung
+        flat: true
+        text: qsTr("Abrechnung")
+        implicitWidth: abrechnung.implicitContentWidth + 10
+    }
+
+    Item
+    {
+        id: hspacer
+        Layout.fillWidth: true
+    }
+
+    Button
+    {
+        id: atajos
+        icon.source: "qrc:/images/menu.svg"
+        icon.color: "red"
+        flat: true
+        Layout.rightMargin: 9
+
+
+    }
+
+}
+

Gui/UsersPage.qml

@@ -1,17 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
-
-Item
-{
-    property string name: "users"
-    anchors.fill: parent
-
-    Label
-    {
-        text: qsTr("Benutzer-Verwaltung")
-        anchors.centerIn: parent
-        font.pixelSize: 57
-        font.bold: true
-    }
-}

Gui/UtilityDialogs.qml

@@ -1,208 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import QtQuick.Dialogs
-import QtCore
-import "../js/qmldict.js" as JsLib
-
-Item
-{
-    id: utilityDialogs
-    property alias backup_config: backupConfig
-    property alias backup_encrypt_pw: recoveryPasswordDialog
-
-    property var recpass
-    property var configpass
-    Dialog
-    {
-
-        anchors.centerIn: parent
-        id: backupConfig
-        title: "Backup Config"
-        standardButtons: Dialog.Apply | Dialog.Cancel
-
-        onApplied:
-        {
-
-            if (configPwd.text === repeatConfigPwd.text)
-            {
-                configpass = repeatConfigPwd.text
-                saveConfigFile.open()
-            }
-            else
-            {
-                configPwd.text = ""
-                configPwd.placeholderText = qsTr("Passwort stimmt nicht überein")
-                configPwd.placeholderTextColor = "red"
-                repeatConfigPwd.placeholderText = qsTr("")
-                repeatConfigPwd.text = ""
-            }
-        }
-            onRejected: resetRecoveryConfigDialog()
-        GridLayout
-        {
-            id: gridPw
-            columns: 2
-            Label
-            {
-                text: qsTr("Passwort eingeben")
-            }
-            TextField
-            {
-
-                id: configPwd
-                placeholderText: qsTr("Sicherungspasswort festlegen")
-                echoMode: TextInput.Password
-                implicitWidth: 300
-            }
-            Label
-            {
-                text: qsTr("Passwort wiederholen")
-            }
-            TextField
-            {
-                property string name: "password"
-                id: repeatConfigPwd
-                placeholderText: qsTr("Sicherungspasswort wiederholen")
-                echoMode: TextInput.Password
-                implicitWidth: 300
-            }
-
-        }
-
-    }
-
-    FileDialog
-    {
-            id: saveConfigFile
-            fileMode: FileDialog.SaveFile
-            nameFilters: ["PYQCRM Recovery files (*.pyqrec)"]
-            currentFolder: StandardPaths.standardLocations(StandardPaths.DocumentsLocation)[0]
-            onAccepted:
-            {
-                config.backupConfig(saveConfigFile.currentFile, configpass)
-            }
-            onRejected:
-            {
-                backupConfig.close()
-                resetRecoveryConfigDialog()
-            }
-    }
-
-    MessageDialog
-    {
-        id: recoveryDialog
-
-        text: qsTr("Diesen Wiederherstellungscode musst du sicher aufbewahren!\nMöchtest du das jetzt machen?")
-        title: qsTr("Wiederherstellen")
-        buttons: MessageDialog.Yes | MessageDialog.No
-        onAccepted: recoveryPasswordDialog.open()
-        onRejected: contentStack.replace("LoginSreen.qml")
-    }
-
-    MessageDialog
-    {
-        id: conErrDialog
-        text: qsTr("Datenbankverbindung fehlgeschlagen")
-        title: qsTr("Datenbank Verbindung")
-    }
-
-    Dialog
-    {
-
-        id: recoveryPasswordDialog
-        modal: true
-        title: qsTr("Wiederherstellung")
-        anchors.centerIn: parent
-        standardButtons: Dialog.Apply | Dialog.Cancel
-        onApplied:
-        {
-            if (recoveryPasswordInput.text === repeatRecoveryPasswordInput.text)
-            {
-                recpass = recoveryPasswordInput.text
-                saveRecoveryDialog.open()
-            }
-            else
-            {
-                recoveryPasswordInput.text = ""
-                recoveryPasswordInput.placeholderText = qsTr("Passwort stimmt nicht überein")
-                recoveryPasswordInput.placeholderTextColor = "red"
-                repeatRecoveryPasswordInput.placeholderText = qsTr("")
-                repeatRecoveryPasswordInput.text = ""
-            }
-        }
-
-        onClosed: resetRecoveryPwDialog()
-
-        ColumnLayout
-        {
-            GridLayout
-            {
-                columns: 2
-                Label
-                {
-                    text: qsTr("Wiederherstellungspasswort festlegen: ")
-                }
-
-                TextField
-                {
-                    id: recoveryPasswordInput
-                    text: ""
-                    echoMode: TextInput.Password
-                    implicitWidth: 300
-                    placeholderText: qsTr("Hier Wiederherstellungspasswort eingeben")
-                }
-                Label
-                {
-                    text: qsTr("Wiederherstellungspasswort wiederholen: ")
-                }
-
-                TextField
-                {
-                    id: repeatRecoveryPasswordInput
-                    text: ""
-                    echoMode: TextInput.Password
-                    implicitWidth: 300
-                    placeholderText: qsTr("Hier Wiederherstellungspasswort wiederholen")
-                }
-            }
-        }
-    }
-
-    FileDialog
-    {
-        id: saveRecoveryDialog
-        title: qsTr("Wiederherstellungsdatei")
-        fileMode: FileDialog.SaveFile
-        nameFilters: ["PYQCRM Recovery files (*.pyqrec)"]
-        currentFolder: StandardPaths.standardLocations(StandardPaths.DocumentsLocation)[0]
-        onAccepted:
-        {
-            config.backupEncryptkey(saveRecoveryDialog.currentFile, recpass)
-        }
-
-        onRejected:
-        {
-            recoveryPasswordDialog.close()
-            resetRecoveryPwDialog()
-        }
-    }
-
-    function resetRecoveryPwDialog()
-    {
-        recoveryPasswordInput.text = ""
-        recoveryPasswordInput.placeholderText = qsTr("Hier Wiederherstellungspasswort eingeben")
-        recoveryPasswordInput.placeholderTextColor = repeatRecoveryPasswordInput.placeholderTextColor
-        repeatRecoveryPasswordInput.text = ""
-        repeatRecoveryPasswordInput.placeholderText = qsTr("Hier Wiederherstellungspasswort wiederholen")
-    }
-
-    function resetRecoveryConfigDialog()
-    {
-        configPwd.text = ""
-        configPwd.placeholderText = qsTr("Hier Wiederherstellungspasswort eingeben")
-        configPwd.placeholderTextColor = repeatConfigPwd.placeholderTextColor
-        repeatConfigPwd.text = ""
-        repeatConfigPwd.placeholderText = qsTr("Hier Wiederherstellungspasswort wiederholen")
-    }
-}

Gui/firststart.qml

@@ -7,14 +7,11 @@ import QtCore
 import "../js/qmldict.js" as Qmldict
 
 
-
 Item
 {
     property string recpass: ""
     property bool adminAvailable: true
 
-
-    id: firstStartItem
     anchors.fill: parent
     StackView
     {
@@ -73,11 +70,12 @@ Item
     MessageDialog
     {
         id: recoveryDialog
+
         text: qsTr("Diesen Wiederherstellungscode musst du sicher aufbewahren!\nMöchtest du das jetzt machen?")
         title: qsTr("Wiederherstellen")
         buttons: MessageDialog.Yes | MessageDialog.No
         onAccepted: recoveryPaswordDialog.open()
-        onRejected: contentStack.replace("LoginSreen.qml")
+        onRejected: gotoLogin()
     }
 
     MessageDialog
@@ -89,7 +87,6 @@ Item
 
     Dialog
     {
-
         id: recoveryPaswordDialog
         modal: true
         title: qsTr("Wiederherstellung")
@@ -118,19 +115,6 @@ Item
                     implicitWidth: 300
                     placeholderText: qsTr("Hier Wiederherstellungspasswort eingeben")
                 }
-                Label
-                {
-                    text: qsTr("Wiederherstellungspasswort eingeben: ")
-                }
-
-                TextField
-                {
-                    id: repeatRecoveryPaswordInput
-                    text: ""
-                    echoMode: TextInput.Password
-                    implicitWidth: 300
-                    placeholderText: qsTr("Hier Wiederherstellungspasswort eingeben")
-                }
             }
         }
     }
@@ -147,7 +131,7 @@ Item
             if (!adminAvailable) config.saveRecoveryKey(saveRecoveryDialog.currentFile, recpass)
             else config.getRecoveryKey(saveRecoveryDialog.currentFile, recpass)
 
-            contentStack.replace("LoginSreen.qml")
+            gotoLogin()
         }
 
         onRejected:
@@ -156,12 +140,6 @@ Item
         }
     }
 
-    Loader
-    {
-        id: utilityDialogs
-        source: "UtilityDialogs.qml"
-    }
-
     Component.onCompleted:
     {
         config.dbConnectionError.connect(onDbConnectionError)
@@ -169,10 +147,15 @@ Item
         config.backupEncryptionKey.connect(onBackupEncryptionKey)
     }
 
+    function gotoLogin()
+    {
+        appLoader.source= "LoginScreen.qml"
+        topBar.visible = true
+    }
+
     function onBackupEncryptionKey()
     {
-
+        recoveryDialog.open()
-        utilityDialogs.item.recoveryDialog.open()
     }
 
     function onDbConnectionError(msg, success)
@@ -193,4 +176,5 @@ Item
             firstStart.push("AdminUserConfig.qml")
         }
     }
+
 }

Gui/main.qml

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

Gui/qmldir

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

LICENSE

@@ -1 +0,0 @@
-Nicht zu verwenden ohne Zahlung!

README

@@ -1,54 +0,0 @@
-                                        PYQCRM - Python QtQuick CRM System
-
-Einleitung:
-----------------
-
-PYQCRM entstand als Teil einer Abschlusspraxis und dem Bedarf der TERO GmbH an einem Managementprogramm für den internen Gebrauch.
-
-
-Erstellung:
-----------------
-
-Das Program wurde mit den folgenen Techologien entwickelt:
-
-- IDE: Qt-Creator 6.8.x
-- Framework: QtQuick - QML 6.8.x
-- Sprache: Python 3.13.x
-- Datenbank: MariaDB 10.11.x
-- Sonstiges: JavaScript
-
-
-Installation:
-------------------
-
-Möglicherweise ist für deine Plattform ein Installationspaket verfügbar. Prüfe es also zuerst.
-
-Es gibt zwei möglichkeiten das Program zu verwenden:
-
-Möglichkeit I:
-
-1. Datenbank einrichten (MaraiDB SQL-Schema verfügbar)
-2. Python installiert und eingerichtet
-3. Das Program in einen bevorzugten Pfad kopieren.
-4. Erstelle einen Link zum main.py-Skript und stelle ihn so ein, dass er mit deinem Python-Interpreter ausgeführt wird
-
-Möglichkeit II:
-
-1. Datenbank einrichten (MaraiDB SQL-Schema verfügbar)
-2. Die ausführbare Version des Programs in einen bevorzugten Pfad kopieren
-3. Erstelle einen Link zur ausführbaren Datei, die für dein System erstellt wurde (pyqcrm/pyqcrm.exe)
-
-
-Kudos:
-----------
-
-Wenn dir dieses Kunstwerk gefällt, kannst du uns deine Wertschätzung einfach dadurch zeigen, dass du jedem von uns einen Bungalow, einen 760IL BMW, lebenslange Flugtickets inklusive Begleitung kaufst und als Geschenk ein paar Millionen Euro auf ein Schweizer Bankkonto überweist.
-
-
-Team:
----------
-
-Marcopolo
-Schnacke
-Renegade
-

TeroStyle/BarButton.qml

@@ -1,61 +0,0 @@
-import QtQuick
-import QtQuick.Controls.impl
-import QtQuick.Controls
-import QtQuick.Templates as T
-
-T.ToolButton {
-    id: control
-
-    property string target
-
-    checkable: true
-    icon.color: Colors.foreground
-    icon.height: 36
-    icon.width: 36
-    implicitHeight: 90
-    implicitWidth: 100
-    topPadding: 20
-
-    contentItem: Column {
-        readonly property color color: control.checked ? Colors.primaryShade : control.hovered ? Colors.primary : Colors.foreground
-
-        IconLabel {
-            color: parent.color
-            icon.color: parent.color
-            icon.height: control.icon.height
-            icon.source: control.icon.source
-            icon.width: control.icon.width
-            x: parent.width * .5 - width * .5
-        }
-        Label {
-            color: parent.color
-            font: Typography.smaller
-            text: control.text
-            x: parent.width * .5 - width * .5
-        }
-    }
-
-    Rectangle {
-        anchors.bottom: parent.bottom
-        anchors.left: parent.left
-        anchors.top: parent.top
-        color: control.checked ? Colors.primaryShade : Colors.primary
-        implicitWidth: 6
-        visible: control.checked || control.hovered
-    }
-    MouseArea {
-        id: mouseArea
-
-        anchors.fill: parent
-        cursorShape: Qt.PointingHandCursor
-
-        onPressed: mouse => mouse.accepted = false
-    }
-
-    onClicked: {
-        if(!target) {
-            return
-        }
-        contentStack.replace(target)
-    }
-}

TeroStyle/Button.qml

@@ -1,69 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls.impl as I
-import QtQuick.Templates as T
-
-T.Button {
-    id: control
-
-    /**
-     * Set true when the button is supposed to be displayed in e.g. a TextField.
-     * You want to do this when this button is directly related to the TextField
-     * and the primary and only action for the TextField.
-     * Usually, you'd only want to display an icon in this button.
-     * If true, automatically sets height, width and position.
-     *
-     * ```qml
-     * TextField {
-     *   placeholderText: "Search..."
-     *   Button {
-     *     icon.source: "qrc:/images/MagnifyingGlass.svg"
-     *     isFieldButton: true
-     *   }
-     * }
-     * ```
-     */
-    property bool isFieldButton: false
-
-
-    height: isFieldButton ? parent.height : null
-    icon.color: Colors.primaryContrast
-    icon.height: 21
-    icon.width: 21
-    implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, implicitContentHeight + topPadding + bottomPadding)
-    implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, implicitContentWidth + leftPadding + rightPadding)
-    /**
-     * Icon is slightly larger than Text, so we need to reduce the padding a
-     * tiny bit to make sure all Buttons are still the same height.
-     */
-    padding: Dimensions.m - (icon.source.toString() === "" ? 0 : 1)
-    x: isFieldButton ? parent.x + parent.width - width : null
-
-    background: Rectangle {
-        anchors.fill: parent
-        border.color: Colors.interactive
-        border.width: isFieldButton ? 1 : 0
-        bottomLeftRadius: topLeftRadius
-        color: !control.enabled ? Colors.disabled : !control.hovered ? Colors.primary : Colors.primaryLighter
-        radius: Dimensions.radius
-        topLeftRadius: isFieldButton ? 0 : radius
-    }
-    contentItem: I.IconLabel {
-        color: !control.enabled ? Colors.disabledForeground : Colors.primaryContrast
-        display: control.display
-        font: control.font
-        icon: control.icon
-        mirrored: control.mirrored
-        spacing: Dimensions.s
-        text: control.text
-    }
-
-    MouseArea {
-        id: mouseArea
-
-        anchors.fill: parent
-        cursorShape: Qt.PointingHandCursor
-
-        onPressed: mouse => mouse.accepted = false
-    }
-}

TeroStyle/Colors.qml

@@ -1,26 +0,0 @@
-pragma Singleton
-
-import QtQuick
-
-QtObject {
-    readonly property int dark: 0
-    readonly property int light: 1
-
-    property int theme: Application.styleHints.colorScheme === Qt.ColorScheme.Light ? light : dark
-
-    readonly property color primary: "#b81a34"
-    readonly property color primaryContrast: "#fdfdfd"
-    readonly property color primaryLighter: Qt.lighter(primary, 1.5)
-    readonly property color primaryShade: theme === dark ? primaryLighter : Qt.darker(primary, 1.5)
-    readonly property color primaryHighlight: theme === dark ? Qt.darker(primary, 2- Colors.highlightOpacity) : Qt.lighter(primary, 2- Colors.highlightOpacity)
-    readonly property color foreground: theme === dark ? "#fdfdfd" : "#110b0c"
-    readonly property color background: theme === dark ? "#303136" : "#eff1f5"
-    readonly property color mantle: theme === dark ? "#1E1E23" : "#e7e9ef"
-    readonly property color interactive: theme === dark ? "#878b97" : "#d9d9da"
-    readonly property color error: theme === dark ? "#ff2264" : "#ff004b"
-    readonly property color disabled: theme === dark ? Qt.darker(interactive, 1.9) : Qt.darker(interactive, 1.3)
-    readonly property color disabledForeground: theme === dark ? Qt.darker(foreground, 1.4) : Qt.lighter(foreground, 1.9)
-    readonly property color transparent: "transparent"
-
-    readonly property double highlightOpacity: .3
-}

TeroStyle/ComboBox.qml

@@ -1,108 +0,0 @@
-import QtQuick
-import QtQuick.Templates as T
-import QtQuick.Controls
-import QtQuick.Controls.impl
-
-T.ComboBox {
-    id: control
-
-    font: Typography.body
-    implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-                             implicitContentHeight + topPadding + bottomPadding,
-                             implicitIndicatorHeight + topPadding + bottomPadding)
-
-
-    contentItem: T.TextField {
-        id: test
-        autoScroll: control.editable
-        color: Colors.foreground
-        enabled: control.editable
-
-        font: Typography.body
-        implicitHeight: Typography.body.pixelSize + topPadding + bottomPadding
-        inputMethodHints: control.inputMethodHints
-        padding: Dimensions.m
-        readOnly: control.down
-        selectByMouse: control.selectTextByMouse
-        text: control.editable ? control.editText : control.displayText
-        validator: control.validator
-        width: control.width - indicator.width
-        verticalAlignment: Text.AlignVCenter
-    }
-    background: Rectangle {
-        border.color: Colors.interactive
-        border.width: 1
-        color: Colors.mantle
-        radius: Dimensions.radius
-        width: parent.width
-    }
-
-    delegate: ItemDelegate {
-        required property var model
-        required property int index
-
-        width: ListView.view.width
-        text: model[control.textRole]
-        highlighted: control.highlightedIndex === index
-        hoverEnabled: control.hoverEnabled
-    }
-    indicator: Rectangle {
-        id: indicator
-
-        border.color: Colors.interactive
-        bottomRightRadius: Dimensions.radius
-        color: Colors.primary
-        height: control.height
-        topRightRadius: Dimensions.radius
-        width: 20 + Dimensions.s * 2
-        x: control.width - width
-        y: 0
-        z: 2
-
-        IconLabel {
-            anchors.fill: parent
-            bottomPadding: Dimensions.s
-            icon.color: Colors.foreground
-            icon.source: "qrc:/images/ChevronDown.svg"
-            leftPadding: Dimensions.s
-            rightPadding: Dimensions.s
-            topPadding: Dimensions.s
-        }
-        MouseArea {
-            anchors.fill: parent
-            cursorShape: Qt.PointingHandCursor
-
-            onPressed: () => {
-                control.popup.visible = true;
-                control.popup.forceActiveFocus()
-            }
-        }
-    }
-    popup: T.Popup {
-        bottomMargin: 6
-        height: Math.min(contentItem.implicitHeight + 2, control.Window.height - topMargin - bottomMargin)
-        padding: 1
-        topMargin: 6
-        width: control.width
-        y: control.height
-
-        background: Rectangle {
-            border.color: Colors.interactive
-            color: Colors.mantle
-            radius: Dimensions.radius
-        }
-        contentItem: ListView {
-            clip: true
-            currentIndex: control.highlightedIndex
-            implicitHeight: contentHeight
-            model: control.popup.visible ? control.delegateModel : null
-
-            T.ScrollBar.vertical: ScrollBar {
-            }
-            highlight: Rectangle {
-                color: Colors.primary
-                opacity: Colors.highlightOpacity
-            }
-        }
-    }
-}

TeroStyle/Dimensions.qml

@@ -1,26 +0,0 @@
-pragma Singleton
-
-import QtQuick
-
-QtObject
-{
-    /**
-     * Distance for objects that are tied to each other,
-     * e.g. a field and its label.
-     */
-    readonly property int s: 9
-
-    /**
-     * Distance for objects that are grouped together, e.g. radio buttons of the
-     * same radio group.
-     */
-    readonly property int m: 15
-
-    /**
-     * Distance for objects that are not related to each other, or to objects
-     * and their container.
-     */
-    readonly property int l: 30
-
-    readonly property int radius: 4
-}

TeroStyle/EmailAddressValidator.qml

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

TeroStyle/Field.qml

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

TeroStyle/H1.qml

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

TeroStyle/H2.qml

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

TeroStyle/Label.qml

@@ -1,5 +0,0 @@
-import QtQuick.Controls
-
-Label {
-    color: Colors.foreground
-}

TeroStyle/NotEmptyValidator.qml

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

TeroStyle/OptionalEmailAddressValidator.qml

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

TeroStyle/OptionalPhoneNumberValidator.qml

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

TeroStyle/PhoneNumberValidator.qml

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

TeroStyle/PostcodeValidator.qml

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

TeroStyle/QuickFilter.qml

@@ -1,64 +0,0 @@
-import QtQuick
-import QtCore
-import QtQuick.Layouts
-
-RowLayout {
-    id: root
-
-    required property ListModel model
-
-    signal selectedChanged(string name)
-
-    spacing: Dimensions.m
-
-    Repeater {
-        model: root.model
-
-        Item {
-            id: item
-
-            required property int index
-            required property var modelData
-            property bool hovered: false
-            property real padding: Dimensions.m
-
-            height: text.height + padding * 2
-            width: text.width + padding * 2
-
-            Rectangle {
-                anchors.fill: parent
-                border.color: modelData.selected ? Colors.transparent : Colors.foreground
-                border.width: 2
-                color: modelData.selected || mouseArea.containsMouse ? Colors.primary : Colors.transparent
-                radius: parent.height
-            }
-            Text {
-                id: text
-
-                color: Colors.foreground
-                font: Typography.body
-                text: modelData.text
-                x: parent.padding
-                y: parent.padding
-            }
-            MouseArea {
-                id: mouseArea
-
-                hoverEnabled: true
-                anchors.fill: parent
-                cursorShape: Qt.PointingHandCursor
-
-                onPressed: {
-                    if (item.modelData.selected)
-                        return;
-                    const model = root.model;
-                    for (let i = 0; i < model.count; i++) {
-                        model.setProperty(i, "selected", false);
-                    }
-                    model.setProperty(item.index, "selected", true);
-                    selectedChanged(item.modelData.name)
-                }
-            }
-        }
-    }
-}

TeroStyle/SearchBar.qml

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

TeroStyle/TextField.qml

@@ -1,47 +0,0 @@
-import QtQuick
-import QtQuick.Templates as T
-
-T.TextField
-{
-    id: control
-
-    background: Rectangle
-    {
-        id: background
-        color: Colors.mantle
-        radius: Dimensions.radius
-        border.width: !control.focus ? 1 : 2
-        border.color: Colors.interactive
-        height: control.implicitHeight
-    }
-
-    color: Colors.foreground
-    implicitHeight: Typography.body.pixelSize + topPadding + bottomPadding
-    placeholderTextColor: Colors.interactive
-    font: Typography.body
-    padding: Dimensions.m
-
-    verticalAlignment: Text.AlignVCenter
-
-
-
-
-    /**
-     * Placeholder
-     */
-    Text {
-        x: control.leftPadding
-        y: control.topPadding
-        width: control.width - (control.leftPadding + control.rightPadding)
-        height: control.height - (control.topPadding + control.bottomPadding)
-
-        font: control.font
-        text: control.placeholderText
-        color: control.placeholderTextColor
-        verticalAlignment: control.verticalAlignment
-        visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter)
-        elide: Text.ElideRight
-        renderType: control.renderType
-    }
-}
-

TeroStyle/Typography.qml

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

TeroStyle/qmldir

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

Tero_CRM_Reinigungsunternehmen.txt

@@ -1,88 +0,0 @@
-CRM für Objektbetreuung Reinigungsservice
-
-
-Minimal Voraussetzung:
-
-
-Mitarbeiter
-- Dokumenten Management System (DMS)
-- Arbeitszeitdokumentation
-- Urlaubsplaner
-- Arbeitnehmer anlegen
-
-Nice To Have:
-- WhatsApp
-- Telefon
-- Social Media Uploader
-Dokumentenvorlagen
-
-
-
-Kunden
-- Kunden anlegen (Hausverwaltung Krefeld)
-- Dokumenten Management System (DMS)
-- Ansprechpartner anlegen
-RG auch in CC Funktion
-
-Nice To Have:
-Dokumentenvorlagen
-
-
-
-
-Dashboard
-
-
-
-Abrechnung
-- Rechnung schreiben (Zugferd Modus)
-- Fixkostenerfassung
-Rechnungsarchiv
-Mahnfunktion
-
-
-Objekt
-- Objekt anlegen
-- Ansprechpartner anlegen
-- Dokumenten Management System (DMS)
-Str. (Pflicht)
-Hausnummer (Pflicht)
-PLZ
-Ort (Pflicht)
-Parteien (Anzahl)
-Stockwerke (Anzahl)
-Zwischenetage (ja/nein)
-Aufzug (ja/nein)
-Fenster (ja/nein) anschließend Anzahl + ohne Leiter erreichbar (ja/nein)
-Besonderheiten (Infofeld)
-Kontaktdaten Hausmeister / Beirat
-Reinigungsmittel zu finden? ( Wo ist es im Kellerraum, Dachgeschoss, 2 Tür von links?)
-Foto Upload wäre toll ;-)
-
-Leistungen
-Treppenhausreinigung
-Garten
-siehe Homepage !!!
-
-
-
-
-Angebot
-
-
-Auftrag
-- Arbeitsauftrag anlegen
-Pflegehinweise zum Objekt
-BG Sicherheitsdatenblätter
-Reinigungsmittel erhalten am ?
-Preis ab Datum
-Objektkontrolle (Wann wurde das Objekt das letzte Mal kontrolliert?) Ähnlich wie Preis mit Datum
-Preise
-Schlüssel
-
-
-Auswertung
-Stundenkalender
-
-
-

backup.pyqrec

@@ -1 +0,0 @@
-zIgY4d8ORJ0HZpG7y8/XeS84mKHFcvNaMmCxdirT6ebjApHlo5XVXspy3ENIEvrZczSDRugR0sAVVt8StqZ2gGAr42tIwFF9Uwl7YBMi72+iGIkwyIGX/Jw3OiHYubkXEooZLYX1MYPOC91ppVnZG0PA0IYdpDofq5inFfxpPBwMdcJxvtZPLhIX2y7Fn3m1/lsWe+e2EBwDGxnZjUjPMsRFMjswBv20EOHk46OuNFwlDyn+w9ZDoJfhF6HKYqNxnBnN90KEUygTYGWk.nfaytDW7Z0Nn2/5d22/ciQ==

doc/Klassendiagramm.drawio

@@ -1,11 +1,11 @@
-<mxfile host="Electron" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/25.0.2 Chrome/128.0.6613.186 Electron/32.2.5 Safari/537.36" version="25.0.2">
+<mxfile host="Electron" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/24.7.17 Chrome/128.0.6613.36 Electron/32.0.1 Safari/537.36" version="24.7.17">
   <diagram id="C5RBs43oDa-KdzZeNtuy" name="Page-1">
-    <mxGraphModel dx="2963" dy="1707" 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">
+    <mxGraphModel dx="1434" dy="844" 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="WIyWlLk6GJQsqaUBKTNV-0" />
         <mxCell id="WIyWlLk6GJQsqaUBKTNV-1" parent="WIyWlLk6GJQsqaUBKTNV-0" />
         <mxCell id="_OjnZrDktrtFcgEA-KSX-13" value="Databasemanager" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="20" y="340" width="170" height="90" as="geometry" />
+          <mxGeometry x="50" y="40" width="170" height="90" as="geometry" />
         </mxCell>
         <mxCell id="_OjnZrDktrtFcgEA-KSX-14" value="&lt;div&gt;- connection&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="_OjnZrDktrtFcgEA-KSX-13" vertex="1">
           <mxGeometry y="26" width="170" height="24" as="geometry" />
@@ -16,17 +16,32 @@
         <mxCell id="_OjnZrDktrtFcgEA-KSX-16" value="+ instance(): connection" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="_OjnZrDktrtFcgEA-KSX-13" vertex="1">
           <mxGeometry y="58" width="170" height="32" as="geometry" />
         </mxCell>
+        <mxCell id="_OjnZrDktrtFcgEA-KSX-38" value="BusinessDao" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="50" y="240" width="160" height="166" as="geometry" />
+        </mxCell>
+        <mxCell id="_OjnZrDktrtFcgEA-KSX-42" value="" style="line;strokeWidth=1;fillColor=none;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;strokeColor=inherit;" parent="_OjnZrDktrtFcgEA-KSX-38" vertex="1">
+          <mxGeometry y="26" width="160" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="_OjnZrDktrtFcgEA-KSX-41" value="&lt;div&gt;&lt;span style=&quot;background-color: initial;&quot;&gt;+ getBusiness()&lt;/span&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;span style=&quot;background-color: initial;&quot;&gt;+ addBusiness()&lt;/span&gt;&lt;/div&gt;&lt;div&gt;+ updateBusiness()&lt;/div&gt;&lt;div&gt;+ delBusiness()&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="_OjnZrDktrtFcgEA-KSX-38" vertex="1">
+          <mxGeometry y="66" width="160" height="100" as="geometry" />
+        </mxCell>
         <mxCell id="_OjnZrDktrtFcgEA-KSX-43" value="BusinessModel" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="240" y="40" width="160" height="270" as="geometry" />
+          <mxGeometry x="280" y="150" width="160" height="170" as="geometry" />
         </mxCell>
         <mxCell id="_OjnZrDktrtFcgEA-KSX-45" value="" style="line;strokeWidth=1;fillColor=none;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;strokeColor=inherit;connectable=1;allowArrows=1;recursiveResize=1;expand=0;" parent="_OjnZrDktrtFcgEA-KSX-43" vertex="1">
           <mxGeometry y="26" width="160" height="54" as="geometry" />
         </mxCell>
-        <mxCell id="_OjnZrDktrtFcgEA-KSX-46" value="- getData()&lt;div&gt;- getBusinessInfo()&lt;br&gt;&lt;div&gt;+ rowCount()&lt;/div&gt;&lt;div&gt;+ columnCount()&lt;/div&gt;&lt;div&gt;+ Data()&lt;/div&gt;&lt;div&gt;+ headerData()&lt;/div&gt;&lt;/div&gt;&lt;div&gt;+ onRowClicked()&lt;/div&gt;&lt;div&gt;+ viewCriterion()&lt;/div&gt;&lt;div&gt;+ addBusiness()&lt;/div&gt;&lt;div&gt;-&amp;nbsp; refreshView()&lt;/div&gt;&lt;div&gt;+ setContact()&lt;/div&gt;&lt;div&gt;+ updateTable()&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="_OjnZrDktrtFcgEA-KSX-43" vertex="1">
+        <mxCell id="_OjnZrDktrtFcgEA-KSX-46" value="- getData()&lt;div&gt;+ rowCount()&lt;/div&gt;&lt;div&gt;+ columnCount()&lt;/div&gt;&lt;div&gt;+ Data()&lt;/div&gt;&lt;div&gt;+ headerData()&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="_OjnZrDktrtFcgEA-KSX-43" vertex="1">
-          <mxGeometry y="80" width="160" height="190" as="geometry" />
+          <mxGeometry y="80" width="160" height="90" as="geometry" />
+        </mxCell>
+        <mxCell id="_OjnZrDktrtFcgEA-KSX-50" value="" style="endArrow=none;html=1;rounded=0;entryX=0.435;entryY=1.063;entryDx=0;entryDy=0;exitX=0.463;exitY=-0.027;exitDx=0;exitDy=0;exitPerimeter=0;entryPerimeter=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="_OjnZrDktrtFcgEA-KSX-38" target="_OjnZrDktrtFcgEA-KSX-16" edge="1">
+          <mxGeometry width="50" height="50" relative="1" as="geometry">
+            <mxPoint x="390" y="460" as="sourcePoint" />
+            <mxPoint x="440" y="410" as="targetPoint" />
+          </mxGeometry>
         </mxCell>
         <mxCell id="xjCWurhqpCHEkLAYqff9-0" value="PermissionDao" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="1200" y="540" width="180" height="220" as="geometry" />
+          <mxGeometry x="1330" y="50" width="180" height="220" as="geometry" />
         </mxCell>
         <mxCell id="xjCWurhqpCHEkLAYqff9-1" value="&lt;div&gt;- id : int&lt;/div&gt;&lt;div&gt;- description : string&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="xjCWurhqpCHEkLAYqff9-0" vertex="1">
           <mxGeometry y="26" width="180" height="64" as="geometry" />
@@ -37,450 +52,70 @@
         <mxCell id="xjCWurhqpCHEkLAYqff9-3" value="&lt;div&gt;+ getPermissions(User)&lt;/div&gt;&lt;div&gt;+ getPermission()&lt;/div&gt;&lt;div&gt;+ grantPermission()&lt;/div&gt;&lt;div&gt;+ setPermission()&lt;/div&gt;&lt;div&gt;+ revokePermission()&lt;/div&gt;&lt;div&gt;+ savePermission()&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="xjCWurhqpCHEkLAYqff9-0" vertex="1">
           <mxGeometry y="98" width="180" height="122" as="geometry" />
         </mxCell>
-        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-12" value="User" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-12" value="User" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
-          <mxGeometry x="870" y="540" width="280" height="270" as="geometry" />
+          <mxGeometry x="827" y="50" width="280" height="270" as="geometry" />
         </mxCell>
-        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-13" value="- username : string&lt;div&gt;- password : string&lt;/div&gt;&lt;div&gt;- roleids : roleenum [ ]&lt;/div&gt;&lt;div&gt;- gecos : string&lt;/div&gt;&lt;div&gt;- enabled : bool&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="Yrs2Ar6oVTmmq3gZQ8Z4-12" vertex="1">
+        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-13" value="- username : string&lt;div&gt;- password : string&lt;/div&gt;&lt;div&gt;- roleids : roleenum [ ]&lt;/div&gt;&lt;div&gt;- gecos : string&lt;/div&gt;&lt;div&gt;- enabled : bool&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" vertex="1" parent="Yrs2Ar6oVTmmq3gZQ8Z4-12">
           <mxGeometry y="26" width="280" height="84" as="geometry" />
         </mxCell>
-        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-14" value="" style="line;strokeWidth=1;fillColor=none;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;strokeColor=inherit;" parent="Yrs2Ar6oVTmmq3gZQ8Z4-12" vertex="1">
+        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-14" value="" style="line;strokeWidth=1;fillColor=none;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;strokeColor=inherit;" vertex="1" parent="Yrs2Ar6oVTmmq3gZQ8Z4-12">
           <mxGeometry y="110" width="280" height="8" as="geometry" />
         </mxCell>
-        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-15" value="+ getRole()&lt;div&gt;+ setRole()&lt;/div&gt;&lt;div&gt;+changePassword(oldpassword, newpassword)&lt;/div&gt;&lt;div&gt;+ getUsername()&lt;/div&gt;&lt;div&gt;+ getPassword()&lt;/div&gt;&lt;div&gt;+ getGecos()&lt;/div&gt;&lt;div&gt;(+ createRole(superuser, admin)????&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="Yrs2Ar6oVTmmq3gZQ8Z4-12" vertex="1">
+        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-15" value="+ getRole()&lt;div&gt;+ setRole()&lt;/div&gt;&lt;div&gt;+changePassword(oldpassword, newpassword)&lt;/div&gt;&lt;div&gt;+ getUsername()&lt;/div&gt;&lt;div&gt;+ getPassword()&lt;/div&gt;&lt;div&gt;+ getGecos()&lt;/div&gt;&lt;div&gt;(+ createRole(superuser, admin)????&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" vertex="1" parent="Yrs2Ar6oVTmmq3gZQ8Z4-12">
           <mxGeometry y="118" width="280" height="152" as="geometry" />
         </mxCell>
-        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-18" value="UserRoles" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-18" value="UserRoles" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
-          <mxGeometry x="1420" y="830" width="160" height="220" as="geometry" />
+          <mxGeometry x="450" y="475" width="160" height="220" as="geometry" />
         </mxCell>
-        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-19" value="+ userrole : Role[ ]" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="Yrs2Ar6oVTmmq3gZQ8Z4-18" vertex="1">
+        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-19" value="+ userrole : Role[ ]" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" vertex="1" parent="Yrs2Ar6oVTmmq3gZQ8Z4-18">
           <mxGeometry y="26" width="160" height="44" as="geometry" />
         </mxCell>
-        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-20" value="" style="line;strokeWidth=1;fillColor=none;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;strokeColor=inherit;" parent="Yrs2Ar6oVTmmq3gZQ8Z4-18" vertex="1">
+        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-20" value="" style="line;strokeWidth=1;fillColor=none;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;strokeColor=inherit;" vertex="1" parent="Yrs2Ar6oVTmmq3gZQ8Z4-18">
           <mxGeometry y="70" width="160" height="8" as="geometry" />
         </mxCell>
-        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-21" value="+ method(type): type" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="Yrs2Ar6oVTmmq3gZQ8Z4-18" vertex="1">
+        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-21" value="+ method(type): type" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" vertex="1" parent="Yrs2Ar6oVTmmq3gZQ8Z4-18">
           <mxGeometry y="78" width="160" height="142" as="geometry" />
         </mxCell>
-        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-22" value="Role" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-22" value="Role" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
-          <mxGeometry x="870" y="920" width="230" height="220" as="geometry" />
+          <mxGeometry x="827" y="430" width="230" height="220" as="geometry" />
         </mxCell>
-        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-23" value="- roletype : string&lt;div&gt;- permissionids : permissionenmum [ ]&lt;/div&gt;&lt;div&gt;&amp;nbsp;&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="Yrs2Ar6oVTmmq3gZQ8Z4-22" vertex="1">
+        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-23" value="- roletype : string&lt;div&gt;- permissionids : permissionenmum [ ]&lt;/div&gt;&lt;div&gt;&amp;nbsp;&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" vertex="1" parent="Yrs2Ar6oVTmmq3gZQ8Z4-22">
           <mxGeometry y="26" width="230" height="64" as="geometry" />
         </mxCell>
-        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-24" value="" style="line;strokeWidth=1;fillColor=none;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;strokeColor=inherit;" parent="Yrs2Ar6oVTmmq3gZQ8Z4-22" vertex="1">
+        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-24" value="" style="line;strokeWidth=1;fillColor=none;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;strokeColor=inherit;" vertex="1" parent="Yrs2Ar6oVTmmq3gZQ8Z4-22">
           <mxGeometry y="90" width="230" height="8" as="geometry" />
         </mxCell>
-        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-25" value="+ getPermission()&lt;div&gt;+ setPermission(superuser, admin)&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;+ getRoletype()&lt;/div&gt;&lt;div&gt;+ setRoletype(superuser, admin)&lt;br&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="Yrs2Ar6oVTmmq3gZQ8Z4-22" vertex="1">
+        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-25" value="+ getPermission()&lt;div&gt;+ setPermission(superuser, admin)&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;+ getRoletype()&lt;/div&gt;&lt;div&gt;+ setRoletype(superuser, admin)&lt;br&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" vertex="1" parent="Yrs2Ar6oVTmmq3gZQ8Z4-22">
           <mxGeometry y="98" width="230" height="122" as="geometry" />
         </mxCell>
-        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-27" value="Permission" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-27" value="Permission" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
-          <mxGeometry x="1410" y="540" width="220" height="230" as="geometry" />
+          <mxGeometry x="1280" y="430" width="220" height="230" as="geometry" />
         </mxCell>
-        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-28" value="- permissions : permissionenmum [ ]" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="Yrs2Ar6oVTmmq3gZQ8Z4-27" vertex="1">
+        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-28" value="- permissions : permissionenmum [ ]" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" vertex="1" parent="Yrs2Ar6oVTmmq3gZQ8Z4-27">
           <mxGeometry y="26" width="220" height="26" as="geometry" />
         </mxCell>
-        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-29" value="" style="line;strokeWidth=1;fillColor=none;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;strokeColor=inherit;" parent="Yrs2Ar6oVTmmq3gZQ8Z4-27" vertex="1">
+        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-29" value="" style="line;strokeWidth=1;fillColor=none;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;strokeColor=inherit;" vertex="1" parent="Yrs2Ar6oVTmmq3gZQ8Z4-27">
           <mxGeometry y="52" width="220" height="8" as="geometry" />
         </mxCell>
-        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-30" value="+ method(type): type" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="Yrs2Ar6oVTmmq3gZQ8Z4-27" vertex="1">
+        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-30" value="+ method(type): type" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" vertex="1" parent="Yrs2Ar6oVTmmq3gZQ8Z4-27">
           <mxGeometry y="60" width="220" height="170" as="geometry" />
         </mxCell>
-        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-44" value="" style="endArrow=diamondThin;endFill=0;endSize=24;html=1;rounded=0;exitX=0.535;exitY=-0.018;exitDx=0;exitDy=0;exitPerimeter=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="Yrs2Ar6oVTmmq3gZQ8Z4-22" edge="1">
+        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-31" value="" style="endArrow=none;html=1;rounded=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
+          <mxGeometry width="50" height="50" relative="1" as="geometry">
+            <mxPoint x="210" y="270" as="sourcePoint" />
+            <mxPoint x="280" y="270" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-42" value="" style="endArrow=diamondThin;endFill=0;endSize=24;html=1;rounded=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1.013;entryY=0.385;entryDx=0;entryDy=0;entryPerimeter=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="Yrs2Ar6oVTmmq3gZQ8Z4-30" target="Yrs2Ar6oVTmmq3gZQ8Z4-25">
           <mxGeometry width="160" relative="1" as="geometry">
-            <mxPoint x="940" y="860" as="sourcePoint" />
+            <mxPoint x="870" y="690" as="sourcePoint" />
-            <mxPoint x="993" y="811" as="targetPoint" />
+            <mxPoint x="1090" y="570" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-0" value="AddressDao" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+        <mxCell id="Yrs2Ar6oVTmmq3gZQ8Z4-44" value="" style="endArrow=diamondThin;endFill=0;endSize=24;html=1;rounded=0;exitX=0.535;exitY=-0.018;exitDx=0;exitDy=0;exitPerimeter=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="Yrs2Ar6oVTmmq3gZQ8Z4-22">
-          <mxGeometry x="460" y="40" width="160" height="130" as="geometry" />
+          <mxGeometry width="160" relative="1" as="geometry">
-        </mxCell>
+            <mxPoint x="897" y="370" as="sourcePoint" />
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-1" value="&lt;div&gt;&lt;br&gt;&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="v96xPLQoPeUk4bUV2WaN-0" vertex="1">
+            <mxPoint x="950" y="321" as="targetPoint" />
-          <mxGeometry y="26" width="160" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-2" value="" style="line;strokeWidth=1;fillColor=none;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;strokeColor=inherit;" parent="v96xPLQoPeUk4bUV2WaN-0" vertex="1">
-          <mxGeometry y="50" width="160" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-3" value="- importPlz()&lt;div&gt;- importCountry()&lt;/div&gt;&lt;div&gt;+ getAddressData()&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="v96xPLQoPeUk4bUV2WaN-0" vertex="1">
-          <mxGeometry y="58" width="160" height="72" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-4" value="AddressModel" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="650" y="40" width="160" height="150" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-5" value="&lt;div&gt;&lt;br&gt;&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="v96xPLQoPeUk4bUV2WaN-4" vertex="1">
-          <mxGeometry y="26" width="160" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-6" value="" style="line;strokeWidth=1;fillColor=none;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;strokeColor=inherit;" parent="v96xPLQoPeUk4bUV2WaN-4" vertex="1">
-          <mxGeometry y="50" width="160" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-7" value="&lt;div&gt;+ rowCount()&lt;/div&gt;&lt;div&gt;+ data()&lt;/div&gt;&lt;div&gt;+ roleNames()&lt;/div&gt;&lt;div&gt;+ setData()&lt;/div&gt;&lt;div&gt;+getAddresses()&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="v96xPLQoPeUk4bUV2WaN-4" vertex="1">
-          <mxGeometry y="58" width="160" height="92" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-8" value="BTypeDAO" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="460" y="280" width="160" height="130" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-9" value="&lt;div&gt;&lt;br&gt;&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="v96xPLQoPeUk4bUV2WaN-8" vertex="1">
-          <mxGeometry y="26" width="160" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-10" value="" style="line;strokeWidth=1;fillColor=none;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;strokeColor=inherit;" parent="v96xPLQoPeUk4bUV2WaN-8" vertex="1">
-          <mxGeometry y="50" width="160" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-11" value="&lt;div&gt;+ getBType()&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="v96xPLQoPeUk4bUV2WaN-8" vertex="1">
-          <mxGeometry y="58" width="160" height="72" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-12" value="BTypeModel" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="650" y="280" width="160" height="130" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-13" value="&lt;div&gt;&lt;br&gt;&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="v96xPLQoPeUk4bUV2WaN-12" vertex="1">
-          <mxGeometry y="26" width="160" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-14" value="" style="line;strokeWidth=1;fillColor=none;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;strokeColor=inherit;" parent="v96xPLQoPeUk4bUV2WaN-12" vertex="1">
-          <mxGeometry y="50" width="160" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-15" value="+ rowCount()&lt;div&gt;+ data()&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="v96xPLQoPeUk4bUV2WaN-12" vertex="1">
-          <mxGeometry y="58" width="160" height="72" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-16" value="ContactDAO" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="460" y="430" width="160" height="130" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-17" value="&lt;div&gt;&lt;br&gt;&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="v96xPLQoPeUk4bUV2WaN-16" vertex="1">
-          <mxGeometry y="26" width="160" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-18" value="" style="line;strokeWidth=1;fillColor=none;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;strokeColor=inherit;" parent="v96xPLQoPeUk4bUV2WaN-16" vertex="1">
-          <mxGeometry y="50" width="160" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-19" value="&lt;div&gt;+ getContacts()&lt;/div&gt;&lt;div&gt;+ addContact()&lt;/div&gt;&lt;div&gt;+ addObjectContact()&lt;/div&gt;&lt;div&gt;+ getContact()&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="v96xPLQoPeUk4bUV2WaN-16" vertex="1">
-          <mxGeometry y="58" width="160" height="72" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-20" value="ContactModel" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="650" y="430" width="160" height="180" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-21" value="&lt;div&gt;&lt;br&gt;&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="v96xPLQoPeUk4bUV2WaN-20" vertex="1">
-          <mxGeometry y="26" width="160" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-22" value="" style="line;strokeWidth=1;fillColor=none;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;strokeColor=inherit;" parent="v96xPLQoPeUk4bUV2WaN-20" vertex="1">
-          <mxGeometry y="50" width="160" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-23" value="+ getContacts()&lt;div&gt;- getData()&lt;/div&gt;&lt;div&gt;+ addContact()&lt;/div&gt;&lt;div&gt;+ addObjectContact()&lt;/div&gt;&lt;div&gt;- getContact()&lt;/div&gt;&lt;div&gt;+ getContactDetails()&lt;/div&gt;&lt;div&gt;- getContactInfo()&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="v96xPLQoPeUk4bUV2WaN-20" vertex="1">
-          <mxGeometry y="58" width="160" height="122" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-24" value="EmployeeDAO" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="470" y="660" width="160" height="130" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-25" value="&lt;div&gt;&lt;br&gt;&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="v96xPLQoPeUk4bUV2WaN-24" vertex="1">
-          <mxGeometry y="26" width="160" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-26" value="" style="line;strokeWidth=1;fillColor=none;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;strokeColor=inherit;" parent="v96xPLQoPeUk4bUV2WaN-24" vertex="1">
-          <mxGeometry y="50" width="160" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-27" value="&lt;div&gt;+ getEmployees()&lt;/div&gt;&lt;div&gt;+ getEmployee()&lt;/div&gt;&lt;div&gt;+ addEmployee()&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="v96xPLQoPeUk4bUV2WaN-24" vertex="1">
-          <mxGeometry y="58" width="160" height="72" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-28" value="EmployeeModel" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="650" y="660" width="160" height="220" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-29" value="&lt;div&gt;&lt;br&gt;&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="v96xPLQoPeUk4bUV2WaN-28" vertex="1">
-          <mxGeometry y="26" width="160" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-30" value="" style="line;strokeWidth=1;fillColor=none;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;strokeColor=inherit;" parent="v96xPLQoPeUk4bUV2WaN-28" vertex="1">
-          <mxGeometry y="50" width="160" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-31" value="+ addEmployee()&lt;div&gt;+ viewCriterion()&lt;/div&gt;&lt;div&gt;-&amp;nbsp; refreshView()&lt;/div&gt;&lt;div&gt;- getData()&lt;/div&gt;&lt;div&gt;+ rowCount()&lt;/div&gt;&lt;div&gt;+ columnCount()&lt;/div&gt;&lt;div&gt;+ data()&lt;/div&gt;&lt;div&gt;+ headerData()&lt;/div&gt;&lt;div&gt;+ onRowClicked()&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="v96xPLQoPeUk4bUV2WaN-28" vertex="1">
-          <mxGeometry y="58" width="160" height="162" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-32" value="ObjectDAO" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="470" y="900" width="160" height="130" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-33" value="&lt;div&gt;&lt;br&gt;&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="v96xPLQoPeUk4bUV2WaN-32" vertex="1">
-          <mxGeometry y="26" width="160" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-34" value="" style="line;strokeWidth=1;fillColor=none;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;strokeColor=inherit;" parent="v96xPLQoPeUk4bUV2WaN-32" vertex="1">
-          <mxGeometry y="50" width="160" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-35" value="&lt;div&gt;+ addObject()&lt;/div&gt;&lt;div&gt;+ getObjects()&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="v96xPLQoPeUk4bUV2WaN-32" vertex="1">
-          <mxGeometry y="58" width="160" height="72" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-36" value="ObjectModel" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="650" y="900" width="160" height="220" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-37" value="&lt;div&gt;&lt;br&gt;&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="v96xPLQoPeUk4bUV2WaN-36" vertex="1">
-          <mxGeometry y="26" width="160" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-38" value="" style="line;strokeWidth=1;fillColor=none;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;strokeColor=inherit;" parent="v96xPLQoPeUk4bUV2WaN-36" vertex="1">
-          <mxGeometry y="50" width="160" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-39" value="+ addObject()&lt;div&gt;-&amp;nbsp; refreshView()&lt;/div&gt;&lt;div&gt;-&amp;nbsp; getData()&lt;/div&gt;&lt;div&gt;+ rowCount()&lt;/div&gt;&lt;div&gt;+ columnCount()&lt;/div&gt;&lt;div&gt;+ viewCriterion()&lt;/div&gt;&lt;div&gt;+ data()&lt;/div&gt;&lt;div&gt;+ headerData()&lt;/div&gt;&lt;div&gt;+ onRowClicked()&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="v96xPLQoPeUk4bUV2WaN-36" vertex="1">
-          <mxGeometry y="58" width="160" height="162" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-40" value="UserDAO" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="20" y="840" width="160" height="130" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-41" value="&lt;div&gt;&lt;br&gt;&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="v96xPLQoPeUk4bUV2WaN-40" vertex="1">
-          <mxGeometry y="26" width="160" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-42" value="" style="line;strokeWidth=1;fillColor=none;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;strokeColor=inherit;" parent="v96xPLQoPeUk4bUV2WaN-40" vertex="1">
-          <mxGeometry y="50" width="160" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-43" value="&lt;div&gt;+ createUser()&lt;/div&gt;&lt;div&gt;+ getUser()&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="v96xPLQoPeUk4bUV2WaN-40" vertex="1">
-          <mxGeometry y="58" width="160" height="72" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-48" value="UserManager" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="220" y="840" width="160" height="240" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-49" value="&lt;div&gt;&lt;br&gt;&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="v96xPLQoPeUk4bUV2WaN-48" vertex="1">
-          <mxGeometry y="26" width="160" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-50" value="" style="line;strokeWidth=1;fillColor=none;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;strokeColor=inherit;" parent="v96xPLQoPeUk4bUV2WaN-48" vertex="1">
-          <mxGeometry y="50" width="160" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-51" value="&lt;div&gt;+ createUser()&lt;/div&gt;&lt;div&gt;-&amp;nbsp; hashPassword()&lt;/div&gt;&lt;div&gt;+ checkAdmin()&lt;/div&gt;&lt;div&gt;+ getUser()&lt;/div&gt;&lt;div&gt;+ getUsers()&lt;/div&gt;&lt;div&gt;+ delUser()&lt;/div&gt;&lt;div&gt;+ updateUser()&lt;/div&gt;&lt;div&gt;+ disableUser()&lt;/div&gt;&lt;div&gt;+ login()&lt;/div&gt;&lt;div&gt;-&amp;nbsp; checkPassword&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="v96xPLQoPeUk4bUV2WaN-48" vertex="1">
-          <mxGeometry y="58" width="160" height="182" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-57" value="" style="endArrow=none;html=1;rounded=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.402;entryY=1.001;entryDx=0;entryDy=0;entryPerimeter=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="_OjnZrDktrtFcgEA-KSX-13" target="v96xPLQoPeUk4bUV2WaN-62" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="50" y="240" as="sourcePoint" />
-            <mxPoint x="103.36000000000013" y="205.29999999999995" as="targetPoint" />
-            <Array as="points" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-59" value="Classname" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="40" y="40" width="160" height="170" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-61" value="" style="line;strokeWidth=1;fillColor=none;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;strokeColor=inherit;" parent="v96xPLQoPeUk4bUV2WaN-59" vertex="1">
-          <mxGeometry y="26" width="160" height="54" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-62" value="&lt;div&gt;&lt;span style=&quot;background-color: initial;&quot;&gt;+ getBusiness()&lt;/span&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;span style=&quot;background-color: initial;&quot;&gt;+ addBusiness()&lt;/span&gt;&lt;/div&gt;&lt;div&gt;+ getOneBusiness()&lt;/div&gt;&lt;div&gt;+ updateBusiness()&lt;/div&gt;&lt;div&gt;+ delBusiness()&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="v96xPLQoPeUk4bUV2WaN-59" vertex="1">
-          <mxGeometry y="80" width="160" height="90" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-63" value="" style="endArrow=none;html=1;rounded=0;entryX=1;entryY=0.25;entryDx=0;entryDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" target="v96xPLQoPeUk4bUV2WaN-59" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="240" y="83" as="sourcePoint" />
-            <mxPoint x="110" y="130" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-64" value="" style="endArrow=none;html=1;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=1.001;exitY=0.088;exitDx=0;exitDy=0;exitPerimeter=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="_OjnZrDktrtFcgEA-KSX-13" target="v96xPLQoPeUk4bUV2WaN-3" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="200" y="348" as="sourcePoint" />
-            <mxPoint x="110" y="250" as="targetPoint" />
-            <Array as="points">
-              <mxPoint x="410" y="348" />
-              <mxPoint x="410" y="134" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-65" value="" style="endArrow=none;html=1;rounded=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="v96xPLQoPeUk4bUV2WaN-1" target="v96xPLQoPeUk4bUV2WaN-5" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="920" y="280" as="sourcePoint" />
-            <mxPoint x="970" y="230" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-66" value="" style="endArrow=none;html=1;rounded=0;exitX=0.998;exitY=-0.03;exitDx=0;exitDy=0;exitPerimeter=0;entryX=0;entryY=0.375;entryDx=0;entryDy=0;entryPerimeter=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="_OjnZrDktrtFcgEA-KSX-14" target="v96xPLQoPeUk4bUV2WaN-11" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="250" y="360" as="sourcePoint" />
-            <mxPoint x="430" y="365" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-67" value="" style="endArrow=none;html=1;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="v96xPLQoPeUk4bUV2WaN-9" target="v96xPLQoPeUk4bUV2WaN-13" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="330" y="460" as="sourcePoint" />
-            <mxPoint x="380" y="410" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-68" value="" style="endArrow=none;html=1;rounded=0;exitX=1.003;exitY=0.724;exitDx=0;exitDy=0;exitPerimeter=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="_OjnZrDktrtFcgEA-KSX-14" target="v96xPLQoPeUk4bUV2WaN-17" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="250" y="530" as="sourcePoint" />
-            <mxPoint x="300" y="480" as="targetPoint" />
-            <Array as="points">
-              <mxPoint x="440" y="383" />
-              <mxPoint x="440" y="468" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-69" value="" style="endArrow=none;html=1;rounded=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="v96xPLQoPeUk4bUV2WaN-17" target="v96xPLQoPeUk4bUV2WaN-21" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="280" y="300" as="sourcePoint" />
-            <mxPoint x="350" y="470" as="targetPoint" />
-            <Array as="points" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-70" value="" style="endArrow=none;html=1;rounded=0;exitX=1.004;exitY=0.263;exitDx=0;exitDy=0;exitPerimeter=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="_OjnZrDktrtFcgEA-KSX-16" target="v96xPLQoPeUk4bUV2WaN-25" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="270" y="530" as="sourcePoint" />
-            <mxPoint x="320" y="480" as="targetPoint" />
-            <Array as="points">
-              <mxPoint x="430" y="406" />
-              <mxPoint x="430" y="698" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-71" value="" style="endArrow=none;html=1;rounded=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="v96xPLQoPeUk4bUV2WaN-25" target="v96xPLQoPeUk4bUV2WaN-29" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="270" y="530" as="sourcePoint" />
-            <mxPoint x="320" y="480" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-72" value="" style="endArrow=none;html=1;rounded=0;exitX=1.008;exitY=0.788;exitDx=0;exitDy=0;exitPerimeter=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="_OjnZrDktrtFcgEA-KSX-16" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="270" y="530" as="sourcePoint" />
-            <mxPoint x="470" y="940" as="targetPoint" />
-            <Array as="points">
-              <mxPoint x="410" y="423" />
-              <mxPoint x="410" y="600" />
-              <mxPoint x="410" y="940" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-74" value="" style="endArrow=none;html=1;rounded=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="v96xPLQoPeUk4bUV2WaN-33" target="v96xPLQoPeUk4bUV2WaN-37" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="490" y="930" as="sourcePoint" />
-            <mxPoint x="540" y="880" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-75" value="" style="endArrow=none;html=1;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=0;exitY=0;exitDx=0;exitDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="v96xPLQoPeUk4bUV2WaN-40" target="_OjnZrDktrtFcgEA-KSX-16" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="430" y="660" as="sourcePoint" />
-            <mxPoint x="480" y="610" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-76" value="" style="endArrow=none;html=1;rounded=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="v96xPLQoPeUk4bUV2WaN-41" target="v96xPLQoPeUk4bUV2WaN-49" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="360" y="620" as="sourcePoint" />
-            <mxPoint x="410" y="570" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-77" value="ConfigLoader" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="1100" y="40" width="170" height="470" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-78" value="&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="v96xPLQoPeUk4bUV2WaN-77" vertex="1">
-          <mxGeometry y="26" width="170" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-79" value="" style="line;strokeWidth=1;fillColor=none;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;strokeColor=inherit;" parent="v96xPLQoPeUk4bUV2WaN-77" vertex="1">
-          <mxGeometry y="50" width="170" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-80" value="+ setConfig()&lt;div&gt;-&amp;nbsp; initializeConfig()&lt;/div&gt;&lt;div&gt;-&amp;nbsp; checkDbConnection()&lt;/div&gt;&lt;div&gt;-&amp;nbsp; saveConfig()&lt;/div&gt;&lt;div&gt;-&amp;nbsp; checkAdminUser()&lt;/div&gt;&lt;div&gt;+ addAdminUser()&lt;/div&gt;&lt;div&gt;-&amp;nbsp; saveData()&lt;/div&gt;&lt;div&gt;+ getRecoveryKey()&lt;/div&gt;&lt;div&gt;-&amp;nbsp; parseImport()&lt;/div&gt;&lt;div&gt;-&amp;nbsp; invalidateEncryptionKey()&lt;/div&gt;&lt;div&gt;+ checkEncryptionKey()&lt;/div&gt;&lt;div&gt;-&amp;nbsp; checkRecoveryPassword&lt;/div&gt;&lt;div&gt;+ importConfig()&lt;/div&gt;&lt;div&gt;-&amp;nbsp; configLoad()&lt;/div&gt;&lt;div&gt;+ getConfig()&lt;/div&gt;&lt;div&gt;-&amp;nbsp; setRecoveryPassword()&lt;/div&gt;&lt;div&gt;-&amp;nbsp; setEncryptionKey()&lt;/div&gt;&lt;div&gt;+ backupConfig()&lt;/div&gt;&lt;div&gt;+ saveDbConf()&lt;/div&gt;&lt;div&gt;+ getDbConf()&lt;/div&gt;&lt;div&gt;+ saveCompanyInfo()&lt;/div&gt;&lt;div&gt;+ getCompanyInfo()&lt;/div&gt;&lt;div&gt;+ saveMiscConf()&lt;/div&gt;&lt;div&gt;+ systray()&lt;/div&gt;&lt;div&gt;+ backupEncryptkey()&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="v96xPLQoPeUk4bUV2WaN-77" vertex="1">
-          <mxGeometry y="58" width="170" height="412" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-89" value="PyqcrmFlags" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="40" y="610" width="170" height="150" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-90" value="&lt;div&gt;ADMIN: enum&lt;/div&gt;&lt;div&gt;USER: enum&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="v96xPLQoPeUk4bUV2WaN-89" vertex="1">
-          <mxGeometry y="26" width="170" height="44" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-91" value="" style="line;strokeWidth=1;fillColor=none;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;strokeColor=inherit;" parent="v96xPLQoPeUk4bUV2WaN-89" vertex="1">
-          <mxGeometry y="70" width="170" height="80" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-93" value="PyqcrmAppliEmpyFlags" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="230" y="610" width="170" height="140" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-94" value="&lt;div&gt;ALL: enum&lt;/div&gt;&lt;div&gt;APPLICANT: enum&lt;/div&gt;&lt;div&gt;EMPLOYEE; enum&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="v96xPLQoPeUk4bUV2WaN-93" vertex="1">
-          <mxGeometry y="26" width="170" height="64" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-95" value="" style="line;strokeWidth=1;fillColor=none;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;strokeColor=inherit;" parent="v96xPLQoPeUk4bUV2WaN-93" vertex="1">
-          <mxGeometry y="90" width="170" height="50" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-96" value="Databasemanager" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="870" y="40" width="170" height="90" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-97" value="&lt;div&gt;- connection&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="v96xPLQoPeUk4bUV2WaN-96" vertex="1">
-          <mxGeometry y="26" width="170" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-98" value="" style="line;strokeWidth=1;fillColor=none;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;strokeColor=inherit;" parent="v96xPLQoPeUk4bUV2WaN-96" vertex="1">
-          <mxGeometry y="50" width="170" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="v96xPLQoPeUk4bUV2WaN-99" value="+ instance(): connection" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="v96xPLQoPeUk4bUV2WaN-96" vertex="1">
-          <mxGeometry y="58" width="170" height="32" as="geometry" />
-        </mxCell>
-        <mxCell id="6xiAvg-kEoilwsfhhM0o-0" value="PyqcrmFlags" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
-          <mxGeometry x="870" y="340" width="170" height="150" as="geometry" />
-        </mxCell>
-        <mxCell id="6xiAvg-kEoilwsfhhM0o-1" value="&lt;div&gt;ADMIN: enum&lt;/div&gt;&lt;div&gt;USER: enum&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" vertex="1" parent="6xiAvg-kEoilwsfhhM0o-0">
-          <mxGeometry y="26" width="170" height="44" as="geometry" />
-        </mxCell>
-        <mxCell id="6xiAvg-kEoilwsfhhM0o-2" value="" style="line;strokeWidth=1;fillColor=none;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;strokeColor=inherit;" vertex="1" parent="6xiAvg-kEoilwsfhhM0o-0">
-          <mxGeometry y="70" width="170" height="80" as="geometry" />
-        </mxCell>
-        <mxCell id="6xiAvg-kEoilwsfhhM0o-3" value="PyqcrmAppliEmpyFlags" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
-          <mxGeometry x="870" y="170" width="170" height="140" as="geometry" />
-        </mxCell>
-        <mxCell id="6xiAvg-kEoilwsfhhM0o-4" value="&lt;div&gt;ALL: enum&lt;/div&gt;&lt;div&gt;APPLICANT: enum&lt;/div&gt;&lt;div&gt;EMPLOYEE; enum&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" vertex="1" parent="6xiAvg-kEoilwsfhhM0o-3">
-          <mxGeometry y="26" width="170" height="64" as="geometry" />
-        </mxCell>
-        <mxCell id="6xiAvg-kEoilwsfhhM0o-5" value="" style="line;strokeWidth=1;fillColor=none;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;strokeColor=inherit;" vertex="1" parent="6xiAvg-kEoilwsfhhM0o-3">
-          <mxGeometry y="90" width="170" height="50" as="geometry" />
-        </mxCell>
-        <mxCell id="6xiAvg-kEoilwsfhhM0o-6" value="" style="endArrow=none;html=1;rounded=0;exitX=0.25;exitY=1;exitDx=0;exitDy=0;entryX=0.25;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="v96xPLQoPeUk4bUV2WaN-89" target="v96xPLQoPeUk4bUV2WaN-40">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="420" y="900" as="sourcePoint" />
-            <mxPoint x="470" y="850" as="targetPoint" />
-            <Array as="points">
-              <mxPoint x="83" y="800" />
-              <mxPoint x="60" y="800" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="6xiAvg-kEoilwsfhhM0o-7" value="" style="endArrow=none;html=1;rounded=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="v96xPLQoPeUk4bUV2WaN-48" target="v96xPLQoPeUk4bUV2WaN-93">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="420" y="900" as="sourcePoint" />
-            <mxPoint x="470" y="850" as="targetPoint" />
-            <Array as="points">
-              <mxPoint x="300" y="800" />
-              <mxPoint x="315" y="800" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="6xiAvg-kEoilwsfhhM0o-8" value="" style="endArrow=none;html=1;rounded=0;exitX=0.25;exitY=1;exitDx=0;exitDy=0;entryX=0.75;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="v96xPLQoPeUk4bUV2WaN-93" target="v96xPLQoPeUk4bUV2WaN-40">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="420" y="900" as="sourcePoint" />
-            <mxPoint x="470" y="850" as="targetPoint" />
-            <Array as="points">
-              <mxPoint x="273" y="780" />
-              <mxPoint x="140" y="780" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="6xiAvg-kEoilwsfhhM0o-9" value="" style="endArrow=none;html=1;rounded=0;entryX=0.75;entryY=1;entryDx=0;entryDy=0;exitX=0.25;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="v96xPLQoPeUk4bUV2WaN-48" target="v96xPLQoPeUk4bUV2WaN-89">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="420" y="900" as="sourcePoint" />
-            <mxPoint x="470" y="850" as="targetPoint" />
-            <Array as="points">
-              <mxPoint x="260" y="800" />
-              <mxPoint x="168" y="800" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="6xiAvg-kEoilwsfhhM0o-10" value="" style="endArrow=none;html=1;rounded=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="v96xPLQoPeUk4bUV2WaN-78" target="v96xPLQoPeUk4bUV2WaN-97">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="600" y="440" as="sourcePoint" />
-            <mxPoint x="650" y="390" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="6xiAvg-kEoilwsfhhM0o-11" value="" style="endArrow=none;html=1;rounded=0;exitX=1.001;exitY=0.102;exitDx=0;exitDy=0;exitPerimeter=0;entryX=-0.002;entryY=0.624;entryDx=0;entryDy=0;entryPerimeter=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="6xiAvg-kEoilwsfhhM0o-0" target="v96xPLQoPeUk4bUV2WaN-80">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="600" y="440" as="sourcePoint" />
-            <mxPoint x="650" y="390" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="6xiAvg-kEoilwsfhhM0o-12" value="" style="endArrow=none;html=1;rounded=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;exitX=-0.001;exitY=0.316;exitDx=0;exitDy=0;exitPerimeter=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="v96xPLQoPeUk4bUV2WaN-80" target="6xiAvg-kEoilwsfhhM0o-4">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="600" y="440" as="sourcePoint" />
-            <mxPoint x="650" y="390" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="6xiAvg-kEoilwsfhhM0o-13" value="Vermasseln" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
-          <mxGeometry x="1350" y="40" width="170" height="140" as="geometry" />
-        </mxCell>
-        <mxCell id="6xiAvg-kEoilwsfhhM0o-14" value="&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" vertex="1" parent="6xiAvg-kEoilwsfhhM0o-13">
-          <mxGeometry y="26" width="170" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="6xiAvg-kEoilwsfhhM0o-15" value="" style="line;strokeWidth=1;fillColor=none;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;strokeColor=inherit;" vertex="1" parent="6xiAvg-kEoilwsfhhM0o-13">
-          <mxGeometry y="50" width="170" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="6xiAvg-kEoilwsfhhM0o-16" value="+ oscarVermasseln()&lt;div&gt;+ entschluesseln()&lt;/div&gt;&lt;div&gt;-&amp;nbsp; vermasslungsKobold()&lt;/div&gt;&lt;div&gt;+ userPasswordHash&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" vertex="1" parent="6xiAvg-kEoilwsfhhM0o-13">
-          <mxGeometry y="58" width="170" height="82" as="geometry" />
-        </mxCell>
-        <mxCell id="6xiAvg-kEoilwsfhhM0o-17" value="" style="endArrow=none;html=1;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="v96xPLQoPeUk4bUV2WaN-78" target="6xiAvg-kEoilwsfhhM0o-14">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="800" y="530" as="sourcePoint" />
-            <mxPoint x="850" y="480" as="targetPoint" />
           </mxGeometry>
         </mxCell>
       </root>

doc/Programmstart Diagramm.drawio

@@ -79,7 +79,7 @@
           <mxGeometry x="10" y="115" width="30" height="30" as="geometry" />
         </mxCell>
         <mxCell id="vLrOMzFsj3qdJpjowrCW-73" value="Data not full usable" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" parent="1" vertex="1">
-          <mxGeometry x="10" y="620" width="130" height="30" as="geometry" />
+          <mxGeometry x="10" y="595" width="130" height="30" as="geometry" />
         </mxCell>
         <mxCell id="wBh1sZi6hsA7ukKMJ2_X-5" value="" style="endArrow=classic;html=1;rounded=0;" parent="1" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
@@ -128,7 +128,7 @@
           <mxGeometry x="40" width="80" height="80" as="geometry" />
         </mxCell>
         <mxCell id="zKFDF5UOk-7tD0-7yUJp-19" value="Dashboard" style="rounded=1;whiteSpace=wrap;html=1;" parent="wBh1sZi6hsA7ukKMJ2_X-23" vertex="1">
-          <mxGeometry y="430" width="160" height="60" as="geometry" />
+          <mxGeometry x="10" y="430" width="160" height="60" as="geometry" />
         </mxCell>
         <mxCell id="zKFDF5UOk-7tD0-7yUJp-21" value="Login Screen" style="rounded=1;whiteSpace=wrap;html=1;" parent="wBh1sZi6hsA7ukKMJ2_X-23" vertex="1">
           <mxGeometry y="140" width="160" height="60" as="geometry" />
@@ -148,10 +148,10 @@
             <mxPoint x="-120" y="130" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="zKFDF5UOk-7tD0-7yUJp-40" 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;" parent="wBh1sZi6hsA7ukKMJ2_X-23" source="zKFDF5UOk-7tD0-7yUJp-37" edge="1" target="zKFDF5UOk-7tD0-7yUJp-19">
+        <mxCell id="zKFDF5UOk-7tD0-7yUJp-40" value="" style="endArrow=classic;html=1;rounded=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="wBh1sZi6hsA7ukKMJ2_X-23" source="zKFDF5UOk-7tD0-7yUJp-37" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="-130" y="220" as="sourcePoint" />
-            <mxPoint x="80" y="420" as="targetPoint" />
+            <mxPoint x="80" y="430" as="targetPoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="zKFDF5UOk-7tD0-7yUJp-41" value="ja" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="zKFDF5UOk-7tD0-7yUJp-40" vertex="1" connectable="0">
@@ -210,10 +210,10 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="vLrOMzFsj3qdJpjowrCW-61" value="" style="rhombus;whiteSpace=wrap;html=1;" parent="wBh1sZi6hsA7ukKMJ2_X-27" vertex="1">
-          <mxGeometry x="140" y="140" width="80" height="60" as="geometry" />
+          <mxGeometry x="140" y="120" width="80" height="60" as="geometry" />
         </mxCell>
         <mxCell id="vLrOMzFsj3qdJpjowrCW-62" value="&lt;span style=&quot;text-wrap: wrap;&quot;&gt;encryption&amp;nbsp;&lt;/span&gt;&lt;div&gt;&lt;span style=&quot;text-wrap: wrap;&quot;&gt;Key&lt;/span&gt;&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" parent="wBh1sZi6hsA7ukKMJ2_X-27" vertex="1">
-          <mxGeometry x="180" y="125" width="80" height="40" as="geometry" />
+          <mxGeometry x="180" y="110" width="80" height="40" as="geometry" />
         </mxCell>
         <mxCell id="vLrOMzFsj3qdJpjowrCW-63" value="create Verschlüssenlungskey" style="rounded=1;whiteSpace=wrap;html=1;" parent="wBh1sZi6hsA7ukKMJ2_X-27" vertex="1">
           <mxGeometry x="270" y="120" width="120" height="35" as="geometry" />
@@ -230,7 +230,7 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="vLrOMzFsj3qdJpjowrCW-71" value="" style="verticalLabelPosition=bottom;verticalAlign=top;html=1;shape=mxgraph.flowchart.or;" parent="wBh1sZi6hsA7ukKMJ2_X-27" vertex="1">
-          <mxGeometry y="145" width="50" height="50" as="geometry" />
+          <mxGeometry y="125" width="50" height="50" as="geometry" />
         </mxCell>
         <mxCell id="wBh1sZi6hsA7ukKMJ2_X-24" value="add admin and user roles&amp;nbsp;&amp;nbsp;" style="rounded=1;whiteSpace=wrap;html=1;" parent="wBh1sZi6hsA7ukKMJ2_X-27" vertex="1">
           <mxGeometry x="270" y="10" width="120" height="60" as="geometry" />
@@ -262,7 +262,7 @@
         <mxCell id="zKFDF5UOk-7tD0-7yUJp-13" value="anlegen Konfiguration" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="250" y="355" width="120" height="65" as="geometry" />
         </mxCell>
-        <mxCell id="KgfY491xeuN-natDz28Q-1" value="" style="rhombus;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+        <mxCell id="KgfY491xeuN-natDz28Q-1" value="" style="rhombus;whiteSpace=wrap;html=1;" vertex="1" parent="1">
           <mxGeometry x="334" y="800" width="80" height="80" as="geometry" />
         </mxCell>
         <mxCell id="vLrOMzFsj3qdJpjowrCW-64" value="" style="endArrow=classic;html=1;rounded=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="vLrOMzFsj3qdJpjowrCW-61" target="KgfY491xeuN-natDz28Q-1" edge="1">
@@ -279,16 +279,16 @@
             <mxPoint as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="KgfY491xeuN-natDz28Q-3" value="backup verschlüsselungskey" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+        <mxCell id="KgfY491xeuN-natDz28Q-3" value="backup verschlüsselungskey" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
           <mxGeometry x="400" y="740" width="120" height="40" as="geometry" />
         </mxCell>
-        <mxCell id="KgfY491xeuN-natDz28Q-4" value="" style="endArrow=classic;html=1;rounded=0;exitX=0.442;exitY=1;exitDx=0;exitDy=0;exitPerimeter=0;" parent="1" source="zKFDF5UOk-7tD0-7yUJp-24" edge="1">
+        <mxCell id="KgfY491xeuN-natDz28Q-4" value="" style="endArrow=classic;html=1;rounded=0;exitX=0.442;exitY=1;exitDx=0;exitDy=0;exitPerimeter=0;" edge="1" parent="1" source="zKFDF5UOk-7tD0-7yUJp-24">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="400" y="860" as="sourcePoint" />
             <mxPoint x="453" y="740" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="KgfY491xeuN-natDz28Q-5" value="" style="endArrow=classic;html=1;rounded=0;exitX=0.442;exitY=1.075;exitDx=0;exitDy=0;exitPerimeter=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="KgfY491xeuN-natDz28Q-3" target="KgfY491xeuN-natDz28Q-1" edge="1">
+        <mxCell id="KgfY491xeuN-natDz28Q-5" value="" style="endArrow=classic;html=1;rounded=0;exitX=0.442;exitY=1.075;exitDx=0;exitDy=0;exitPerimeter=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="KgfY491xeuN-natDz28Q-3" target="KgfY491xeuN-natDz28Q-1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="400" y="660" as="sourcePoint" />
             <mxPoint x="450" y="610" as="targetPoint" />
@@ -297,107 +297,6 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="cG-jPwor9kiN46-01Wd7-3" value="click showcustomer" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-          <mxGeometry x="900" y="100" width="100" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="cG-jPwor9kiN46-01Wd7-4" value="click Objects" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-          <mxGeometry x="900" y="340" width="100" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="cG-jPwor9kiN46-01Wd7-5" value="click Employees" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-          <mxGeometry x="900" y="260" width="100" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="cG-jPwor9kiN46-01Wd7-6" value="click Invoice" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-          <mxGeometry x="900" y="180" width="100" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="cG-jPwor9kiN46-01Wd7-10" value="connect to database" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-          <mxGeometry x="1110" y="215" width="120" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="cG-jPwor9kiN46-01Wd7-11" value="" style="rhombus;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-          <mxGeometry x="1270" y="210" width="80" height="80" as="geometry" />
-        </mxCell>
-        <mxCell id="cG-jPwor9kiN46-01Wd7-18" value="showGUI" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-          <mxGeometry x="1410" y="220" width="120" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="cG-jPwor9kiN46-01Wd7-20" value="Erfolgreich" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
-          <mxGeometry x="1270" y="185" width="80" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="cG-jPwor9kiN46-01Wd7-23" value="programm kann nicht genutzt werden" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-          <mxGeometry x="1260" y="370" width="130" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="cG-jPwor9kiN46-01Wd7-27" value="" style="endArrow=classic;html=1;rounded=0;exitX=1.02;exitY=0.617;exitDx=0;exitDy=0;exitPerimeter=0;entryX=0;entryY=0.25;entryDx=0;entryDy=0;" edge="1" parent="1" source="cG-jPwor9kiN46-01Wd7-6" target="cG-jPwor9kiN46-01Wd7-10">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="760" y="300" as="sourcePoint" />
-            <mxPoint x="1080" y="220" as="targetPoint" />
-            <Array as="points">
-              <mxPoint x="1050" y="217" />
-              <mxPoint x="1050" y="230" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="cG-jPwor9kiN46-01Wd7-28" value="" style="endArrow=classic;html=1;rounded=0;exitX=1.007;exitY=0.22;exitDx=0;exitDy=0;exitPerimeter=0;entryX=0;entryY=0.75;entryDx=0;entryDy=0;" edge="1" parent="1" source="cG-jPwor9kiN46-01Wd7-5" target="cG-jPwor9kiN46-01Wd7-10">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="1010" y="299" as="sourcePoint" />
-            <mxPoint x="1040" y="270" as="targetPoint" />
-            <Array as="points">
-              <mxPoint x="1050" y="273" />
-              <mxPoint x="1050" y="260" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="cG-jPwor9kiN46-01Wd7-29" value="" style="endArrow=classic;html=1;rounded=0;exitX=1;exitY=0.75;exitDx=0;exitDy=0;entryX=0.143;entryY=0.984;entryDx=0;entryDy=0;entryPerimeter=0;" edge="1" parent="1" source="cG-jPwor9kiN46-01Wd7-4" target="cG-jPwor9kiN46-01Wd7-10">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="760" y="300" as="sourcePoint" />
-            <mxPoint x="1040" y="320" as="targetPoint" />
-            <Array as="points">
-              <mxPoint x="1080" y="385" />
-              <mxPoint x="1127" y="385" />
-              <mxPoint x="1127" y="330" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="cG-jPwor9kiN46-01Wd7-31" value="" style="endArrow=classic;html=1;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="cG-jPwor9kiN46-01Wd7-11" target="cG-jPwor9kiN46-01Wd7-18">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="760" y="300" as="sourcePoint" />
-            <mxPoint x="810" y="250" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="cG-jPwor9kiN46-01Wd7-32" value="ja" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="cG-jPwor9kiN46-01Wd7-31">
-          <mxGeometry x="-0.3333" relative="1" as="geometry">
-            <mxPoint as="offset" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="cG-jPwor9kiN46-01Wd7-33" value="" style="endArrow=classic;html=1;rounded=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="1" source="cG-jPwor9kiN46-01Wd7-11">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="760" y="300" as="sourcePoint" />
-            <mxPoint x="1310" y="367" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="cG-jPwor9kiN46-01Wd7-39" value="nein" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="cG-jPwor9kiN46-01Wd7-33">
-          <mxGeometry x="-0.2208" y="1" relative="1" as="geometry">
-            <mxPoint as="offset" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="cG-jPwor9kiN46-01Wd7-35" value="" style="endArrow=classic;html=1;rounded=0;exitX=1;exitY=0.25;exitDx=0;exitDy=0;entryX=0.13;entryY=-0.006;entryDx=0;entryDy=0;entryPerimeter=0;" edge="1" parent="1" source="cG-jPwor9kiN46-01Wd7-3" target="cG-jPwor9kiN46-01Wd7-10">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="900" y="460" as="sourcePoint" />
-            <mxPoint x="1130" y="210" as="targetPoint" />
-            <Array as="points">
-              <mxPoint x="1126" y="115" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="cG-jPwor9kiN46-01Wd7-37" value="" style="endArrow=classic;html=1;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=1.007;exitY=0.581;exitDx=0;exitDy=0;exitPerimeter=0;" edge="1" parent="1" source="cG-jPwor9kiN46-01Wd7-10" target="cG-jPwor9kiN46-01Wd7-11">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="850" y="270" as="sourcePoint" />
-            <mxPoint x="900" y="220" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="cG-jPwor9kiN46-01Wd7-40" value="" style="endArrow=classic;html=1;rounded=0;" edge="1" parent="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="1250" y="80" as="sourcePoint" />
-            <mxPoint x="1350" y="80" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
       </root>
     </mxGraphModel>
   </diagram>

doc/README.md

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