fixing linking behavior of numeric attribtues (which should be embedded) vs non-numeric attributes (which should be linked)

Author: lzehl

schemas/research/TissueSampleCollectionStateStatistic.schema.tpl.json

@@ -1,26 +1,33 @@
 {
   "_type": "core:TissueSampleCollectionStateStatistic",
   "required": [
-    "attribute",
     "count"
   ],
   "properties": {
-    "attribute": {
+    "count": {
+      "type": "integer",
+      "_instruction": "Enter the tissue sample count within the tissue sample collection to which the defined state attribute(s) apply.",
+    },
+    "qualitativeCharacteristic": {
       "type": "array",
       "minItems": 1,
       "uniqueItems": true,
-      "_instruction": "Add all attributes (including age) common for the specified tissue sample count within the tissue sample collection state.",
+      "_instruction": "Add all qualitative characteristics common for the specified tissue sample count within the tissue sample collection state.",
       "_linkedTypes": [
         "controlledTerms:Disease",
         "controlledTerms:DiseaseModel",
-        "controlledTerms:TissueSampleAttribute",
+        "controlledTerms:TissueSampleAttribute"
+      ]
+    },
+    "quantitativeMeasurement": {
+      "type": "array",
+      "minItems": 1,
+      "uniqueItems": true,
+      "_instruction": "Add all quantitative measurements common for the specified tissue sample count within the tissue sample collection state.",
+      "_embeddedTypes": [
         "core:SpecimenAge",
         "core:SpecimenWeight"
       ]
-    },
-    "count": {
-      "type": "integer",
-      "_instruction": "Enter the tissue sample count within the tissue sample collection to which the defined state attribute(s) apply.",
-    }
+    }   
   }
 }

schemas/research/subjectGroupStateStatistic.schema.tpl.json

@@ -1,27 +1,34 @@
 {
   "_type": "core:SubjectGroupStateStatistic",
   "required": [
-    "attribute",
     "count"
   ],
   "properties": {
-    "attribute": {
+    "count": {
+      "type": "integer",
+      "_instruction": "Enter the subject count within the subject group to which the defined state attribute(s) (composed of qualitative characteristic(s) and/or quantitative measurement(s)) apply.",
+    },
+    "qualitativeCharacteristic": {
       "type": "array",
       "minItems": 1,
       "uniqueItems": true,
-      "_instruction": "Add all attributes (including age) common for the specified subject count within the subject group state.",
+      "_instruction": "Add all qualitative characteristics common for the specified subject count within the subject group state.",
       "_linkedTypes": [
         "controlledTerms:AgeCategory",
         "controlledTerms:Disease",
         "controlledTerms:DiseaseModel",
-        "controlledTerms:SubjectAttribute",
+        "controlledTerms:SubjectAttribute"
+      ]
+    },
+    "quantitativeMeasurement": {
+      "type": "array",
+      "minItems": 1,
+      "uniqueItems": true,
+      "_instruction": "Add all quantitative measurements common for the specified subject count within the subject group state.",
+      "_embeddedTypes": [
         "core:SpecimenAge",
         "core:SpecimenWeight"
       ]
-    },
-    "count": {
-      "type": "integer",
-      "_instruction": "Enter the subject count within the subject group to which the defined state attribute(s) apply.",
     }
   }
 }

schemas/research/subjectGroupStatistic.schema.tpl.json

@@ -11,7 +11,9 @@
       "uniqueItems": true,
       "_instruction": "Add all attributes common for the specified subject count within the subject group.",
       "_linkedTypes": [
-        "controlledTerms:SpecimenAttribute"
+        "controlledTerms:BiologicalSex",
+        "controlledTerms:Species",
+        "controlledTerms:Strain"
       ]
     },
     "count": {

schemas/research/tissueSampleCollectionStatistic.schema.tpl.json

@@ -11,7 +11,9 @@
       "uniqueItems": true,
       "_instruction": "Add all attributes common for the specified tissue sample count within the tissue sample collection.",
       "_linkedTypes": [
-        "controlledTerms:SpecimenAttribute",
+        "controlledTerms:BiologicalSex",
+        "controlledTerms:Species",
+        "controlledTerms:Strain",
         "core:TissueSampleIdentity"
       ]
     },