From 705bffc8d3dcda6582b5e7b53729aeb13b420aa36236aee62187d1282ba9df52 Mon Sep 17 00:00:00 2001 From: linuxero Date: Fri, 17 Jan 2025 11:06:07 +0100 Subject: [PATCH] New employee to object as combobox --- Gui/AddObjectEmployee.qml | 6 +++--- Gui/ApplicantPersonalData.qml | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Gui/AddObjectEmployee.qml b/Gui/AddObjectEmployee.qml index 52a68e6..9b9abfa 100644 --- a/Gui/AddObjectEmployee.qml +++ b/Gui/AddObjectEmployee.qml @@ -29,7 +29,7 @@ ApplicationWindow text: qsTr("Eingesetzter Mitarbeiter") Layout.alignment: Qt.AlignRight } - TextField + ComboBox { id: assignee Layout.fillWidth: true @@ -103,10 +103,10 @@ ApplicationWindow text: qsTr("Hinzufügen") onClicked: { - if (assignee.text.trim() !== "" && duration.text.trim() !== "" && wage.text.trim() !== "" && cleanDays.text.trim() !== "" && tasks.text.trim() !== "" && output.text.trim() !== "") + if (duration.text.trim() !== "" && wage.text.trim() !== "" && cleanDays.text.trim() !== "" && tasks.text.trim() !== "" && output.text.trim() !== "") { var ne = { - "assignee": assignee.text.trim(), + "assignee": assignee.currentText, "duration": duration.text.trim(), "wage": wage.text.trim(), "cleandays": cleanDays.text.trim(), diff --git a/Gui/ApplicantPersonalData.qml b/Gui/ApplicantPersonalData.qml index 296173a..f3e407c 100644 --- a/Gui/ApplicantPersonalData.qml +++ b/Gui/ApplicantPersonalData.qml @@ -18,7 +18,8 @@ GridLayout Layout.fillWidth: true editable: false model: [qsTr("Herr"), qsTr("Frau")] - onCurrentTextChanged: briefAnrede.text = title.currentText === "Herr"? "Sehr geehrter " + title.currentText + ",": "Sehr geehrte " + title.currentText + "," + onCurrentTextChanged: briefAnrede.text = title.currentText === "Herr"? "Sehr geehrter " + + title.currentText: "Sehr geehrte " + title.currentText } Label {