-
Notifications
You must be signed in to change notification settings - Fork 30
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 #245 from adewg/Develop
Merge Develop into ADE-1 for 1.2 release
- Loading branch information
Showing
73 changed files
with
9,350 additions
and
176 deletions.
There are no files selected for viewing
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
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
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
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,21 @@ | ||
| { | ||
| "description": "Represents a collection of daily feed reports. Based on icarResourceCollection to provide paging etc.", | ||
|
|
||
| "allOf": [{ | ||
| "$ref": "../collections/icarResourceCollection.json" | ||
| }, | ||
| { | ||
| "type": "object", | ||
|
|
||
| "properties": { | ||
| "member": { | ||
| "type": "array", | ||
| "items": { | ||
| "$ref": "../resources/icarDailyFeedReportResource.json" | ||
| }, | ||
| "description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case daily feed reports." | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } |
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,21 @@ | ||
| { | ||
| "description": "Represents a collection of daily milking averages per animal. Based on icarResourceCollection to provide paging etc.", | ||
|
|
||
| "allOf": [{ | ||
| "$ref": "../collections/icarResourceCollection.json" | ||
| }, | ||
| { | ||
| "type": "object", | ||
|
|
||
| "properties": { | ||
| "member": { | ||
| "type": "array", | ||
| "items": { | ||
| "$ref": "../resources/icarDailyMilkingAveragesResource.json" | ||
| }, | ||
| "description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case test day result events." | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } |
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,21 @@ | ||
| { | ||
| "description": "Represents a collection of feeds. Based on icarResourceCollection to provide paging etc.", | ||
|
|
||
| "allOf": [{ | ||
| "$ref": "../collections/icarResourceCollection.json" | ||
| }, | ||
| { | ||
| "type": "object", | ||
|
|
||
| "properties": { | ||
| "member": { | ||
| "type": "array", | ||
| "items": { | ||
| "$ref": "../resources/icarFeedResource.json" | ||
| }, | ||
| "description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case feeds." | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } |
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,21 @@ | ||
| { | ||
| "description": "Represents a collection of feed intakes. Based on icarResourceCollection to provide paging etc.", | ||
|
|
||
| "allOf": [{ | ||
| "$ref": "../collections/icarResourceCollection.json" | ||
| }, | ||
| { | ||
| "type": "object", | ||
|
|
||
| "properties": { | ||
| "member": { | ||
| "type": "array", | ||
| "items": { | ||
| "$ref": "../resources/icarFeedIntakeEventResource.json" | ||
| }, | ||
| "description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case feed intakes." | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } |
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,21 @@ | ||
| { | ||
| "description": "Represents a collection of feed recommendations. Based on icarResourceCollection to provide paging etc.", | ||
|
|
||
| "allOf": [{ | ||
| "$ref": "../collections/icarResourceCollection.json" | ||
| }, | ||
| { | ||
| "type": "object", | ||
|
|
||
| "properties": { | ||
| "member": { | ||
| "type": "array", | ||
| "items": { | ||
| "$ref": "../resources/icarFeedRecommendationResource.json" | ||
| }, | ||
| "description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case feed recommendations." | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } |
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,21 @@ | ||
| { | ||
| "description": "Represents a collection of feed reports. Based on icarResourceCollection to provide paging etc.", | ||
|
|
||
| "allOf": [{ | ||
| "$ref": "../collections/icarResourceCollection.json" | ||
| }, | ||
| { | ||
| "type": "object", | ||
|
|
||
| "properties": { | ||
| "member": { | ||
| "type": "array", | ||
| "items": { | ||
| "$ref": "../resources/icarFeedReportResource.json" | ||
| }, | ||
| "description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case feed reports." | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } |
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,21 @@ | ||
| { | ||
| "description": "Represents a collection of feed storage devices. Based on icarResourceCollection to provide paging etc.", | ||
|
|
||
| "allOf": [{ | ||
| "$ref": "../collections/icarResourceCollection.json" | ||
| }, | ||
| { | ||
| "type": "object", | ||
|
|
||
| "properties": { | ||
| "member": { | ||
| "type": "array", | ||
| "items": { | ||
| "$ref": "../resources/icarFeedStorageResource.json" | ||
| }, | ||
| "description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case feed storage devices." | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } |
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,21 @@ | ||
| { | ||
| "description": "Represents a collection of rations. Based on icarResourceCollection to provide paging etc.", | ||
|
|
||
| "allOf": [{ | ||
| "$ref": "../collections/icarResourceCollection.json" | ||
| }, | ||
| { | ||
| "type": "object", | ||
|
|
||
| "properties": { | ||
| "member": { | ||
| "type": "array", | ||
| "items": { | ||
| "$ref": "../resources/icarRationResource.json" | ||
| }, | ||
| "description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case rations." | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } |
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,21 @@ | ||
| { | ||
| "description": "Represents a collection of schemata/types. Based on icarResourceCollection to provide paging etc.", | ||
|
|
||
| "allOf": [{ | ||
| "$ref": "../collections/icarResourceCollection.json" | ||
| }, | ||
| { | ||
| "type": "object", | ||
|
|
||
| "properties": { | ||
| "member": { | ||
| "type": "array", | ||
| "items": { | ||
| "$ref": "../resources/icarSchemeTypeResource.json" | ||
| }, | ||
| "description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case scheme values." | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } |
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,21 @@ | ||
| { | ||
| "description": "Represents a collection of scheme type values. Based on icarResourceCollection to provide paging etc.", | ||
|
|
||
| "allOf": [{ | ||
| "$ref": "../collections/icarResourceCollection.json" | ||
| }, | ||
| { | ||
| "type": "object", | ||
|
|
||
| "properties": { | ||
| "member": { | ||
| "type": "array", | ||
| "items": { | ||
| "$ref": "../resources/icarSchemeValueResource.json" | ||
| }, | ||
| "description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case schemata or scheme types." | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } |
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 |
|---|---|---|
|
|
@@ -8,6 +8,7 @@ | |
| "FemaleNeuter", | ||
| "Male", | ||
| "MaleCryptorchid", | ||
| "MaleNeuter" | ||
| "MaleNeuter", | ||
| "Unknown" | ||
| ] | ||
| } | ||
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 |
|---|---|---|
|
|
@@ -9,6 +9,7 @@ | |
| "Pregnant", | ||
| "NotPregnant", | ||
| "Birthed", | ||
| "DoNotBreed" | ||
| "DoNotBreed", | ||
| "PregnantMultipleFoetus" | ||
| ] | ||
| } | ||
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,11 @@ | ||
| { | ||
| "description": "Severity code to distinguish warnings and errors.", | ||
|
|
||
| "type": "string", | ||
|
|
||
| "enum": [ | ||
| "Information", | ||
| "Warning", | ||
| "Error" | ||
| ] | ||
| } |
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,15 @@ | ||
| { | ||
| "description": "Enumeration for method of death (whether the animal died from an accident, natural causes, or was euthanised).", | ||
|
|
||
| "type": "string", | ||
|
|
||
| "enum": [ | ||
| "Perished", | ||
| "Slaughter", | ||
| "Culled", | ||
| "Theft", | ||
| "Lost", | ||
| "Accident", | ||
| "Other" | ||
| ] | ||
| } |
Oops, something went wrong.