Skip to content

Commit 4da4cd6

Browse files
cookeaccookeac
authored
Merge pull request #475 from adewg/Develop
Merge changes from Develop branch into ADE-1 for 1.4.0 release
2 parents 6022820 + 9fe413d commit 4da4cd6

File tree

122 files changed

+5005
-469
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+5005
-469
lines changed

‎.github/workflows/ValidateWithSpeccy.yml

-14
This file was deleted.

‎CHANGELOG.md

+53-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,59 @@
11
# Changelog
22

3-
## [v1.3.2](https://github.com/adewg/ICAR/tree/HEAD) (2023-02-15)
3+
## [v1.4.0](https://github.com/adewg/ICAR/tree/v1.4.0) (2024-05-21)
44

5-
[Full Changelog](https://github.com/adewg/ICAR/compare/v1.3.1...HEAD)
5+
[Full Changelog](https://github.com/adewg/ICAR/compare/v1.3.2...v1.4.0)
6+
7+
**Closed issues:**
8+
9+
- Improve descriptions in icarGestationResource [\#463](https://github.com/adewg/ICAR/issues/463)
10+
- Expand icarAttentionCategoryType.json and icarAttentionCauseType.json to include more types [\#462](https://github.com/adewg/ICAR/issues/462)
11+
- Add Animal property to AttentionEventResource [\#461](https://github.com/adewg/ICAR/issues/461)
12+
- Add missing property "EventDateTime" in resource "icarGestationResource" [\#459](https://github.com/adewg/ICAR/issues/459)
13+
- Add support for feeding costs and feed refusal [\#458](https://github.com/adewg/ICAR/issues/458)
14+
- Sorting of animals [\#456](https://github.com/adewg/ICAR/issues/456)
15+
- Remove "enum" attribute from deprecated "@type" property of icarResourceType [\#451](https://github.com/adewg/ICAR/issues/451)
16+
- Add support for milking shifts or batch milking to icarMilkingVisitEventResource [\#450](https://github.com/adewg/ICAR/issues/450)
17+
- Remaining items to be addressed for ADE 1.4 release [\#443](https://github.com/adewg/ICAR/issues/443)
18+
- Update icarResourceTypeCatalog.md [\#440](https://github.com/adewg/ICAR/issues/440)
19+
- icarDeviceResource is not correctly structured [\#439](https://github.com/adewg/ICAR/issues/439)
20+
- Add Certified Milk Weight and Total Milk Weight to Milking Visit [\#436](https://github.com/adewg/ICAR/issues/436)
21+
- Second ManagementTag in IcarAnimalCoreResource [\#435](https://github.com/adewg/ICAR/issues/435)
22+
- IcarMovementArrivalEventResource: additional information about former events [\#432](https://github.com/adewg/ICAR/issues/432)
23+
- Add Discriminator to resourceTypeCatalog.md [\#426](https://github.com/adewg/ICAR/issues/426)
24+
- Extend feed inventory transactions to allow feeds to be manufactured or harvested on farm [\#422](https://github.com/adewg/ICAR/issues/422)
25+
- Add \(ICAR\) certification identifier for devices [\#412](https://github.com/adewg/ICAR/issues/412)
26+
- Improve device references in events [\#411](https://github.com/adewg/ICAR/issues/411)
27+
- Fraction property in the icarBreedFractionsType model [\#410](https://github.com/adewg/ICAR/issues/410)
28+
- service-sires API [\#402](https://github.com/adewg/ICAR/issues/402)
29+
- Device Attentions message [\#393](https://github.com/adewg/ICAR/issues/393)
30+
- Define metrics for carcass observations [\#386](https://github.com/adewg/ICAR/issues/386)
31+
- Group feed utilisation/allowance event [\#382](https://github.com/adewg/ICAR/issues/382)
32+
- Add Inventory to MedicineRessource? [\#369](https://github.com/adewg/ICAR/issues/369)
33+
- Request to make Meta required on IcarEventCoreResource and SourceId on Meta required [\#366](https://github.com/adewg/ICAR/issues/366)
34+
- Define icarCarcassObservationsEventResource [\#363](https://github.com/adewg/ICAR/issues/363)
35+
- Define a generalised carcass observation [\#362](https://github.com/adewg/ICAR/issues/362)
36+
- Define carcass type / resource for carcass data [\#361](https://github.com/adewg/ICAR/issues/361)
37+
- Define Processing Lot for carcass data [\#360](https://github.com/adewg/ICAR/issues/360)
38+
- Extensions to Consignment for animals being sent to a processor [\#359](https://github.com/adewg/ICAR/issues/359)
39+
- "number" or "SetId" added the AnimalSet [\#356](https://github.com/adewg/ICAR/issues/356)
40+
- Heat recording - standardise vendor-specific fields and make them extensible [\#354](https://github.com/adewg/ICAR/issues/354)
41+
- Possible agenda for webinar January 2023 [\#343](https://github.com/adewg/ICAR/issues/343)
42+
- Provide predictions for expected milk yield [\#285](https://github.com/adewg/ICAR/issues/285)
43+
- Define carcase data feedback event and collection [\#155](https://github.com/adewg/ICAR/issues/155)
44+
45+
**Merged pull requests:**
46+
47+
- Add AU/NZ/UK medicine registers [\#447](https://github.com/adewg/ICAR/pull/447) ([cookeac](https://github.com/cookeac))
48+
- feat: add rearing, growing & finishing to animal set purposes enum [\#392](https://github.com/adewg/ICAR/pull/392) ([willsimmMOA](https://github.com/willsimmMOA))
49+
- Add well-known identifier documentation for Australian NLIS ID and PIC [\#388](https://github.com/adewg/ICAR/pull/388) ([cookeac](https://github.com/cookeac))
50+
- Update icarLocationIdentifierType.md [\#380](https://github.com/adewg/ICAR/pull/380) ([matheuscanalmoa](https://github.com/matheuscanalmoa))
51+
- Update icarAnimalIdentifierType.md [\#379](https://github.com/adewg/ICAR/pull/379) ([matheuscanalmoa](https://github.com/matheuscanalmoa))
52+
- Update icarBreedIdentifierType.md [\#378](https://github.com/adewg/ICAR/pull/378) ([matheuscanalmoa](https://github.com/matheuscanalmoa))
53+
54+
## [v1.3.2](https://github.com/adewg/ICAR/tree/v1.3.2) (2023-02-15)
55+
56+
[Full Changelog](https://github.com/adewg/ICAR/compare/v1.3.1...v1.3.2)
657

758
**Closed issues:**
859

‎collections/icarAnimalSortingCommandCollection.json

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"description": "Represents a collection of animal-sorting-commands. Based on icarResourceCollection to provide paging etc.",
3+
"allOf": [
4+
{
5+
"$ref": "../collections/icarResourceCollection.json"
6+
},
7+
{
8+
"type": "object",
9+
"properties": {
10+
"member": {
11+
"type": "array",
12+
"items": {
13+
"$ref": "../resources/icarAnimalSortingCommandResource.json"
14+
},
15+
"description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case animal sorting commands (icarAnimalSortingCommandResource)."
16+
}
17+
}
18+
}
19+
]
20+
}

‎collections/icarAttentionEventCollection.json

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"description": "Represents a collection of attention events generated by devices. Based on icarResourceCollection to provide paging etc.",
3+
4+
"allOf": [{
5+
"$ref": "icarResourceCollection.json"
6+
},
7+
{
8+
"type": "object",
9+
10+
"properties": {
11+
"member": {
12+
"type": "array",
13+
"items": {
14+
"$ref": "../resources/icarAttentionEventResource.json"
15+
},
16+
"description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case attention events."
17+
}
18+
}
19+
}
20+
]
21+
}

‎collections/icarCarcassCollection.json

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"description": "Represents a collection of carcass resources. Based on icarResourceCollection to provide paging etc.",
3+
4+
"allOf": [{
5+
"$ref": "../collections/icarResourceCollection.json"
6+
},
7+
{
8+
"type": "object",
9+
10+
"properties": {
11+
"member": {
12+
"type": "array",
13+
"items": {
14+
"$ref": "../resources/icarCarcassResource.json"
15+
},
16+
"description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case carcasses."
17+
}
18+
}
19+
}
20+
]
21+
}

‎collections/icarCarcassObservationsEventCollection.json

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"description": "Represents a collection of carcass observation events. Based on icarResourceCollection to provide paging etc.",
3+
4+
"allOf": [{
5+
"$ref": "../collections/icarResourceCollection.json"
6+
},
7+
{
8+
"type": "object",
9+
10+
"properties": {
11+
"member": {
12+
"type": "array",
13+
"items": {
14+
"$ref": "../resources/icarCarcassObservationsEventResource.json"
15+
},
16+
"description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case carcass observation events."
17+
}
18+
}
19+
}
20+
]
21+
}

‎collections/icarFeedTransactionCollection.json

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"description": "Represents a collection of feed inventory transactions. Based on icarResourceCollection to provide paging etc.",
3+
4+
"allOf": [{
5+
"$ref": "../collections/icarResourceCollection.json"
6+
},
7+
{
8+
"type": "object",
9+
10+
"properties": {
11+
"member": {
12+
"type": "array",
13+
"items": {
14+
"$ref": "../resources/icarFeedTransactionResource.json"
15+
},
16+
"description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case inventory transactions."
17+
}
18+
}
19+
}
20+
]
21+
}

‎collections/icarGroupFeedingEventCollection.json

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"description": "Represents a collection of feed intakes. Based on icarResourceCollection to provide paging etc.",
3+
4+
"allOf": [{
5+
"$ref": "../collections/icarResourceCollection.json"
6+
},
7+
{
8+
"type": "object",
9+
10+
"properties": {
11+
"member": {
12+
"type": "array",
13+
"items": {
14+
"$ref": "../resources/icarGroupFeedingEventResource.json"
15+
},
16+
"description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case group feeding events."
17+
}
18+
}
19+
}
20+
]
21+
}

‎collections/icarGroupPositionObservationEventCollection.json

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"description": "Represents a collection of group position observation events.",
3+
4+
"allOf": [{
5+
"$ref": "../collections/icarResourceCollection.json"
6+
},
7+
{
8+
"type": "object",
9+
10+
"properties": {
11+
"member": {
12+
"type": "array",
13+
"items": {
14+
"$ref": "../resources/icarGroupPositionObservationEventResource.json"
15+
},
16+
"description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case group position observation events."
17+
}
18+
}
19+
}
20+
]
21+
}

‎collections/icarInventoryTransactionCollection.json

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"description": "Represents a collection of inventory transactions. Based on icarResourceCollection to provide paging etc.",
3+
4+
"allOf": [{
5+
"$ref": "../collections/icarResourceCollection.json"
6+
},
7+
{
8+
"type": "object",
9+
10+
"properties": {
11+
"member": {
12+
"type": "array",
13+
"items": {
14+
"$ref": "../resources/icarInventoryTransactionResource.json"
15+
},
16+
"description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case inventory transactions."
17+
}
18+
}
19+
}
20+
]
21+
}

‎collections/icarMedicineTransactionCollection.json

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"description": "Represents a collection of medicine inventory transactions. Based on icarResourceCollection to provide paging etc.",
3+
4+
"allOf": [{
5+
"$ref": "../collections/icarResourceCollection.json"
6+
},
7+
{
8+
"type": "object",
9+
10+
"properties": {
11+
"member": {
12+
"type": "array",
13+
"items": {
14+
"$ref": "../resources/icarMedicineTransactionResource.json"
15+
},
16+
"description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case inventory transactions."
17+
}
18+
}
19+
}
20+
]
21+
}

‎collections/icarMilkPredictionsCollection.json

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"description": "Represents a collection of milk predictions per animal. Based on icarResourceCollection to provide paging etc.",
3+
4+
"allOf": [{
5+
"$ref": "../collections/icarResourceCollection.json"
6+
},
7+
{
8+
"type": "object",
9+
10+
"properties": {
11+
"member": {
12+
"type": "array",
13+
"items": {
14+
"$ref": "../resources/icarMilkPredictionResource.json"
15+
},
16+
"description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case milk prediction events."
17+
}
18+
}
19+
}
20+
]
21+
}

‎collections/icarPositionObservationEventCollection.json

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"description": "Represents a collection of animal position observation events.",
3+
4+
"allOf": [{
5+
"$ref": "../collections/icarResourceCollection.json"
6+
},
7+
{
8+
"type": "object",
9+
10+
"properties": {
11+
"member": {
12+
"type": "array",
13+
"items": {
14+
"$ref": "../resources/icarPositionObservationEventResource.json"
15+
},
16+
"description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case position observation events."
17+
}
18+
}
19+
}
20+
]
21+
}

‎collections/icarProcessingLotCollection.json

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"description": "Represents a collection of carcass processing lots. Based on icarResourceCollection to provide paging etc.",
3+
4+
"allOf": [{
5+
"$ref": "../collections/icarResourceCollection.json"
6+
},
7+
{
8+
"type": "object",
9+
10+
"properties": {
11+
"member": {
12+
"type": "array",
13+
"items": {
14+
"$ref": "../resources/icarProcessingLotResource.json"
15+
},
16+
"description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case carcass processing lots."
17+
}
18+
}
19+
}
20+
]
21+
}

‎collections/icarReproEmbryoFlushingEventCollection.json

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"description": "Represents a collection of animal embryo flushing events. Based on icarResourceCollection to provide paging etc.",
3+
4+
"allOf": [{
5+
"$ref": "../collections/icarResourceCollection.json"
6+
},
7+
{
8+
"type": "object",
9+
10+
"properties": {
11+
"member": {
12+
"type": "array",
13+
"items": {
14+
"$ref": "../resources/icarReproEmbryoFlushingEventResource.json"
15+
},
16+
"description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case embryo flushing events."
17+
}
18+
}
19+
}
20+
]
21+
}

‎collections/icarSortingSiteCollection.json

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"description": "Represents a collection of sites. Based on icarResourceCollection to provide paging etc.",
3+
"allOf": [
4+
{
5+
"$ref": "../collections/icarResourceCollection.json"
6+
},
7+
{
8+
"type": "object",
9+
"properties": {
10+
"member": {
11+
"type": "array",
12+
"items": {
13+
"$ref": "../resources/icarSortingSiteResource.json"
14+
},
15+
"description": "As per JSON-LD Hydra syntax, member provides the array of objects, in this case sorting-sites."
16+
}
17+
}
18+
}
19+
]
20+
}

0 commit comments

Comments
 (0)