fix cohort variables

HDRUK · Mar 22, 2024 · 724e860 · 724e860
1 parent c5acfb6
commit 724e860
Show file tree

Hide file tree

Showing 7 changed files with 104 additions and 102 deletions.
diff --git a/docs/HDRUK/2.2.0.md b/docs/HDRUK/2.2.0.md
@@ -390,66 +390,66 @@ Male, Female, Other
 
 ### biologicalsamples
 
-Male, Female, Other
+Blood, Saliva, Urine, Other
 
-| title   | is_list   | is_optional   | required   | type                                                       |
-|:--------|:----------|:--------------|:-----------|:-----------------------------------------------------------|
-| Gender  | True      | True          | False      | ["BiologicalSampleType['Blood','Other','Urine','Saliva']"] |
+| title              | is_list   | is_optional   | required   | type                                                       |
+|:-------------------|:----------|:--------------|:-----------|:-----------------------------------------------------------|
+| Biological Samples | True      | True          | False      | ["BiologicalSampleType['Blood','Other','Urine','Saliva']"] |
 
 
 
 
 ### psychological
 
-Male, Female, Other
+Mental health, Cognitive function
 
-| title   | is_list   | is_optional   | required   | type                                                        |
-|:--------|:----------|:--------------|:-----------|:------------------------------------------------------------|
-| Gender  | True      | True          | False      | ["PsychologicalType['Cognitive Function','Mental Health']"] |
+| title         | is_list   | is_optional   | required   | type                                                        |
+|:--------------|:----------|:--------------|:-----------|:------------------------------------------------------------|
+| Psychological | True      | True          | False      | ["PsychologicalType['Cognitive Function','Mental Health']"] |
 
 
 
 
 ### physical
 
-Male, Female, Other
+Cardiovascular, Respiratory, Musculoskeletal, Hearing and Vision, Reproductive
 
-| title   | is_list   | is_optional   | required   | type                                                                                                 |
-|:--------|:----------|:--------------|:-----------|:-----------------------------------------------------------------------------------------------------|
-| Gender  | True      | True          | False      | ["PhysicalType['Respiratory','Vision','Hearing','Musculoskeletal','Cardiovascular','Reproductive']"] |
+| title    | is_list   | is_optional   | required   | type                                                                                                 |
+|:---------|:----------|:--------------|:-----------|:-----------------------------------------------------------------------------------------------------|
+| Physical | True      | True          | False      | ["PhysicalType['Respiratory','Vision','Hearing','Musculoskeletal','Cardiovascular','Reproductive']"] |
 
 
 
 
 ### anthropometric
 
-Male, Female, Other
+Height, Weight, Waist circumference, Hip circumference, Blood pressure
 
-| title   | is_list   | is_optional   | required   | type                                                                                                 |
-|:--------|:----------|:--------------|:-----------|:-----------------------------------------------------------------------------------------------------|
-| Gender  | True      | True          | False      | ["AnthropometricType['Blood Pressure','Hip Circumference','Height','Waist Circumference','Weight']"] |
+| title          | is_list   | is_optional   | required   | type                                                                                                 |
+|:---------------|:----------|:--------------|:-----------|:-----------------------------------------------------------------------------------------------------|
+| Anthropometric | True      | True          | False      | ["AnthropometricType['Blood Pressure','Hip Circumference','Height','Waist Circumference','Weight']"] |
 
 
 
 
 ### lifestyle
 
-Male, Female, Other
+Cohort lifestyle habits: Smoking, Physical activity, Dietary habits, Alcohol
 
-| title   | is_list   | is_optional   | required   | type                                                                         |
-|:--------|:----------|:--------------|:-----------|:-----------------------------------------------------------------------------|
-| Gender  | True      | True          | False      | ["LifestylesType['Smoking','Dietary Habits','Physical Activity','Alcohol']"] |
+| title     | is_list   | is_optional   | required   | type                                                                         |
+|:----------|:----------|:--------------|:-----------|:-----------------------------------------------------------------------------|
+| Lifestyle | True      | True          | False      | ["LifestylesType['Smoking','Dietary Habits','Physical Activity','Alcohol']"] |
 
 
 
 
 ### socioeconomic
 
-Male, Female, Other
+Occupation, Family circumstances, Housing, Education, Ethnic group, Martial status, Social support
 
-| title   | is_list   | is_optional   | required   | type                                                                                                                                         |
-|:--------|:----------|:--------------|:-----------|:---------------------------------------------------------------------------------------------------------------------------------------------|
-| Gender  | True      | True          | False      | ["SocioEconomicType['Finances','Family Circumstances','Housing','Education','Marital Status','Occupation','Ethnic Group','Social Support']"] |
+| title          | is_list   | is_optional   | required   | type                                                                                                                                         |
+|:---------------|:----------|:--------------|:-----------|:---------------------------------------------------------------------------------------------------------------------------------------------|
+| Socio-economic | True      | True          | False      | ["SocioEconomicType['Finances','Family Circumstances','Housing','Education','Marital Status','Occupation','Ethnic Group','Social Support']"] |
 
 
 

diff --git a/docs/HDRUK/2.2.0.structure.json b/docs/HDRUK/2.2.0.structure.json
@@ -497,8 +497,8 @@
                   {
                         "name": "biologicalsamples",
                         "required": false,
-                        "title": "Gender",
-                        "description": "Male, Female, Other",
+                        "title": "Biological Samples",
+                        "description": "Blood, Saliva, Urine, Other",
                         "examples": null,
                         "type": [
                               "BiologicalSampleType['Blood','Other','Urine','Saliva']"
@@ -509,8 +509,8 @@
                   {
                         "name": "psychological",
                         "required": false,
-                        "title": "Gender",
-                        "description": "Male, Female, Other",
+                        "title": "Psychological",
+                        "description": "Mental health, Cognitive function",
                         "examples": null,
                         "type": [
                               "PsychologicalType['Cognitive Function','Mental Health']"
@@ -521,8 +521,8 @@
                   {
                         "name": "physical",
                         "required": false,
-                        "title": "Gender",
-                        "description": "Male, Female, Other",
+                        "title": "Physical",
+                        "description": "Cardiovascular, Respiratory, Musculoskeletal, Hearing and Vision, Reproductive",
                         "examples": null,
                         "type": [
                               "PhysicalType['Respiratory','Vision','Hearing','Musculoskeletal','Cardiovascular','Reproductive']"
@@ -533,8 +533,8 @@
                   {
                         "name": "anthropometric",
                         "required": false,
-                        "title": "Gender",
-                        "description": "Male, Female, Other",
+                        "title": "Anthropometric",
+                        "description": "Height, Weight, Waist circumference, Hip circumference, Blood pressure",
                         "examples": null,
                         "type": [
                               "AnthropometricType['Blood Pressure','Hip Circumference','Height','Waist Circumference','Weight']"
@@ -545,8 +545,8 @@
                   {
                         "name": "lifestyle",
                         "required": false,
-                        "title": "Gender",
-                        "description": "Male, Female, Other",
+                        "title": "Lifestyle",
+                        "description": "Cohort lifestyle habits: Smoking, Physical activity, Dietary habits, Alcohol",
                         "examples": null,
                         "type": [
                               "LifestylesType['Smoking','Dietary Habits','Physical Activity','Alcohol']"
@@ -557,8 +557,8 @@
                   {
                         "name": "socioeconomic",
                         "required": false,
-                        "title": "Gender",
-                        "description": "Male, Female, Other",
+                        "title": "Socio-economic",
+                        "description": "Occupation, Family circumstances, Housing, Education, Ethnic group, Martial status, Social support",
                         "examples": null,
                         "type": [
                               "SocioEconomicType['Finances','Family Circumstances','Housing','Education','Marital Status','Occupation','Ethnic Group','Social Support']"

diff --git a/docs/HDRUK/2.2.1.md b/docs/HDRUK/2.2.1.md
@@ -390,66 +390,66 @@ Male, Female, Other
 
 ### biologicalsamples
 
-Male, Female, Other
+Blood, Saliva, Urine, Other
 
-| title   | is_list   | is_optional   | required   | type                                                       |
-|:--------|:----------|:--------------|:-----------|:-----------------------------------------------------------|
-| Gender  | True      | True          | False      | ["BiologicalSampleType['Blood','Other','Urine','Saliva']"] |
+| title              | is_list   | is_optional   | required   | type                                                       |
+|:-------------------|:----------|:--------------|:-----------|:-----------------------------------------------------------|
+| Biological Samples | True      | True          | False      | ["BiologicalSampleType['Blood','Other','Urine','Saliva']"] |
 
 
 
 
 ### psychological
 
-Male, Female, Other
+Mental health, Cognitive function
 
-| title   | is_list   | is_optional   | required   | type                                                        |
-|:--------|:----------|:--------------|:-----------|:------------------------------------------------------------|
-| Gender  | True      | True          | False      | ["PsychologicalType['Cognitive Function','Mental Health']"] |
+| title         | is_list   | is_optional   | required   | type                                                        |
+|:--------------|:----------|:--------------|:-----------|:------------------------------------------------------------|
+| Psychological | True      | True          | False      | ["PsychologicalType['Cognitive Function','Mental Health']"] |
 
 
 
 
 ### physical
 
-Male, Female, Other
+Cardiovascular, Respiratory, Musculoskeletal, Hearing and Vision, Reproductive
 
-| title   | is_list   | is_optional   | required   | type                                                                                                 |
-|:--------|:----------|:--------------|:-----------|:-----------------------------------------------------------------------------------------------------|
-| Gender  | True      | True          | False      | ["PhysicalType['Respiratory','Vision','Hearing','Musculoskeletal','Cardiovascular','Reproductive']"] |
+| title    | is_list   | is_optional   | required   | type                                                                                                 |
+|:---------|:----------|:--------------|:-----------|:-----------------------------------------------------------------------------------------------------|
+| Physical | True      | True          | False      | ["PhysicalType['Respiratory','Vision','Hearing','Musculoskeletal','Cardiovascular','Reproductive']"] |
 
 
 
 
 ### anthropometric
 
-Male, Female, Other
+Height, Weight, Waist circumference, Hip circumference, Blood pressure
 
-| title   | is_list   | is_optional   | required   | type                                                                                                 |
-|:--------|:----------|:--------------|:-----------|:-----------------------------------------------------------------------------------------------------|
-| Gender  | True      | True          | False      | ["AnthropometricType['Blood Pressure','Hip Circumference','Height','Waist Circumference','Weight']"] |
+| title          | is_list   | is_optional   | required   | type                                                                                                 |
+|:---------------|:----------|:--------------|:-----------|:-----------------------------------------------------------------------------------------------------|
+| Anthropometric | True      | True          | False      | ["AnthropometricType['Blood Pressure','Hip Circumference','Height','Waist Circumference','Weight']"] |
 
 
 
 
 ### lifestyle
 
-Male, Female, Other
+Cohort lifestyle habits: Smoking, Physical activity, Dietary habits, Alcohol
 
-| title   | is_list   | is_optional   | required   | type                                                                         |
-|:--------|:----------|:--------------|:-----------|:-----------------------------------------------------------------------------|
-| Gender  | True      | True          | False      | ["LifestylesType['Smoking','Dietary Habits','Physical Activity','Alcohol']"] |
+| title     | is_list   | is_optional   | required   | type                                                                         |
+|:----------|:----------|:--------------|:-----------|:-----------------------------------------------------------------------------|
+| Lifestyle | True      | True          | False      | ["LifestylesType['Smoking','Dietary Habits','Physical Activity','Alcohol']"] |
 
 
 
 
 ### socioeconomic
 
-Male, Female, Other
+Occupation, Family circumstances, Housing, Education, Ethnic group, Martial status, Social support
 
-| title   | is_list   | is_optional   | required   | type                                                                                                                                         |
-|:--------|:----------|:--------------|:-----------|:---------------------------------------------------------------------------------------------------------------------------------------------|
-| Gender  | True      | True          | False      | ["SocioEconomicType['Finances','Family Circumstances','Housing','Education','Marital Status','Occupation','Ethnic Group','Social Support']"] |
+| title          | is_list   | is_optional   | required   | type                                                                                                                                         |
+|:---------------|:----------|:--------------|:-----------|:---------------------------------------------------------------------------------------------------------------------------------------------|
+| Socio-economic | True      | True          | False      | ["SocioEconomicType['Finances','Family Circumstances','Housing','Education','Marital Status','Occupation','Ethnic Group','Social Support']"] |
 
 
 

diff --git a/docs/HDRUK/2.2.1.structure.json b/docs/HDRUK/2.2.1.structure.json
@@ -497,8 +497,8 @@
                   {
                         "name": "biologicalsamples",
                         "required": false,
-                        "title": "Gender",
-                        "description": "Male, Female, Other",
+                        "title": "Biological Samples",
+                        "description": "Blood, Saliva, Urine, Other",
                         "examples": null,
                         "type": [
                               "BiologicalSampleType['Blood','Other','Urine','Saliva']"
@@ -509,8 +509,8 @@
                   {
                         "name": "psychological",
                         "required": false,
-                        "title": "Gender",
-                        "description": "Male, Female, Other",
+                        "title": "Psychological",
+                        "description": "Mental health, Cognitive function",
                         "examples": null,
                         "type": [
                               "PsychologicalType['Cognitive Function','Mental Health']"
@@ -521,8 +521,8 @@
                   {
                         "name": "physical",
                         "required": false,
-                        "title": "Gender",
-                        "description": "Male, Female, Other",
+                        "title": "Physical",
+                        "description": "Cardiovascular, Respiratory, Musculoskeletal, Hearing and Vision, Reproductive",
                         "examples": null,
                         "type": [
                               "PhysicalType['Respiratory','Vision','Hearing','Musculoskeletal','Cardiovascular','Reproductive']"
@@ -533,8 +533,8 @@
                   {
                         "name": "anthropometric",
                         "required": false,
-                        "title": "Gender",
-                        "description": "Male, Female, Other",
+                        "title": "Anthropometric",
+                        "description": "Height, Weight, Waist circumference, Hip circumference, Blood pressure",
                         "examples": null,
                         "type": [
                               "AnthropometricType['Blood Pressure','Hip Circumference','Height','Waist Circumference','Weight']"
@@ -545,8 +545,8 @@
                   {
                         "name": "lifestyle",
                         "required": false,
-                        "title": "Gender",
-                        "description": "Male, Female, Other",
+                        "title": "Lifestyle",
+                        "description": "Cohort lifestyle habits: Smoking, Physical activity, Dietary habits, Alcohol",
                         "examples": null,
                         "type": [
                               "LifestylesType['Smoking','Dietary Habits','Physical Activity','Alcohol']"
@@ -557,8 +557,8 @@
                   {
                         "name": "socioeconomic",
                         "required": false,
-                        "title": "Gender",
-                        "description": "Male, Female, Other",
+                        "title": "Socio-economic",
+                        "description": "Occupation, Family circumstances, Housing, Education, Ethnic group, Martial status, Social support",
                         "examples": null,
                         "type": [
                               "SocioEconomicType['Finances','Family Circumstances','Housing','Education','Marital Status','Occupation','Ethnic Group','Social Support']"