From 1963d2b370ac71c9e3957df9b87140b4a1ef9fbe Mon Sep 17 00:00:00 2001 From: Erik Date: Fri, 17 May 2024 08:14:36 +0000 Subject: [PATCH 1/3] Add delivered field to consumedRationType and consumedFeedType --- types/icarConsumedFeedType.json | 4 ++++ types/icarConsumedRationType.json | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/types/icarConsumedFeedType.json b/types/icarConsumedFeedType.json index 94cfc36..51cf5fe 100644 --- a/types/icarConsumedFeedType.json +++ b/types/icarConsumedFeedType.json @@ -14,6 +14,10 @@ "$ref": "../types/icarFeedQuantityType.json", "description": "The amount of feed the animal was entitled to receive" }, + "delivered": { + "$ref": "../types/icarFeedQuantityType.json", + "description": "The amount of feed the animal/group received. If not present, it can be assumed that the delivered will be equal to entitlement" + }, "feedConsumption": { "$ref": "../types/icarFeedQuantityType.json", "description": "The amount of feed the animal has consumed" diff --git a/types/icarConsumedRationType.json b/types/icarConsumedRationType.json index dbf3d30..c810b1a 100644 --- a/types/icarConsumedRationType.json +++ b/types/icarConsumedRationType.json @@ -15,6 +15,10 @@ "$ref": "../types/icarFeedQuantityType.json", "description": "The amount of feed the animal was entitled to receive" }, + "delivered": { + "$ref": "../types/icarFeedQuantityType.json", + "description": "The amount of feed the animal/group received. If not present, it can be assumed that the delivered will be equal to entitlement" + }, "feedConsumption": { "$ref": "../types/icarFeedQuantityType.json", "description": "The amount of feed the animal has consumed" From 3bad4c7ce1ffe23a7041211d8be273dc97da8217 Mon Sep 17 00:00:00 2001 From: Erik Date: Fri, 17 May 2024 08:15:22 +0000 Subject: [PATCH 2/3] Add totatCost field to consumedRationType and consumedFeedType --- types/icarConsumedFeedType.json | 4 ++++ types/icarConsumedRationType.json | 4 ++++ types/icarCostType.json | 22 ++++++++++++++++++++++ 3 files changed, 30 insertions(+) create mode 100644 types/icarCostType.json diff --git a/types/icarConsumedFeedType.json b/types/icarConsumedFeedType.json index 51cf5fe..f905220 100644 --- a/types/icarConsumedFeedType.json +++ b/types/icarConsumedFeedType.json @@ -25,6 +25,10 @@ "dryMatterPercentage": { "type": "number", "description": "The dry matter content of the feed provided or consumed, expressed as a percentage." + }, + "totalCost": { + "$ref": "../types/icarCostType.json", + "description": "Total cost applied to this feeding. Based on the delivered or entitled amount" } } } diff --git a/types/icarConsumedRationType.json b/types/icarConsumedRationType.json index c810b1a..81cd594 100644 --- a/types/icarConsumedRationType.json +++ b/types/icarConsumedRationType.json @@ -26,6 +26,10 @@ "dryMatterPercentage": { "type": "number", "description": "The dry matter content of the ration provided or consumed, expressed as a percentage." + }, + "totalCost": { + "$ref": "../types/icarCostType.json", + "description": "Total cost applied to this feeding. Based on the delivered or entitled amount" } } } diff --git a/types/icarCostType.json b/types/icarCostType.json new file mode 100644 index 0000000..b5ca07d --- /dev/null +++ b/types/icarCostType.json @@ -0,0 +1,22 @@ +{ + "description": "The amount of costs", + + "type": "object", + + "required": [ + "currency", + "value" + ], + + "properties": { + "currency": { + "type": "string", + "description": "The currency of the cost expressed using the ISO 4217 3-character code (such as AUD, GBP, USD, EUR)." + }, + "value": { + "type": "number", + "format": "double", + "description": "The costs in the units specified." + } + } +} From 52983341415df852263b51ef2d7ae9cf96bc9209 Mon Sep 17 00:00:00 2001 From: Erik Date: Fri, 17 May 2024 08:15:57 +0000 Subject: [PATCH 3/3] Update consumedRationType and consumedFeedType descriptions. They can be applied to 1 or more animals --- types/icarConsumedFeedType.json | 6 +++--- types/icarConsumedRationType.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/types/icarConsumedFeedType.json b/types/icarConsumedFeedType.json index f905220..a9b1ea9 100644 --- a/types/icarConsumedFeedType.json +++ b/types/icarConsumedFeedType.json @@ -1,5 +1,5 @@ { - "description": "gives the consumed feed and the amount the animal was entitled to. Amounts are real weights", + "description": "gives the consumed feed and the amount the animal/group was entitled to. Amounts are real weights", "type": "object", "required": [ "feedId" @@ -12,7 +12,7 @@ }, "entitlement": { "$ref": "../types/icarFeedQuantityType.json", - "description": "The amount of feed the animal was entitled to receive" + "description": "The amount of feed the animal/group was entitled to receive" }, "delivered": { "$ref": "../types/icarFeedQuantityType.json", @@ -20,7 +20,7 @@ }, "feedConsumption": { "$ref": "../types/icarFeedQuantityType.json", - "description": "The amount of feed the animal has consumed" + "description": "The amount of feed the animal/group has consumed" }, "dryMatterPercentage": { "type": "number", diff --git a/types/icarConsumedRationType.json b/types/icarConsumedRationType.json index 81cd594..d901609 100644 --- a/types/icarConsumedRationType.json +++ b/types/icarConsumedRationType.json @@ -1,5 +1,5 @@ { - "description": "Gives the consumed amount of a mixed ration, and the amount the animal was entitled to. Amounts are real weights.", + "description": "Gives the consumed amount of a mixed ration, and the amount the animal/group was entitled to. Amounts are real weights.", "type": "object", "required": [ @@ -13,7 +13,7 @@ }, "entitlement": { "$ref": "../types/icarFeedQuantityType.json", - "description": "The amount of feed the animal was entitled to receive" + "description": "The amount of feed the animal/group was entitled to receive" }, "delivered": { "$ref": "../types/icarFeedQuantityType.json", @@ -21,7 +21,7 @@ }, "feedConsumption": { "$ref": "../types/icarFeedQuantityType.json", - "description": "The amount of feed the animal has consumed" + "description": "The amount of feed the animal/group has consumed" }, "dryMatterPercentage": { "type": "number",