Merge pull request #111 from introlab/dev

Main merge for 1.3.2 release

Author: SBriere

.github/workflows/build_on_pull_request.yml

@@ -13,28 +13,19 @@ jobs:
     steps:
 
     - name: Install Qt
-      uses: jurplel/install-qt-action@v3.3.0
+      uses: jurplel/install-qt-action@v4
       with:
         version: '6.7.3'
-        host: 'windows'
         target: 'desktop'
+        host: 'windows'
         arch: 'win64_msvc2019_64'
-        dir: 'C:\'
-        install-deps: 'true'
-        modules: 'all'
-        #archives: 'qtbase qtsvg'
-        cache: 'false'
-        cache-key-prefix: 'install-qt-action'
-        setup-python: 'false'
-        tools: 'tools_ninja'
-        set-env: 'true'
-        tools-only: 'false'
-        aqtversion: '==3.1.*'
-        py7zrversion: '==0.20.*'
-        extra: '--external 7z'
+        use-official: true
+        email: ${{ secrets.QT_EMAIL }}
+        pw: ${{ secrets.QT_PW }}
+        modules: 'qt3d qtactiveqt qtcharts qtconnectivity qtdatavis3d qtgraphs qtgrpc qthttpserver qtimageformats qtlanguageserver qtlocation qtlottie qtmultimedia qtnetworkauth qtpdf qtpositioning.debug_information qtpositioning qtquick3dphysics qtquickeffectmaker qtremoteobjects qtscxml qtsensors qtserialbus qtserialport qtspeech qtvirtualkeyboard qtwebchannel qtwebengine qtwebsockets qtwebview debug_info qt5compat qtquick3d qtquicktimeline qtshadertools'
 
     - name: Checkout files
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: recursive
 

.gitignore

@@ -7,3 +7,4 @@ venv
 doctrees
 CMakeLists.txt.user
 .DS_Store
+.cache

CMakeLists.txt

@@ -2,8 +2,8 @@
 cmake_minimum_required(VERSION 3.21)
 
 if (APPLE)
-    set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0" CACHE STRING "Minimum OS X deployment version")
-    set(CMAKE_OSX_ARCHITECTURES arm64 x86_64 CACHE STRING "OS X supported architectures")
+    set(CMAKE_OSX_DEPLOYMENT_TARGET "13.0" CACHE STRING "Minimum OS X deployment version")
+    set(CMAKE_OSX_ARCHITECTURES arm64 x86_64)
 endif(APPLE)
 
 project(OpenTeraPlus)
@@ -19,7 +19,7 @@ cmake_policy(SET CMP0007 NEW)
 # Software version
 SET(CPACK_PACKAGE_VERSION_MAJOR "1")
 SET(CPACK_PACKAGE_VERSION_MINOR "3")
-SET(CPACK_PACKAGE_VERSION_PATCH "1")
+SET(CPACK_PACKAGE_VERSION_PATCH "2")
 SET(CPACK_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
 add_definitions(-DOPENTERAPLUS_VERSION="${CPACK_PACKAGE_VERSION}" )
 add_definitions(-DOPENTERAPLUS_VERSION_MAJOR="${CPACK_PACKAGE_VERSION_MAJOR}" )

client/resources/stylesheet.qss

@@ -291,6 +291,8 @@ QLineEdit, QSpinBox, QTextEdit, QDateTimeEdit, QTimeEdit, QDateEdit{
     color:black;
     min-height: 25px;
     padding-left: 5px;
+    selection-color: white;
+    selection-background-color: black;
 }
 
 QLineEdit:!enabled, QSpinBox:!enabled, QDateTimeEdit:!enabled, QTimeEdit:!enabled, QDateEdit:!enabled{
@@ -321,6 +323,8 @@ QDateTimeEdit::down-arrow:!enabled, QDateTimeEdit::up-arrow:!enabled, QDateEdit:
 QPlainTextEdit {
     background-color: rgba(255,255,255,70%);
     color: black;
+    selection-color: white;
+    selection-background-color: black;
 }
 
 QPlainTextEdit:!enabled{
@@ -484,6 +488,14 @@ QCheckBox::indicator {
      height: 32px;
  }
 
+QCheckBox:unchecked:!enabled{
+    color: #e47f7577;
+}
+
+QCheckBox:checked:!enabled{
+    color: rgba(0,255,0,50%);
+}
+
 QListView::indicator, QTreeWidget::indicator, QTableWidget::indicator {
      width: 20px;
      height: 20px;

client/resources/translations/openteraplus_en.ts

@@ -89,6 +89,9 @@ set(headers
     editors/UserWidget.h
 
     # Services
+    services/ActimetryService/ActimetryComManager.h
+    services/ActimetryService/ActimetryWebAPI.h
+    services/ActimetryService/ActimetryConfigWidget.h
     services/BaseServiceComManager.h
     services/BaseServiceWidget.h
     services/BaseServiceToolsWidget.h
@@ -103,11 +106,15 @@ set(headers
     services/EmailService/EmailComManager.h
     services/EmailService/EmailServiceWebAPI.h
     services/EmailService/EmailTemplateWidget.h
+    services/MOVEService/MOVEConfigWidget.h
+    services/MOVEService/MOVEWebAPI.h
+    services/MOVEService/MOVEComManager.h
     services/SurveyService/SurveyComManager.h
     services/SurveyService/SurveyEditorDialog.h
     services/SurveyService/SurveyServiceConfigWidget.h
     services/SurveyService/SurveyServiceWebAPI.h
 
+
     # Widgets
     widgets/SessionInviteWidget.h
     widgets/OnlineManagerWidget.h
@@ -231,6 +238,8 @@ set(srcs
     editors/UserWidget.cpp
 
     # Services
+    services/ActimetryService/ActimetryComManager.cpp
+    services/ActimetryService/ActimetryConfigWidget.cpp
     services/BaseServiceComManager.cpp
     services/BaseServiceWidget.cpp
     services/BaseServiceToolsWidget.cpp
@@ -242,6 +251,8 @@ set(srcs
     services/EmailService/EmailComManager.cpp
     services/EmailService/EmailServiceConfigWidget.cpp
     services/EmailService/EmailTemplateWidget.cpp
+    services/MOVEService/MOVEConfigWidget.cpp
+    services/MOVEService/MOVEComManager.cpp
     services/SurveyService/SurveyComManager.cpp
     services/SurveyService/SurveyEditorDialog.cpp
     services/SurveyService/SurveyServiceConfigWidget.cpp
@@ -350,7 +361,9 @@ SET(uis
     editors/UserWidget.ui
 
     # Services
+    services/ActimetryService/ActimetryConfigWidget.ui
     services/DanceService/DanceConfigWidget.ui
+    services/MOVEService/MOVEConfigWidget.ui
     services/DashboardsService/DashboardsConfigWidget.ui
     services/EmailService/EmailServiceConfigWidget.ui
     services/EmailService/EmailTemplateWidget.ui

client/resources/translations/openteraplus_fr.ts

@@ -45,5 +45,9 @@
         <string>Microphone access</string>
         <key>LSMinimumSystemVersion</key>
         <string>10.13</string>
+        <key>LSApplicationQueriesSchemes</key>
+        <array>
+            <string>https</string>
+        </array>
 </dict>
 </plist>

client/src/CMakeLists.txt

@@ -50,7 +50,7 @@ void PasswordStrengthDialog::checkPasswordsMatch()
         ui->txtPasswordConf->setStyleSheet("background-color: #ffaaaa;");
         ui->btnOK->setEnabled(false);
     }else{
-        ui->txtPasswordConf->setStyleSheet("");
+        ui->txtPasswordConf->setStyleSheet(" ");
         ui->btnOK->setEnabled(m_errors.isEmpty());
     }
 }

client/src/Info.plist.in

@@ -9,7 +9,9 @@
 #include "dialogs/GeneratePasswordDialog.h"
 #include "dialogs/PasswordStrengthDialog.h"
 
+#include "services/ActimetryService/ActimetryConfigWidget.h"
 #include "services/DanceService/DanceConfigWidget.h"
+#include "services/MOVEService/MOVEConfigWidget.h"
 
 ParticipantWidget::ParticipantWidget(ComManager *comMan, const TeraData *data, QWidget *parent) :
     DataEditorWidget(comMan, data, parent),
@@ -393,14 +395,13 @@ void ParticipantWidget::updateServiceTabs()
         addServiceTab(service);
     }
 
-    // Remove tabs not anymore present
-    /*for(QWidget* tab: std::as_const(m_services_tabs)){
-        if (!ids_service.contains(m_services_tabs.key(tab))){
-            ui->tabNav->removeTab(ui->tabNav->indexOf(tab));
-            tab->deleteLater();
-            m_services_tabs.remove(m_services_tabs.key(tab));
+    if (m_services_tabs.count() == 0){
+        // No config widget (maybe because no widget) - hide tab
+        int indexTabServices = ui->tabNav->indexOf(ui->tabServices);
+        if (ui->tabNav->isTabVisible(indexTabServices)){
+            ui->tabNav->setTabVisible(indexTabServices, false);
         }
-    }*/
+    }
 }
 
 void ParticipantWidget::addServiceTab(const TeraData &service)
@@ -411,13 +412,27 @@ void ParticipantWidget::addServiceTab(const TeraData &service)
 
     QString service_key = service.getFieldValue("service_key").toString();
 
+    // Actimetry Service
+    if (service_key == "ActimetryService") {
+        ActimetryConfigWidget* wdg = new ActimetryConfigWidget(m_comManager, m_data->getFieldValue("id_project").toInt(), m_data->getUuid(), m_data->getName());
+        ui->tabServicesDetails->insertTab(0, wdg, QIcon("://icons/service.png"), service.getName());
+        m_services_tabs.insert(id_service, wdg);
+    }
+
     // Dance Service
     if (service_key == "DanceService"){
         DanceConfigWidget* wdg = new DanceConfigWidget(m_comManager, m_data->getFieldValue("id_project").toInt(), m_data->getUuid());
         ui->tabServicesDetails->insertTab(0, wdg, QIcon("://icons/service.png"), service.getName());
         m_services_tabs.insert(id_service, wdg);
     }
 
+    // MOVE Service
+    if (service_key == "MOVEService"){
+        MOVEConfigWidget* wdg = new MOVEConfigWidget(m_comManager, m_data->getFieldValue("id_project").toInt(), m_data->getUuid(), m_data->getName());
+        ui->tabServicesDetails->insertTab(0, wdg, QIcon("://icons/service.png"), service.getName());
+        m_services_tabs.insert(id_service, wdg);
+    }
+
     int indexTabServices = ui->tabNav->indexOf(ui->tabServices);
     if (!ui->tabNav->isTabVisible(indexTabServices)){
         ui->tabNav->setTabVisible(indexTabServices, true);
@@ -428,8 +443,19 @@ void ParticipantWidget::addServiceTab(const TeraData &service)
 
 void ParticipantWidget::refreshWebAccessUrl()
 {
-    int index = ui->cmbServices->currentIndex();
-    if (index >= m_services.count() || index <0 || dataIsNew())
+    if (dataIsNew())
+        return;
+
+    QString service_key = ui->cmbServices->currentData().toString();
+    int index = -1;
+    for (int i=0; i<m_services.count(); i++){
+        if (m_services.at(i).getFieldValue("service_key").toString() == service_key){
+            index = i;
+            break;
+        }
+    }
+
+    if (index < 0)
         return;
 
     QString service_url = TeraData::getServiceParticipantUrl(m_services[index],
@@ -489,6 +515,9 @@ void ParticipantWidget::processSessionTypesReply(QList<TeraData> session_types)
         }
     }
 
+    if (ui->cmbSessionType->count() == 0)
+        ui->cmbSessionType->hide();
+
     // Query sessions for that participant
     if (!m_data->isNew()){
         // Select current session type based on last session type used with that participant
@@ -580,14 +609,22 @@ void ParticipantWidget::processServicesReply(QList<TeraData> services, QUrlQuery
     bool has_email_service = false;
     foreach(TeraData service, services){
         QString service_key = service.getFieldValue("service_key").toString();
-        if (service_key != "FileTransferService"){
-            m_services.append(service);
-            ui->cmbServices->addItem(service.getName(), service_key);
-        }else{
-            m_allowFileTransfers = true; // We have a file transfer service with that project - allow uploads!
-            ui->wdgSessions->enableFileTransfers(true);
+        m_services.append(service);
+
+        // Web access combo box
+        if (service.hasFieldName("service_endpoint_participant")){
+            if (!service.getFieldValue("service_endpoint_participant").isNull()){
+                // Ignore specific services...
+                if (service_key != "FileTransferService" && service_key != "ActimetryService" && service_key != "EmailService")
+                    ui->cmbServices->addItem(service.getName(), service_key);
+            }
         }
 
+        // Assets
+        m_allowFileTransfers = service.getFieldValue("service_has_assets").toBool(); // We have a file transfer service with that project - allow uploads!
+        ui->wdgSessions->enableFileTransfers(m_allowFileTransfers);
+
+        // Email
         if (service_key == "EmailService"){
             has_email_service = true;
         }
@@ -613,6 +650,8 @@ void ParticipantWidget::processServicesReply(QList<TeraData> services, QUrlQuery
     int default_index = ui->cmbServices->findData("VideoRehabService");
     if (default_index>=0)
         ui->cmbServices->setCurrentIndex(default_index);
+    ui->chkWebAccess->setEnabled(ui->cmbServices->count() > 0);
+    ui->chkLogin->setEnabled(ui->cmbServices->count() > 0);
 
     // Add specific services configuration tabs
     updateServiceTabs();
@@ -1003,7 +1042,7 @@ void ParticipantWidget::on_txtUsername_textEdited(const QString &current)
     if (current.isEmpty()){
         ui->txtUsername->setStyleSheet("background-color: #ffaaaa;");
     }else{
-        ui->txtUsername->setStyleSheet("");
+        ui->txtUsername->setStyleSheet(" ");
     }
 }
 
@@ -1030,16 +1069,16 @@ void ParticipantWidget::on_txtPassword_textEdited(const QString &current)
     if (!m_data->getFieldValue("participant_login_enabled").toBool() && ui->txtPassword->text().isEmpty()){
         ui->txtPassword->setStyleSheet("background-color: #ffaaaa;");
     }else{
-        ui->txtPassword->setStyleSheet("");
+        ui->txtPassword->setStyleSheet(" ");
     }
 
     /*QString confirm_pass = ui->txtPasswordConfirm->text();
     if (current != confirm_pass || ui->txtPassword->text().isEmpty()){
         ui->txtPassword->setStyleSheet("background-color: #ffaaaa;");
         ui->txtPasswordConfirm->setStyleSheet("background-color: #ffaaaa;");
     }else{
-        ui->txtPassword->setStyleSheet("");
-        ui->txtPasswordConfirm->setStyleSheet("");
+        ui->txtPassword->setStyleSheet(" ");
+        ui->txtPasswordConfirm->setStyleSheet(" ");
     }*/
 }