-
Notifications
You must be signed in to change notification settings - Fork 27
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #24 from cookeac/master
Inheritance changes - icarEventCoreResource, icarIdentifierType
- Loading branch information
Showing
7 changed files
with
136 additions
and
155 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,4 @@ | ||
| { | ||
| "required": [ | ||
| "id", | ||
| "scheme" | ||
| ], | ||
| "type": "object", | ||
| "properties": { | ||
| "id": { | ||
| "$ref": "https://raw.githubusercontent.com/adewg/ICAR/master/Release%20Candidate%20Messages/icarAnimalIdType.json" | ||
| }, | ||
| "scheme": { | ||
| "$ref": "https://raw.githubusercontent.com/adewg/ICAR/master/Release%20Candidate%20Messages/icarAnimalIdSchemeCode.json" | ||
| } | ||
| }, | ||
| "description": "Identifies an animal" | ||
| "$ref": "icarIdentifierType.json", | ||
| "description": "Identifies an animal using a scheme and ID." | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| { | ||
| "$schema": "http://json-schema.org/draft-07/schema#", | ||
|
|
||
| "required": [ | ||
| "id", | ||
| "animal", | ||
| "eventDateTime" | ||
| ], | ||
| "type": "object", | ||
| "properties": { | ||
| "id": { | ||
| "type": "string", | ||
| "description": "Unique identifier in the system for this event." | ||
| }, | ||
| "animal": { | ||
| "$ref": "icarAnimalIdentifierType.json", | ||
| "description": "Unique animal scheme and identifier combination." | ||
| }, | ||
| "eventDateTime": { | ||
| "$ref": "icarDateTimeType.json", | ||
| "description": "ISO8601 date and time." | ||
| }, | ||
| "location": { | ||
| "$ref": "icarLocationIdentifierType.json", | ||
| "description": "Unique location scheme and identifier combination." | ||
| }, | ||
| "meta": { | ||
| "$ref": "icarMetaDataResource.json", | ||
| "description": "Optional meta-data for the event." | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| { | ||
| "$schema": "http://json-schema.org/draft-07/schema#", | ||
|
|
||
| "required": [ | ||
| "id", | ||
| "scheme" | ||
| ], | ||
|
|
||
| "type": "object", | ||
|
|
||
| "properties": { | ||
| "id": { | ||
| "type": "string", | ||
| "description": "A unique identification for the resource issued under the auspices of the scheme." | ||
| }, | ||
| "scheme": { | ||
| "type": "string", | ||
| "description": "The identifier (in reverse domain format) of an official scheme that manages unique identifiers." | ||
| } | ||
| }, | ||
| "description": "Identifies a resource." | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "$schema": "http://json-schema.org/draft-07/schema#", | ||
|
|
||
| "$ref": "icarIdentifierType.json", | ||
| "description": "Location identifier based on a scheme and ID." | ||
| } |
144 changes: 74 additions & 70 deletions
144
Release Candidate Messages/icarMilkingVisitResource.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,73 +1,77 @@ | ||
| { | ||
| "required": [ | ||
| "id", | ||
| "animal", | ||
| "milkingStartingDateTime", | ||
| "milkingMilkWeight" | ||
| ], | ||
| "type": "object", | ||
| "properties": { | ||
| "id": { | ||
| "type": "string", | ||
| "description": "A unique identifier for this location for the milking visit message" | ||
| }, | ||
| "animal": { | ||
| "$ref": "https://raw.githubusercontent.com/adewg/ICAR/master/Release%20Candidate%20Messages/icarAnimalIdentifierType.json" | ||
| }, | ||
| "milkingStartingDateTime": { | ||
| "$ref": "https://raw.githubusercontent.com/adewg/ICAR/master/Release%20Candidate%20Messages/icarDateTimeType.json" | ||
| }, | ||
| "milkingDuration": { | ||
| "$ref": "https://raw.githubusercontent.com/adewg/ICAR/master/Release%20Candidate%20Messages/icarMilkDurationType.json" | ||
| }, | ||
| "milkingVisitDuration": { | ||
| "$ref": "https://raw.githubusercontent.com/adewg/ICAR/master/Release%20Candidate%20Messages/icarMilkDurationType.json" | ||
| }, | ||
| "milkingType": { | ||
| "$ref": "https://raw.githubusercontent.com/adewg/ICAR/master/Release%20Candidate%20Messages/icarMilkingTypeCode.json" | ||
| }, | ||
| "milkingMilkWeight": { | ||
| "$ref": "https://raw.githubusercontent.com/adewg/ICAR/master/Release%20Candidate%20Messages/icarMilkingMilkWeightType.json" | ||
| }, | ||
| "milkingSuccess": { | ||
| "$ref": "https://raw.githubusercontent.com/adewg/ICAR/master/Release%20Candidate%20Messages/icarMilkingSuccessType.json" | ||
| }, | ||
| "milkingExceptionCode": { | ||
| "$ref": "https://raw.githubusercontent.com/adewg/ICAR/master/Release%20Candidate%20Messages/icarMilkingExceptionCode.json" | ||
| }, | ||
| "milkingParlourUnit": { | ||
| "type": "string", | ||
| "description": "The milking parlour unit where the milking took place." | ||
| }, | ||
| "milkingBoxNumber": { | ||
| "type": "string", | ||
| "description": "The milking box number where the milking took place." | ||
| }, | ||
| "milkingDeviceId": { | ||
| "type": "string", | ||
| "description": "The ID of the device where the milking took place" | ||
| }, | ||
| "measureDeviceId": { | ||
| "type": "string", | ||
| "description": "The ID of the device where the measurement of the milking took place" | ||
| }, | ||
| "quarterMilkings": { | ||
| "type": "array", | ||
| "items": { | ||
| "$ref": "https://raw.githubusercontent.com/adewg/ICAR/master/Release%20Candidate%20Messages/icarQuarterMilkingType.json" | ||
| } | ||
| }, | ||
| "animalMilkingSample": { | ||
| "type": "array", | ||
| "items": { | ||
| "$ref": "https://raw.githubusercontent.com/adewg/ICAR/master/Release%20Candidate%20Messages/icarAnimalMilkingSampleType.json" | ||
| } | ||
| }, | ||
| "icarMilkCharacteristicsTypes": { | ||
| "type": "array", | ||
| "items": { | ||
| "$ref": "https://raw.githubusercontent.com/adewg/ICAR/master/Release%20Candidate%20Messages/icarMilkCharacteristicsType.json" | ||
| } | ||
| { | ||
| "$schema": "http://json-schema.org/draft-07/schema#", | ||
|
|
||
| "required": [ | ||
| "id", | ||
| "animal", | ||
| "milkingStartingDateTime", | ||
| "milkingMilkWeight" | ||
| ], | ||
|
|
||
| "type": "object", | ||
|
|
||
| "allOf": [ | ||
| { | ||
| "$ref": "icarEventCoreResource.json" | ||
| }, | ||
| { | ||
| "properties": { | ||
| "milkingStartingDateTime": { | ||
| "$ref": "https://raw.githubusercontent.com/adewg/ICAR/master/Release%20Candidate%20Messages/icarDateTimeType.json" | ||
| }, | ||
| "milkingDuration": { | ||
| "$ref": "https://raw.githubusercontent.com/adewg/ICAR/master/Release%20Candidate%20Messages/icarMilkDurationType.json" | ||
| }, | ||
| "milkingVisitDuration": { | ||
| "$ref": "https://raw.githubusercontent.com/adewg/ICAR/master/Release%20Candidate%20Messages/icarMilkDurationType.json" | ||
| }, | ||
| "milkingType": { | ||
| "$ref": "https://raw.githubusercontent.com/adewg/ICAR/master/Release%20Candidate%20Messages/icarMilkingTypeCode.json" | ||
| }, | ||
| "milkingMilkWeight": { | ||
| "$ref": "https://raw.githubusercontent.com/adewg/ICAR/master/Release%20Candidate%20Messages/icarMilkingMilkWeightType.json" | ||
| }, | ||
| "milkingSuccess": { | ||
| "$ref": "https://raw.githubusercontent.com/adewg/ICAR/master/Release%20Candidate%20Messages/icarMilkingSuccessType.json" | ||
| }, | ||
| "milkingExceptionCode": { | ||
| "$ref": "https://raw.githubusercontent.com/adewg/ICAR/master/Release%20Candidate%20Messages/icarMilkingExceptionCode.json" | ||
| }, | ||
| "milkingParlourUnit": { | ||
| "type": "string", | ||
| "description": "The milking parlour unit where the milking took place." | ||
| }, | ||
| "milkingBoxNumber": { | ||
| "type": "string", | ||
| "description": "The milking box number where the milking took place." | ||
| }, | ||
| "milkingDeviceId": { | ||
| "type": "string", | ||
| "description": "The ID of the device where the milking took place" | ||
| }, | ||
| "measureDeviceId": { | ||
| "type": "string", | ||
| "description": "The ID of the device where the measurement of the milking took place" | ||
| }, | ||
| "quarterMilkings": { | ||
| "type": "array", | ||
| "items": { | ||
| "$ref": "https://raw.githubusercontent.com/adewg/ICAR/master/Release%20Candidate%20Messages/icarQuarterMilkingType.json" | ||
| } | ||
| }, | ||
| "animalMilkingSample": { | ||
| "type": "array", | ||
| "items": { | ||
| "$ref": "https://raw.githubusercontent.com/adewg/ICAR/master/Release%20Candidate%20Messages/icarAnimalMilkingSampleType.json" | ||
| } | ||
| }, | ||
| "icarMilkCharacteristicsTypes": { | ||
| "type": "array", | ||
| "items": { | ||
| "$ref": "https://raw.githubusercontent.com/adewg/ICAR/master/Release%20Candidate%20Messages/icarMilkCharacteristicsType.json" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } |