diff --git a/src/activities/server/components/AddModifyPupilDialog.qml b/src/activities/server/components/AddModifyPupilDialog.qml
index 9a4c9e620..f25deec07 100644
--- a/src/activities/server/components/AddModifyPupilDialog.qml
+++ b/src/activities/server/components/AddModifyPupilDialog.qml
@@ -1,139 +1,187 @@
 import QtQuick 2.6
 import "../../../core"
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.2
 import "../server.js" as Activity
 
 Popup {
     id: addModifyPupilDialog
 
     property string label: "To be modified in calling element."
     property string pupilName: "Pupil name to be modifyed in calling element."
     property string groupsNames: "Groups Names to be modifyed in calling element."
     property bool textInputReadOnly: false
     property int pupilsListIndex
 
     signal accepted()
 
     anchors.centerIn: Overlay.overlay
     width: 600
-    height: 300
+    height: 400
     modal: true
     focus: true
     closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent
 
 
     ColumnLayout {
+
         height: parent.height
         width: parent.width
         spacing: 20
 
+        Text {
+            id: errorMessage
+
+            Layout.preferredHeight: 40
+            Layout.preferredWidth: errorMessage.implicitWidth
+            Layout.alignment : Qt.AlignHCenter | Qt.AlignCenter
+
+            font {
+                family: Style.fontAwesome
+                pixelSize: 15
+
+            }
+            color: "red"
+            visible: false
+        }
+
         Text {
             id: groupDialogText
 
             Layout.preferredHeight: 40
             Layout.preferredWidth: parent.width
             Layout.leftMargin: 20
 
             text: label
             font.bold: true
             font {
                 family: Style.fontAwesome
                 pixelSize: 20
             }
         }
 
         Text {
             id: pupilNameTitleText
 
             Layout.preferredHeight: 20
             Layout.preferredWidth: parent.width
             Layout.leftMargin: 40
 
             text: qsTr("Pupil name")
             font.bold: true
             font {
                 family: Style.fontAwesome
                 pixelSize: 15
             }
         }
 
         UnderlinedTextInput {
             id: pupilNameTextInput
 
             Layout.preferredHeight: 20
             Layout.preferredWidth: parent.width
             Layout.leftMargin: 40
 
             defaultText: addModifyPupilDialog.pupilName    //? here we have a problem, when too long text is going left
         }
 
         Text {
             id: groupsListTitleText
 
             Layout.preferredHeight: 20
             Layout.preferredWidth: parent.width
             Layout.leftMargin: 40
 
             text: qsTr("Groups")
             font.bold: true
             font {
                 family: Style.fontAwesome
                 pixelSize: 15
             }
         }
 
         UnderlinedTextInput {
             id: groupsNamesTextInput
 
             Layout.preferredHeight: 20
             Layout.preferredWidth: parent.width
             Layout.leftMargin: 40
 
             defaultText: addModifyPupilDialog.groupsNames
         }
 
 
         Rectangle {
             id: commandButtonsRectangle
             Layout.preferredWidth: parent.width
             Layout.fillHeight: true
 
             ViewButton {
                 id: saveButton
 
                 anchors.right: parent.right
                 anchors.bottom: parent.bottom
                 text: qsTr("Save")
                 onClicked: {
                     console.log("---- " + addModifyPupilDialog.pupilName)
 
                     console.log("1++++---- " + pupilsListIndex)
                     console.log("2++++---- " + pupilNameTextInput.text)
                     console.log("3++++---- " + Activity.pupilsNamesArray)
                     Activity.pupilsNamesArray[pupilsListIndex][0] = pupilNameTextInput.text
 
-                    console.log("---- " + Activity.pupilsNamesArray)
-
-                    addModifyPupilDialog.accepted()
-
-
-                //    addModifyPupilDialog.close();
+                    //Activity.pupilsNamesArray[pupilsListIndex][0] = pupilNameTextInput.text
+
+                    console.log("???? " + Activity.pupilsNamesArray[pupilsListIndex][2])
+
+
+
+                    var testGroupNames = groupsNamesTextInput.text.split("-");
+                    //test if all the grousp added exist
+                    var allGroupsAreValid = true
+                    for (var i=0; i<testGroupNames.length; i++) {
+                        print(testGroupNames[i])
+                        if (!Activity.groupsNamesArray.includes(testGroupNames[i])) {
+                            errorMessage.text = qsTr("The following group does not exists : " + testGroupNames[i])
+                            errorMessage.visible = true
+                            allGroupsAreValid = false
+                        }
+                    }
+
+                    //test if groups are not added twice
+                    for (i=0; i<testGroupNames.length; i++) {
+                        print(testGroupNames[i])
+                        if (Activity.groupsNamesArray.includes(testGroupNames[i])) {
+                            var idx = testGroupNames.indexOf(testGroupNames[i])
+                            var idx2 = testGroupNames.indexOf(testGroupNames[i], idx+1)
+                            if (idx2 !== -1) {
+                                errorMessage.text = qsTr("The following group has been added more than once : " + testGroupNames[i])
+                                errorMessage.visible = true
+                                allGroupsAreValid = false
+                            }
+                        }
+                    }
+
+                    if (allGroupsAreValid === true) {
+                        Activity.pupilsNamesArray[pupilsListIndex][2] = groupsNamesTextInput.text
+                        addModifyPupilDialog.accepted()
+                        addModifyPupilDialog.close();
+                    }
                 }
             }
 
             ViewButton {
                 id: cancelButton
 
                 anchors.right: saveButton.left
                 anchors.bottom: parent.bottom
                 text: qsTr("Cancel")
 
                 onClicked: {
                    console.log("cancel...")
                    addModifyPupilDialog.close();
                 }
             }
         }
     }
 }
diff --git a/src/activities/server/components/RemovePupilsDialog.qml b/src/activities/server/components/RemovePupilsDialog.qml
index 397fe3ce9..7416bb28d 100644
--- a/src/activities/server/components/RemovePupilsDialog.qml
+++ b/src/activities/server/components/RemovePupilsDialog.qml
@@ -1,120 +1,112 @@
 import QtQuick 2.6
 import "../../../core"
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
 import "../server.js" as Activity
 
 Popup {
     id: removePupilsDialog
 
     property alias pupilsNamesText: pupilsNamesText
 
+    signal accepted()
+
     anchors.centerIn: Overlay.overlay
     width: 600
-    height: 600
+    height: 400
     modal: true
     focus: true
     closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent
 
-    onOpened: {
-        pupilsNamesText.text = "test"
-        print("uuuu")
-       // console.log(pupilsDetailsRepeater.itemAt(2)).pupilDetailsRectangleMouseArea.width
+//    onOpened: {
+//        pupilsNamesText.text = "test"
+//        print("uuuu")
+//       // console.log(pupilsDetailsRepeater.itemAt(2)).pupilDetailsRectangleMouseArea.width
 
-    }
+//    }
 
     ColumnLayout {
         height: parent.height
 
         width: parent.width
 
         Rectangle {
             id: removePupilsTextRectangle
 
             Layout.preferredWidth: parent.width
             Layout.alignment: Qt.AlignCenter
             Layout.minimumHeight: 40
             Layout.preferredHeight: 40
             Text {
                 id: deletePupilGroupsText
                 anchors.centerIn: parent
                 width: parent.width * 2/3
                 wrapMode: Text.WordWrap
                 text: qsTr("Are you sure you want to remove the following children from the server?")
                 font.bold: true
                 color: Style.colourNavigationBarBackground
                 font {
                   family: Style.fontAwesome
                   pixelSize: 15
                 }
             }
         }
 
         Rectangle {
             id: pupilsNamesTextRectangle
 
             Layout.preferredWidth: parent.width
             Layout.alignment: Qt.AlignCenter
             Layout.minimumHeight: 80
             Layout.preferredHeight: 100
             Text {
                 id: pupilsNamesText
                 anchors.centerIn: parent
                 //text: qsTr("Format:\nPatrick Dummy;2003\nPatricia Brown;2004\nor\nPatrick Dummy;2003;2nd grade-music-sport\nPatricia Brown;2004;2nd grade-music-art")
                 font.bold: true
                 color: "grey"
                 font {
                   family: Style.fontAwesome
                   pixelSize: 12
                 }
             }
 
         }
 
 
 
         Rectangle {
             id: okCancelRectangle
 
             Layout.preferredWidth: parent.width
             Layout.alignment: Qt.AlignCenter
-            Layout.minimumHeight: saveButton.height
+            Layout.minimumHeight: okButton.height
             Layout.preferredHeight: Layout.minimumHeight
 
             ViewButton {
-                id: saveButton
+                id: okButton
 
                 anchors.right: parent.right
                 anchors.bottom: parent.bottom
                 text: qsTr("Ok")
                 onClicked: {
-
-              //      var lines = edit.text.split('\n')
-
-                    //Activity.addPupilsNamesFromList(edit.text)
-
-                    //console.log("---- " + lines)
-
-                    console.log(pupilsDetailsRepeater.itemAt(2)).pupilDetailsRectangleMouseArea.width
-
-
-                    removePupilsDialog.pupilsToBeRemoved()
+                    removePupilsDialog.accepted()
+                    removePupilsDialog.close()
                 }
-
             }
 
             ViewButton {
                 id: cancelButton
 
-                anchors.right: saveButton.left
+                anchors.right: okButton.left
                 anchors.bottom: parent.bottom
                 text: qsTr("Cancel")
 
                 onClicked: {
                    console.log("cancel...")
                    removePupilsDialog.close();
                 }
             }
         }
     }
 }
diff --git a/src/activities/server/views/ManagePupilsView.qml b/src/activities/server/views/ManagePupilsView.qml
index 3671ee43e..024ca1530 100644
--- a/src/activities/server/views/ManagePupilsView.qml
+++ b/src/activities/server/views/ManagePupilsView.qml
@@ -1,382 +1,405 @@
 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
 
 
     signal pupilsNamesListSelected(var pupilsNamesList)
 
 
     Connections {
         target: masterController.ui_navigationController
+        onGoAddPupilDialog: addPupilDialog.open()
         onGoAddPupilsFromListDialog: addPupilsFromListDialog.open()
         onGoRemovePupilsDialog: removePupilsDialog.open()
     }
 
 
     ListView {
         id: selectedPupilsListview
     }
 
 
     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  - pupilsNavigationBar.width
 
         //color: "red"
 
 
         ColumnLayout{
             id: pupilsDetailsColumn
 
             spacing: 2
             anchors.top: parent.top
             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 {
+                        id: pupilGroupsHeader
                         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
 
                     //property alias pupilNameCheckBox: pupilDetailsRectangle.pupilDetailsRectangleMouseArea.pupilDetailsRectangleRowLayout.pupilName.pupilNameCheckBox
 
                     property alias pupilNameCheckBox: pupilNameCheckBox
 
                     property bool editPupilRectangleVisible: false
                     property bool optionsPupilRectangleVisible: false
 
                     width: managePupilsViewRectangle.width
                     height: 40
 
                     border.color: "green"
                     border.width: 5
 
                     MouseArea {
                         id: pupilDetailsRectangleMouseArea
                         anchors.right: pupilDetailsRectangle.right //right: pupilCommandOptions.right
                         anchors.top: pupilDetailsRectangle.top
                         height: pupilDetailsRectangle.height
                         width: parent.width
 
                         hoverEnabled: true
                         onEntered: {    //modifyPupilCommandsRectangle.visible = true
                                         pupilDetailsRectangle.color = Style.colourPanelBackgroundHover
                                         pupilDetailsRectangle.editPupilRectangleVisible = true
                                         pupilDetailsRectangle.optionsPupilRectangleVisible = true
 
                         }
                         onExited: {
                                         ///modifyPupilCommandsRectangle.visible = false
                                         pupilDetailsRectangle.color = Style.colourBackground
                                         pupilDetailsRectangle.editPupilRectangleVisible = false
                                         pupilDetailsRectangle.optionsPupilRectangleVisible = false
                         }
 
                         RowLayout {
                             id: pupilDetailsRectangleRowLayout
 
                             width: parent.width
                             height: 40
 
                             Rectangle {
                                 id: pupilName
                                 Layout.alignment: Qt.AlignLeft
                                 Layout.fillHeight: true
                                 Layout.minimumWidth: pupilsDetailsColumn.pupilNameColWidth
                                 color: "transparent"
                                 CheckBox {
                                     id: pupilNameCheckBox
                                     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.fillWidth: true
                                 Layout.fillHeight: true
                                 height: 40
                                 color: "transparent"
                                 Text {
                                     id: groupsText
                                     text: modelData[2]
                                     leftPadding: 10
                                     anchors.verticalCenter: parent.verticalCenter
                                     color: "grey"
                                 }
                             }
                             Rectangle {
                                 id: editPupilRectangle
                                 Layout.minimumWidth: 50
                                 //Layout.alignment: Qt.AlignRight
                                 Layout.fillHeight: true
                                 height: 40
 
                                 visible: pupilDetailsRectangle.editPupilRectangleVisible
                                 color: "transparent"
                                 Text {
                                     id: editIcon
                                     text: "\uf304"
                                     anchors.centerIn: parent
                                     color: "grey"
                                     font {
                                        family: Style.fontAwesome
                                        pixelSize: Style.pixelSizeNavigationBarIcon / 2
                                     }
                                 }
                                 MouseArea {
                                     anchors.left: parent.left
                                     anchors.top: parent.top
                                     height: parent.height
                                     width: parent.width
 
                                     //anchors.fill: parent
                                     hoverEnabled: true
                                     onEntered: {    //modifyPupilCommandsRectangle.visible = true
                                                     editIcon.color = Style.colourNavigationBarBackground //Style.colourPanelBackgroundHover
                                                     //pupilDetailsRectangle.editPupilRectangleVisible = true
                                                     //pupilDetailsRectangle.optionsPupilRectangleVisible = true
-                                        print("sdfsfsdf")
-
+                                                    print("sdfsfsdf")
                                     }
                                     onExited: {
                                                     ///modifyPupilCommandsRectangle.visible = false
                                                     editIcon.color = Style.colourCommandBarFontDisabled //Style.colourBackground
                                                     //pupilDetailsRectangle.editPupilRectangleVisible = false
                                                     //pupilDetailsRectangle.optionsPupilRectangleVisible = false
                                     }
                                     onClicked: {
                                         modifyPupilDialog.pupilName = modelData[0]
                                         modifyPupilDialog.groupsNames = modelData[2]
                                         modifyPupilDialog.pupilsListIndex = index
                                         modifyPupilDialog.open()
                                     }
                                }
                             }
                             Rectangle {
                                 id: optionsPupilRectangle
                                 Layout.minimumWidth: 50
                                 Layout.alignment: Qt.AlignRight
                                 Layout.fillHeight: true
                                 height: 40
 
                                 visible: pupilDetailsRectangle.optionsPupilRectangleVisible
                                 color: "transparent"
                                 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
                                     }
                                 }
                                 MouseArea {
                                     anchors.left: parent.left
                                     anchors.top: parent.top
                                     height: parent.height
                                     width: parent.width
 
                                     hoverEnabled: true
                                     onClicked: {
                                         modifyPupilGroupsDialog.open()
                                     }
 
                                     onEntered: {
                                         //modifyPupilCommandsRectangle.visible = true
                                         optionsIcon.color = Style.colourNavigationBarBackground //Style.colourPanelBackgroundHover
                                         //pupilDetailsRectangle.editPupilRectangleVisible = true
                                         //pupilDetailsRectangle.optionsPupilRectangleVisible = true
                                         print("sdfsfsdf")
 
                                     }
                                     onExited: {
                                         ///modifyPupilCommandsRectangle.visible = false
                                         optionsIcon.color = Style.colourCommandBarFontDisabled //Style.colourBackground
                                         //pupilDetailsRectangle.editPupilRectangleVisible = false
                                         //pupilDetailsRectangle.optionsPupilRectangleVisible = false
                                     }
                                }
                             }
                         }
                     }
 
                     ModifyPupilGroupsDialog {
                         id: modifyPupilGroupsDialog
                     }
 
                     AddModifyPupilDialog {
                         id: modifyPupilDialog
 
                         label: qsTr("Modify the name or the groups")
 
                         onAccepted: {
                             pupilsDetailsRepeater.model = Activity.pupilsNamesArray
-                                        pupilDetailsRectangle.update()
+                            //pupilDetailsRectangle.update()  //? does not work
                         }
                     }
                 }
             }
         }
     }
 
     CommandBar {
         commandList: masterController.ui_commandController.ui_managePupilsViewContextCommands
     }
 
+
+    AddModifyPupilDialog {
+        id: addPupilDialog
+
+        label: qsTr("Add pupil name and its group(s)")
+
+        onAccepted: {
+            pupilsDetailsRepeater.model = Activity.pupilsNamesArray
+        }
+
+
+    }
+
+
     AddPupilsFromListDialog {
         id: addPupilsFromListDialog
 
         onPupilsDetailsAdded: {
             pupilsDetailsRepeater.model = Activity.pupilsNamesArray
         }
 
     }
 
     RemovePupilsDialog {
         id: removePupilsDialog
 
         onOpened: {
             var pupilsNamesList = []
             for(var i = 0 ; i < pupilsDetailsRepeater.count ; i ++) {
                 if (pupilsDetailsRepeater.itemAt(i).pupilNameCheckBox.checked === true) {
                     console.log("test" + pupilsDetailsRepeater.itemAt(i).pupilNameCheckBox.text)
                     pupilsNamesList.push(pupilsDetailsRepeater.itemAt(i).pupilNameCheckBox.text)
                 }
             }
             console.log(pupilsNamesList)
             managePupilsView.pupilsNamesListSelected(pupilsNamesList)
             var pupilsNamesListStr = ""
             for(i = 0 ; i < pupilsNamesList.length ; i++) {
                 console.log("++--------" + pupilsNamesList[i])
 
                 pupilsNamesListStr = pupilsNamesListStr + pupilsNamesList[i] + "\r\n"
             }
 
             pupilsNamesText.text = pupilsNamesListStr
 
             console.log("----------")
             console.log(pupilsNamesListStr)
 
         }
+
+        onAccepted: {
+            var pupilsNamesToRemoveList = []
+            for(var i = pupilsDetailsRepeater.count-1; i >= 0; i--) {
+                if (pupilsDetailsRepeater.itemAt(i).pupilNameCheckBox.checked === true) {
+                    Activity.pupilsNamesArray.splice(i,1)
+
+                    console.log("removed" + pupilsDetailsRepeater.itemAt(i).pupilNameCheckBox.text)
+                }
+            }
+            pupilsDetailsRepeater.model = Activity.pupilsNamesArray
+        }
+
     }
 }
diff --git a/src/core/serverMasterController/controllers/command-controller.cpp b/src/core/serverMasterController/controllers/command-controller.cpp
index 1043891f0..71311b2ce 100644
--- a/src/core/serverMasterController/controllers/command-controller.cpp
+++ b/src/core/serverMasterController/controllers/command-controller.cpp
@@ -1,202 +1,203 @@
 #include "command-controller.h"
 
 #include <QList>
 #include <QDebug>
 
 using namespace cm::framework;
 using namespace cm::models;
 
 namespace cm {
 namespace controllers {
 
 class CommandController::Implementation
 {
 public:
 	Implementation(CommandController* _commandController, IDatabaseController* _databaseController, NavigationController* _navigationController, Client* _newClient, ClientSearch* _clientSearch)
 		: commandController(_commandController)
 		, databaseController(_databaseController)
 		, navigationController(_navigationController)
 		, newClient(_newClient)
 		, clientSearch(_clientSearch)
 	{
         Command* createClientSaveCommand = new Command( commandController, QChar( 0xf0c7 ), "Save" );
         QObject::connect( createClientSaveCommand, &Command::executed, commandController, &CommandController::onCreateClientSaveExecuted );
 		createClientViewContextCommands.append( createClientSaveCommand );
 
 		Command* findClientSearchCommand = new Command( commandController, QChar( 0xf002 ), "Search" );
 		QObject::connect( findClientSearchCommand, &Command::executed, commandController, &CommandController::onFindClientSearchExecuted );
 		findClientViewContextCommands.append( findClientSearchCommand );
 
 		Command* editClientDeleteCommand = new Command( commandController, QChar( 0xf235 ), "Delete" );
 		QObject::connect( editClientDeleteCommand, &Command::executed, commandController, &CommandController::onEditClientDeleteExecuted );
 		editClientViewContextCommands.append( editClientDeleteCommand );
 
 		Command* editClientSaveCommand = new Command( commandController, QChar( 0xf0c7 ), "Save" );
 		QObject::connect( editClientSaveCommand, &Command::executed, commandController, &CommandController::onEditClientSaveExecuted );
 		editClientViewContextCommands.append( editClientSaveCommand );
 
         Command* managePupilsAddPupilCommand = new Command( commandController, QChar( 0xf234 ), "Add Pupil" );
         QObject::connect( managePupilsAddPupilCommand, &Command::executed, commandController, &CommandController::onManagePupilsAddPupilExecuted );
         managePupilsViewContextCommands.append( managePupilsAddPupilCommand );
 
         Command* managePupilsAddPupilFromListCommand = new Command( commandController, QChar( 0xf2c2 ), "Add Pupils from List" );
         QObject::connect( managePupilsAddPupilFromListCommand, &Command::executed, commandController, &CommandController::onManagePupilsAddPupilsFromListExecuted );
         managePupilsViewContextCommands.append( managePupilsAddPupilFromListCommand );
 
         Command* managePupilsRemovePupilsFromListCommand = new Command( commandController, QChar( 0xf503 ), "Remove Pupil(s)" );
         QObject::connect( managePupilsRemovePupilsFromListCommand, &Command::executed, commandController, &CommandController::onManagePupilsRemovePupilsExecuted );
         managePupilsViewContextCommands.append( managePupilsRemovePupilsFromListCommand );
 
         Command* managePupilsEditPupilFromListCommand = new Command( commandController, QChar( 0xf4ff ), "Edit Pupil" );
         QObject::connect( managePupilsEditPupilFromListCommand, &Command::executed, commandController, &CommandController::onManagePupilsEditPupilExecuted );
         managePupilsViewContextCommands.append( managePupilsEditPupilFromListCommand );
     }
 
 	CommandController* commandController{nullptr};
 
 	IDatabaseController* databaseController{nullptr};
 	NavigationController* navigationController{nullptr};
 	Client* newClient{nullptr};
 	ClientSearch* clientSearch{nullptr};
 	Client* selectedClient{nullptr};
 	QList<Command*> createClientViewContextCommands{};
 	QList<Command*> findClientViewContextCommands{};
 	QList<Command*> editClientViewContextCommands{};
     QList<Command*> managePupilsViewContextCommands{};
 };
 
 CommandController::CommandController(QObject* parent, IDatabaseController* databaseController, NavigationController* navigationController, Client* newClient, ClientSearch* clientSearch)
 	: QObject(parent)
 {
 	implementation.reset(new Implementation(this, databaseController, navigationController, newClient, clientSearch));
 }
 
 CommandController::~CommandController()
 {
 }
 
 QQmlListProperty<Command> CommandController::ui_createClientViewContextCommands()
 {
 	return QQmlListProperty<Command>(this, implementation->createClientViewContextCommands);
 }
 
 QQmlListProperty<Command> CommandController::ui_findClientViewContextCommands()
 {
 	return QQmlListProperty<Command>(this, implementation->findClientViewContextCommands);
 }
 
 QQmlListProperty<Command> CommandController::ui_editClientViewContextCommands()
 {
 	return QQmlListProperty<Command>(this, implementation->editClientViewContextCommands);
 }
 
 QQmlListProperty<Command> CommandController::ui_managePupilsViewContextCommands()
 {
     return QQmlListProperty<Command>(this, implementation->managePupilsViewContextCommands);
 }
 
 
 void CommandController::setSelectedClient(Client* client)
 {
 	implementation->selectedClient = client;
 }
 
 void CommandController::onCreateClientSaveExecuted()
 {
 	qDebug() << "You executed the Save command!";
 
 	implementation->databaseController->createRow(implementation->newClient->key(), implementation->newClient->id(), implementation->newClient->toJson());
 
 	qDebug() << "New client saved.";
 
 	implementation->clientSearch->searchText()->setValue(implementation->newClient->id());
 	implementation->clientSearch->search();
 	implementation->navigationController->goFindClientView();
 }
 
 void CommandController::onFindClientSearchExecuted()
 {
 	qDebug() << "You executed the Search command!";
 
 	implementation->clientSearch->search();
 }
 
 void CommandController::onEditClientSaveExecuted()
 {
 	qDebug() << "You executed the Save command!";
 
 	implementation->databaseController->updateRow(implementation->selectedClient->key(), implementation->selectedClient->id(), implementation->selectedClient->toJson());
 
 	qDebug() << "Updated client saved.";
 }
 
 void CommandController::onEditClientDeleteExecuted()
 {
 	qDebug() << "You executed the Delete command!";
 
 	implementation->databaseController->deleteRow(implementation->selectedClient->key(), implementation->selectedClient->id());
 	implementation->selectedClient = nullptr;
 
 	qDebug() << "Client deleted.";
 
 	implementation->clientSearch->search();
     implementation->navigationController->goAddPupilsFromListDialog();
 }
 
 void CommandController::onManagePupilsAddPupilExecuted()
 {
     qDebug() << "You created a new pupil!";
+    implementation->navigationController->goAddPupilDialog();
 
   /*  implementation->databaseController->createRow(implementation->newClient->key(), implementation->newClient->id(), implementation->newClient->toJson());
 
     qDebug() << "New client saved.";
 
     implementation->clientSearch->searchText()->setValue(implementation->newClient->id());
     implementation->clientSearch->search();
     implementation->navigationController->goFindClientView();*/
 }
 
 void CommandController::onManagePupilsAddPupilsFromListExecuted()
 {
     qDebug() << "You created new pupils from list!";
     implementation->navigationController->goAddPupilsFromListDialog();
   /*  implementation->databaseController->createRow(implementation->newClient->key(), implementation->newClient->id(), implementation->newClient->toJson());
 
     qDebug() << "New client saved.";
 
     implementation->clientSearch->searchText()->setValue(implementation->newClient->id());
     implementation->clientSearch->search();
     implementation->navigationController->goFindClientView();*/
 }
 
 void CommandController::onManagePupilsEditPupilExecuted()
 {
     qDebug() << "You edited a pupil!";
 
   /*  implementation->databaseController->createRow(implementation->newClient->key(), implementation->newClient->id(), implementation->newClient->toJson());
 
     qDebug() << "New client saved.";
 
     implementation->clientSearch->searchText()->setValue(implementation->newClient->id());
     implementation->clientSearch->search();
     implementation->navigationController->goFindClientView();*/
 }
 
 void CommandController::onManagePupilsRemovePupilsExecuted()
 {
     qDebug() << "You removed pupil(s)!";
     implementation->navigationController->goRemovePupilsDialog();
 
     /*  implementation->databaseController->createRow(implementation->newClient->key(), implementation->newClient->id(), implementation->newClient->toJson());
 
     qDebug() << "New client saved.";
 
     implementation->clientSearch->searchText()->setValue(implementation->newClient->id());
     implementation->clientSearch->search();
     implementation->navigationController->goFindClientView();*/
 }
 
 
 
 
 }}
diff --git a/src/core/serverMasterController/controllers/navigation-controller.h b/src/core/serverMasterController/controllers/navigation-controller.h
index 4090e0b9c..19eb60006 100644
--- a/src/core/serverMasterController/controllers/navigation-controller.h
+++ b/src/core/serverMasterController/controllers/navigation-controller.h
@@ -1,34 +1,35 @@
 #ifndef NAVIGATIONCONTROLLER_H
 #define NAVIGATIONCONTROLLER_H
 
 #include <QObject>
 
 #include <cm-lib_global.h>
 #include <models/client.h>
 
 namespace cm {
 namespace controllers {
 
 class CMLIBSHARED_EXPORT NavigationController : public QObject
 {
 	Q_OBJECT
 
 public:
 	explicit NavigationController(QObject* parent = nullptr) : QObject(parent){}
 
 signals:
     void goManagePupilsView();
     void goCreateClientView();
 	void goDashboardView();
 	void goEditClientView(cm::models::Client* client);
 	void goFindClientView();
     void goManageWorkPlanView();
     void goAddPupilsFromListDialog();
     void goRemovePupilsDialog();
+    void goAddPupilDialog();
 
 };
 
 }
 }
 
 #endif