Skip to content

Commit 4c40f9c

Browse files
lzehllzehl
committed
updating to a simpler cchange for handling statistics
1 parent c87894e commit 4c40f9c

12 files changed

+128
-189
lines changed

‎schemas/research/TissueSampleCollectionStateStatistic.schema.tpl.json‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎schemas/research/specimenAge.schema.tpl.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"_type": "core:Age",
2+
"_type": "core:SpecimenAge",
33
"required": [
44
"age",
55
"reference"

‎schemas/research/specimenSet.schema.tpl.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,40 @@
22
"_categories": [
33
"fileOrigin"
44
],
5+
"required": [
6+
"species"
7+
],
58
"properties": {
69
"additionalRemarks": {
710
"type": "string",
811
"_instruction": "Enter any additional remarks concerning this specimen set."
912
},
13+
"biologicalSex": {
14+
"type": "array",
15+
"minItems": 1,
16+
"uniqueItems": true,
17+
"_instruction": "Add the biological sex of all specimen in this set.",
18+
"_linkedTypes": [
19+
"controlledTerms:BiologicalSex"
20+
]
21+
},
1022
"internalIdentifier": {
1123
"type": "string",
1224
"_instruction": "Enter the identifier (or label) of this specimen set that is used within the corresponding data files to identify this specimen set."
1325
},
1426
"lookupLabel": {
1527
"type": "string",
1628
"_instruction": "Enter a lookup label for this specimen set that may help you to find this instance more easily."
29+
},
30+
"species": {
31+
"type": "array",
32+
"minItems": 1,
33+
"uniqueItems": true,
34+
"_instruction": "Add the species and/or strain (a sub-type of a genetic variant of species) of all specimen in this set.",
35+
"_linkedTypes": [
36+
"controlledTerms:Species",
37+
"core:Strain"
38+
]
1739
}
1840
}
1941
}

‎schemas/research/specimenState.schema.tpl.json‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
"type": "string",
88
"_instruction": "Enter any additional remarks concerning the specimen (set) in this state."
99
},
10+
"age": {
11+
"_instruction": "Enter the age and age reference of the specimen (set) in this state.",
12+
"_embeddedTypes": [
13+
"core:SpecimenAge"
14+
]
15+
},
1016
"associatedProtocol": {
1117
"type": "array",
1218
"minItems": 1,
@@ -24,13 +30,29 @@
2430
"lookupLabel": {
2531
"type": "string",
2632
"_instruction": "Enter a lookup label for this specimen (set) state that may help you to find this instance more easily."
27-
}
33+
},
34+
"pathology": {
35+
"type": "array",
36+
"minItems": 1,
37+
"uniqueItems": true,
38+
"_instruction": "Add all (human) diseases and/or conditions that the specimen (set) in this state has and/or is a model for.",
39+
"_linkedTypes": [
40+
"controlledTerms:Disease",
41+
"controlledTerms:DiseaseModel"
42+
]
43+
},
2844
"relativeTimeIndication": {
2945
"_instruction": "If there is a temporal relation between the states of a specimen (set), enter the relative time that has passed between this and the preceding specimen (set) state referenced under 'descendedFrom'.",
3046
"_embeddedTypes": [
3147
"core:QuantitativeValue",
3248
"core:QuantitativeValueRange"
3349
]
50+
},
51+
"weight": {
52+
"_instruction": "Enter the weight and weight type of the specimen (set) in this state.",
53+
"_embeddedTypes": [
54+
"core:SpecimenWeight"
55+
]
3456
}
3557
}
3658
}

‎schemas/research/subjectGroup.schema.tpl.json‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,24 @@
22
"_type": "core:SubjectGroup",
33
"_extends": "research/specimenSet.schema.tpl.json",
44
"required": [
5-
"attributeStatistic",
65
"numberOfSubjects",
76
"studiedState"
87
],
98
"properties": {
10-
"attributeStatistic": {
11-
"type": "array",
12-
"minItems": 1,
13-
"uniqueItems": true,
14-
"_instruction": "Add all known statistics for the attributes of this subject group.",
15-
"_embeddedTypes": [
16-
"core:SubjectGroupStatistic"
17-
]
18-
},
199
"numberOfSubjects": {
2010
"type": "integer",
2111
"minimum": 2,
2212
"_instruction": "Enter the number of subjects that belong to this subject group."
2313
},
14+
"isPartOf": {
15+
"type": "array",
16+
"minItems": 1,
17+
"uniqueItems": true,
18+
"_instruction": "Add all subject groups of which this subject group is a subgroup.",
19+
"_linkedTypes": [
20+
"core:SubjectGroup"
21+
]
22+
},
2423
"studiedState": {
2524
"type": "array",
2625
"minItems": 1,

‎schemas/research/subjectGroupState.schema.tpl.json‎

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,41 @@
22
"_type": "core:SubjectGroupState",
33
"_extends": "research/specimenState.schema.tpl.json",
44
"required": [
5-
"attributeStatistic"
5+
"ageCategory"
66
],
77
"properties": {
8-
"attributeStatistic": {
8+
"ageCategory": {
99
"type": "array",
1010
"minItems": 1,
1111
"uniqueItems": true,
12-
"_instruction": "Add all known statistics for the attributes of this subject group state.",
13-
"_embeddedTypes": [
14-
"core:SubjectGroupStateStatistic"
12+
"_instruction": "Add the age category of the subject in this state.",
13+
"_linkedTypes": [
14+
"controlledTerms:AgeCategory"
15+
]
16+
},
17+
"attribute": {
18+
"type": "array",
19+
"minItems": 1,
20+
"uniqueItems": true,
21+
"_instruction": "Add all attributes that can be ascribed to this subject group state.",
22+
"_linkedTypes": [
23+
"controlledTerms:SubjectAttribute"
1524
]
1625
},
1726
"descendedFrom": {
1827
"_instruction": "Add the previous subject group state.",
1928
"_linkedTypes": [
2029
"core:SubjectGroupState"
2130
]
31+
},
32+
"handedness": {
33+
"type": "array",
34+
"minItems": 1,
35+
"uniqueItems": true,
36+
"_instruction": "Add all preferred types of handedness of the subject group in this state.",
37+
"_linkedTypes": [
38+
"controlledTerms:Handedness"
39+
]
2240
}
2341
}
2442
}

‎schemas/research/subjectGroupStateStatistic.schema.tpl.json‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎schemas/research/subjectGroupStatistic.schema.tpl.json‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎schemas/research/tissueSampleCollection.schema.tpl.json‎

Lines changed: 46 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,55 @@
22
"_type": "core:TissueSampleCollection",
33
"_extends": "research/specimenSet.schema.tpl.json",
44
"required": [
5-
"attributeStatistic",
6-
"numberOfTissueSamples",
7-
"studiedState"
5+
"origin",
6+
"studiedState",
7+
"type"
88
],
99
"properties": {
10-
"attributeStatistic": {
10+
"anatomicalLocation": {
1111
"type": "array",
1212
"minItems": 1,
1313
"uniqueItems": true,
14-
"_instruction": "Add all known statistics for the attributes of this tissue sample collection.",
15-
"_embeddedTypes": [
16-
"core:TissueSampleCollectionStatistic"
14+
"_instruction": "Add all anatomical entities that describe the anatomical location of this tissue sample collection.",
15+
"_linkedCategories": [
16+
"anatomicalLocation"
17+
]
18+
},
19+
"isPartOf": {
20+
"type": "array",
21+
"minItems": 1,
22+
"uniqueItems": true,
23+
"_instruction": "Add all tissue sample collections of which this tissue sample collection is a subcollection.",
24+
"_linkedTypes": [
25+
"core:TissueSampleCollection"
1726
]
1827
},
28+
"laterality": {
29+
"type": "array",
30+
"minItems": 1,
31+
"maxItems": 2,
32+
"uniqueItems": true,
33+
"_instruction": "Add one or both sides of the body, bilateral organ or bilateral organ part that this tissue sample collection originates from.",
34+
"_linkedTypes": [
35+
"controlledTerms:Laterality"
36+
]
37+
},
1938
"numberOfTissueSamples": {
2039
"type": "integer",
2140
"minimum": 2,
2241
"_instruction": "Enter the number of tissue samples that belong to this tissue sample collection."
2342
},
43+
"origin": {
44+
"type": "array",
45+
"minItems": 1,
46+
"uniqueItems": true,
47+
"_instruction": "Add the biogical origin of all tissue samples in this collection.",
48+
"_linkedTypes": [
49+
"controlledTerms:CellType",
50+
"controlledTerms:Organ",
51+
"controlledTerms:OrganismSubstance"
52+
]
53+
},
2454
"studiedState": {
2555
"type": "array",
2656
"minItems": 1,
@@ -29,6 +59,15 @@
2959
"_linkedTypes": [
3060
"core:TissueSampleCollectionState"
3161
]
62+
},
63+
"type": {
64+
"type": "array",
65+
"minItems": 1,
66+
"uniqueItems": true,
67+
"_instruction": "Add the type of all tissue samples in this collection.",
68+
"_linkedTypes": [
69+
"controlledTerms:TissueSampleType"
70+
]
3271
}
3372
}
3473
}

‎schemas/research/tissueSampleCollectionState.schema.tpl.json‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
{
22
"_type": "core:TissueSampleCollectionState",
33
"_extends": "research/specimenState.schema.tpl.json",
4-
"required": [
5-
"attributeStatistic"
6-
],
74
"properties": {
8-
"attributeStatistic": {
5+
"attribute": {
96
"type": "array",
107
"minItems": 1,
118
"uniqueItems": true,
12-
"_instruction": "Add all known statistics for the attributes of this tissue sample collection state.",
13-
"_embeddedTypes": [
14-
"core:TissueSampleCollectionStateStatistic"
9+
"_instruction": "Add all attributes that can be ascribed to this tissue sample collection state.",
10+
"_linkedTypes": [
11+
"controlledTerms:TissueSampleAttribute"
1512
]
1613
},
1714
"descendedFrom": {

0 commit comments

Comments
 (0)