diff --git a/Gui/ApplicantNationalInsurance.qml b/Gui/ApplicantNationalInsurance.qml index 79f6017..c2e79ce 100644 --- a/Gui/ApplicantNationalInsurance.qml +++ b/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" - id: passno + property string name: "idnumber" + id: idnumber Layout.fillWidth: true } @@ -111,8 +111,8 @@ GridLayout } TextField { - property string name: "passduration" - id: passduration + property string name: "idexpiry" + id: idexpiry Layout.fillWidth: true } Label @@ -122,8 +122,8 @@ GridLayout } TextField { - property string name: "exhibitionlocation" - id: exhibitionlocation + property string name: "idauthority" + id: idauthority Layout.fillWidth: true } Label @@ -134,8 +134,8 @@ GridLayout } TextField { - property string name: "exhibitdate" - id: exhibitdate + property string name: "idissued" + id: idissued Layout.fillWidth: true } CheckBox @@ -146,61 +146,63 @@ GridLayout text: qsTr("Arbeitserlaubnis ?") 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" - id: residenceissuedloc - visible: nation.currentText === "Deutschland"? false:true + property string name: "residenceauthority" + id: residenceauthority + 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" - id: residenceexpire - visible: nation.currentText === "Deutschland"? false:true + property string name: "residenceexpiry" + id: residenceexpiry + visible: residencetype.checked Layout.fillWidth: true } diff --git a/Gui/ApplicantPersonalData.qml b/Gui/ApplicantPersonalData.qml index 56196b2..db473cd 100644 --- a/Gui/ApplicantPersonalData.qml +++ b/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" - id: workstart + property string name: "contractstart" + 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" - id: workend + property string name: "contractend" + 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 - workend.placeholderText = pf + contractstart.placeholderText = pf + contractend.placeholderText = pf briefAnrede.placeholderText = pf houseno.placeholderText = pf } diff --git a/Gui/ApplicantVarious.qml b/Gui/ApplicantVarious.qml index 7f2ecf3..f881616 100644 --- a/Gui/ApplicantVarious.qml +++ b/Gui/ApplicantVarious.qml @@ -16,8 +16,8 @@ GridLayout TextField { - property string name: "behinderung" - id: behinderung + property string name: "disability" + id: disability placeholderText: "0,0" } @@ -42,8 +42,8 @@ GridLayout TextField { - property string name: "kostenstelle" - id: kostenstelle + property string name: "office" + id: office Layout.fillWidth: true } @@ -55,8 +55,8 @@ GridLayout TextField { - property string name: "fremdlohn" - id: fremdLohnNummer + property string name: "empreference" + id: empreference Layout.fillWidth: true } } diff --git a/lib/DB/EmployeeDAO.py b/lib/DB/EmployeeDAO.py new file mode 100644 index 0000000..92d8d72 --- /dev/null +++ b/lib/DB/EmployeeDAO.py @@ -0,0 +1,6 @@ +# This Python file uses the following encoding: utf-8 + + +class EmployeeDAO: + def __init__(self): + pass diff --git a/lib/DB/EmployeeModel.py b/lib/DB/EmployeeModel.py new file mode 100644 index 0000000..786c139 --- /dev/null +++ b/lib/DB/EmployeeModel.py @@ -0,0 +1,6 @@ +# This Python file uses the following encoding: utf-8 + + +class EmployeeModel: + def __init__(self): + pass diff --git a/pyqcrm.pyproject b/pyqcrm.pyproject index 32eac10..1d5ad15 100644 --- a/pyqcrm.pyproject +++ b/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" ] }