diff --git a/src/activities/server/components/ManageGroupsBar.qml b/src/activities/server/components/ManageGroupsBar.qml index 95c2033cc..d9bb10647 100644 --- a/src/activities/server/components/ManageGroupsBar.qml +++ b/src/activities/server/components/ManageGroupsBar.qml @@ -1,344 +1,370 @@ import QtQuick 2.9 import QtQuick.Layouts 1.12 //import QtQuick.Controls 1.4 import "../../../core" import QtQuick.Dialogs 1.3 import QtQuick.Controls 2.3 import "../components" import "../server.js" as Activity Item { id: pupilsNavigationBarItem property bool isCollapsed: true property int groupTextMargin: 30 anchors { top: parent.top bottom: parent.bottom left: parent.left } width: Style.widthNavigationButton Rectangle { id: pupilsNavigationRectangle width: parent.width height: parent.height color: Style.colourBackground border.width: 1 - border.color: "lightgrey" + border.color: "lightgrey" ColumnLayout{ id: groupNames spacing: 2 anchors.top: parent.top - width: parent.width - 10 + width: parent.width //groups header Rectangle { id: test height: 60 width: parent.width RowLayout { width: parent.width height: parent.height Rectangle { Layout.fillHeight: true Layout.minimumWidth: pupilsNavigationRectangle.width/5 Text { anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter color: Style.colourNavigationBarBackground font { family: Style.fontAwesome pixelSize: Style.pixelSizeNavigationBarIcon/2 } text: "\uf0c0" font.bold: true leftPadding: 20 topPadding: 20 } } Rectangle { implicitHeight: 60 Layout.fillWidth: true Layout.fillHeight: true Text { anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left leftPadding: 10 topPadding: 20 text: qsTr("Groups") font.bold: true color: Style.colourNavigationBarBackground } } } } //groups names Repeater { id: groupsNamesRepeater model: Activity.groupsNamesArray Rectangle { id: groupNameRectangle width: groupNames.width Layout.preferredHeight: 40 RowLayout { id: groupNameRow width: pupilsNavigationRectangle.width - 10 height: 40 Rectangle { Layout.fillHeight: true Layout.minimumWidth: pupilsNavigationRectangle.width/5 color: "transparent" Text { text: "\uf054" anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter leftPadding: 20 color: "grey" font { family: Style.fontAwesome pixelSize: Style.pixelSizeNavigationBarIcon / 2 } } } Rectangle { + id: groupeNameTextRectangle Layout.fillWidth: true Layout.fillHeight: true - height: 40 + Layout.preferredWidth: groupNameText.width + Layout.preferredHeight: groupNameText.height color: "transparent" + + MouseArea { + anchors.fill: parent + height: parent.height + width: parent.width + hoverEnabled: true + onClicked: { + console.log("sort groups") + } + onEntered: { groupNameText.color = Style.colourNavigationBarBackground + groupNameRectangle.color = Style.colourPanelBackgroundHover + } + onExited: { groupNameText.color = "grey" + groupNameRectangle.color = Style.colourBackground + } + } + Text { - text: modelData + id: groupNameText + anchors.verticalCenter: parent.verticalCenter - width: parent.width + + text: modelData color: "grey" leftPadding: 5 elide: Text.ElideRight + } } + Rectangle { id: elipsis Layout.minimumWidth: pupilsNavigationRectangle.width/5 Layout.fillHeight: true height: 40 color: "transparent" Text { id: elipsisText text: "\uf142" //elipsis-v anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter color: "grey" font { family: Style.fontAwesome pixelSize: Style.pixelSizeNavigationBarIcon / 2 //? see with style } } - } - } - - MouseArea { - //anchors.fill: groupNameRectangle - anchors.right: groupNameRectangle.right - anchors.top: groupNameRectangle.top - height: groupNameRectangle.height - width: groupNameRectangle.width - - - //anchors.fill: parent - hoverEnabled: true - onEntered: { elipsisText.color = Style.colourNavigationBarBackground - modifyGroupCommandsRectangle.visible = true - groupNameRectangle.color = Style.colourPanelBackgroundHover - } - onExited: { elipsisText.color = "grey" - modifyGroupCommandsRectangle.visible = false - groupNameRectangle.color = Style.colourBackground - } - Rectangle { - id: modifyGroupCommandsRectangle - - anchors.right: parent.right - visible: false - height: groupNameRow.height - width: 100 - color: "transparent" + MouseArea { + anchors.right: elipsis.right + anchors.top: elipsis.top + height: elipsis.height + width: elipsis.width - RowLayout { - width: pupilsNavigationRectangle.width/3 - height: parent.height + hoverEnabled: true + onEntered: { elipsisText.color = Style.colourNavigationBarBackground + modifyGroupCommandsRectangle.visible = true + groupNameRectangle.color = Style.colourPanelBackgroundHover + } + onExited: { elipsisText.color = "grey" + modifyGroupCommandsRectangle.visible = false + groupNameRectangle.color = Style.colourBackground + } Rectangle { - id: editIconRectangle - - Layout.fillWidth: true - Layout.preferredWidth: modifyGroupCommandsRectangle/2 - Layout.preferredHeight: editIcon.height - color: "transparent" - - Text { - id: editIcon - text: "\uf304" - anchors.centerIn: parent - color: "grey" - font { - family: Style.fontAwesome - pixelSize: Style.pixelSizeNavigationBarIcon / 2 + id: modifyGroupCommandsRectangle + + anchors.right: parent.right + visible: false + height: groupNameRow.height + width: 70 + color: Style.colourPanelBackgroundHover + + Row { + width: pupilsNavigationRectangle.width/3 + height: parent.height + anchors.fill: parent + + Rectangle { + id: editIconRectangle + + width: parent.width/2 + height: parent.height + color: "transparent" + + Text { + id: editIcon + text: "\uf304" + anchors.centerIn: parent + color: "grey" + font { + family: Style.fontAwesome + pixelSize: Style.pixelSizeNavigationBarIcon / 2 + } + } + MouseArea { + anchors.fill: parent + hoverEnabled: true + onClicked: { + modifyGroupDialog.inputText = modelData + console.log("--" + index) + modifyGroupDialog.groupNameIndex = index + modifyGroupDialog.open() + console.log("clicked ...") + } + onEntered: { editIcon.color = Style.colourNavigationBarBackground } + onExited: { editIcon.color = Style.colourCommandBarFontDisabled } + } } - } - MouseArea { - anchors.fill: parent - hoverEnabled: true - onClicked: { - modifyGroupDialog.inputText = modelData - console.log("--" + index) - modifyGroupDialog.groupNameIndex = index - modifyGroupDialog.open() - console.log("clicked ...") - } - onEntered: { editIcon.color = Style.colourNavigationBarBackground } - onExited: { editIcon.color = Style.colourCommandBarFontDisabled } - } - } - Rectangle { - Layout.preferredWidth: modifyGroupCommandsRectangle/2 - Layout.preferredHeight: editIcon.height - Layout.fillWidth: true - color: "transparent" - - Text { - id: trashIcon - text: "\uf2ed" - anchors.centerIn: parent - color: "grey" - font { - family: Style.fontAwesome - pixelSize: Style.pixelSizeNavigationBarIcon / 2 + Rectangle { + + color: "transparent" + + width: parent.width/2 + height: parent.height + + Text { + id: trashIcon + text: "\uf2ed" + anchors.centerIn: parent + color: "grey" + font { + family: Style.fontAwesome + pixelSize: Style.pixelSizeNavigationBarIcon / 2 + } + } + MouseArea { + anchors.fill: parent + hoverEnabled: true + onClicked: { + addAGroupText.color = Style.colourNavigationBarBackground + removeGroupDialog.groupNameIndex = index + removeGroupDialog.open() + console.log("clicked ...") + } + onEntered: { trashIcon.color = Style.colourNavigationBarBackground } + onExited: { trashIcon.color = Style.colourCommandBarFontDisabled } + } } } - MouseArea { - anchors.fill: parent - hoverEnabled: true - onClicked: { - addAGroupText.color = Style.colourNavigationBarBackground - removeGroupDialog.groupNameIndex = index - removeGroupDialog.open() - console.log("clicked ...") - } - onEntered: { trashIcon.color = Style.colourNavigationBarBackground } - onExited: { trashIcon.color = Style.colourCommandBarFontDisabled } - } } - } - } - AddModifyGroupDialog { - id: modifyGroupDialog + AddModifyGroupDialog { + id: modifyGroupDialog - property int groupNameIndex + property int groupNameIndex - label: "Modify Group Name" - inputText: "testdefault" + label: "Modify Group Name" + inputText: "testdefault" - onAccepted: { - console.log("save.dfg..") - console.log(textInputValue) - Activity.groupsNamesArray[groupNameIndex] = textInputValue - console.log(Activity.groupsNamesArray) - groupsNamesRepeater.model = Activity.groupsNamesArray - modifyGroupDialog.close() - } - } + onAccepted: { + console.log("save.dfg..") + console.log(textInputValue) + Activity.groupsNamesArray[groupNameIndex] = textInputValue + console.log(Activity.groupsNamesArray) + groupsNamesRepeater.model = Activity.groupsNamesArray + modifyGroupDialog.close() + } + } - AddModifyGroupDialog { - id: removeGroupDialog + AddModifyGroupDialog { + id: removeGroupDialog - property int groupNameIndex + property int groupNameIndex - label: qsTr("Are you sure you want to remove the group") - inputText: Activity.groupsNamesArray[groupNameIndex] + label: qsTr("Are you sure you want to remove the group") + inputText: Activity.groupsNamesArray[groupNameIndex] - textInputReadOnly: true + textInputReadOnly: true - onAccepted: { - console.log("save.dfg..") - console.log(textInputValue) - Activity.groupsNamesArray[groupNameIndex] = textInputValue - console.log(Activity.groupsNamesArray) - groupsNamesRepeater.model = Activity.groupsNamesArray - modifyGroupDialog.close() + onAccepted: { + console.log("save.dfg..") + console.log(textInputValue) + Activity.groupsNamesArray[groupNameIndex] = textInputValue + console.log(Activity.groupsNamesArray) + groupsNamesRepeater.model = Activity.groupsNamesArray + modifyGroupDialog.close() + } + } } + } + } + + + } } } Rectangle { id: addAGroupLabelRectangle anchors.top: groupNames.bottom anchors.left: parent.left width: parent.width - 10 height: 40 Text { id: addAGroupText text: "\uf067" + qsTr("Add a group") anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter leftPadding: 5 color: "grey" font { family: Style.fontAwesome pixelSize: Style.pixelSizeNavigationBarIcon / 3 //? see with style } } MouseArea { anchors.fill: parent hoverEnabled: true onClicked: { addAGroupText.color = Style.colourNavigationBarBackground addGroupDialog.open() console.log("clicked ...") } onEntered: { addAGroupText.color = Style.colourNavigationBarBackground } onExited: { addAGroupText.color = "grey" } } AddModifyGroupDialog { id: addGroupDialog label: qsTr("Add a group name") inputText: qsTr("Group name") onAccepted: { console.log("save new group..") console.log(textInputValue) Activity.groupsNamesArray.push(textInputValue) console.log(Activity.groupsNamesArray) groupsNamesRepeater.model = Activity.groupsNamesArray addGroupDialog.close() } } } } } diff --git a/src/activities/server/views/ManagePupilsView.qml b/src/activities/server/views/ManagePupilsView.qml index 5c66f5d8c..d74ed99e4 100644 --- a/src/activities/server/views/ManagePupilsView.qml +++ b/src/activities/server/views/ManagePupilsView.qml @@ -1,396 +1,476 @@ import QtQuick 2.12 import QtQuick.Layouts 1.12 import QtQml.Models 2.12 import CM 1.0 import "../components" import "../../../core" import QtQuick.Controls 2.2 import "." import "../server.js" as Activity Item { id: managePupilsView - width: activity.width + //width: activity.width // property Client newClient: masterController.ui_newClient Rectangle { anchors.fill: parent color: Style.colourBackground Text { anchors.centerIn: parent text: "Manage Pupils View" } } TopBanner { id: topBanner text: "Groups and pupils management" } ManageGroupsBar { id: pupilsNavigationBar anchors.top: topBanner.bottom } Rectangle { id: managePupilsViewRectangle anchors.left: pupilsNavigationBar.right anchors.top: topBanner.bottom anchors.right: parent.right anchors.bottom: parent.bottom - width: managePupilsView.width + width: managePupilsView.width - pupilsNavigationBar.width //color: "red" ColumnLayout{ id: pupilsDetailsColumn spacing: 2 anchors.top: parent.top - width: parent.width - 10 + width: parent.width property int pupilNameColWidth : pupilsDetailsColumn.width/3 property int yearOfBirthColWidth : pupilsDetailsColumn.width/8 //pupils header Rectangle { id: pupilsHeaderRectangle height: 60 width: parent.width RowLayout { width: managePupilsViewRectangle.width - 10 height: parent.height Rectangle { id: pupilNameHeader Layout.fillHeight: true Layout.minimumWidth: pupilsDetailsColumn.pupilNameColWidth Text { anchors.verticalCenter: parent.verticalCenter color: Style.colourNavigationBarBackground text: "Pupils Names" font.bold: true leftPadding: 60 topPadding: 20 } } Rectangle { id: yearOfBirthHeader Layout.fillHeight: true Layout.minimumWidth: pupilsDetailsColumn.yearOfBirthColWidth //any way to find "year of birth text width" if translations ? Text { anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter text: "Year of Birth" font.bold: true color: Style.colourNavigationBarBackground topPadding: 20 } } Rectangle { Layout.fillWidth: true Layout.fillHeight: true Text { anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left leftPadding: 10 text: "Groups" font.bold: true color: Style.colourNavigationBarBackground topPadding: 20 } } } } //pupils data Repeater { id: pupilsDetailsRepeater model: Activity.pupilsNamesArray + + Rectangle { id: pupilDetailsRectangle - width: managePupilsViewRectangle.width - navigationBar.width - height: 40 - //Layout.preferredHeight: 40 + property bool editPupilRectangleVisible: false + + width: managePupilsViewRectangle.width + height: 40 - color: "blue" border.color: "green" border.width: 5 RowLayout { width: parent.width height: 40 Rectangle { id: pupilName Layout.fillHeight: true Layout.minimumWidth: pupilsDetailsColumn.pupilNameColWidth color: "transparent" CheckBox { text: modelData[0] anchors.verticalCenter: parent.verticalCenter leftPadding: 20 } } Rectangle { id: yearOfBirth Layout.fillHeight: true Layout.minimumWidth: pupilsDetailsColumn.yearOfBirthColWidth //any way to find "year of birth text width" if translations ? color: "transparent" Text { id: yearText text: modelData[1] anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter color: "grey" } } Rectangle { id: groups - Layout.minimumWidth: 30 + Layout.fillWidth: true Layout.fillHeight: true height: 40 color: "transparent" Text { - id: elipsisText + id: groupsText text: "yy" //modelData[2] leftPadding: 10 anchors.verticalCenter: parent.verticalCenter color: "grey" } } Rectangle { - id: pupilCommandOptions - Layout.fillWidth: true + id: editPupilRectangle + Layout.minimumWidth: 50 + Layout.alignment: Qt.AlignRight Layout.fillHeight: true height: 40 + + visible: pupilDetailsRectangle.editPupilRectangleVisible color: "transparent" Text { - id: pupilElipsisV - text: "options" - leftPadding: 10 - anchors.verticalCenter: parent.verticalCenter + id: editIcon + text: "\uf304" + anchors.centerIn: parent color: "grey" + font { + family: Style.fontAwesome + pixelSize: Style.pixelSizeNavigationBarIcon / 2 + } } } - } - - MouseArea { - - anchors.right: pupilDetailsRectangle.right - anchors.top: pupilDetailsRectangle.top - height: pupilDetailsRectangle.height - width: pupilDetailsRectangle.width - 50 - - //anchors.fill: parent - hoverEnabled: true - onEntered: { modifyPupilCommandsRectangle.visible = true - pupilDetailsRectangle.color = Style.colourPanelBackgroundHover - } - onExited: { - modifyPupilCommandsRectangle.visible = false - pupilDetailsRectangle.color = Style.colourBackground - } - Rectangle { - id: modifyPupilCommandsRectangle + id: optionsPupilRectangle + Layout.minimumWidth: 50 + Layout.alignment: Qt.AlignRight + Layout.fillHeight: true + height: 40 - anchors.right: parent.right visible: false - height: pupilDetailsRow.height - width: 100 color: "transparent" - - RowLayout { - id: pupilDetailsRow - width: parent.width - height: parent.height - - Rectangle { - id: editIconRectangle - - Layout.fillWidth: true - Layout.preferredWidth: modifyPupilCommandsRectangle/2 - Layout.preferredHeight: editIcon.height - color: "transparent" - - Text { - id: editIcon - text: "\uf304" - anchors.centerIn: parent - color: "grey" - font { - family: Style.fontAwesome - pixelSize: Style.pixelSizeNavigationBarIcon / 2 - } - } - MouseArea { - anchors.fill: parent - hoverEnabled: true - onClicked: { - modifyPupilDialog.inputText = modelData[0] - console.log("--" + index) - modifyPupilDialog.pupilDetailsIndex = index - modifyPupilDialog.open() - console.log("clicked ...") - } - onEntered: { editIcon.color = Style.colourNavigationBarBackground } - onExited: { editIcon.color = Style.colourCommandBarFontDisabled } - } - } - Rectangle { - Layout.preferredWidth: modifyPupilCommandsRectangle/2 - Layout.preferredHeight: editIcon.height - Layout.fillWidth: true - color: "transparent" - - Text { - id: trashIcon - text: "\uf2ed" - anchors.centerIn: parent - color: "grey" - font { - family: Style.fontAwesome - pixelSize: Style.pixelSizeNavigationBarIcon / 2 - } - } - MouseArea { - anchors.fill: parent - hoverEnabled: true - onClicked: { - addAGroupText.color = Style.colourNavigationBarBackground - removeGroupDialog.pupilDetailsIndex = index - removeGroupDialog.open() - console.log("clicked ...") - } - onEntered: { trashIcon.color = Style.colourNavigationBarBackground } - onExited: { trashIcon.color = Style.colourCommandBarFontDisabled } - } + Text { + id: optionsIcon + text: "\uf142" //elipsis-v + anchors.horizontalCenter: parent.horizontalCenter + anchors.verticalCenter: parent.verticalCenter + color: "grey" + font { + family: Style.fontAwesome + pixelSize: Style.pixelSizeNavigationBarIcon / 2 //? see with style } } } + } - AddModifyGroupDialog { - id: modifyPupilDialog + MouseArea { - property int pupilDetailsIndex + Layout.alignment: Qt.AlignRight + //anchors.fill: parent //right: pupilCommandOptions.right + //anchors.top: pupilCommandOptions.top + height: parent.height + width: parent.width - label: "Modify Pupil Details" - inputText: "testdefault" + //anchors.fill: parent + hoverEnabled: true + onEntered: { //modifyPupilCommandsRectangle.visible = true + pupilDetailsRectangle.color = Style.colourPanelBackgroundHover + pupilDetailsRectangle.editPupilRectangleVisible = true - onAccepted: { - console.log("save.dfg..") - console.log(textInputValue) - Activity.pupilsNamesArray[pupilDetailsIndex][0] = textInputValue - Activity.pupilsNamesArray[pupilDetailsIndex][1] = "2004" - console.log(Activity.pupilsNamesArray) - pupilsDetailsRepeater.model = Activity.pupilsNamesArray - modifyPupilDialog.close() - } } - - AddModifyGroupDialog { - id: removeGroupDialog - - property int groupNameIndex - - label: qsTr("Are you sure you want to remove the group") - inputText: Activity.groupsNamesArray[groupNameIndex] - - textInputReadOnly: true - - onAccepted: { - console.log("save.dfg..") - console.log(textInputValue) - Activity.groupsNamesArray[groupNameIndex][0] = textInputValue - Activity.groupsNamesArray[groupNameIndex][1] = "2004" - console.log(Activity.groupsNamesArray) - pupilsDetailsRepeater.model = Activity.pupilsNamesArray - modifyGroupDialog.close() - } + onExited: { + ///modifyPupilCommandsRectangle.visible = false + pupilDetailsRectangle.color = Style.colourBackground } + } + + + + + + +// Rectangle { +// id: pupilCommandOptions +// Layout.minimumWidth: 50 +// Layout.fillHeight: true +// Layout.alignment: Qt.AlignRight +// height: 40 +// color: "transparent" +// Text { +// id: elipsisText +// text: "\uf142" //elipsis-v +// anchors.horizontalCenter: parent.horizontalCenter +// anchors.verticalCenter: parent.verticalCenter +// color: "grey" +// font { +// family: Style.fontAwesome +// pixelSize: Style.pixelSizeNavigationBarIcon / 2 //? see with style +// } +// } + +// MouseArea { + +// anchors.right: pupilCommandOptions.right +// anchors.top: pupilCommandOptions.top +// height: pupilCommandOptions.height +// width: pupilCommandOptions.width + +// //anchors.fill: parent +// hoverEnabled: true +// onEntered: { modifyPupilCommandsRectangle.visible = true +// pupilCommandOptions.color = Style.colourPanelBackgroundHover +// } +// onExited: { +// modifyPupilCommandsRectangle.visible = false +// pupilCommandOptions.color = Style.colourBackground +// } + +// Rectangle { +// id: modifyPupilCommandsRectangle + +// anchors.right: parent.right +// visible: false +// height: parent.height +// width: 100 +// color: "transparent" + +// border.width: 3 +// border.color: "red" + +// Row { +// id: pupilDetailsRow +// width: parent.width +// height: parent.height + +// Rectangle { +// id: editIconRectangle + +// width: parent.width/2 +// height: parent.height +// color: "transparent" + +// border.color: "red" +// border.width: 3 + +// Text { +// id: editIcon +// text: "\uf304" +// anchors.centerIn: parent +// color: "grey" +// font { +// family: Style.fontAwesome +// pixelSize: Style.pixelSizeNavigationBarIcon / 2 +// } +// } +// MouseArea { +// anchors.fill: parent +// hoverEnabled: true +// onClicked: { +// modifyPupilDialog.inputText = modelData[0] +// console.log("--" + index) +// modifyPupilDialog.pupilDetailsIndex = index +// modifyPupilDialog.open() +// console.log("clicked ...") +// } +// onEntered: { editIcon.color = Style.colourNavigationBarBackground } +// onExited: { editIcon.color = Style.colourCommandBarFontDisabled } +// } +// } +// Rectangle { +// width: parent.width/2 +// height: parent.height + +// color: "transparent" + +// Text { +// id: trashIcon +// text: "\uf2ed" +// anchors.centerIn: parent +// color: "grey" +// font { +// family: Style.fontAwesome +// pixelSize: Style.pixelSizeNavigationBarIcon / 2 +// } +// } +// MouseArea { +// anchors.fill: parent +// hoverEnabled: true +// onClicked: { +// addAGroupText.color = Style.colourNavigationBarBackground +// removeGroupDialog.pupilDetailsIndex = index +// removeGroupDialog.open() +// console.log("clicked ...") +// } +// onEntered: { trashIcon.color = Style.colourNavigationBarBackground } +// onExited: { trashIcon.color = Style.colourCommandBarFontDisabled } +// } +// } +// } +// } + +// AddModifyGroupDialog { +// id: modifyPupilDialog + +// property int pupilDetailsIndex + +// label: "Modify Pupil Details" +// inputText: "testdefault" + +// onAccepted: { +// console.log("save.dfg..") +// console.log(textInputValue) +// Activity.pupilsNamesArray[pupilDetailsIndex][0] = textInputValue +// Activity.pupilsNamesArray[pupilDetailsIndex][1] = "2004" +// console.log(Activity.pupilsNamesArray) +// pupilsDetailsRepeater.model = Activity.pupilsNamesArray +// modifyPupilDialog.close() +// } +// } + +// AddModifyGroupDialog { +// id: removeGroupDialog + +// property int groupNameIndex + +// label: qsTr("Are you sure you want to remove the group") +// inputText: Activity.groupsNamesArray[groupNameIndex] + +// textInputReadOnly: true + +// onAccepted: { +// console.log("save.dfg..") +// console.log(textInputValue) +// Activity.groupsNamesArray[groupNameIndex][0] = textInputValue +// Activity.groupsNamesArray[groupNameIndex][1] = "2004" +// console.log(Activity.groupsNamesArray) +// pupilsDetailsRepeater.model = Activity.pupilsNamesArray +// modifyGroupDialog.close() +// } +// } +// } +// } + } - } - } } - } + } CommandBar { commandList: masterController.ui_commandController.ui_managePupilsViewContextCommands } /* ScrollView { id: scrollView anchors { left: parent.left right: parent.right top: parent.top //bottom: commandBar.top margins: Style.sizeScreenMargin } clip: true Column { spacing: Style.sizeScreenMargin width: scrollView.width Panel { headerText: "Client Details" contentComponent: Column { spacing: Style.sizeControlSpacing StringEditorSingleLine { stringDecorator: newClient.ui_reference anchors { left: parent.left right: parent.right } } StringEditorSingleLine { stringDecorator: newClient.ui_name anchors { left: parent.left right: parent.right } } } } AddressEditor { address: newClient.ui_supplyAddress headerText: "Supply Address" } AddressEditor { address: newClient.ui_billingAddress headerText: "Billing Address" } } } */ }