Merge pull request #55 from fjelltopp/development

ADX-890 Remove Shiny90 survey age group restriction and add Naomi Com…
fjelltopp · Nov 26, 2022 · 3b31c45 · 3b31c45
2 parents 450c149 + eb97a7d
commit 3b31c45
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 11 deletions.
diff --git a/package_schemas/country_estimates/3_country_estimates_23.json b/package_schemas/country_estimates/3_country_estimates_23.json
@@ -323,6 +323,25 @@
                 "field_value": "inputs-unaids-naomi-report"
             }]
         },
+        {
+            "name": "Naomi Comparison Report",
+            "about": "The Naomi Comparison report file",
+            "resource_type": "inputs-unaids-naomi-comparison-report",
+            "resource_fields": [{
+                "field_name": "name",
+                "preset": "hidden_value",
+                "field_value": "Naomi Comparison Report"
+            }, {
+                "field_name": "format",
+                "label": "Format",
+                "preset": "resource_format_autocomplete",
+                "default": "URL"
+            }, {
+                "field_name": "resource_type",
+                "preset": "hidden_value",
+                "field_value": "inputs-unaids-naomi-comparison-report"
+            }]
+        },
         {
             "name": "Key Populations Excel Workbook",
             "about": "The Key Populations Excel Workbook",

diff --git a/table_schemas/shiny90_survey/1_shiny90_survey_estimates.json b/table_schemas/shiny90_survey/1_shiny90_survey_estimates.json
@@ -32,18 +32,10 @@
         {
             "name": "Age Group",
             "title": "Age Group",
-            "description": "The age group - must be \"15-24\", \"25-34\", \"35-49\", \"50+\", \"15-49\" or \"15+\"",
+            "description": "The age groups used for model fitting are: \"15-24\", \"25-34\", \"35-49\", \"50+\", \"15-49\" or \"15+\". Others may be present also. ",
             "type": "string",
             "constraints": {
-                "required": true,
-                "enum": [
-                    "15-24",
-                    "25-34",
-                    "35-49",
-                    "50+",
-                    "15-49",
-                    "15+"
-                ]
+                "required": true
             }
         },
         {
@@ -132,4 +124,4 @@
     "title": "Shiny90 Survey Data Input",
     "version": "1",
     "description": "If data does not exist, please indicate so with the value \"NA\" and ignore any warning given by Excel."
-}
+}