Refs #99. Added project id in test invitations

client/src/dialogs/TestInvitationDialog.cpp

@@ -73,6 +73,7 @@ void TestInvitationDialog::setEnableEmail(const bool &enable_email)
 
     if (!m_enableEmails){
         ui->chkInviteEmail->setCheckState(Qt::Unchecked);
+        on_chkInviteEmail_checkStateChanged(Qt::Unchecked); // Force check since it's the default value
     }else{
         // Default value is on
         ui->chkInviteEmail->setCheckState(Qt::Checked);
@@ -91,6 +92,11 @@ void TestInvitationDialog::setEnableInviteesList(const bool &enable)
         ui->stackedPages->addWidget(ui->pageTargets);
 }
 
+void TestInvitationDialog::setCurrentProjectId(const int &id_project)
+{
+    m_currentProjectId = id_project;
+}
+
 void TestInvitationDialog::setInvitableDevices(QHash<int, TeraData> *devices)
 {
     if (devices)
@@ -242,6 +248,9 @@ void TestInvitationDialog::on_stackedPages_currentChanged(int current_index)
     if (ui->btnNext->isEnabled() && ui->stackedPages->currentWidget() == ui->pageTargets){
         ui->btnNext->setEnabled(ui->widgetInvitees->getInviteesCount() > 0);
     }
+    if (ui->btnOK->isVisible() && ui->stackedPages->currentWidget() == ui->pageTargets){
+        ui->btnOK->setEnabled(ui->widgetInvitees->getInviteesCount() > 0);
+    }
 }
 
 
@@ -273,6 +282,7 @@ void TestInvitationDialog::on_btnOK_clicked()
             QJsonObject invitation;
             invitation["id_test_invitation"] = 0;
             invitation["id_participant"] = id;
+            invitation["id_project"] = m_currentProjectId;
             if (m_currentSessionId)
                 invitation["id_session"] = m_currentSessionId;
             invitation["id_test_type"] = ui->cmbTestType->currentData().toInt();
@@ -286,6 +296,7 @@ void TestInvitationDialog::on_btnOK_clicked()
             QJsonObject invitation;
             invitation["id_test_invitation"] = 0;
             invitation["id_device"] = id;
+            invitation["id_project"] = m_currentProjectId;
             if (m_currentSessionId)
                 invitation["id_session"] = m_currentSessionId;
             invitation["id_test_type"] = ui->cmbTestType->currentData().toInt();
@@ -299,6 +310,7 @@ void TestInvitationDialog::on_btnOK_clicked()
             QJsonObject invitation;
             invitation["id_test_invitation"] = 0;
             invitation["id_user"] = id;
+            invitation["id_project"] = m_currentProjectId;
             if (m_currentSessionId)
                 invitation["id_session"] = m_currentSessionId;
             invitation["id_test_type"] = ui->cmbTestType->currentData().toInt();
@@ -355,8 +367,10 @@ void TestInvitationDialog::on_chkInviteEmail_checkStateChanged(const Qt::CheckSt
 
 void TestInvitationDialog::inviteesCountChanged(int count)
 {
-    qDebug() << count;
-    if (ui->stackedPages->currentWidget() == ui->pageTargets)
+    if (ui->stackedPages->currentWidget() == ui->pageTargets && ui->stackedPages->currentIndex() < ui->stackedPages->count() - 1)
         ui->btnNext->setEnabled(count > 0);
+
+    if (ui->stackedPages->currentIndex() == ui->stackedPages->count() - 1)
+        ui->btnOK->setEnabled(count > 0);
 }
 

client/src/dialogs/TestInvitationDialog.h

@@ -23,6 +23,7 @@ class TestInvitationDialog : public QDialog
     void setCurrentData(TeraData* data);
     void setEnableEmail(const bool& enable_email);
     void setEnableInviteesList(const bool& enable);
+    void setCurrentProjectId(const int& id_project);
 
     void setInvitableDevices(QHash<int, TeraData>* devices);
     void setInvitableParticipants(QHash<int, TeraData>* participants);
@@ -55,7 +56,8 @@ private slots:
     bool        m_enableEmails = false;
 
     QList<TeraData> m_pendingInvitations;
-    int         m_currentSessionId = 0;
+    int             m_currentSessionId = 0;
+    int             m_currentProjectId = 0;
 
     void initUI();
     void processNextEmail();

client/src/editors/ParticipantWidget.cpp

@@ -607,6 +607,7 @@ void ParticipantWidget::processServicesReply(QList<TeraData> services, QUrlQuery
 
     ui->btnEmailWeb->setVisible(has_email_service);
     ui->wdgInvitations->setEnableEmail(has_email_service);
+    ui->wdgSessions->enableEmails(has_email_service);
 
     // Find and select VideoRehab by default in the combobox
     int default_index = ui->cmbServices->findData("VideoRehabService");

client/src/editors/ProjectWidget.cpp

@@ -1316,8 +1316,10 @@ void ProjectWidget::on_tabNav_currentChanged(int index)
 
     // Test invitations
     if (current_tab == ui->tabInvitations){
-        if (m_data)
+        if (m_data){
+            ui->wdgInvitations->setCurrentProject(m_data->getId());
             ui->wdgInvitations->loadForProject(m_data->getId());
+        }
     }
 
 }

client/src/editors/SessionWidget.cpp

@@ -1,6 +1,11 @@
 #include "SessionWidget.h"
 #include "ui_SessionWidget.h"
 
+#include "GlobalMessageBox.h"
+
+#include "TeraSessionStatus.h"
+#include "TeraSessionEvent.h"
+
 #include <QFileDialog>
 #include <QStandardPaths>
 
@@ -46,6 +51,7 @@ SessionWidget::SessionWidget(ComManager *comMan, const TeraData *data, QWidget *
 
      if (data->hasFieldName("id_project")){
          m_idProject = data->getFieldValue("id_project").toInt();
+         ui->wdgInvitations->setCurrentProject(m_idProject);
          ui->tabAssets->setAssociatedProject(m_idProject);
      }
 
@@ -188,6 +194,12 @@ void SessionWidget::setTestTypes(QList<TeraData> *test_types)
     }
 }
 
+void SessionWidget::enableEmails(const bool &enable)
+{
+    m_allowEmails = enable;
+    ui->wdgInvitations->setEnableEmail(m_allowEmails);
+}
+
 void SessionWidget::updateControlsState()
 {
     ui->grpSummary->setVisible(!dataIsNew());

client/src/editors/SessionWidget.h

@@ -5,12 +5,6 @@
 #include <QTableWidgetItem>
 
 #include "DataEditorWidget.h"
-#include "GlobalMessageBox.h"
-
-#include "TeraSessionStatus.h"
-#include "TeraSessionEvent.h"
-#include "data/DownloadingFile.h"
-#include "dialogs/BaseDialog.h"
 
 namespace Ui {
 class SessionWidget;
@@ -32,6 +26,7 @@ class SessionWidget : public DataEditorWidget
     void showTests();
 
     void setTestTypes(QList<TeraData>* test_types);
+    void enableEmails(const bool& enable);
 
     void connectSignals();
 private:
@@ -40,6 +35,7 @@ class SessionWidget : public DataEditorWidget
     int     m_idProject;
     QString m_baseParticipantUuid;  // Base participant UUID when editing a new session
     bool    m_alwaysShowAssets;       // Allow creation of new assets, even when no assets are present
+    bool    m_allowEmails = false;
 
     //QMap<int, QTableWidgetItem*> m_listDeviceDatas;
     QMap<int, QTableWidgetItem*> m_listSessionEvents;

client/src/widgets/SessionsListWidget.cpp

@@ -117,6 +117,11 @@ void SessionsListWidget::enableTestInvitations(QList<TeraData> *test_types)
     m_testTypes = test_types;
 }
 
+void SessionsListWidget::enableEmails(const bool &enable)
+{
+    m_allowEmails = enable;
+}
+
 void SessionsListWidget::setSessionsCount(const int &count)
 {
     m_totalSessions = count;
@@ -813,6 +818,7 @@ void SessionsListWidget::showSessionEditor(TeraData *session_info)
         ses_widget->showAssets();
     if (m_currentSessionShowTests)
         ses_widget->showTests();
+    ses_widget->enableEmails(m_allowEmails);
 
     m_diag_editor->setCentralWidget(ses_widget);
 

client/src/widgets/SessionsListWidget.h

@@ -38,6 +38,7 @@ class SessionsListWidget : public QWidget
     void enableDeletion(const bool& enable);
     void enableFileTransfers(const bool& enable);
     void enableTestInvitations(QList<TeraData>* test_types);
+    void enableEmails(const bool& enable);
 
     void setSessionsCount(const int& count);
     int getSessionsCount();
@@ -70,6 +71,7 @@ class SessionsListWidget : public QWidget
 
     bool                            m_allowDeletion;
     bool                            m_allowFileTransfers;
+    bool                            m_allowEmails;
 
     QString                         m_currentUuid;
     int                             m_currentId;
@@ -123,15 +125,10 @@ private slots:
     void currentCalendarDateActivated(QDate current_date);
 
     void on_btnCheckSessionTypes_clicked();
-
     void on_btnUncheckSessionTypes_clicked();
-
     void on_btnFilterSessionsTypes_clicked();
-
     void on_tableSessions_itemDoubleClicked(QTableWidgetItem *item);
-
     void on_btnAssetsBrowser_clicked();
-
     void on_btnTestsBrowser_clicked();
 
 signals:

client/src/widgets/TestInvitationsWidget.cpp

@@ -66,6 +66,11 @@ void TestInvitationsWidget::setEnableEmail(const bool &enable_email)
     m_enableEmails = enable_email;
 }
 
+void TestInvitationsWidget::setCurrentProject(const int &id_project)
+{
+    m_idProject = id_project;
+}
+
 void TestInvitationsWidget::loadForProject(const int &id_project)
 {
     setViewMode(ViewMode::VIEWMODE_PROJECT);
@@ -92,6 +97,8 @@ void TestInvitationsWidget::loadForParticipant(TeraData* participant)
     m_listInvitations_items.clear();
     m_invitations.clear();
 
+    m_idProject = participant->getFieldValue("id_project").toInt();
+
     if (m_comManager){
         QUrlQuery args;
         args.addQueryItem(WEB_QUERY_ID_PARTICIPANT, QString::number(participant->getId()));
@@ -351,6 +358,7 @@ void TestInvitationsWidget::on_btnInvite_clicked()
 
     m_invitationDialog = new TestInvitationDialog(m_comManager, this);
     m_invitationDialog->setTestTypes(m_testTypes);
+    m_invitationDialog->setCurrentProjectId(m_idProject);
     m_invitationDialog->setInvitableDevices(m_invitableDevices);
     m_invitationDialog->setInvitableParticipants(m_invitableParticipants);
     m_invitationDialog->setInvitableUsers(m_invitableUsers);

client/src/widgets/TestInvitationsWidget.h

@@ -26,6 +26,7 @@ class TestInvitationsWidget : public QWidget
     void setInvitableParticipants(QHash<int, TeraData>* participants);
     void setInvitableUsers(QHash<int, TeraData>* users);
     void setEnableEmail(const bool& enable_email);
+    void setCurrentProject(const int& id_project);
 
     void loadForProject(const int& id_project);
     void loadForParticipant(TeraData *participant);
@@ -88,6 +89,8 @@ private slots:
     QHash<int, TeraData>*           m_invitableParticipants = nullptr;
     QHash<int, TeraData>*           m_invitableUsers = nullptr;
 
+    int                             m_idProject = -1;
+
     // Icons are defined here (speed up load)
     QIcon m_deleteIcon;
     QIcon m_viewIcon;