Add Applicant form changed

Gui/ApplicantNationalInsurance.qml

@@ -33,7 +33,7 @@ GridLayout
     TextField
     {
         property string name: "socialno"
-        id: socialnumber
+        id: socialno
         Layout.fillWidth: true
     }
 
@@ -99,8 +99,8 @@ GridLayout
     }
     TextField
     {
-        property string name: "passno"
+        property string name: "idnumber"
-        id: passno
+        id: idnumber
         Layout.fillWidth: true
     }
 
@@ -111,8 +111,8 @@ GridLayout
     }
     TextField
     {
-        property string name: "passduration"
+        property string name: "idexpiry"
-        id: passduration
+        id: idexpiry
         Layout.fillWidth: true
     }
     Label
@@ -122,8 +122,8 @@ GridLayout
     }
     TextField
     {
-        property string name: "exhibitionlocation"
+        property string name: "idauthority"
-        id: exhibitionlocation
+        id: idauthority
         Layout.fillWidth: true
     }
     Label
@@ -134,8 +134,8 @@ GridLayout
     }
     TextField
     {
-        property string name: "exhibitdate"
+        property string name: "idissued"
-        id: exhibitdate
+        id: idissued
         Layout.fillWidth: true
     }
     CheckBox
@@ -146,61 +146,63 @@ GridLayout
         text: qsTr("Arbeitserlaubnis <font color='red'><b>?</b></font>")
         visible: nation.currentText === "Deutschland"? false:true
     }
-    Item
+    CheckBox
     {
-        Layout.fillWidth: true
+        property string name: "residencetype"
+        id: residencetype
+        text: qsTr("Aufenthaltstitel")
         visible: nation.currentText === "Deutschland"? false:true
     }
     Label
     {
         text: qsTr("Aufenthaltstitel Nr.")
-        visible: nation.currentText === "Deutschland"? false:true
+        visible: residencetype.checked
         Layout.alignment: Qt.AlignRight
     }
     TextField
     {
         property string name: "residenceno"
         id: residenceno
-        visible: nation.currentText === "Deutschland"? false:true
+        visible: residencetype.checked
         Layout.fillWidth: true
     }
     Label
     {
         text: qsTr("Ausgestellt von")
-        visible: nation.currentText === "Deutschland"? false:true
+        visible: residencetype.checked
         Layout.alignment: Qt.AlignRight
     }
     TextField
     {
-        property string name: "residenceissuedloc"
+        property string name: "residenceauthority"
-        id: residenceissuedloc
+        id: residenceauthority
-        visible: nation.currentText === "Deutschland"? false:true
+        visible: residencetype.checked
         Layout.fillWidth: true
     }
     Label
     {
         text: qsTr("Ausgestellt am")
-        visible: nation.currentText === "Deutschland"? false:true
+        visible: residencetype.checked
         Layout.alignment: Qt.AlignRight
     }
     TextField
     {
         property string name: "residenceissued"
         id: residenceissued
-        visible: nation.currentText === "Deutschland"? false:true
+        visible: residencetype.checked
         Layout.fillWidth: true
     }
     Label
     {
         text: qsTr("Gültig bis")
-        visible: nation.currentText === "Deutschland"? false:true
+        visible: residencetype.checked
         Layout.alignment: Qt.AlignRight
     }
     TextField
     {
-        property string name: "residenceexpire"
+        property string name: "residenceexpiry"
-        id: residenceexpire
+        id: residenceexpiry
-        visible: nation.currentText === "Deutschland"? false:true
+        visible: residencetype.checked
         Layout.fillWidth: true
     }
 

Gui/ApplicantPersonalData.qml

@@ -310,14 +310,14 @@ GridLayout
     }
     Label
     {
-        text: qsTr("Arbeitsbeginn")
+        text: qsTr("Vertragsbeginn")
         Layout.alignment: Qt.AlignRight
         visible: radio.children[1].checked
     }
     TextField
     {
-        property string name: "workstart"
+        property string name: "contractstart"
-        id: workstart
+        id: contractstart
         Layout.fillWidth: true
         visible: radio.children[1].checked
         placeholderTextColor: "red"
@@ -330,14 +330,14 @@ GridLayout
     }
     Label
     {
-        text: qsTr("Bei Befristung Ende")
+        text: qsTr("Vertragsende")
         Layout.alignment: Qt.AlignRight
         visible: radio.children[1].checked
     }
     TextField
     {
-        property string name: "workend"
+        property string name: "contractend"
-        id: workend
+        id: contractend
         Layout.fillWidth: true
         visible: radio.children[1].checked
         placeholderTextColor: "red"
@@ -409,7 +409,7 @@ GridLayout
                     && (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() && briefAnrede.text.trim())
+                    && contractstart.text.trim() && contractend.text.trim() && briefAnrede.text.trim())
         }
     }
     function requiredField()
@@ -420,8 +420,8 @@ GridLayout
         cellphone.placeholderText = pf
         email.placeholderText = pf
         jobdescription.placeholderText = pf
-        workstart.placeholderText = pf
+        contractstart.placeholderText = pf
-        workend.placeholderText = pf
+        contractend.placeholderText = pf
         briefAnrede.placeholderText = pf
         houseno.placeholderText = pf
     }

Gui/ApplicantVarious.qml

@@ -16,8 +16,8 @@ GridLayout
 
     TextField
     {
-        property string name: "behinderung"
+        property string name: "disability"
-        id: behinderung
+        id: disability
         placeholderText: "0,0"
     }
 
@@ -42,8 +42,8 @@ GridLayout
 
     TextField
     {
-        property string name: "kostenstelle"
+        property string name: "office"
-        id: kostenstelle
+        id: office
         Layout.fillWidth: true
     }
 
@@ -55,8 +55,8 @@ GridLayout
 
     TextField
     {
-        property string name: "fremdlohn"
+        property string name: "empreference"
-        id: fremdLohnNummer
+        id: empreference
         Layout.fillWidth: true
     }
 }

lib/DB/EmployeeDAO.py

@@ -0,0 +1,6 @@
+# This Python file uses the following encoding: utf-8
+
+
+class EmployeeDAO:
+    def __init__(self):
+        pass

lib/DB/EmployeeModel.py

@@ -0,0 +1,6 @@
+# This Python file uses the following encoding: utf-8
+
+
+class EmployeeModel:
+    def __init__(self):
+        pass

pyqcrm.pyproject

@@ -18,6 +18,8 @@
         "lib/DB/BTypeModel.py",
         "lib/DB/BTypeDAO.py",
         "lib/DB/ContactDAO.py",
-        "lib/DB/ContactModel.py"
+        "lib/DB/ContactModel.py",
+        "lib/DB/EmployeeModel.py",
+        "lib/DB/EmployeeDAO.py"
     ]
 }