New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#285 milk predictions #346

Closed

erwinspeybroeck wants to merge 38 commits into Develop from erwinspeybroeck

Collaborator

erwinspeybroeck commented Nov 9, 2022

Changed accordingly the remarks

erwinspeybroeck and others added 8 commits

October 27, 2022 11:28


          Merge pull request #339 from adewg/Develop

276f10e

Develop


          added milk predictions

b5168e8

for the moment only the milk url


          Merge branch 'erwinspeybroeck' of https://github.com/adewg/ICAR into …

1208d95

…erwinspeybroeck


          Merge pull request #344 from adewg/Develop

75f9ced

Develop


          new type

84c3ed8

I introduced a new type


          Merge branch 'erwinspeybroeck' of https://github.com/adewg/ICAR into …

791c5d4

…erwinspeybroeck


          adapted urls

a23f125

adapted url's to reflect meilk predictions


          error in tag

19c54c3

the tag get-existing-milking-withdrawals was not correct

cookeac reviewed

View reviewed changes

resources/icarMilkPredictionResource.json Outdated Show resolved Hide resolved

cookeac reviewed

View reviewed changes

resources/icarMilkPredictionResource.json Outdated Show resolved Hide resolved

cookeac reviewed

View reviewed changes

resources/icarTestDayResultEventResource.json Outdated Show resolved Hide resolved

cookeac reviewed

View reviewed changes

types/icarMilkingFatWeightType.json Outdated

		@@ -0,0 +1,24 @@
		{

Collaborator

cookeac Nov 17, 2022

Remove this file.

cookeac reviewed

View reviewed changes

types/icarMilkingPredictionType.json Outdated Show resolved Hide resolved

cookeac requested changes

View reviewed changes

Collaborator

cookeac left a comment

@erwinspeybroeck to make the changes.

cookeac linked an issue

that may be closed by this pull request

Provide predictions for expected milk yield #285

Closed

erwinspeybroeck commented

View reviewed changes

types/icarMilkingPredictionType.json Outdated Show resolved Hide resolved

erwinspeybroeck commented

View reviewed changes

types/icarMilkingPredictionType.json Outdated Show resolved Hide resolved

erwinspeybroeck commented

View reviewed changes

types/icarMilkingPredictionType.json Outdated Show resolved Hide resolved

erwinspeybroeck and others added 7 commits

November 22, 2022 16:54


          Update types/icarMilkingPredictionType.json

bb69e2b


          Update types/icarMilkingPredictionType.json

32b12f0


          Update types/icarMilkingPredictionType.json

dbfca8a


          Delete icarMilkingFatWeightType.json

a54c57e


          Update resources/icarMilkPredictionResource.json

a1ac7ea

Co-authored-by: Andrew Cooke <[email protected]>


          Update resources/icarMilkPredictionResource.json

6f902c3

Co-authored-by: Andrew Cooke <[email protected]>


          Update resources/icarTestDayResultEventResource.json

bfd79d3

Co-authored-by: Andrew Cooke <[email protected]>

erwinspeybroeck commented

View reviewed changes

resources/icarMilkPredictionResource.json Outdated Show resolved Hide resolved

erwinspeybroeck added 2 commits

November 22, 2022 16:58


          Update resources/icarMilkPredictionResource.json

c1af117


          Delete icarMilkingProteinWeightType.json

7c8daa5

erwinspeybroeck requested a review from cookeac

November 22, 2022 16:01


          Merge pull request #352 from adewg/Develop

17bac59

Develop

cookeac requested a review from AlexeyHardCode

December 1, 2022 07:52

erwinspeybroeck added 5 commits

December 7, 2022 11:05


          Update icarStatisticsResource.json

19f223e

statistics should be part of a group


          Update icarStatisticsResource.json

e29ae5b

second try


          Update icarStatisticsGroupType.json

247d7d4

added the statistics over here


          Update managementURLScheme.json

0e7297a

added 1.3.2 tag en attached taht to the statistics


          Update exampleUrlScheme.json

26719e1

added 1.3.2 tag and attached that to the statistics API

cookeac requested changes

View reviewed changes

Collaborator

cookeac left a comment

@erwinspeybroeck In addition to the few suggestions I have added in the files (you should be able to just accept/commit these), please consider:

Removing the changes to icarStatisticsResource and icarStatisticsGroupType as these are now corrected in the published ADE 1.3.2. Depending on how you are editing, you might choose to "stash" the files with the milk prediction changes, then refresh your branch from the Develop branch, and then put your milk prediction files back in.
In the URL schemes, for the moment just leave all the tags as "-1.3-" rather than 1.3.2 or 1.4. We will update all the tags in bulk before we publish version 1.4.

Thanks

types/icarMilkingPredictionType.json Outdated Show resolved Hide resolved

types/icarMilkingPredictionType.json Outdated Show resolved Hide resolved

types/icarMilkingPredictionType.json Outdated Show resolved Hide resolved

types/icarMilkingPredictionType.json Outdated Show resolved Hide resolved

url-schemes/exampleUrlScheme.json Outdated Show resolved Hide resolved

erwinspeybroeck and others added 5 commits

March 22, 2023 07:39


          Update types/icarMilkingPredictionType.json

e1e83bf

Co-authored-by: Andrew Cooke <[email protected]>


          Update types/icarMilkingPredictionType.json

5b2c350

Co-authored-by: Andrew Cooke <[email protected]>


          Update types/icarMilkingPredictionType.json

e2d5913

Co-authored-by: Andrew Cooke <[email protected]>


          Update types/icarMilkingPredictionType.json

e3a4ba3

Co-authored-by: Andrew Cooke <[email protected]>


          Update url-schemes/exampleUrlScheme.json

46785ce

Co-authored-by: Andrew Cooke <[email protected]>

erwinspeybroeck commented

View reviewed changes

resources/icarStatisticsResource.json Outdated Show resolved Hide resolved

url-schemes/exampleUrlScheme.json Outdated Show resolved Hide resolved

url-schemes/exampleUrlScheme.json Outdated Show resolved Hide resolved

url-schemes/exampleUrlScheme.json Outdated Show resolved Hide resolved

url-schemes/managementURLScheme.json Outdated Show resolved Hide resolved

url-schemes/managementURLScheme.json Outdated Show resolved Hide resolved

url-schemes/milkURLScheme.json Show resolved Hide resolved

url-schemes/milkURLScheme.json Outdated Show resolved Hide resolved

erwinspeybroeck added 8 commits

March 22, 2023 07:53


          Update resources/icarStatisticsResource.json

5acf5f8


          Update url-schemes/exampleUrlScheme.json

d51c255


          Update url-schemes/exampleUrlScheme.json

84eed0d


          Update url-schemes/exampleUrlScheme.json

e7dbd5f


          Update url-schemes/managementURLScheme.json

7c85253


          Update url-schemes/managementURLScheme.json

cb58dd4


          Update url-schemes/milkURLScheme.json

b1d6853


          Update url-schemes/milkURLScheme.json

ad48008

erwinspeybroeck commented

View reviewed changes

url-schemes/milkURLScheme.json Outdated Show resolved Hide resolved

url-schemes/managementURLScheme.json Outdated Show resolved Hide resolved

erwinspeybroeck added 2 commits

March 22, 2023 09:29


          Update url-schemes/milkURLScheme.json

b5e5d35


          Update url-schemes/managementURLScheme.json

b8318c5

erwinspeybroeck closed this

Collaborator Author

erwinspeybroeck commented Mar 23, 2023

will not use it

erwinspeybroeck deleted the erwinspeybroeck branch

March 23, 2023 07:42

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet