Fixing ObjectAddOnContactPerson.qml conflict

Gui/AddNewObject.qml

@@ -11,20 +11,6 @@ GridLayout
     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
-    }
-
     //// New grid row
 
     Label
@@ -73,6 +59,21 @@ GridLayout
         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
+        popup.y: postcode.y + 5 - (postcode.height * 2)
+        currentIndex: -1
+        onCurrentIndexChanged: city.currentIndex = postcode.currentIndex
+
+        validator: RegularExpressionValidator
+        {
+            regularExpression: /([0-9]{1,5})/
+        }
     }
 
     Label
@@ -106,7 +107,8 @@ GridLayout
 
     SpinBox
     {
-        id: parteien
+        property string name: "units"
+        id: partitions
         Layout.fillWidth: true
         from: 1
         to: 100
@@ -121,6 +123,7 @@ GridLayout
 
     SpinBox
     {
+        property string name: "floors"
         id: floors
         Layout.fillWidth: true
         from: 1
@@ -141,7 +144,7 @@ GridLayout
         id: mezzanin
         Layout.fillWidth: true
         editable: false
-        model: [qsTr("Jööö"), qsTr("Nöööööööööööööööööööööööööö")]
+        model: [qsTr("Ja"), qsTr("Nein")]
     }
 
     Label
@@ -156,66 +159,25 @@ GridLayout
         id: lift
         Layout.fillWidth: true
         editable: false
-        model: [qsTr("Jööö"), qsTr("Nöööööööööööööööööööööööööö")]
+        model: [qsTr("Ja"), qsTr("Nein")]
     }
 
     //New grid row
-
     Label
     {
-        text: qsTr("Fenster")
-        Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
-    }
-
-    ComboBox
-    {
-        property string name: "windows"
-        id: windows
-        Layout.fillWidth: true
-        editable: false
-        model: [qsTr("Jööö"), qsTr("Nöööööööööööööööööööööööööö")]
-        onCurrentIndexChanged: nrWindows.enabled = (windows.currentIndex === 0)? true: false
-    }
-
-    Label
-    {
-        text: qsTr("Anzahl")
-        Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
-    }
-
-    SpinBox
-    {
-        id: nrWindows
-        Layout.fillWidth: true
-        from: 0
-        to: 100
-        value: 0
-    }
-
-    // New grid row
-    CheckBox
-    {
-        id: ladder
-        text: qsTr("Leiter")
+        text: qsTr("Objekt-Nr.")
         Layout.alignment: Qt.AlignRight
-        checked: false
-        onCheckStateChanged:
-        {
-            //checkFields()
-        }
+    }
+    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"
     }
 
-    CheckBox
-    {
-        id: accessible
-        text: qsTr("Erreichbar")
-        Layout.alignment: Qt.AlignRight
-        checked: false
-        onCheckStateChanged:
-        {
-            //checkFields()
-        }
-    }
 
     Label
     {
@@ -232,39 +194,35 @@ GridLayout
     }
 
     //// New grid row
-    Label
-    {
-        text: qsTr("kontaktdaten")
-        Layout.alignment: Qt.AlignRight | Qt.AlignTop
-    }
 
-    ComboBox
-    {
-        property string name: "contact"
-        id: contact
-        Layout.fillWidth: true
-        editable: false
-        model: [qsTr("Beirat"), qsTr("Hausmeister")]
-    }
 
     Label
     {
-        text: qsTr("Reingunsmittel wo?")
+        text: qsTr("Reinigungsmittel wo?")
         Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
     }
 
     TextField
     {
-        property string name: "cleansing"
-        id: cleamsing
+        property string name: "cleaningproducts"
+        id: cleaningproducts
         Layout.fillWidth: true
         placeholderText: "Pflichtfeld"
         placeholderTextColor: "red"
+        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()
+    }
 }