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

Misc ag fixes (AgPackage dates, GAPInspection harvestCompany) #933

Merged
merged 2 commits into from
Feb 20, 2024
Merged

Misc ag fixes (AgPackage dates, GAPInspection harvestCompany) #933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e40a0b
fix: change GAPInspection harvestCompany to Organization ref
rhofvendahl Feb 9, 2024
2385774
fix: separate AgPackage date
rhofvendahl Feb 9, 2024
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
2 changes: 1 addition & 1 deletion docs/openapi/components/schemas/common/AgricultureInspectionGeneric.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ example: |-
"phoneNumber": "+1-383-555-4822"
},
"voicePickCode": "4642",
"date": "2021-03-14",
"harvestDate": "2021-03-14",
"labelImageUrl": "https://img.example.org/640/480/",
"labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
"agricultureProduct": [
Expand Down
29 changes: 22 additions & 7 deletions docs/openapi/components/schemas/common/AgriculturePackage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,29 @@ properties:
$linkedData:
term: voicePickCode
'@id': https://w3id.org/traceability#voicePickCode
date:
title: Packing, Harvest, or Best By Date
packingDate:
title: Packing Date
description: >-
Human readable date describing the date the package was packed, harvested,
or is 'best by.'
Human readable date describing the date the package was packed.
type: string
$linkedData:
term: date
term: packingDate
'@id': https://schema.org/DateTime
harvestDate:
title: Harvest Date
description: >-
Human readable date describing the date the package was harvested.
type: string
$linkedData:
term: harvestDate
'@id': https://schema.org/DateTime
bestByDate:
title: Best By Date
description: >-
Human readable date describing the date the package is 'best by'.
type: string
$linkedData:
term: bestByDate
'@id': https://schema.org/DateTime
labelImageUrl:
title: Label Image URL
Expand Down Expand Up @@ -108,7 +123,7 @@ example: |-
"phoneNumber": "+1-632-555-6601"
},
"voicePickCode": "4642",
"date": "2021-03-14",
"harvestDate": "2021-03-14",
"labelImageUrl": "https://img.example.org/640/480/",
"labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
"agricultureProduct": [
Expand Down Expand Up @@ -189,4 +204,4 @@ example: |-
"labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
}
]
}
}
2 changes: 1 addition & 1 deletion docs/openapi/components/schemas/common/AgricultureParcelDelivery.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ example: |-
"phoneNumber": "+1-470-555-7721"
},
"voicePickCode": "4642",
"date": "2021-03-14",
"harvestDate": "2021-03-14",
"labelImageUrl": "https://img.example.org/640/480/",
"labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
"agricultureProduct": [
Expand Down
2 changes: 1 addition & 1 deletion docs/openapi/components/schemas/common/AgricultureProduct.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ properties:
type: string
$linkedData:
term: plantParts
'@id': https://schema.org/description
'@id': https://schema.org/description
labelImageUrl:
title: Label Image URL
description: Image of the package label.
Expand Down
2 changes: 1 addition & 1 deletion docs/openapi/components/schemas/common/FoodGradeInspection.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ example: |-
"phoneNumber": "+1-130-555-2218"
},
"voicePickCode": "4642",
"date": "2021-03-14",
"harvestDate": "2021-03-14",
"labelImageUrl": "https://img.example.org/640/480/",
"labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
"agricultureProduct": [
Expand Down
2 changes: 1 addition & 1 deletion docs/openapi/components/schemas/common/GAPInspection.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ properties:
harvestCompany:
title: Harvest Company
description: The harvest company if a separate contracted company is used to harvest the crop.
type: string
$ref: ./Organization.yml
$linkedData:
term: harvestCompany
'@id': https://vocabulary.uncefact.org/associatedParty
Expand Down
4 changes: 2 additions & 2 deletions docs/openapi/components/schemas/common/USDAPPQ203ForeignSiteInspection.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ example: |-
"phoneNumber": "+1-224-555-4962"
},
"voicePickCode": "4642",
"date": "2021-03-14",
"harvestDate": "2021-03-14",
"labelImageUrl": "https://img.example.org/640/480/",
"labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
"agricultureProduct": [
Expand Down Expand Up @@ -334,4 +334,4 @@ example: |-
}
}
]
}
}
2 changes: 1 addition & 1 deletion docs/openapi/components/schemas/common/USDAPPQ309APestInterceptionRecord.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ example: |-
"phoneNumber": "+1-426-555-4205"
},
"voicePickCode": "4642",
"date": "2021-03-14",
"harvestDate": "2021-03-14",
"labelImageUrl": "https://img.example.org/640/480/",
"labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
"agricultureProduct": [
Expand Down
2 changes: 1 addition & 1 deletion docs/openapi/components/schemas/common/USDAPPQ368NoticeOfArrival.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ example: |-
"phoneNumber": "+1-120-555-3811"
},
"voicePickCode": "4642",
"date": "2021-03-14",
"harvestDate": "2021-03-14",
"labelImageUrl": "https://img.example.org/640/480/",
"labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
"agricultureProduct": [
Expand Down
2 changes: 1 addition & 1 deletion docs/openapi/components/schemas/common/USDAPPQ429FumigationRecord.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ example: |-
"phoneNumber": "+1-642-555-2793"
},
"voicePickCode": "4642",
"date": "2021-03-14",
"harvestDate": "2021-03-14",
"labelImageUrl": "https://img.example.org/640/480/",
"labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
"agricultureProduct": [
Expand Down
4 changes: 2 additions & 2 deletions docs/openapi/components/schemas/common/USDAPPQ505PlantDeclaration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ example: |-
"phoneNumber": "+1-445-555-2091"
},
"voicePickCode": "4642",
"date": "2021-03-14",
"harvestDate": "2021-03-14",
"labelImageUrl": "https://img.example.org/640/480/",
"labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
"agricultureProduct": [
Expand Down Expand Up @@ -212,4 +212,4 @@ example: |-
"jobTitle": "Import Specialist"
},
"date": "2022-04-21"
}
}
2 changes: 1 addition & 1 deletion docs/openapi/components/schemas/credentials/FoodGradeInspectionCredential.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ example: |-
"phoneNumber": "+1-750-555-5996"
},
"voicePickCode": "4642",
"date": "2021-03-14",
"harvestDate": "2021-03-14",
"labelImageUrl": "https://img.example.org/640/480/",
"labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
"agricultureProduct": [
Expand Down
Loading