Merge pull request #93 from introlab/dev

Main merge for 1.2.0 release

Author: SBriere

.github/workflows/build_on_pull_request.yml

@@ -0,0 +1,64 @@
+# This workflow will run on pull requests
+name: Build on Pull Requests
+on:
+  workflow_dispatch:
+    branches: [main, dev]
+    
+  pull_request:
+    branches: [dev, main]
+    
+jobs:
+  build:
+    runs-on: windows-2019
+    steps:
+    
+    - name: Install Qt
+      uses: jurplel/install-qt-action@v3.3.0
+      with:
+        version: '6.5.3'
+        host: 'windows'
+        target: 'desktop'
+        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'
+        
+    - name: Checkout files
+      uses: actions/checkout@v3
+      with:
+        submodules: recursive
+    
+    - name: List current files
+      run: |
+        dir
+        
+    - name: Create build directory
+      run: mkdir build
+      
+    - name: List Qt directory
+      working-directory: ${{env.Qt6_DIR}}
+      run: |
+        dir
+    
+    - uses: TheMrMilchmann/setup-msvc-dev@v3
+      with:
+        arch: x64
+      
+    - name: Build
+      env:
+        CMAKE_MODULE_PATH : ${{env.Qt6_Dir}}/lib/cmake/Qt6
+      working-directory: build
+      run: |
+        cmake ../ -DCMAKE_BUILD_TYPE=Release -DQT6_DIR=${{env.Qt6_Dir}} -G CodeBlocks
+        cmake --build .
+

.github/workflows/docs_deploy.yml

@@ -8,18 +8,6 @@ on:
   workflow_dispatch:
     branches: ["main", "dev"]
 
-# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
-permissions:
-  contents: read
-  pages: write
-  id-token: write
-
-# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
-# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
-concurrency:
-  group: "pages"
-  cancel-in-progress: false
-
 jobs:
   # Build job
   build:

.gitignore

@@ -1,2 +1,9 @@
 /client/resources/translations/*.qm
 deploy
+/build-*
+*.user
+
+html
+venv
+doctrees
+CMakeLists.txt.user

CMakeLists.txt

@@ -1,23 +1,23 @@
 if (APPLE)
-    set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13" CACHE STRING "Minimum OS X deployment version")
+    set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0" CACHE STRING "Minimum OS X deployment version")
 endif(APPLE)
 
 project(OpenTeraPlus)
 
-include(CTest)
-enable_testing()
+#include(CTest)
+#enable_testing()
 #include(CheckFunctionExists)
 
 #Look for minimum cmake version
-cmake_minimum_required(VERSION 3.0.2)
+cmake_minimum_required(VERSION 3.21)
 
 #DEFINITIONS POLICY, NEW SINCE 3.0.2
 cmake_policy(SET CMP0043 NEW)
 
 # Software version
 SET(CPACK_PACKAGE_VERSION_MAJOR "1")
-SET(CPACK_PACKAGE_VERSION_MINOR "1")
-SET(CPACK_PACKAGE_VERSION_PATCH "3")
+SET(CPACK_PACKAGE_VERSION_MINOR "2")
+SET(CPACK_PACKAGE_VERSION_PATCH "0")
 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}" )
@@ -48,7 +48,7 @@ endif(UNIX AND NOT APPLE)
 
 
 set(CMAKE_VERBOSE_MAKEFILE ON)
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 
 message(STATUS "Using QMAKE: ${QT_QMAKE_EXECUTABLE}")
@@ -67,7 +67,7 @@ add_subdirectory(shared)
 add_subdirectory(client)
 
 # Tests
-add_subdirectory(tests)
+#add_subdirectory(tests)
 
 # Readme and other files
 add_custom_target(readme SOURCES README.md LICENSE.TXT)

README.md

@@ -12,6 +12,7 @@ OpenTeraPlus is a client that works with [OpenTera Server](https://github.com/in
 
 ## Publication(s)
 
+* [![DOI](https://joss.theoj.org/papers/10.21105/joss.05497/status.svg)](https://doi.org/10.21105/joss.05497) Létourneau, D., Brière , S.,  et al., [OpenTera: A Framework for Telehealth Applications](https://doi.org/10.21105/joss.05497), Journal of Open Source Software, vol. 8, no 91, p. 5497 (2023)
 * Panchea, A.M., Létourneau, D., Brière, S. et al., [OpenTera: A microservice architecture solution for rapid prototyping of robotic solutions to COVID-19 challenges in care facilities](https://rdcu.be/cHzmf),  Health Technol. 12, 583–596 (2022)
 
 ## Current Features

README_fr.md

@@ -0,0 +1,66 @@
+<img src="docs/logo/LogoOpenTeraPlus.png" width="500">
+
+# OpenTeraPlus
+OpenTeraPlus est un client pour le [Serveur OpenTera](https://github.com/introlab/opentera). Son rôle est d'agir comme un outil général pour gérer une instance d'OpenTera et de fournir certaines fonctionnalités spécifiques à certains services, telles que la Téléréadaptation.
+
+## Auteurs
+
+* Simon Brière, ing. M.Sc.A., Centre de recherche sur le Vieillissement (CDRV), CIUSSS de l'Estrie-CHUS (@sbriere)
+* Dominic Létourneau, ing. M.Sc.A., IntRoLab, Université de Sherbrooke (@doumdi)
+* François Michaud, ing. Ph.D., IntRoLab, Université de Sherbrooke
+* Michel Tousignant, pht, Ph.D., CDRV, Université de Sherbrooke
+
+## Publication(s)
+
+* [![DOI](https://joss.theoj.org/papers/10.21105/joss.05497/status.svg)](https://doi.org/10.21105/joss.05497) Létourneau, D., Brière , S.,  et al., [OpenTera: A Framework for Telehealth Applications](https://doi.org/10.21105/joss.05497), Journal of Open Source Software, vol. 8, no 91, p. 5497 (2023)
+* Panchea, A.M., Létourneau, D., Brière, S. et al., [OpenTera: A microservice architecture solution for rapid prototyping of robotic solutions to COVID-19 challenges in care facilities](https://rdcu.be/cHzmf),  Health Technol. 12, 583–596 (2022)
+
+## Fonctionnalités actuelles
+
+### Aperçu des fonctionnalités
+* Gestion globale du système, incluant les accès utilisateurs - rôles pour sites, projets, appareils, types de séances et services
+* Gestion des participants (patients), incluant l'activation/désactivation, regroupements et tableaux de bord des séances
+* Intégration spécifique pour les services de téléréadaptation et toutes les activités cliniques demandant une séance audio-vidéo adaptée au contexte
+* Gestion des séances, incluant fichiers / données attachées et tests / questionnaires
+
+### Fonctionnalités détaillées
+* Connexion en tant qu'utilisateur
+  * Implémentation de l'accès selon les groupes utilisateurs
+* Gestion des projets et sites
+  * Accès des groupes utilisateurs
+  * Appareils, types de séances et évaluations liées
+  * Services associés
+* Gestion des participants (patients)
+  * Regroupement des participants
+  * Activation / désactivation des participants, liens webs et connexion traditionnelle
+  * Ajout / suppression
+* Gestion des séances
+  * Création de nouvelle séance et édition de séances existantes
+  * Vue calendrier des séances réalisées et planifiées
+  * Affichage des événements de séance
+  * Téléchargement et gestion des fichiers attachés aux séances
+  * Affichage des évaluations attachées aux séances
+* Gestion des appareils
+  * Association d'appareils aux participants
+  * Activation / désactivation d'appareils
+  * Configuration des appareils
+* Gestion des services OpenTera
+  * Édition de la configuration
+* Séances de téléréadaptation
+  * Création et gestion de séances vidéos axées sur la télésanté
+* ... et plus!
+
+# Captures d'écran
+<table><tr>
+<td><img src="docs/screenshots/LoginScreen.png" width="100" alt="Login Screen" title="Login Screen"></td>
+<td><img src="docs/screenshots/ProjectNavigator.png" width="100" alt="Project Navigator" title="Project Navigator"></td>
+<td><img src="docs/screenshots/Participant.png" width="100" alt="Participant Viewer" title="Participant Viewer"></td>
+<td><img src="docs/screenshots/SessionLobby.png" width="100" alt="Session Lobby" title="Session Lobby"></td>
+<td><img src="docs/screenshots/AdminConfig.png" width="100" alt="Admin configuration" title="Admin configuration"></td>
+</tr></table>
+
+# Vidéo
+[![OpenTera+ Logiciel Clinique de Télésanté](https://img.youtube.com/vi/FathjoDGlZ0/maxresdefault.jpg)](https://youtu.be/FathjoDGlZ0)
+ 
+# Licence
+OpenTeraPlus est licencé sous [GNU General Public License v3.0](https://www.gnu.org/licenses/gpl-3.0.en.html)

client/CMakeLists.txt

@@ -1,4 +1,4 @@
-find_package(Qt5Core REQUIRED)
+find_package(Qt6Core REQUIRED)
 
 add_subdirectory(resources)
 add_subdirectory(src)

client/resources/TeraClient.qrc

@@ -148,5 +148,6 @@
         <file>icons/logs/os_mac.png</file>
         <file>icons/logs/os_windows.png</file>
         <file>icons/pause.png</file>
+        <file>icons/project_disabled.png</file>
     </qresource>
 </RCC>

client/resources/icons.txt

@@ -1,3 +1,13 @@
 <a href="https://www.flaticon.com/free-icons/logos" title="logos icons">Logos icons created by Pixel perfect - Flaticon</a>
 <a href="https://www.flaticon.com/free-icons/logotype" title="logotype icons">Logotype icons created by Freepik - Flaticon</a>
-<a href="https://www.flaticon.com/free-icons/chrome" title="chrome icons">Chrome icons created by Pixel perfect - Flaticon</a>
+<a href="https://www.flaticon.com/free-icons/chrome" title="chrome icons">Chrome icons created by Pixel perfect - Flaticon</a>
+<a href="https://www.flaticon.com/free-icons/book" title="book icons">Book icons created by max.icons - Flaticon</a>
+<a href="https://www.flaticon.com/free-icons/search" title="search icons">Search icons created by Vector Stall - Flaticon</a>
+<a href="https://www.flaticon.com/free-icons/filter" title="filter icons">Filter icons created by designhub - Flaticon</a>
+<a href="https://www.flaticon.com/free-icons/loading-arrow" title="loading arrow icons">Loading arrow icons created by Laisa Islam Ani - Flaticon</a>
+<a href="https://www.flaticon.com/free-icons/files-and-folders" title="files and folders icons">Files and folders icons created by riajulislam - Flaticon</a>
+<a href="https://www.flaticon.com/free-icons/ui" title="ui icons">Ui icons created by berkahicon - Flaticon</a>
+<a href="https://www.flaticon.com/free-icons/output" title="output icons">Output icons created by Laisa Islam Ani - Flaticon</a>
+<a href="https://www.flaticon.com/free-icons/company" title="company icons">Company icons created by Dragon Icons - Flaticon</a>
+<a href="https://www.flaticon.com/free-icons/work" title="work icons">Work icons created by Pixel perfect - Flaticon</a>
+<a href="https://www.flaticon.com/free-icons/folder" title="folder icons">Folder icons created by Freepik - Flaticon</a>