Merge changes from Develop branch into ADE-1 for 1.4.0 release #475

cookeac · 2024-05-21T09:34:36Z

Version 1.4.0 is now ready to go with the pre-requisites completed.
I have updated CHANGELOG.md with the changes.

Next steps:

Approve this pull request
Merge
Finalise and publish the v1.4.0 release (currently in draft)

Reapply Embryo Flushing Changes. Resolves #296

Merge ADE 1.3.2 changes back into Develop branch

Extend the icarConsignmentType adding origin and destination organisations, and additional information needed for sending livestock for processing.

Add `icarCarcassResource`, `icarProcessingLot`, and `icarCarcassObservationsEvent` and supporting types and enumerations. Resolves #360 Resolves #361 Resolves #362

Extensions to Consignment for animals being sent to a processor

I've had feedback that grade is confusing if the text value is not specifically a grade but some other result (e.g. the presence of a defect).

Carcass, processing lot, and carcass observations resources

Animal set changes - adds `reference`. Resolves #356

changed test day result - added predictions added milk prediction resource

some uppercase to lower case and missing types added

changed tag + one upper to lower case

description expanded - more clear removed fat weight en protein weight type

Merge ADE1 well-known identifier doc changes back into Develop

Defines a generalised icarInventoryTransactionResource and its specific versions, icarFeedTransactionResource and icarMedicineTransactionResource. Resolves #369

Remove $id terms

Removed extraneous comma

Clarify how the resource should be used and maintained.

Sorting of animals

Add the icarSortingSiteResource identifier (site) to position observations, so you can record a position observation to confirm that an animal has been sorted into that site.

Improve description for icarGestationResource

Update to OpenAPI version 3.1 Resolves #239 Resolves #451

Define position observations. Resolves #383

Add the milkingShiftNumber and milkingShiftLocalDate, as specified in #450.

get to the develop branch

Added Reproduction, DeviceIsue and Weight as new categories

Added new causes for the attention (Heat, LowBattery, Offline, UnderWeight, OverWeight, AtTargetWeight)

… be applied to 1 or more animals

Addition further attention categories and causes for reproduction triggered, weight triggered, or battery related alerts. Resolves #462

…ried-weight-to-consumed-feed #458 Add feeding costs (total cost) and delivered weight to consumed feed types. Resolves #458

Add milkingShiftNumber and milkingShiftLocalDate. Resolves #450

Fix linting errors

Added descriptions to improve documentation, especially about certified milk weight. Resolves #444

Finished description improvements in icarMilkingVisitEventResource. Resolves #444

Update CHANGELOG for 1.4.0

erwinspeybroeck

approved - a lot!

tpekeler · 2024-05-21T12:27:48Z

Approved as well. Made some sample checks, didn't review everything.

tpekeler

Done

cookeac and others added 30 commits November 22, 2022 17:44

Revert "Revert "Added repro flushing event with type and enums""

41f8962

Merge pull request #351 from adewg/revert-350-revert-337-ADE-1

26613ee

Reapply Embryo Flushing Changes. Resolves #296

Merge pull request #368 from adewg/RC-for-ADE-1-3-2

298b8a2

Merge ADE 1.3.2 changes back into Develop branch

Added reference property to the icarAnimalSetResource.

b23f0cf

Add organisations (identifiers, identity, type).

a61a3e6

Extend consignment with org and declarations

e8f7796

Extend the icarConsignmentType adding origin and destination organisations, and additional information needed for sending livestock for processing.

Add carcasses, processing lots, and observations

8281088

Add `icarCarcassResource`, `icarProcessingLot`, and `icarCarcassObservationsEvent` and supporting types and enumerations. Resolves #360 Resolves #361 Resolves #362

Correct quotation marks in descr.

593fe1b

Rename killDate to killDateTime for consistency

01f81a8

simplify processorGrid name

477ce56

Make organization name required.

687e65c

Merge pull request #370 from cookeac/Develop

37b9959

Extensions to Consignment for animals being sent to a processor

Fix Spectral linting errors in repro URL scheme

5898c35

Change problemDetail to remark for consistency

e0ae180

Rename qualitativeGrade to qualitativeValue

39b15b9

I've had feedback that grade is confusing if the text value is not specifically a grade but some other result (e.g. the presence of a defect).

Merge pull request #371 from cookeac/Carcass

caa82f9

Carcass, processing lot, and carcass observations resources

Merge pull request #376 from adewg/animalSet-changes

1d0d778

Animal set changes - adds `reference`. Resolves #356

milk prediction

dc5a1bd

changed test day result - added predictions added milk prediction resource

update

c4bff1e

some uppercase to lower case and missing types added

last changes

b1a75e5

changed tag + one upper to lower case

changes

528d8aa

description expanded - more clear removed fat weight en protein weight type

Update url-schemes/milkURLScheme.json

1eb1cff

Update resources/icarTestDayResultEventResource.json

92dba23

Update types/icarMilkingPredictionType.json

d99c23a

Update types/icarMilkingPredictionType.json

6d464c7

Merge pull request #384 from adewg/ADE-1

c9ddaaf

Merge ADE1 well-known identifier doc changes back into Develop

Inventory transaction resources

30bf000

Defines a generalised icarInventoryTransactionResource and its specific versions, icarFeedTransactionResource and icarMedicineTransactionResource. Resolves #369

Fix linting errors

4301073

Fix linting errors

9cae01a

Remove $id terms

Fix linting error

2e06b6a

Removed extraneous comma

cookeac and others added 24 commits April 30, 2024 09:19

Improve description for icarGestationResource

59e69c7

Clarify how the resource should be used and maintained.

Merge pull request #457 from GEA-FT/animal-sorting

0becf0e

Sorting of animals

Add site id to icarPositionObservationType

679c13d

Add the icarSortingSiteResource identifier (site) to position observations, so you can record a position observation to confirm that an animal has been sorted into that site.

Merge pull request #464 from cookeac/463-gestation-descriptions

584f50e

Improve description for icarGestationResource

Merge pull request #438 from adewg/239-openapi-3.1

df6e1b3

Update to OpenAPI version 3.1 Resolves #239 Resolves #451

Merge pull request #430 from cookeac/location-observation-383

68fa35b

Define position observations. Resolves #383

Add milkingShiftNumber and milkingShiftLocalDate

287445b

Add the milkingShiftNumber and milkingShiftLocalDate, as specified in #450.

Merge pull request #469 from adewg/Develop

8b7c653

get to the develop branch

Update icarAttentionCategoryType.json

2ee111b

Added Reproduction, DeviceIsue and Weight as new categories

Update icarAttentionCauseType.json

312e1ff

Added new causes for the attention (Heat, LowBattery, Offline, UnderWeight, OverWeight, AtTargetWeight)

Add delivered field to consumedRationType and consumedFeedType

1963d2b

Add totatCost field to consumedRationType and consumedFeedType

3bad4c7

Update consumedRationType and consumedFeedType descriptions. They can…

5298334

… be applied to 1 or more animals

Merge pull request #470 from adewg/erwinspeybroeck

373787f

Addition further attention categories and causes for reproduction triggered, weight triggered, or battery related alerts. Resolves #462

Merge pull request #471 from ErikUniformAgri/458-add-costs-and-delive…

8e24163

…ried-weight-to-consumed-feed #458 Add feeding costs (total cost) and delivered weight to consumed feed types. Resolves #458

Update OpenAPI tags to ADE-1.4-xxx

7041362

Trying to fix Spectral OAS error not allowing array of string/null

acfcf73

Fixed sorting URL scheme (spaces in operation, moved to 3.1)

4e3df0a

Merge pull request #468 from cookeac/450-milking-shifts

c76ab6d

Add milkingShiftNumber and milkingShiftLocalDate. Resolves #450

Merge pull request #472 from cookeac/fix-linting-errors

cf08a7f

Fix linting errors

Finished description improvements in icarMilkingVisitEventResource

5cafc9c

Added descriptions to improve documentation, especially about certified milk weight. Resolves #444

Merge pull request #473 from cookeac/444-doc-certified-milkweight

829e848

Finished description improvements in icarMilkingVisitEventResource. Resolves #444

Update CHANGELOG for 1.4.0

98ca9c3

Merge pull request #474 from cookeac/Release-1.4-changelog

9fe413d

Update CHANGELOG for 1.4.0

cookeac requested review from erwinspeybroeck and tpekeler May 21, 2024 09:34

erwinspeybroeck approved these changes May 21, 2024

View reviewed changes

cookeac merged commit 4da4cd6 into ADE-1 May 21, 2024
2 checks passed

tpekeler reviewed May 21, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge changes from Develop branch into ADE-1 for 1.4.0 release #475

Merge changes from Develop branch into ADE-1 for 1.4.0 release #475

cookeac commented May 21, 2024

erwinspeybroeck left a comment

tpekeler commented May 21, 2024

tpekeler left a comment

Merge changes from Develop branch into ADE-1 for 1.4.0 release #475

Merge changes from Develop branch into ADE-1 for 1.4.0 release #475

Conversation

cookeac commented May 21, 2024

erwinspeybroeck left a comment

Choose a reason for hiding this comment

tpekeler commented May 21, 2024

tpekeler left a comment

Choose a reason for hiding this comment