diff --git a/Gui/ObjectAddOnContactPerson.qml b/Gui/ObjectAddOnContactPerson.qml index 4f4ab07..7b39aaf 100644 --- a/Gui/ObjectAddOnContactPerson.qml +++ b/Gui/ObjectAddOnContactPerson.qml @@ -4,6 +4,7 @@ import QtQuick.Controls GridLayout { + property var contacts: null columns: 2 CheckBox @@ -11,14 +12,6 @@ GridLayout id: contactperson text: qsTr("Ansprechpartner") Layout.columnSpan: 2 - onCheckStateChanged: - { - title.enabled = contactperson.checked - firstname.enabled = contactperson.checked - lastname.enabled = contactperson.checked - phonenumber.enabled = contactperson.checked - posizion.enabled = contactperson.checked - } } Label { @@ -30,7 +23,7 @@ GridLayout id: title model: [qsTr("Herr"),qsTr("Frau")] Layout.fillWidth: true - enabled: false + enabled: contactperson.checked } Label { @@ -43,7 +36,7 @@ GridLayout Layout.fillWidth: true placeholderText: "Pflichtfeld" placeholderTextColor: "red" - enabled: false + enabled: contactperson.checked } Label { @@ -56,7 +49,7 @@ GridLayout Layout.fillWidth: true placeholderText: "Pflichtfeld" placeholderTextColor: "red" - enabled: false + enabled: contactperson.checked } Label { @@ -69,7 +62,7 @@ GridLayout Layout.fillWidth: true placeholderText: "Pflichtfeld" placeholderTextColor: "red" - enabled: false + enabled: contactperson.checked } Label { @@ -82,8 +75,147 @@ GridLayout Layout.fillWidth: true placeholderText: "Pflichtfeld" placeholderTextColor: "red" - enabled: false + enabled: contactperson.checked } + RowLayout + { + Layout.fillWidth: true + Layout.columnSpan: 2 + + Item + { + Layout.fillWidth: true + } + + Button + { + id: removeContact + text: qsTr("Entfernen") + enabled: contactperson.checked + } + + Button + { + id: addContact + text: qsTr("Hinzufügen") + enabled: contactperson.checked + onClicked: + { + var num_contacts = 0 + if (contacts !== null && contacts !== undefined) num_contacts = Object.keys(contacts).length + else contacts = {} + if (num_contacts < 3 && firstname.text.trim() !== "" && lastname.text.trim() !== "" && phonenumber.text.trim() !== "" && posizion.text.trim() !== "") + { + contacts[num_contacts] = {} + contacts[num_contacts]["title"] = title.currentText + contacts[num_contacts]["fname"] = firstname.text.trim() + contacts[num_contacts]["lname"] = lastname.text.trim() + contacts[num_contacts]["phone"] = phonenumber.text.trim() + contacts[num_contacts]["position"] = posizion.text.trim() + + contactModel.append({name: title.currentText + " " + firstname.text.trim() + " " + lastname.text.trim(), phone: phonenumber.text.trim(), posizion: posizion.text.trim()}) + + firstname.text = "" + lastname.text = "" + phonenumber.text = "" + posizion.text = "" + } + } + } + } + + Label + { + text: qsTr("Ansprechpartner") + Layout.alignment: Qt.AlignRight | Qt.AlignTop + } + + ListModel + { + id: contactModel + } + + Component + { + id: headline + Row + { + Text + { + id: cpname + text: qsTr("Name") + width: 175 + font.bold: true + horizontalAlignment: Text.AlignHCenter + color: "yellow" + } + + Text + { + id: cpphone + text: qsTr("Telefon") + width: 100 + font.bold: true + horizontalAlignment: Text.AlignHCenter + color: "yellow" + } + + Text + { + id: cppos + text: qsTr("Position") + width: 150 + font.bold: true + horizontalAlignment: Text.AlignHCenter + color: "yellow" + } + } + } + + Rectangle + { + Layout.fillWidth: true + implicitHeight: 100 + color: firstname.palette.base + border.color: firstname.activeFocus? firstname.palette.highlight: firstname.palette.base + ListView + { + id: contactView + //Layout.fillWidth: true + implicitHeight: parent.height + model: contactModel + + header: headline + + delegate: Item + { + width: parent.width + //color: firstname.palette.base + //border.color: firstname.activeFocus? firstname.palette.highlight: firstname.palette.base + height: 15 + + Row + { + spacing: 9 + Text + { + text: model.name + width: 175 + } + Text + { + text: model.phone + width: 100 + } + Text + { + text: model.posizion + width: 150 + } + } + } + } + } } diff --git a/Gui/ObjectAddOnEmployee.qml b/Gui/ObjectAddOnEmployee.qml index 28660d4..6bec906 100644 --- a/Gui/ObjectAddOnEmployee.qml +++ b/Gui/ObjectAddOnEmployee.qml @@ -4,47 +4,75 @@ import QtQuick.Controls GridLayout { + property var employeens: null id: oaoemployee columns: 2 rows: 4 Label { text: qsTr("Mitarbeiter") + Layout.alignment: Qt.AlignRight | Qt.AlignTop } - ScrollView - { - Layout.rowSpan: 3 - Layout.fillWidth: true - TextArea + ListModel + { + id: employeeModel + } + + Rectangle + { + Layout.fillWidth: true + implicitHeight: 75 + Layout.rowSpan: 2 + color: mitarbeiterhin.palette.base + border.color: mitarbeiterhin.activeFocus? mitarbeiterhin.palette.highlight: mitarbeiterhin.palette.base + ListView { id: mitarbeitertext - implicitWidth: parent.width - implicitHeight: 100 - wrapMode: TextEdit.Wrap - background: Rectangle + model: ListModel{ListElement {name: "Mitarbeiter1"} ListElement{name: "Mitarbeiter2"}} + delegate: Item { - color: mitarbeiterhin.palette.base - border.color: mitarbeiterhin.activeFocus? mitarbeiterhin.palette.highlight: mitarbeiterhin.palette.base + Text + { + text: model.name + } } + // wrapMode: TextEdit.Wrap + // background: Rectangle + // { + // color: mitarbeiterhin.palette.base + // border.color: mitarbeiterhin.activeFocus? mitarbeiterhin.palette.highlight: mitarbeiterhin.palette.base + // } } } - Button + RowLayout { - id: mitarbeiterhin - property var neuermitarbeiter: undefined - text: qsTr("Mitarbeiter hinzufügen") Layout.columnSpan: 2 Layout.fillWidth: true - Layout.alignment: Qt.AlignRight - Layout.maximumWidth: mitarbeitertext.width - onClicked: + Item { - var nm = Qt.createComponent("AddObjectEmployee.qml") - if (nm.status === Component.Ready) + Layout.fillWidth: true + } + + Button + { + id: mitarbeiterraus + text: qsTr("Mitarbeiter entfernen") + } + + Button + { + id: mitarbeiterhin + property var neuermitarbeiter: undefined + text: qsTr("Mitarbeiter hinzufügen") + onClicked: { - neuermitarbeiter = nm.createObject (appWindow, {width: 600, height: 400}) - neuermitarbeiter.show() + var nm = Qt.createComponent("AddObjectEmployee.qml") + if (nm.status === Component.Ready) + { + neuermitarbeiter = nm.createObject (appWindow, {width: 600, height: 400}) + neuermitarbeiter.show() + } } } } diff --git a/Gui/ObjectView.qml b/Gui/ObjectView.qml index 1bb9a92..31bacd6 100644 --- a/Gui/ObjectView.qml +++ b/Gui/ObjectView.qml @@ -164,10 +164,8 @@ GridLayout { id: infoview Layout.fillWidth: true - Layout.preferredHeight: 200 - //Layout.columnSpan: 3 + Layout.preferredHeight: 110 ScrollBar.horizontal: ScrollBar - { policy: ScrollBar.AlwaysOn } @@ -176,9 +174,7 @@ GridLayout { id: objectInfo property string name: "objectinfo" - Layout.fillWidth: true - Layout.fillHeight: true - + implicitWidth: parent.width wrapMode: TextEdit.Wrap background: Rectangle { diff --git a/Gui/main.qml b/Gui/main.qml index 543f8d6..593cf2b 100644 --- a/Gui/main.qml +++ b/Gui/main.qml @@ -7,8 +7,8 @@ import QtCore ApplicationWindow { id: appWindow - width: Screen.width * .6 - height: Screen.height * .75 + width: Screen.width * .75 + height: Screen.height * .85 visible: true title: "PYQCRM" property string confile: ""