From d91035ad0b7613b646c90fa179036f61420ae7ad Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 15 Dec 2021 15:46:59 +0100 Subject: [PATCH 1/8] Bump dev version --- java-sdk/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-sdk/build.gradle b/java-sdk/build.gradle index dc692230..0b127fcb 100644 --- a/java-sdk/build.gradle +++ b/java-sdk/build.gradle @@ -9,7 +9,7 @@ plugins { } allprojects { - version = '0.7.5' + version = '0.7.6-SNAPSHOT' group = 'org.radarbase' } From a6ae372bc10b4ffe6ae51422a29d8dbf540fdd4f Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 23 Dec 2021 12:50:52 +0100 Subject: [PATCH 2/8] Fix radar-schemas docker build --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ba988961..4963207b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,8 @@ FROM gradle:7.3-jdk17 as builder RUN mkdir -p /code/java-sdk WORKDIR /code/java-sdk -ENV GRADLE_USER_HOME=/code/.gradlecache +ENV GRADLE_USER_HOME=/code/.gradlecache \ + GRADLE_OPTS=-Djdk.lang.Process.launchMechanism=vfork COPY java-sdk/build.gradle java-sdk/settings.gradle /code/java-sdk/ COPY java-sdk/radar-schemas-commons/build.gradle /code/java-sdk/radar-schemas-commons/ From 4e198dca981d6024b9b44fd055b4f4d6146ab244 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 23 Dec 2021 13:31:58 +0100 Subject: [PATCH 3/8] Simplify docker build --- Dockerfile | 15 +++++---------- java-sdk/build.gradle | 2 +- java-sdk/gradle/wrapper/gradle-wrapper.properties | 2 +- java-sdk/radar-catalog-server/build.gradle | 10 +++++++++- java-sdk/radar-schemas-tools/build.gradle | 8 ++++++++ 5 files changed, 24 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4963207b..1a56d77e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ COPY java-sdk/radar-schemas-core/build.gradle /code/java-sdk/radar-schemas-core/ COPY java-sdk/radar-schemas-registration/build.gradle /code/java-sdk/radar-schemas-registration/ COPY java-sdk/radar-schemas-tools/build.gradle /code/java-sdk/radar-schemas-tools/ COPY java-sdk/radar-catalog-server/build.gradle /code/java-sdk/radar-catalog-server/ -RUN gradle downloadDependencies --no-watch-fs -Pprofile=docker +RUN gradle downloadDependencies copyDependencies startScripts --no-watch-fs -Pprofile=docker COPY commons /code/commons COPY specifications /code/specifications @@ -22,11 +22,7 @@ COPY java-sdk/radar-schemas-registration/src /code/java-sdk/radar-schemas-regist COPY java-sdk/radar-schemas-tools/src /code/java-sdk/radar-schemas-tools/src COPY java-sdk/radar-catalog-server/src /code/java-sdk/radar-catalog-server/src -RUN gradle distTar --no-watch-fs -Pprofile=docker \ - && cd radar-schemas-tools/build/distributions \ - && tar xzf radar-schemas-tools*.tar.gz \ - && cd ../../../radar-catalog-server/build/distributions \ - && tar xzf radar-catalog-server*.tar.gz +RUN gradle jar --no-watch-fs -Pprofile=docker FROM azul/zulu-openjdk-alpine:17-jre-headless @@ -50,10 +46,9 @@ WORKDIR /schema RUN mkdir -p original merged java/src java/classes /usr/share/java \ && chown 101 merged java/src java/classes -COPY --from=builder /code/java-sdk/radar-schemas-tools/build/distributions/radar-schemas-tools-*/lib/* /usr/lib/ -COPY --from=builder /code/java-sdk/radar-catalog-server/build/distributions/radar-catalog-server-*/lib/* /usr/lib/ -COPY --from=builder /code/java-sdk/radar-schemas-tools/build/distributions/radar-schemas-tools-*/bin/radar-schemas-tools /usr/bin/ -COPY --from=builder /code/java-sdk/radar-catalog-server/build/distributions/radar-catalog-server-*/bin/radar-catalog-server /usr/bin/ +COPY --from=builder /code/java-sdk/radar-*/build/third-party/* /usr/lib/ +COPY --from=builder /code/java-sdk/radar-*/build/scripts/* /usr/bin/ +COPY --from=builder /code/java-sdk/radar-*/build/libs/* /usr/lib/ COPY ./commons ./original/commons COPY ./specifications ./original/specifications diff --git a/java-sdk/build.gradle b/java-sdk/build.gradle index 0b127fcb..a30c6816 100644 --- a/java-sdk/build.gradle +++ b/java-sdk/build.gradle @@ -73,5 +73,5 @@ nexusPublishing { } wrapper { - gradleVersion '7.3.1' + gradleVersion '7.3.3' } diff --git a/java-sdk/gradle/wrapper/gradle-wrapper.properties b/java-sdk/gradle/wrapper/gradle-wrapper.properties index 84d1f85f..2e6e5897 100644 --- a/java-sdk/gradle/wrapper/gradle-wrapper.properties +++ b/java-sdk/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/java-sdk/radar-catalog-server/build.gradle b/java-sdk/radar-catalog-server/build.gradle index 08c3ea18..a8c80642 100644 --- a/java-sdk/radar-catalog-server/build.gradle +++ b/java-sdk/radar-catalog-server/build.gradle @@ -23,7 +23,7 @@ dependencies { implementation project(':radar-schemas-core') implementation group: 'net.sourceforge.argparse4j', name: 'argparse4j', version: argparseVersion - def log4j2Version = "2.16.0" + def log4j2Version = "2.17.0" runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:$log4j2Version") runtimeOnly("org.apache.logging.log4j:log4j-api:$log4j2Version") runtimeOnly("org.apache.logging.log4j:log4j-jul:$log4j2Version") @@ -41,6 +41,14 @@ if (!project.hasProperty("profile") || project.property("profile") != "docker") apply from: "$rootDir/gradle/testing.gradle" } +task copyDependencies(type: Copy) { + from(configurations.named("runtimeClasspath").map {it.files }) + into("$buildDir/third-party/") + doLast { + println("Copied third-party runtime dependencies") + } +} + //---------------------------------------------------------------------------// // Publishing // //---------------------------------------------------------------------------// diff --git a/java-sdk/radar-schemas-tools/build.gradle b/java-sdk/radar-schemas-tools/build.gradle index 0e8c5eed..6e675dbc 100644 --- a/java-sdk/radar-schemas-tools/build.gradle +++ b/java-sdk/radar-schemas-tools/build.gradle @@ -55,6 +55,14 @@ test { // Publishing // //---------------------------------------------------------------------------// +task copyDependencies(type: Copy) { + from(configurations.named("runtimeClasspath").map {it.files }) + into("$buildDir/third-party/") + doLast { + println("Copied third-party runtime dependencies") + } +} + tasks.withType(Tar) { compression = Compression.GZIP archiveExtension.set('tar.gz') From c224730f9e7c18e43c89cd819268bf3d21b197f3 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 23 Dec 2021 14:19:54 +0100 Subject: [PATCH 4/8] Bump dependencies versions --- java-sdk/build.gradle | 4 ++-- java-sdk/radar-schemas-commons/build.gradle | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java-sdk/build.gradle b/java-sdk/build.gradle index a30c6816..d566c8c9 100644 --- a/java-sdk/build.gradle +++ b/java-sdk/build.gradle @@ -3,7 +3,7 @@ //---------------------------------------------------------------------------// plugins { - id 'com.github.davidmc24.gradle.plugin.avro-base' version '1.2.1' + id 'com.github.davidmc24.gradle.plugin.avro-base' version '1.3.0' id("io.github.gradle-nexus.publish-plugin") version "1.1.0" id("com.github.ben-manes.versions") version "0.39.0" } @@ -24,7 +24,7 @@ subprojects { ext.website = 'https://radar-base.org' ext { - avroVersion = '1.9.2' + avroVersion = '1.11.0' argparseVersion = '0.9.0' jacksonVersion = '2.12.5' radarJerseyVersion = "0.8.0.1" diff --git a/java-sdk/radar-schemas-commons/build.gradle b/java-sdk/radar-schemas-commons/build.gradle index 72b3d635..2251d736 100644 --- a/java-sdk/radar-schemas-commons/build.gradle +++ b/java-sdk/radar-schemas-commons/build.gradle @@ -21,8 +21,8 @@ dependencies { } compileJava { - targetCompatibility = JavaVersion.VERSION_1_8 - sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_11 } //---------------------------------------------------------------------------// From 80f03ba0387e15d5b777928f03bb9e56fca3e0ac Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 23 Dec 2021 14:26:57 +0100 Subject: [PATCH 5/8] Bump version --- java-sdk/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-sdk/build.gradle b/java-sdk/build.gradle index d566c8c9..88ae459d 100644 --- a/java-sdk/build.gradle +++ b/java-sdk/build.gradle @@ -9,7 +9,7 @@ plugins { } allprojects { - version = '0.7.6-SNAPSHOT' + version = '0.7.6' group = 'org.radarbase' } From 8a6143acf200ca17e57c20a867fb9ba95f5317be Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 23 Dec 2021 14:46:13 +0100 Subject: [PATCH 6/8] Bump radar-jersey --- java-sdk/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-sdk/build.gradle b/java-sdk/build.gradle index 88ae459d..6adec81d 100644 --- a/java-sdk/build.gradle +++ b/java-sdk/build.gradle @@ -27,7 +27,7 @@ subprojects { avroVersion = '1.11.0' argparseVersion = '0.9.0' jacksonVersion = '2.12.5' - radarJerseyVersion = "0.8.0.1" + radarJerseyVersion = "0.8.1" junitVersion = '4.13.2' confluentVersion = '7.0.1' From b20b93a88c2c92bec8a700317b18007940e91da2 Mon Sep 17 00:00:00 2001 From: mpgxvii Date: Wed, 12 Jan 2022 14:47:03 +0000 Subject: [PATCH 7/8] Add new questionnaire specs --- specifications/active/aRMT-1.16.0.yml | 263 ++++++++++++++++++++++++++ 1 file changed, 263 insertions(+) create mode 100644 specifications/active/aRMT-1.16.0.yml diff --git a/specifications/active/aRMT-1.16.0.yml b/specifications/active/aRMT-1.16.0.yml new file mode 100644 index 00000000..a9904d21 --- /dev/null +++ b/specifications/active/aRMT-1.16.0.yml @@ -0,0 +1,263 @@ +name: aRMT +vendor: RADAR +model: aRMT-App +version: 1.15.0 +assessment_type: QUESTIONNAIRE +doc: aRMT Questionnaires definition. Includes Personal Health Questionnaire Depression Scale (PHQ-8), Experience sampling method (ESM) and RSES and other data. +data: + - type: THINC_IT + topic: notification_thinc_it + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://github.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/blob/master/questionnaires/thinc_it/thinc_it_armt.json + - type: ROMBERG_TEST + doc: The value of the task is in milliseconds (ms). + topic: task_romberg_test + value_schema: .active.task.Task + questionnaire_definition_url: https://github.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/blob/master/questionnaires/romberg_test/romberg_test_armt.json + - type: 2MW_TEST + doc: The value of the task is in milliseconds (ms). + topic: task_2MW_test + value_schema: .active.task.Task + questionnaire_definition_url: https://github.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/blob/master/questionnaires/2MW_test/2MW_test_armt.json + - type: TANDEM_WALKING_TEST + doc: The value of the task is in milliseconds (ms). + topic: task_tandem_walking_test + value_schema: .active.task.Task + questionnaire_definition_url: https://github.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/blob/master/questionnaires/tandem_walking_test/tandem_walking_test_armt.json + - type: PHQ8 + topic: questionnaire_phq8 + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/phq8/phq8_armt.json + - type: ESM + topic: questionnaire_esm + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/esm/esm_armt.json + - type: AUDIO + doc: A speech questionnaire that contain two parts, a scripted text part where users will record themselves reading a text aloud, and an unscripted text part where users will record themselves answering a question. + topic: questionnaire_audio + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/audio/audio_armt.json + - type: AUDIO_2 + doc: A speech questionnaire that contain two parts, a scripted text part where users will record themselves reading a text aloud, and an unscripted text part where users will record themselves answering a question. + topic: questionnaire_audio + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/audio_2/audio_2_armt.json + - type: AUDIO_3 + doc: A speech questionnaire that contain two parts, a scripted text part where users will record themselves reading a text aloud, and an unscripted text part where users will record themselves answering a question. + topic: questionnaire_audio + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/audio_3/audio_3_armt.json + - type: AUDIO_4 + topic: questionnaire_audio + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/audio_4/audio_4_armt.json + - type: RSES + topic: questionnaire_rses + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/rses/rses_armt.json + - type: PERCEIVED_DEFICITS_QUESTIONNAIRE + topic: questionnaire_perceived_deficits_questionnaire + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/perceived_deficits_questionnaire/perceived_deficits_questionnaire_armt.json + - type: PATIENT_DETERMINED_DISEASE_STEP + topic: questionnaire_patient_determined_disease_step + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/patient_determined_disease_step/patient_determined_disease_step_armt.json + - type: ESM28Q + topic: questionnaire_esm28q + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/esm28q/esm28q_armt.json + - type: BIPQ + topic: questionnaire_bipq + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/bipq/bipq_armt.json + - type: ESM_EPI_MOD_1 + topic: questionnaire_esm_epi_mod_1 + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/esm_epi_mod_1/esm_epi_mod_1_armt.json + - type: EVENING_ASSESSMENT + topic: questionnaire_evening_assessment + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/evening_assessment/evening_assessment_armt.json + - type: MORNING_ASSESSMENT + topic: questionnaire_morning_assessment + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/morning_assessment/morning_assessment_armt.json + - type: TAM + topic: questionnaire_tam + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/tam/tam_armt.json + - type: BAARS_IV + topic: questionnaire_baars_iv + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/baars_iv/baars_iv_armt.json + - type: ARI_SELF + topic: questionnaire_ari_self + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/ari_self/ari_self_armt.json + - type: GAD7 + topic: questionnaire_gad7 + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/gad7/gad7_armt.json + - type: RPQ + topic: questionnaire_rpq + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/rpq/rpq_armt.json + - type: ART_COGNITIVE_TEST + topic: questionnaire_art_cognitive_test + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/art_cognitive_test/art_cognitive_test_armt.json + - type: COVID19_DIAGNOSIS + topic: questionnaire_covid19_diagnosis + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/covid19_diagnosis/covid19_diagnosis_armt.json + - type: COVID19_SYMPTOMS + topic: questionnaire_covid19_symptoms + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/covid19_symptoms/covid19_symptoms_armt.json + - type: CNS_COVID19_BASELINE + topic: questionnaire_cns_covid19_baseline + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/cns_covid19_baseline/cns_covid19_baseline_armt.json + - type: CNS_COVID19_FOLLOWUP + topic: questionnaire_cns_covid19_followup + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/cns_covid19_followup/cns_covid19_followup_armt.json + - type: CNS_COVID19_FOLLOWUP_V2 + topic: questionnaire_cns_covid19_followup_v2 + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/cns_covid19_followup_v2/cns_covid19_followup_v2_armt.json + - type: CNS_COVID19_FOLLOWUP_V3 + topic: questionnaire_cns_covid19_followup_v3 + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/cns_covid19_followup_v3/cns_covid19_followup_v3_armt.json + - type: ART_COVID19_FOLLOWUP + topic: questionnaire_art_covid19_followup + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/art_covid19_followup/art_covid19_followup_armt.json + - type: ADHD_MEDICATION_USE + topic: questionnaire_adhd_medication_use + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/adhd_medication_use/adhd_medication_use_armt.json + - type: QIDS + topic: questionnaire_qids + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/qids/qids_armt.json + - type: WSAS + topic: questionnaire_wsas + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/wsas/wsas_armt.json + - type: SLEEP_QUESTIONS + topic: questionnaire_rapid_sleep_questions + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/sleep_questions/sleep_questions_armt.json + - type: AUDIO_WITHOUT_UNSCRIPTED + doc: A speech questionnaire similar to the AUDIO questionnaire but without the second unscripted task. + topic: questionnaire_audio_without_unscripted + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/audio_without_unscripted/audio_without_unscripted_armt.json + - type: AUDIO_WITHOUT_UNSCRIPTED_2 + doc: A speech questionnaire similar to the AUDIO questionnaire but without the second unscripted task. + topic: questionnaire_audio_without_unscripted_2 + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/audio_without_unscripted_2/audio_without_unscripted_armt.json + - type: AUDIO_WITHOUT_UNSCRIPTED_3 + doc: A speech questionnaire similar to the AUDIO questionnaire but without the second unscripted task. + topic: questionnaire_audio_without_unscripted_3 + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/audio_without_unscripted_3/audio_without_unscripted_armt.json + - type: CAT + topic: questionnaire_cat + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/cat/cat_armt.json + - type: PSQI + topic: questionnaire_psqi + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/psqi/psqi_armt.json + - type: FSS + topic: questionnaire_fss + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/fss/fss_armt.json + - type: PCFS + topic: questionnaire_pcfs + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/pcfs/pcfs_armt.json + - type: RALPMH_COVID_SYMPTOMS + topic: questionnaire_ralpmh_covid_symptoms + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/ralpmh_covid_symptoms/ralpmh_covid_symptoms_armt.json + - type: LIPF + topic: questionnaire_lipf + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/lipf/lipf_armt.json + - type: ERS + topic: questionnaire_ers + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/ers/ers_armt.json + - type: VAS + topic: questionnaire_vas + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/vas/vas_armt.json + - type: PULSE_OX + topic: questionnaire_pulse_ox + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/pulse_ox/pulse_ox_armt.json + - type: AUDIO_WITHOUT_UNSCRIPTED_4 + doc: A speech questionnaire that contains `The North Wind` scripted text where users will record themselves reading a text aloud. + topic: questionnaire_audio_without_unscripted_4 + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/audio_without_unscripted_4/audio_without_unscripted_4_armt.json + - type: AUDIO_COUNT + doc: A speech questionnaire where users will record themselves count from 1 to 20 aloud. + topic: questionnaire_audio_count + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/audio_count/audio_count_armt.json + - type: AUDIO_VOCALISATION + doc: A speech questionnaire where users will record themselves speak the vowels displayed on the screen aloud. + topic: questionnaire_audio_vocalisation + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/audio_vocalisation/audio_vocalisation_armt.json + - type: EXACERBATION_DIARY + topic: questionnaire_exacerbation_diary + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/exacerbation_diary/exacerbation_diary_armt.json + - type: NUVOAIR_SPIROMETRY + topic: notification_nuvoair_spirometry + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/nuvoair_spirometry/nuvoair_spirometry_armt.json + - type: K_BUILD_PRIVATE + topic: questionnaire_k_build_private + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions-Private/master/questionnaires/k_build_private/k_build_private_armt.json + - type: COMPLETION_LOG + doc: Information about the completeness of each questionnaire. + topic: questionnaire_completion_log + value_schema: .monitor.questionnaire.QuestionnaireCompletionLog + - type: TIMEZONE + doc: Timezone information sent along with each questionnaire. + topic: questionnaire_timezone + value_schema: .monitor.application.ApplicationTimeZone + - type: APP_EVENT + doc: Questionnaire application interaction event. + topic: questionnaire_app_event + value_schema: .monitor.questionnaire.QuestionnaireApplicationInteractionEvent + - type: EPI_SEIZURE_DIARY + topic: questionnaire_epi_seizure_diary + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/epi_seizure_diary/epi_seizure_diary_armt.json + - type: EPI_EVENING_QUESTIONNAIRE + topic: questionnaire_epi_evening_questionnaire + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/epi_evening_questionnaire/epi_evening_questionnaire_armt.json + - type: EPI_WSAS + topic: questionnaire_epi_wsas + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/epi_wsas/epi_wsas_armt.json + - type: BP + topic: questionnaire_bp + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/bp/bp_armt.json + - type: HLH + topic: questionnaire_hlh + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/hlh/hlh_armt.json From e29d6396d02f4440b7f45738325f42e85e6272f7 Mon Sep 17 00:00:00 2001 From: mpgxvii Date: Wed, 12 Jan 2022 14:47:40 +0000 Subject: [PATCH 8/8] Bump version --- specifications/active/aRMT-1.16.0.yml | 50 ++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/specifications/active/aRMT-1.16.0.yml b/specifications/active/aRMT-1.16.0.yml index a9904d21..9e4e539b 100644 --- a/specifications/active/aRMT-1.16.0.yml +++ b/specifications/active/aRMT-1.16.0.yml @@ -1,7 +1,7 @@ name: aRMT vendor: RADAR model: aRMT-App -version: 1.15.0 +version: 1.16.0 assessment_type: QUESTIONNAIRE doc: aRMT Questionnaires definition. Includes Personal Health Questionnaire Depression Scale (PHQ-8), Experience sampling method (ESM) and RSES and other data. data: @@ -261,3 +261,51 @@ data: topic: questionnaire_hlh value_schema: .active.questionnaire.Questionnaire questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/hlh/hlh_armt.json + - type: TECHNOLOGY_USAGE + topic: questionnaire_technology_usage + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/technology_usage/technology_usage_armt.json + - type: REGULAR_ACTIVITIES + topic: questionnaire_regular_activities + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/regular_activities/regular_activities_armt.json + - type: NONREGULAR_ACTIVITIES + topic: questionnaire_nonregular_activities + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/nonregular_activities/nonregular_activities_armt.json + - type: AUTISM_SYMPTOMS + topic: questionnaire_autism_symptoms + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/autism_symptoms/autism_symptoms_armt.json + - type: SLEEP_QUALITY_INFO + topic: questionnaire_sleep_quality + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/sleep_quality_info/sleep_quality_info_armt.json + - type: SLEEP_QUALITY + topic: questionnaire_sleep_quality + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/sleep_quality/sleep_quality_armt.json + - type: ADHD_SYMPTOMS + topic: questionnaire_adhd_symptoms + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/adhd_symptoms/adhd_symptoms_armt.json + - type: USER_FEEDBACK + topic: questionnaire_user_feedback + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/user_feedback/user_feedback_armt.json + - type: PROGRESS_REPORT_1 + topic: questionnaire_progress_report + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/progress_report_1/progress_report_1_armt.json + - type: PROGRESS_REPORT_2 + topic: questionnaire_progress_report + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/progress_report_2/progress_report_2_armt.json + - type: PROGRESS_REPORT_3 + topic: questionnaire_progress_report + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/progress_report_3/progress_report_3_armt.json + - type: PROGRESS_REPORT_4 + topic: questionnaire_progress_report + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/progress_report_4/progress_report_4_armt.json