Skip to content
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

Jump to bottom

Merge from Develop to create ADE-1 v 1.0.2 #118

Merged
merged 7 commits into from
Jun 8, 2020
Merged

Merge from Develop to create ADE-1 v 1.0.2 #118

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
685cf79
Update readme with instruction to link PRs to issues
cookeac Jun 4, 2020
9bd5dff
Merge pull request #115 from adewg/cookeac-patch-1
erwinspeybroeck Jun 4, 2020
c776cb1
Merge pull request #10 from adewg/Develop
cookeac Jun 5, 2020
010b860
Explain icarValidSampleFillingIndicator #116
Jun 5, 2020
5e3a078
Fix icarQuarterId enum
Jun 5, 2020
8f99c78
Merge pull request #117 from cookeac/master
erwinspeybroeck Jun 5, 2020
112c70a
Merge branch 'ADE-1' into Develop
cookeac Jun 8, 2020
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
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@ The Animal Data Exchange Working Group welcome contributions
* The default branch is set to **ADE-1** which is the current release. This is to make it easier for organisations to clone and use the specifications. If you expect to contribute you will need to work on the **Develop** branch instead.
* Propose changes by logging an issue, then creating your own fork of the **Develop** branch and proposing a Pull Request that will be reviewed by the maintainers.


2 changes: 1 addition & 1 deletion enums/icarValidSampleFillingIndicatorType.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"description": "Indicator of valid sample filling according to ICAR_ValidSampleFillingIndicatorCode list",
"description": "Validity of sample based on milk volume: 0=success (>80% expected milk), 1=incomplete (< 20% expected milk), 2=completed (with between 20-80% expected milk).",

"type": "string",

Expand Down
4 changes: 2 additions & 2 deletions types/icarQuarterMilkingType.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"enum": [
"LF",
"RF",
"LB",
"RB"
"LR",
"RR"
]
},
"quarterMilkingDuration": {
Expand Down