From 6fb344b3f84d7af324253e53704fadcde3fbb2c1 Mon Sep 17 00:00:00 2001
From: Arjan Frans <afrans@rovecom.nl>
Date: Wed, 21 Jun 2023 09:41:07 +0200
Subject: [PATCH 1/4] Additional Metrics for Daily Milk Production Averages

---
 resources/icarDailyMilkingAveragesResource.json | 12 +++++++++++-
 resources/icarLactationResource.json            |  6 +++++-
 types/icarConsumedFeedType.json                 |  4 ++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/resources/icarDailyMilkingAveragesResource.json b/resources/icarDailyMilkingAveragesResource.json
index 2ac0bdf2..8a2827bb 100644
--- a/resources/icarDailyMilkingAveragesResource.json
+++ b/resources/icarDailyMilkingAveragesResource.json
@@ -33,8 +33,18 @@
         "milkYieldAvg7days": {
           "$ref": "../types/icarTraitAmountType.json",
           "description": "The average-amount of milk produced within 7 days."
+        },
+        "MilkRefusals": {
+          "type": "number",
+          "description": "Total amount of refusals this day."
+        },
+        "milkCharacteristics": {
+          "type": "array",
+          "items": {
+            "$ref": "../types/icarMilkCharacteristicsType.json"
+          }
         }
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/resources/icarLactationResource.json b/resources/icarLactationResource.json
index 99698b63..02fdbceb 100644
--- a/resources/icarLactationResource.json
+++ b/resources/icarLactationResource.json
@@ -63,8 +63,12 @@
         },
         "milkRecordingMethod": {
           "$ref": "../types/icarMilkRecordingMethodType.json"
+        },
+        "GestationDays": {
+          "type": "number",
+          "description": "Current days in gestation this day."
         }
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/types/icarConsumedFeedType.json b/types/icarConsumedFeedType.json
index 9e2ac763..4b3769f1 100644
--- a/types/icarConsumedFeedType.json
+++ b/types/icarConsumedFeedType.json
@@ -17,6 +17,10 @@
     "feedConsumption": {
       "$ref": "../types/icarFeedQuantityType.json",
       "description": "The amount of feed the animal has consumed"
+    },
+    "feedResidues": {
+      "$ref": "../types/icarFeedQuantityType.json",
+      "description": "Amount of feed that is not consumed or leftover during milking."
     }
   }
 }

From 4118af35c7c8d03601d4f65f9890b5a93d92da96 Mon Sep 17 00:00:00 2001
From: Arjan Frans <afrans@rovecom.nl>
Date: Wed, 21 Jun 2023 10:14:37 +0200
Subject: [PATCH 2/4] Additional Metrics for Daily Milk Production Averages -
 downcase first letter

---
 resources/icarDailyMilkingAveragesResource.json | 2 +-
 resources/icarLactationResource.json            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/icarDailyMilkingAveragesResource.json b/resources/icarDailyMilkingAveragesResource.json
index 8a2827bb..e236f152 100644
--- a/resources/icarDailyMilkingAveragesResource.json
+++ b/resources/icarDailyMilkingAveragesResource.json
@@ -34,7 +34,7 @@
           "$ref": "../types/icarTraitAmountType.json",
           "description": "The average-amount of milk produced within 7 days."
         },
-        "MilkRefusals": {
+        "milkRefusals": {
           "type": "number",
           "description": "Total amount of refusals this day."
         },
diff --git a/resources/icarLactationResource.json b/resources/icarLactationResource.json
index 02fdbceb..83768e57 100644
--- a/resources/icarLactationResource.json
+++ b/resources/icarLactationResource.json
@@ -64,7 +64,7 @@
         "milkRecordingMethod": {
           "$ref": "../types/icarMilkRecordingMethodType.json"
         },
-        "GestationDays": {
+        "gestationDays": {
           "type": "number",
           "description": "Current days in gestation this day."
         }

From 1e569bb941c501f40f73a5d7544cb0a8f82991bf Mon Sep 17 00:00:00 2001
From: Arjan Frans <afrans@rovecom.nl>
Date: Wed, 21 Jun 2023 10:23:53 +0200
Subject: [PATCH 3/4] Additional Metrics for Daily Milk Production Averages -
 remove blank line

---
 resources/icarDailyMilkingAveragesResource.json | 2 +-
 resources/icarLactationResource.json            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/icarDailyMilkingAveragesResource.json b/resources/icarDailyMilkingAveragesResource.json
index e236f152..bdb1913a 100644
--- a/resources/icarDailyMilkingAveragesResource.json
+++ b/resources/icarDailyMilkingAveragesResource.json
@@ -47,4 +47,4 @@
       }
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/resources/icarLactationResource.json b/resources/icarLactationResource.json
index 83768e57..943332c9 100644
--- a/resources/icarLactationResource.json
+++ b/resources/icarLactationResource.json
@@ -71,4 +71,4 @@
       }
     }
   ]
-}
+}
\ No newline at end of file

From ac7a0e0d0aba73089f390bb90acd82f3730b2ba0 Mon Sep 17 00:00:00 2001
From: Arjan Frans <afrans@rovecom.nl>
Date: Thu, 22 Jun 2023 13:15:50 +0200
Subject: [PATCH 4/4] Add milkingsEntitled

---
 resources/icarDailyMilkingAveragesResource.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/resources/icarDailyMilkingAveragesResource.json b/resources/icarDailyMilkingAveragesResource.json
index bdb1913a..be4544e1 100644
--- a/resources/icarDailyMilkingAveragesResource.json
+++ b/resources/icarDailyMilkingAveragesResource.json
@@ -38,6 +38,10 @@
           "type": "number",
           "description": "Total amount of refusals this day."
         },
+        "milkingsEntitled": {
+          "type": "number",
+          "description": "The entitled amount of milkings for this day."
+        },
         "milkCharacteristics": {
           "type": "array",
           "items": {