changed AddApplicant

Gui/ApplicantPersonalData.qml

@@ -92,6 +92,10 @@ GridLayout
         Layout.fillWidth: true
         placeholderTextColor: "red"
         onTextChanged: checkFields()
+        validator: RegularExpressionValidator
+        {
+            regularExpression: /([0-9a-zA-Z\-]{1,6})/
+        }
 
     }
     Label
@@ -146,6 +150,61 @@ GridLayout
         currentIndex: -1
 
     }
+    Label
+    {
+        text: qsTr("Geburtsname")
+        Layout.alignment: Qt.AlignRight
+        visible: radio.children[1].checked
+    }
+    TextField
+    {
+        property string name: "birthname"
+        id: birthname
+        Layout.fillWidth: true
+        onTextChanged: checkFields()
+        Layout.columnSpan: 3
+        visible: radio.children[1].checked
+    }
+    Label
+    {
+        text: qsTr("Geburtsdatum")
+        Layout.alignment: Qt.AlignRight
+        visible: radio.children[1].checked
+    }
+    TextField
+    {
+        property string name: "birthday"
+        id: birthday
+        Layout.fillWidth: true
+        placeholderText: "Pflichtfeld"
+        placeholderTextColor: "red"
+        onTextChanged: checkFields()
+        Layout.columnSpan: 3
+        visible: radio.children[1].checked
+        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}))/
+        }
+    }
+
+    Label
+    {
+        text: qsTr("Geburtsort")
+        Layout.alignment: Qt.AlignRight
+        visible: radio.children[1].checked
+    }
+    TextField
+    {
+        property string name: "placeofbirth"
+        id: placeofbirth
+        Layout.fillWidth: true
+        placeholderText: "Pflichtfeld"
+        placeholderTextColor: "red"
+        onTextChanged: checkFields()
+        Layout.columnSpan: 3
+        visible: radio.children[1].checked
+    }
 
     Label
     {
@@ -160,6 +219,10 @@ GridLayout
         placeholderTextColor: "red"
         Layout.columnSpan: 3
         onTextChanged: checkFields()
+        validator: RegularExpressionValidator
+        {
+            regularExpression: /([+0-9]{1})([0-9]{1,17})/
+        }
     }
     Label
     {
@@ -174,6 +237,10 @@ GridLayout
         placeholderTextColor: "red"
         Layout.columnSpan: 3
         onTextChanged: checkFields()
+        validator: RegularExpressionValidator
+        {
+            regularExpression: /([+0-9]{1})([0-9]{1,17})/
+        }
     }
     Label
     {
@@ -188,6 +255,10 @@ GridLayout
         placeholderTextColor: "red"
         Layout.columnSpan: 3
         onTextChanged: checkFields()
+        validator: RegularExpressionValidator
+        {
+            regularExpression: /([\+!#$%&‘\*\–\/\=?\^_`\.{|}\~0-9A-Za-z]{1,185})@([0-9A-Za-z\.]{1,64})\.([a-zA-z]{2,5})/
+        }
     }
     Label
     {
@@ -206,6 +277,22 @@ GridLayout
         Layout.columnSpan: 3
     }
     Label
+    {
+        text: qsTr("Stundenlohn")
+        Layout.alignment: Qt.AlignRight
+        visible: radio.children[1].checked
+    }
+    TextField
+    {
+        property string name: "salary"
+        id: salary
+        Layout.fillWidth: true
+        visible: radio.children[1].checked
+        placeholderTextColor: "red"
+        Layout.columnSpan: 3
+        onTextChanged: checkFields()
+    }
+    Label
     {
         text: qsTr("Jobbeschreibung")
         Layout.alignment: Qt.AlignRight
@@ -236,6 +323,10 @@ GridLayout
         placeholderTextColor: "red"
         Layout.columnSpan: 3
         onTextChanged: checkFields()
+        validator: RegularExpressionValidator
+        {
+            regularExpression: /((^|)(0[1-9]{1}|[1-2]{1}[0-9]{1}|3[0-1]))\.((^|)(0[1-9]{1}|1[0-2]{1}))\.((^|)(196[0-9]{1}|19[7-9]{1}[0-9]{1}|20[0-9]{2}))/
+        }
     }
     Label
     {
@@ -252,22 +343,38 @@ GridLayout
         placeholderTextColor: "red"
         Layout.columnSpan: 3
         onTextChanged: checkFields()
+        validator: RegularExpressionValidator
+        {
+            regularExpression: /((^|)(0[1-9]{1}|[1-2]{1}[0-9]{1}|3[0-1]))\.((^|)(0[1-9]{1}|1[0-2]{1}))\.((^|)(196[0-9]{1}|19[7-9]{1}[0-9]{1}|20[0-9]{2}))/
+        }
     }
     Label
     {
-        text: qsTr("Arbeitszeiten")
+        text: qsTr("Arbeitszeiten Tage")
         Layout.alignment: Qt.AlignRight
         visible: radio.children[1].checked
     }
-    TextField
+    ComboBox
     {
-        property string name: "timework"
-        id: timetowork
+        property string name: "workdays"
+        id: workdays
         Layout.fillWidth: true
         visible: radio.children[1].checked
-        placeholderTextColor: "red"
-        Layout.columnSpan: 3
-        onTextChanged: checkFields()
+        model: ["1","2","3","4","5","6","7"]
+    }
+    Label
+    {
+        text: qsTr("Stunden")
+        Layout.alignment: Qt.AlignRight
+        visible: radio.children[1].checked
+    }
+    ComboBox
+    {
+        property string name: "workhours"
+        id: workhours
+        Layout.fillWidth: true
+        visible: radio.children[1].checked
+        model: ["1","2","3","4","5","6","7","8"]
     }
     Label
     {
@@ -299,9 +406,10 @@ GridLayout
         {
             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()) && phonenumber.text.trim()
+                    && (city.editText.trim() || city.currentText.trim())
+                    && birthday.text.trim() && phonenumber.text.trim()
                     && cellphone.text.trim() && email.text.trim() && jobdescription.text.trim()
-                    && workstart.text.trim() && workend.text.trim() && timetowork.text.trim() && briefAnrede.text.trim())
+                    && workstart.text.trim() && workend.text.trim() && briefAnrede.text.trim())
         }
     }
     function requiredField()
@@ -314,7 +422,6 @@ GridLayout
         jobdescription.placeholderText = pf
         workstart.placeholderText = pf
         workend.placeholderText = pf
-        timetowork.placeholderText = pf
         briefAnrede.placeholderText = pf
         houseno.placeholderText = pf
     }