Skip to content

Commit

Permalink
rm gender fields
Browse files Browse the repository at this point in the history
  • Loading branch information
@BSnelling
BSnelling committed Aug 22, 2024
1 parent 78de344 commit 6b90df2
Show file tree
Hide file tree
Showing 15 changed files with 7 additions and 382 deletions.
28 changes: 0 additions & 28 deletions docs/GWDM/2.0.form.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1497,34 +1497,6 @@
"types": "int",
"location": "demographicFrequency.ethnicity.count"
},
{
"required": true,
"title": "Gender assigned at birth bin",
"description": null,
"guidance": "",
"examples": null,
"is_list": false,
"is_optional": false,
"types": {
"type": "string",
"options": [
"male",
"female"
]
},
"location": "demographicFrequency.genderAssignedAtBirth.bin"
},
{
"required": true,
"title": "Gender assigned at birth count",
"description": null,
"guidance": "",
"examples": null,
"is_list": false,
"is_optional": false,
"types": "int",
"location": "demographicFrequency.genderAssignedAtBirth.count"
},
{
"required": true,
"title": "Disease code",
Expand Down
33 changes: 1 addition & 32 deletions docs/GWDM/2.0.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1369,7 +1369,7 @@ Restrictions on the use of the tissue sample

## demographicFrequency

An object containing demographic frequency data categorised by age, ethnicity, gender assigned at birth, and disease attributes.
An object containing demographic frequency data categorised by age, ethnicity, and disease attributes.



Expand Down Expand Up @@ -1438,37 +1438,6 @@ None



### genderAssignedAtBirth

Gender assigned at birth, male or female, and their corresponding counts.






#### bin

None

| title | guidance | is_list | required | type |
|:-----------------------------|:-----------|:----------|:-----------|:--------------------------------|
| Gender assigned at birth bin | | False | True | ["GenderEnum['male','female']"] |




#### count

None

| title | guidance | is_list | required | type |
|:-------------------------------|:-----------|:----------|:-----------|:--------|
| Gender assigned at birth count | | False | True | ['int'] |




### disease

Array of diseases and their corresponding counts.
Expand Down
43 changes: 1 addition & 42 deletions docs/GWDM/2.0.structure.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1866,7 +1866,7 @@
"name": "demographicFrequency",
"required": false,
"title": "Demographic frequency",
"description": "An object containing demographic frequency data categorised by age, ethnicity, gender assigned at birth, and disease attributes.",
"description": "An object containing demographic frequency data categorised by age, ethnicity, and disease attributes.",
"guidance": "",
"examples": null,
"type": [
Expand Down Expand Up @@ -1958,47 +1958,6 @@
}
]
},
{
"name": "genderAssignedAtBirth",
"required": false,
"title": "Gender assigned at birth",
"description": "Gender assigned at birth, male or female, and their corresponding counts.",
"guidance": "",
"examples": null,
"type": [
"GenderAssignedAtBirth"
],
"is_list": true,
"is_optional": true,
"subItems": [
{
"name": "bin",
"required": true,
"title": "Gender assigned at birth bin",
"description": null,
"guidance": "",
"examples": null,
"type": [
"GenderEnum['male','female']"
],
"is_list": false,
"is_optional": false
},
{
"name": "count",
"required": true,
"title": "Gender assigned at birth count",
"description": null,
"guidance": "",
"examples": null,
"type": [
"int"
],
"is_list": false,
"is_optional": false
}
]
},
{
"name": "disease",
"required": false,
Expand Down
46 changes: 0 additions & 46 deletions docs/HDRUK/3.0.0.form.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -496,24 +496,6 @@
},
"location": "coverage.pathway"
},
{
"required": false,
"title": "Gender",
"description": "Male, Female, Other",
"guidance": "Options are limited to Male/Female/Other.",
"examples": null,
"is_list": true,
"is_optional": true,
"types": {
"type": "string",
"options": [
"Male",
"Female",
"Other"
]
},
"location": "coverage.gender"
},
{
"required": false,
"title": "Purpose of dataset collection",
Expand Down Expand Up @@ -1763,34 +1745,6 @@
"types": "int",
"location": "demographicFrequency.ethnicity.count"
},
{
"required": true,
"title": "Gender assigned at birth",
"description": null,
"guidance": "",
"examples": null,
"is_list": false,
"is_optional": false,
"types": {
"type": "string",
"options": [
"male",
"female"
]
},
"location": "demographicFrequency.genderAssignedAtBirth.bin"
},
{
"required": true,
"title": "Gender assigned at birth count",
"description": null,
"guidance": "",
"examples": null,
"is_list": false,
"is_optional": false,
"types": "int",
"location": "demographicFrequency.genderAssignedAtBirth.count"
},
{
"required": true,
"title": "Disease code",
Expand Down
44 changes: 1 addition & 43 deletions docs/HDRUK/3.0.0.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -398,17 +398,6 @@ Please indicate if the dataset is representative of the patient pathway and any



### gender

Male, Female, Other

| title | guidance | is_list | required | type |
|:--------|:------------------------------------------|:----------|:-----------|:----------------------------------------|
| Gender | Options are limited to Male/Female/Other. | True | False | ["GenderType['Male','Female','Other']"] |




## provenance

Provenance information allows researchers to understand data within the context of its origins and can be an indicator of quality, authenticity and timeliness.
Expand Down Expand Up @@ -1218,7 +1207,7 @@ Links to locations of information and or raw downloads of synthetic data associa

## demographicFrequency

An object containing demographic frequency data categorised by age, ethnicity, gender assigned at birth, and disease attributes.
An object containing demographic frequency data categorised by age, ethnicity, and disease attributes.



Expand Down Expand Up @@ -1287,37 +1276,6 @@ None



### genderAssignedAtBirth

Gender assigned at birth, male or female, and their corresponding counts.






#### bin

None

| title | guidance | is_list | required | type |
|:-------------------------|:-----------|:----------|:-----------|:--------------------------------|
| Gender assigned at birth | | False | True | ["GenderEnum['male','female']"] |




#### count

None

| title | guidance | is_list | required | type |
|:-------------------------------|:-----------|:----------|:-----------|:--------|
| Gender assigned at birth count | | False | True | ['int'] |




### disease

Array of diseases and their corresponding counts.
Expand Down
56 changes: 1 addition & 55 deletions docs/HDRUK/3.0.0.structure.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -524,19 +524,6 @@
"is_list": false,
"is_optional": true,
"subItems": []
},
{
"name": "gender",
"required": false,
"title": "Gender",
"description": "Male, Female, Other",
"guidance": "Options are limited to Male/Female/Other.",
"examples": null,
"type": [
"GenderType['Male','Female','Other']"
],
"is_list": true,
"is_optional": true
}
]
},
Expand Down Expand Up @@ -1636,7 +1623,7 @@
"name": "demographicFrequency",
"required": false,
"title": "Demographic frequency",
"description": "An object containing demographic frequency data categorised by age, ethnicity, gender assigned at birth, and disease attributes.",
"description": "An object containing demographic frequency data categorised by age, ethnicity, and disease attributes.",
"guidance": "",
"examples": null,
"type": [
Expand Down Expand Up @@ -1728,47 +1715,6 @@
}
]
},
{
"name": "genderAssignedAtBirth",
"required": false,
"title": "Gender assigned at birth",
"description": "Gender assigned at birth, male or female, and their corresponding counts.",
"guidance": "",
"examples": null,
"type": [
"GenderAssignedAtBirth"
],
"is_list": true,
"is_optional": true,
"subItems": [
{
"name": "bin",
"required": true,
"title": "Gender assigned at birth",
"description": null,
"guidance": "",
"examples": null,
"type": [
"GenderEnum['male','female']"
],
"is_list": false,
"is_optional": false
},
{
"name": "count",
"required": true,
"title": "Gender assigned at birth count",
"description": null,
"guidance": "",
"examples": null,
"type": [
"int"
],
"is_list": false,
"is_optional": false
}
]
},
{
"name": "disease",
"required": false,
Expand Down
8 changes: 0 additions & 8 deletions hdr_schemata/models/GWDM/v2_0/DemographicFrequency.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
from .Age import Age
from .Disease import Disease
from .Ethnicity import Ethnicity
from .GenderAssignedAtBirth import GenderAssignedAtBirth

an = annotations.demographicFrequency

Expand All @@ -29,13 +28,6 @@ class Config:
# json_schema_extra={"guidance": an.ethnicity.guidance}
)

genderAssignedAtBirth: Optional[List[GenderAssignedAtBirth]] = Field(
None,
title=an.genderAssignedAtBirth.title,
description=an.genderAssignedAtBirth.description,
# json_schema_extra={"guidance": an.genderAssignedAtBirth.guidance}
)

disease: Optional[List[Disease]] = Field(
None,
title=an.disease.title,
Expand Down
11 changes: 0 additions & 11 deletions hdr_schemata/models/GWDM/v2_0/GenderAssignedAtBirth.py
View file

This file was deleted.

9 changes: 1 addition & 8 deletions hdr_schemata/models/GWDM/v2_0/annotations/config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ tissuesSampleCollection:
description: "Restrictions on the use of the tissue sample"
demographicFrequency:
title: "Demographic frequency"
description: "An object containing demographic frequency data categorised by age, ethnicity, gender assigned at birth, and disease attributes."
description: "An object containing demographic frequency data categorised by age, ethnicity, and disease attributes."
age:
title: "Age"
description: "Array of age bins and their corresponding counts."
Expand All @@ -576,13 +576,6 @@ demographicFrequency:
title: "Ethnicity bin"
count:
title: "Ethnicity count"
genderAssignedAtBirth:
title: "Gender assigned at birth"
description: "Gender assigned at birth, male or female, and their corresponding counts."
bin:
title: "Gender assigned at birth bin"
count:
title: "Gender assigned at birth count"
disease:
title: "Disease"
description: "Array of diseases and their corresponding counts."
Expand Down
Loading

0 comments on commit 6b90df2

Please sign in to comment.