merging solved

Gui/ApplicantPersonalData.qml

@@ -5,7 +5,7 @@ import QtQuick.Layouts
 GridLayout
 {
     id: personalData
-    columns: 2
+    columns: 4
 
     Label
     {
@@ -18,6 +18,7 @@ GridLayout
         id: title
         Layout.fillWidth: true
         editable: false
+        Layout.columnSpan: 3
         model: [qsTr("Keine Angabe"), qsTr("Herr"), qsTr("Frau")]
         onCurrentTextChanged:
         {
@@ -33,6 +34,7 @@ GridLayout
                     briefAnrede.text = "Guten Tag "
             }
         }
+
     }
     Label
     {
@@ -47,7 +49,7 @@ GridLayout
         placeholderText: "Pflichtfeld"
         placeholderTextColor: "red"
         onTextChanged: checkFields()
-
+        Layout.columnSpan: 3
     }
     Label
     {
@@ -62,7 +64,7 @@ GridLayout
         placeholderText: "Pflichtfeld"
         placeholderTextColor: "red"
         onTextChanged: checkFields()
-
+        Layout.columnSpan: 3
     }
     Label
     {
@@ -76,59 +78,73 @@ GridLayout
         Layout.fillWidth: true
         placeholderTextColor: "red"
 
+    }
+    Label
+    {
+        text: qsTr("Nr.")
+        Layout.alignment: Qt.AlignRight
+    }
+    TextField
+    {
+        property string name: "houseno"
+        id: houseno
+        Layout.fillWidth: true
+        placeholderTextColor: "red"
+
     }
     Label
     {
         text: qsTr("PLZ")
         Layout.alignment: Qt.AlignRight
     }
-    RowLayout
+
+
+
+
+    ComboBox
     {
-        property string name: "Oschkar"
+        property string name: "postcode"
-        ComboBox
+        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
         {
-            property string name: "postcode"
+            regularExpression: /([0-9]{1,5})/
-            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
-        {
-            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
-            popup.y: postcode.y + 5 - (postcode.height * 2)
-            currentIndex: -1
-
         }
     }
+
+
+    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
+        popup.y: postcode.y + 5 - (postcode.height * 2)
+        currentIndex: -1
+
+    }
+
     Label
     {
         text: qsTr("Telefonnummer")
@@ -140,6 +156,7 @@ GridLayout
         id: phonenumber
         Layout.fillWidth: true
         placeholderTextColor: "red"
+        Layout.columnSpan: 3
     }
     Label
     {
@@ -152,6 +169,7 @@ GridLayout
         id: cellphone
         Layout.fillWidth: true
         placeholderTextColor: "red"
+        Layout.columnSpan: 3
     }
     Label
     {
@@ -164,6 +182,7 @@ GridLayout
         id: email
         Layout.fillWidth: true
         placeholderTextColor: "red"
+        Layout.columnSpan: 3
     }
     Label
     {
@@ -179,6 +198,7 @@ GridLayout
         editable: false
         model: [qsTr("ledig"), qsTr("verheiratet"), qsTr("verwitwet"), qsTr("geschieden")]
         visible: radio.children[1].checked
+        Layout.columnSpan: 3
     }
     Label
     {
@@ -193,6 +213,7 @@ GridLayout
         Layout.fillWidth: true
         visible: radio.children[1].checked
         placeholderTextColor: "red"
+        Layout.columnSpan: 3
     }
     Label
     {
@@ -207,6 +228,7 @@ GridLayout
         Layout.fillWidth: true
         visible: radio.children[1].checked
         placeholderTextColor: "red"
+        Layout.columnSpan: 3
     }
     Label
     {
@@ -221,6 +243,7 @@ GridLayout
         Layout.fillWidth: true
         visible: radio.children[1].checked
         placeholderTextColor: "red"
+        Layout.columnSpan: 3
     }
     Label
     {
@@ -235,6 +258,7 @@ GridLayout
         Layout.fillWidth: true
         visible: radio.children[1].checked
         placeholderTextColor: "red"
+        Layout.columnSpan: 3
     }
     Label
     {
@@ -247,12 +271,13 @@ GridLayout
         id: briefAnrede
         Layout.fillWidth: true
         placeholderTextColor: "red"
+        Layout.columnSpan: 3
     }
 
     Item
     {
         Layout.fillHeight: true
-        Layout.columnSpan: 2
+        Layout.columnSpan: 4
     }
     function checkPersonalField()
     {

lib/DB/AddressDAO.py

@@ -14,9 +14,11 @@ class AddressDAO:
 
 
 
+
     def __importPlz(self):
-        with open("import json filepath here", "r") as plz:
+        with open("pfad zur datei", "r") as plz:
             postcodes = json.load(plz)
+            irgendwas = ""
             try:
                 for i in postcodes:
                     test =i["plz_name"].split(",")
@@ -26,7 +28,8 @@ class AddressDAO:
                         town = town.strip()
                         if town:
                             print(f"PROCESSING {i['name']} {town}")
-                            self.__cur.callproc("addZipCodes", (i["name"], town,))
+                            self.__cur.callproc("addZipCodes", (i["name"], town, irgendwas,))
+                #self.__cur.callproc("addZipCodes", ("56271", "Kleinmaischeid", irgendwas,))
             except mariadb.OperationalError as e:
                 print(f"Database Error: {e}")
             finally:
@@ -34,7 +37,7 @@ class AddressDAO:
                 print("FINISHED")#
 
     def __importCountry(self):
-        with open("/home/dstoppek/Downloads/staaten.json", "r") as country:
+        with open("pfad zur datei", "r") as country:
             countries = json.load(country)
             old = ""
             try: