Skip to content
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

Quick changes: improvements to death, treatments, departure, milking #227

Merged
merged 14 commits into from
Jul 29, 2021
Merged

Quick changes: improvements to death, treatments, departure, milking #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
7bd093f
Create healthURLScheme.json
May 20, 2021
202fd80
Merge pull request #19 from adewg/Develop
cookeac May 20, 2021
596645e
Merge branch 'master' of https://github.com/cookeac/ICAR
May 20, 2021
325e9b6
Update resource for RFC7801 compliance and Ids
cookeac Jul 1, 2021
a040753
Added ErrorResource, BatchResult, removed collections
cookeac Jul 1, 2021
72c5dfe
Changes to death method and reason
cookeac Jul 15, 2021
19730a1
Add no. treatments and interval to courses
cookeac Jul 15, 2021
441b5d1
Added Unknown departure reason, additional milk characteristics
cookeac Jul 15, 2021
2bfe712
Added Unknown departure reason, additional milk characteristics
cookeac Jul 15, 2021
89604b2
Changes to death method and reason
cookeac Jul 15, 2021
f1c1ac6
Revert "Added ErrorResource, BatchResult, removed collections"
cookeac Jul 26, 2021
7557644
Revert "Update resource for RFC7801 compliance and Ids"
cookeac Jul 26, 2021
3f0af0a
Revert "Create healthURLScheme.json"
cookeac Jul 26, 2021
4c0e10f
Update icarDeathReasonType.json
cookeac Jul 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions enums/icarDeathMethodType.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@
"type": "string",

"enum": [
"Perished",
"Slaughter",
"Culled",
"Theft",
"Lost",
"Accident",
"Euthanised",
"Natural",
"Unknown"
"Other"
]
}
9 changes: 8 additions & 1 deletion enums/icarDeathReasonType.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@
"Consumption",
"Culled",
"Other",
"Unknown"
"Unknown",
"Age",
"Mastitis",
"Production",
"LegOrClaw",
"MilkingAbility",
"Nutrition",
"Fertility"
]
}
3 changes: 2 additions & 1 deletion enums/icarDepartureReasonType.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"MilkingAbility",
"BadType",
"Behaviour",
"Other"
"Other",
"Unknown"
]
}
11 changes: 11 additions & 0 deletions types/icarMedicineCourseSummaryType.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,17 @@
"$ref": "../types/icarMedicineDoseType.json",
"description": "Total dose proposed or administered."
},
"numberOfTreatments": {
"type": "number",
"description": "The number of treatments included in the course.",
"nullable": true
},
"treatmentInterval": {
"type": "number",
"format": "double",
"description": "The interval between treatments specified in HOURS.",
"nullable": true
},
"batches": {
"type": "array",
"items": {
Expand Down
2 changes: 1 addition & 1 deletion types/icarMilkCharacteristicsType.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"properties": {
"characteristic": {
"type": "string",
"description": "ICAR Milk Characteristics Codes and values - we have at this moment SCC, FAT, PROTEIN, LAC, UREA, BLOOD, ACETONE, BHB, LDH, PRO, AVGCOND, MAXCOND, AVGFLWR, MAXFLWR, WEIGHT.\nThe following units have to be applied:\n\n|SCC|Somatic cell count|x1000 cells/ml|NCL\n|FAT|Fat|%|VP\n|PROTEIN|Protein|%|VP\n|LAC|Lactose|%|VP\n|UREA|Urea|mg/l|M1\n|BLOOD|Blood|true/false|A99\n|ACETONE|Acetone|mmol/l|M33\n|BHB|Beta hydroxybutyrate|mmol/l|M33\n|LDH|Lactate dehydrogenase|IU/l|\n|PRO|Progesteron|mmol/l|M33\n|AVGCOND|Average conductivity value of the milk at 25 ° C|mS/cm|H61\n|MAXCOND|Maximum conductivity value of the milk at 25 ° C|mS/cm|H61\n|AVGFLWR|Average flow rate|Kg/min|F31\n|MAXFLWR|Max flow rate|Kg/min|F31\n|WEIGHT|Weight of animal|Kg|KGM\n|PAG|Pregnancy associated glycoprotein|mmol/l|M33"
"description": "ICAR Milk Characteristics Codes and values: SCC, FAT, PROTEIN, LAC, UREA, BLOOD, ACETONE, BHB, LDH, PRO, AVGCOND, MAXCOND, AVGFLWR, MAXFLWR, WEIGHT, TEMPERATURE.\nThe following units have to be applied:\n\n|SCC|Somatic cell count|x1000 cells/ml|NCL\n|FAT|Fat|%|VP\n|PROTEIN|Protein|%|VP\n|LAC|Lactose|%|VP\n|UREA|Urea|mg/l|M1\n|BLOOD|Blood|true/false|A99\n|ACETONE|Acetone|mmol/l|M33\n|BHB|Beta hydroxybutyrate|mmol/l|M33\n|LDH|Lactate dehydrogenase|IU/l|\n|PRO|Progesteron|mmol/l|M33\n|AVGCOND|Average conductivity value of the milk at 25 ° C|mS/cm|H61\n|MAXCOND|Maximum conductivity value of the milk at 25 ° C|mS/cm|H61\n|AVGFLWR|Average flow rate|Kg/min|F31\n|MAXFLWR|Max flow rate|Kg/min|F31\n|WEIGHT|Weight of animal|Kg|KGM\n|PAG|Pregnancy associated glycoprotein|mmol/l|M33"
},
"value": {
"type": "string",
Expand Down
15 changes: 15 additions & 0 deletions types/icarQuarterMilkingType.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,21 @@
"RR"
]
},
"xposition": {
"type": "number",
"nullable": true,
"description": "Optional milking robot X position. Vendors may choose not to provide this."
},
"yposition": {
"type": "number",
"nullable": true,
"description": "Optional milking robot Y position. Vendors may choose not to provide this."
},
"zposition": {
"type": "number",
"nullable": true,
"description": "Optional milking robot Z position. Vendors may choose not to provide this."
},
"quarterMilkingDuration": {
"$ref": "../types/icarMilkDurationType.json"
},
Expand Down