Merge pull request #2 from satra/main

update nimh minimal with age logic
ReproNim · Apr 5, 2024 · fdc4f54 · fdc4f54
2 parents 265f47c + f8b547e
commit fdc4f54
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/build_deploy.yaml b/.github/workflows/build_deploy.yaml
@@ -20,19 +20,19 @@ jobs:
         echo "PROTOCOL_SLUG is set to $PROTOCOL_SLUG"    
     
     - name: Check out repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0  # Fetches the entire history for comprehensive CI checks
 
     - name: Set up Node.js
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v4
       with:
         node-version: '14.x' # Updated to a more recent LTS version
 
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
-        python-version: '3.9' # Updated to Python 3.9
+        python-version: '3.10' # Updated to Python 3.9
 
     - name: Install system dependencies
       run: sudo apt-get install jq

diff --git a/activities/demo/demo_schema b/activities/demo/demo_schema
@@ -2,7 +2,7 @@
     "@context": [
         "https://raw.githubusercontent.com/ReproNim/reproschema/1.0.0-rc4/contexts/generic",
         {
-            "demo": "https://raw.githubusercontent.com/ReproNim/reproschema-library/9be140d0297ae0671d50466448ae67dea86d3bfd/activities/NDA/items/"
+            "demo": "https://raw.githubusercontent.com/ReproNim/reproschema-library/80867e36fb2c00563290486bf3f3bbeb3198f5cb/activities/NDA/items/"
         }
         ],
     "@type": "reproschema:Activity",

diff --git a/config.env b/config.env
@@ -1 +1 @@
-REPROSCHEMA_UI_CHECKSUM=2129a41e2238066f5c32bb076ee00e382398cc39
+REPROSCHEMA_UI_CHECKSUM=4ce97fa214d31b2782817fd270b45b5911c45eb8
diff --git a/nimh_minimal/nimh_minimal_schema b/nimh_minimal/nimh_minimal_schema
@@ -2,7 +2,7 @@
     "@context": [
         "https://raw.githubusercontent.com/ReproNim/reproschema/1.0.0-rc4/contexts/generic",
         {
-            "activity_path": "https://raw.githubusercontent.com/ReproNim/reproschema-library/9be140d0297ae0671d50466448ae67dea86d3bfd/activities/"
+            "activity_path": "https://raw.githubusercontent.com/ReproNim/reproschema-library/80867e36fb2c00563290486bf3f3bbeb3198f5cb/activities/"
         }
         ],
     "@type": "reproschema:Protocol",
@@ -32,39 +32,39 @@
                 "prefLabel": {
                     "en": "DSM5 Adult"
                 },
-                "isVis": true
+                "isVis": "Number(demo_schema.interview_age) >= 12*18"
             },
 	        {
                 "variableName": "WHODAS12_schema",
                 "isAbout": "activity_path:WHODAS12/WHODAS12_schema",
                 "prefLabel": {
                     "en": "WHODAS12"
                 },
-                "isVis": true
+                "isVis": "Number(demo_schema.interview_age) >= 12*18"
             },
 	        {
                 "variableName": "PHQ9_schema",
                 "isAbout": "activity_path:PHQ-9/PHQ9_schema",
                 "prefLabel": {
                     "en": "PHQ9"
                 },
-                "isVis": true
+                "isVis": "Number(demo_schema.interview_age) >= 12*18"
             },
 	        {
                 "variableName": "GAD7_schema",
                 "isAbout": "activity_path:GAD7/GAD7_schema",
                 "prefLabel": {
                     "en": "GAD7"
                 },
-                "isVis": true
+                "isVis": "Number(demo_schema.interview_age) >= 12*18"
             },
             {
                 "isAbout": "activity_path:dsm_5_parent_guardian_rated_level_1_crosscutting_s/dsm_5_parent_guardian_rated_level_1_crosscutting_s_schema",
                 "variableName": "dsm_5_parent_guardian_rated_level_1_crosscutting_s_schema",
                 "prefLabel": {
                     "en": "DSM5 Parent"
                 },
-                "isVis": false
+                "isVis": "Number(demo_schema_interview_age) > 12*6 && Number(demo_schema_interview_age) < 12*18"
             },
             {
                 "isAbout": "activity_path:DSM-5_Y/DSM5_crosscutting_youth_schema",
@@ -80,7 +80,7 @@
                 "prefLabel": {
                     "en": "RCADS-25"
                 },
-                "isVis": false
+                "isVis": "Number(demo_schema_interview_age) > 12*4 && Number(demo_schema_interview_age) < 12*18"
             },
             {
                 "isAbout": "activity_path:ThankYou/ThankYou_schema",
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		REPROSCHEMA_UI_CHECKSUM=2129a41e2238066f5c32bb076ee00e382398cc39
		REPROSCHEMA_UI_CHECKSUM=4ce97fa214d31b2782817fd270b45b5911c45eb8