Merge pull request #118 from adewg/Develop

Merge from Develop to create ADE-1 v 1.0.2
adewg · Jun 8, 2020 · c38c431 · c38c431
2 parents e63f2f4 + 112c70a
commit c38c431
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -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.
 
+
diff --git a/enums/icarValidSampleFillingIndicatorType.json b/enums/icarValidSampleFillingIndicatorType.json
@@ -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",
 

diff --git a/types/icarQuarterMilkingType.json b/types/icarQuarterMilkingType.json
@@ -10,8 +10,8 @@
       "enum": [
         "LF",
         "RF",
-        "LB",
-        "RB"
+        "LR",
+        "RR"
       ]
     },
     "quarterMilkingDuration": {
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.
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,8 +10,8 @@ @@
           "enum": [
             "LF",
             "RF",
-            "LB",
-            "RB"
+            "LR",
+            "RR"
           ]
         },
         "quarterMilkingDuration": {
@@ Expand Down @@