Skip to content

Corrections to C3 #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kwlodarczyk wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Corrections to C3 #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
20b11c1
Correction in new RAMLs - used specific schemas instead of collection…
kwlodarczyk Feb 26, 2018
3153dde
Corrected "allOf" => "properties"; updated to use the new collection …
kwlodarczyk Feb 26, 2018
780da11
Added missing file name in reference
kwlodarczyk Feb 26, 2018
5b2e309
Updated property name to be as in RAML description and example
kwlodarczyk Feb 26, 2018
3eb6106
Revert "Updated property name to be as in RAML description and example"
kwlodarczyk Mar 9, 2018
0c44b43
Changed "unit" => "units" in example to be consistent with schema
kwlodarczyk Mar 9, 2018
b06cc88
Changed "unit" => "units" for consistency with unit-related propertie…
kwlodarczyk Mar 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bloodPressure.raml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@ traits:
"id": "unique_example_id",
"systolic": 110,
"diastolic": 85,
"unit": "mmHg"
"units": "mmHg"
}
2 changes: 1 addition & 1 deletion bloodPressureMonitorAM.raml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ documentation:
schemas:
- batch-retrieve: !include oic.collection.batch-retrieve-schema.json
- links: !include oic.collection.linkslist-schema.json
- baseline: !include oic.collection-schema.json
- baseline: !include oic.r.bloodpressuremonitor-am.json

traits:
- interface-all:
Expand Down
2 changes: 1 addition & 1 deletion bodyScaleAM.raml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ documentation:
schemas:
- batch-retrieve: !include oic.collection.batch-retrieve-schema.json
- links: !include oic.collection.linkslist-schema.json
- baseline: !include oic.collection-schema.json
- baseline: !include oic.r.bodyscale-am.json

traits:
- interface-all:
Expand Down
2 changes: 1 addition & 1 deletion glucoseMedication.raml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@ traits:
"rt": ["oic.r.glucose.medication"],
"id": "unique_example_id",
"medication": 100,
"unit": "mg",
"units": "mg",
"regimen": "rapidacting"
}
2 changes: 1 addition & 1 deletion glucoseMeterAM.raml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ documentation:
schemas:
- batch-retrieve: !include oic.collection.batch-retrieve-schema.json
- links: !include oic.collection.linkslist-schema.json
- baseline: !include oic.collection-schema.json
- baseline: !include oic.r.glucosemeter-am.json

traits:
- interface-all:
Expand Down
63 changes: 31 additions & 32 deletions oic.r.bloodpressuremonitor-am.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,46 +6,45 @@
"definitions": {
"oic.r.bloodpressuremonitor-am": {
"type": "object",
"allOf": [
{
"rt": {
"type": "array",
"minItems": 2,
"maxItems": 2,
"uniqueItems": true,
"items": {
"enum": ["oic.r.bloodpressuremonitor-am", "oic.wk.col.atomic"]
}
"properties": {
"rt": {
"type": "array",
"minItems": 2,
"maxItems": 2,
"uniqueItems": true,
"items": {
"enum": ["oic.r.bloodpressuremonitor-am", "oic.wk.col.atomic"]
}
},
"rts": {
"type": "array",
"minItems": 1,
"maxItems": 4,
"uniqueItems": true,
"items": {
"enum": ["oic.r.bloodpressure", "oic.r.pulserate", "oic.r.userid", "oic.r.time.stamp"]
},
"rts": {
"type": "array",
"minItems": 1,
"maxItems": 4,
"uniqueItems": true,
"items": {
"enum": ["oic.r.bloodpressure", "oic.r.pulserate", "oic.r.userid", "oic.r.time.stamp"]
},
"description": "This contains all possible resource types for this atomic measurement."
"description": "This contains all possible resource types for this atomic measurement."
},
"rts-m": {
"type": "array",
"minItems": 1,
"maxItems": 1,
"uniqueItems": true,
"items": {
"enum": ["oic.r.bloodpressure"]
},
"rts-m": {
"type": "array",
"minItems": 1,
"maxItems": 1,
"uniqueItems": true,
"items": {
"enum": ["oic.r.bloodpressure"]
},
"description": "This contains all mandatory resource types for this atomic measurement."
}
"description": "This contains all mandatory resource types for this atomic measurement."
}
]
}
}
},
"type": "object",
"allOf": [
{"$ref": "oic.core.json#/definitions/oic.core"},
{"$ref": "#/definitions/oic.r.bloodpressuremonitor-am"},
{"$ref": "oic.collection-schema.json#/definitions/oic.collection"}
{"$ref": "oic.collection-schema.json#/definitions/oic.collection.properties"},
{"$ref": "oic.collection-schema.json#/definitions/oic.collection.links.arrayoflinks"},
{"$ref": "#/definitions/oic.r.bloodpressuremonitor-am"}
],
"required": ["rts-m"]
}
2 changes: 1 addition & 1 deletion oic.r.body.location.temperature.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"allOf": [
{"$ref": "oic.core.json#/definitions/oic.core"},
{"$ref": "oic.baseResource.json#/definitions/oic.r.baseresource"},
{"$ref": "#/definitions/oic.r.body.location"},
{"$ref": "oic.r.body.location.json#/definitions/oic.r.body.location"},
{"$ref": "#/definitions/oic.r.body.location.temperature"}
],
"required": ["bloc"]
Expand Down
63 changes: 31 additions & 32 deletions oic.r.bodyscale-am.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,46 +6,45 @@
"definitions": {
"oic.r.bodyscale-am": {
"type": "object",
"allOf": [
{
"rt": {
"type": "array",
"minItems": 2,
"maxItems": 2,
"uniqueItems": true,
"items": {
"enum": ["oic.r.bodyscale-am", "oic.wk.col.atomic"]
}
"properties": {
"rt": {
"type": "array",
"minItems": 2,
"maxItems": 2,
"uniqueItems": true,
"items": {
"enum": ["oic.r.bodyscale-am", "oic.wk.col.atomic"]
}
},
"rts": {
"type": "array",
"minItems": 1,
"maxItems": 9,
"uniqueItems": true,
"items": {
"enum": ["oic.r.weight", "oic.r.bmi", "oic.r.height", "oic.r.body.fat", "oic.r.body.water", "oic.r.body.slm", "oic.r.body.ffm", "oic.r.time.stamp", "oic.r.userid"]
},
"rts": {
"type": "array",
"minItems": 1,
"maxItems": 9,
"uniqueItems": true,
"items": {
"enum": ["oic.r.weight", "oic.r.bmi", "oic.r.height", "oic.r.body.fat", "oic.r.body.water", "oic.r.body.slm", "oic.r.body.ffm", "oic.r.time.stamp", "oic.r.userid"]
},
"description": "This contains all possible resource types for this atomic measurement."
"description": "This contains all possible resource types for this atomic measurement."
},
"rts-m": {
"type": "array",
"minItems": 1,
"maxItems": 1,
"uniqueItems": true,
"items": {
"enum": ["oic.r.weight"]
},
"rts-m": {
"type": "array",
"minItems": 1,
"maxItems": 1,
"uniqueItems": true,
"items": {
"enum": ["oic.r.weight"]
},
"description": "This contains all mandatory resource types for this atomic measurement."
}
"description": "This contains all mandatory resource types for this atomic measurement."
}
]
}
}
},
"type": "object",
"allOf": [
{"$ref": "oic.core.json#/definitions/oic.core"},
{"$ref": "#/definitions/oic.r.bodyscale-am"},
{"$ref": "oic.collection-schema.json#/definitions/oic.collection"}
{"$ref": "oic.collection-schema.json#/definitions/oic.collection.properties"},
{"$ref": "oic.collection-schema.json#/definitions/oic.collection.links.arrayoflinks"},
{"$ref": "#/definitions/oic.r.bodyscale-am"}
],
"required": ["rts-m"]
}
63 changes: 31 additions & 32 deletions oic.r.bodythermometer-am.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,46 +6,45 @@
"definitions": {
"oic.r.bodythermometer-am": {
"type": "object",
"allOf": [
{
"rt": {
"type": "array",
"minItems": 2,
"maxItems": 2,
"uniqueItems": true,
"items": {
"enum": ["oic.r.bodythermometer-am", "oic.wk.col.atomic"]
}
"properties": {
"rt": {
"type": "array",
"minItems": 2,
"maxItems": 2,
"uniqueItems": true,
"items": {
"enum": ["oic.r.bodythermometer-am", "oic.wk.col.atomic"]
}
},
"rts": {
"type": "array",
"minItems": 1,
"maxItems": 4,
"uniqueItems": true,
"items": {
"enum": ["oic.r.temperature", "oic.r.body.location.temperature", "oic.r.time.stamp", "oic.r.userid"]
},
"rts": {
"type": "array",
"minItems": 1,
"maxItems": 4,
"uniqueItems": true,
"items": {
"enum": ["oic.r.temperature", "oic.r.body.location.temperature", "oic.r.time.stamp", "oic.r.userid"]
},
"description": "This contains all possible resource types for this atomic measurement."
"description": "This contains all possible resource types for this atomic measurement."
},
"rts-m": {
"type": "array",
"minItems": 1,
"maxItems": 1,
"uniqueItems": true,
"items": {
"enum": ["oic.r.temperature"]
},
"rts-m": {
"type": "array",
"minItems": 1,
"maxItems": 1,
"uniqueItems": true,
"items": {
"enum": ["oic.r.temperature"]
},
"description": "This contains all mandatory resource types for this atomic measurement."
}
"description": "This contains all mandatory resource types for this atomic measurement."
}
]
}
}
},
"type": "object",
"allOf": [
{"$ref": "oic.core.json#/definitions/oic.core"},
{"$ref": "#/definitions/oic.r.bodythermometer-am"},
{"$ref": "oic.collection-schema.json#/definitions/oic.collection"}
{"$ref": "oic.collection-schema.json#/definitions/oic.collection.properties"},
{"$ref": "oic.collection-schema.json#/definitions/oic.collection.links.arrayoflinks"},
{"$ref": "#/definitions/oic.r.bodythermometer-am"}
],
"required": ["rts-m"]
}
2 changes: 1 addition & 1 deletion oic.r.glucose.medication.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"readOnly": true,
"description": "The level of medication undertaken"
},
"unit": {
"units": {
"type": "string",
"readOnly": true,
"enum": ["mg", "mL"],
Expand Down
63 changes: 31 additions & 32 deletions oic.r.glucosemeter-am.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,46 +6,45 @@
"definitions": {
"oic.r.glucosemeter-am": {
"type": "object",
"allOf": [
{
"rt": {
"type": "array",
"minItems": 2,
"maxItems": 2,
"uniqueItems": true,
"items": {
"enum": ["oic.r.glucosemeter-am", "oic.wk.col.atomic"]
}
"properties": {
"rt": {
"type": "array",
"minItems": 2,
"maxItems": 2,
"uniqueItems": true,
"items": {
"enum": ["oic.r.glucosemeter-am", "oic.wk.col.atomic"]
}
},
"rts": {
"type": "array",
"minItems": 1,
"maxItems": 11,
"uniqueItems": true,
"items": {
"enum": ["oic.r.glucose", "oic.r.glucose.carb", "oic.r.glucose.exercise", "oic.r.glucose.health", "oic.r.glucose.hba1c", "oic.r.glucose.meal", "oic.r.glucose.medication", "oic.r.glucose.samplelocation", "oic.r.glucose.tester", "oic.r.time.observed", "oic.r.userid"]
},
"rts": {
"type": "array",
"minItems": 1,
"maxItems": 11,
"uniqueItems": true,
"items": {
"enum": ["oic.r.glucose", "oic.r.glucose.carb", "oic.r.glucose.exercise", "oic.r.glucose.health", "oic.r.glucose.hba1c", "oic.r.glucose.meal", "oic.r.glucose.medication", "oic.r.glucose.samplelocation", "oic.r.glucose.tester", "oic.r.time.observed", "oic.r.userid"]
},
"description": "This contains all possible resource types for this atomic measurement."
"description": "This contains all possible resource types for this atomic measurement."
},
"rts-m": {
"type": "array",
"minItems": 1,
"maxItems": 1,
"uniqueItems": true,
"items": {
"enum": ["oic.r.glucose"]
},
"rts-m": {
"type": "array",
"minItems": 1,
"maxItems": 1,
"uniqueItems": true,
"items": {
"enum": ["oic.r.glucose"]
},
"description": "This contains all mandatory resource types for this atomic measurement."
}
"description": "This contains all mandatory resource types for this atomic measurement."
}
]
}
}
},
"type": "object",
"allOf": [
{"$ref": "oic.core.json#/definitions/oic.core"},
{"$ref": "#/definitions/oic.r.glucosemeter-am"},
{"$ref": "oic.collection-schema.json#/definitions/oic.collection"}
{"$ref": "oic.collection-schema.json#/definitions/oic.collection.properties"},
{"$ref": "oic.collection-schema.json#/definitions/oic.collection.links.arrayoflinks"},
{"$ref": "#/definitions/oic.r.glucosemeter-am"}
],
"required": ["rts-m"]
}
2 changes: 1 addition & 1 deletion rbodyThermometerAM.raml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ documentation:
schemas:
- batch-retrieve: !include oic.collection.batch-retrieve-schema.json
- links: !include oic.collection.linkslist-schema.json
- baseline: !include oic.collection-schema.json
- baseline: !include oic.r.bodythermometer-am.json

traits:
- interface-all:
Expand Down