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

Move sizeOrAmount to AgProduct #941

Merged
merged 2 commits into from
Mar 13, 2024
Merged

Move sizeOrAmount to AgProduct #941

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38130cc
feat: move sizeOrAmount to AgProduct
rhofvendahl Mar 11, 2024
073e545
feat: integrate ppq587 changes from main
rhofvendahl Mar 13, 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
30 changes: 15 additions & 15 deletions docs/openapi/components/schemas/common/AgricultureActivity.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,13 @@ example: |-
"AgricultureProduct"
],
"plu": "94225",
"unitQuantity": {
"type": [
"QuantitativeValue"
],
"unitCode": "boxes",
"value": "893"
},
"product": {
"type": [
"Product"
Expand All @@ -145,13 +152,6 @@ example: |-
},
"name": "Avocados",
"description": "Avocados, 4 pack boxes",
"sizeOrAmount": {
"type": [
"QuantitativeValue"
],
"unitCode": "boxes",
"value": "893"
},
"weight": {
"type": [
"QuantitativeValue"
Expand Down Expand Up @@ -183,13 +183,6 @@ example: |-
},
"name": "Tomatoes",
"description": "Tomatoes, Cartons",
"sizeOrAmount": {
"type": [
"QuantitativeValue"
],
"unitCode": "cartons",
"value": "348"
},
"weight": {
"type": [
"QuantitativeValue"
Expand All @@ -199,6 +192,13 @@ example: |-
},
"sku": "164664203943"
},
"unitQuantity": {
"type": [
"QuantitativeValue"
],
"unitCode": "cartons",
"value": "348"
},
"scientificName": "Solanum lycopersicum",
"labelImageUrl": "https://img.example.org/033383401508/640/480/",
"labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
Expand Down Expand Up @@ -246,4 +246,4 @@ example: |-
}
}
]
}
}
7 changes: 0 additions & 7 deletions docs/openapi/components/schemas/common/AgricultureInspectionGeneric.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,13 +261,6 @@ example: |-
},
"name": "Avocados",
"description": "Avocados, 4 pack boxes",
"sizeOrAmount": {
"type": [
"QuantitativeValue"
],
"unitCode": "hg/ha",
"value": "60"
},
"weight": {
"type": [
"QuantitativeValue"
Expand Down
21 changes: 7 additions & 14 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 @@ -145,13 +145,6 @@ example: |-
},
"name": "Avocados",
"description": "Avocados, 4 pack boxes",
"sizeOrAmount": {
"type": [
"QuantitativeValue"
],
"unitCode": "hg/ha",
"value": "60"
},
"weight": {
"type": [
"QuantitativeValue"
Expand Down Expand Up @@ -183,13 +176,6 @@ example: |-
},
"name": "Avocados",
"description": "Avocados, 4 pack boxes",
"sizeOrAmount": {
"type": [
"QuantitativeValue"
],
"unitCode": "boxes",
"value": "893"
},
"weight": {
"type": [
"QuantitativeValue"
Expand All @@ -199,6 +185,13 @@ example: |-
},
"sku": "563279941950"
},
"unitQuantity": {
"type": [
"QuantitativeValue"
],
"unitCode": "boxes",
"value": "893"
},
"scientificName": "Persea americana",
"labelImageUrl": "https://img.example.org/033383401508/640/480/",
"labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
Expand Down
7 changes: 0 additions & 7 deletions docs/openapi/components/schemas/common/AgricultureParcelDelivery.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,13 +264,6 @@ example: |-
},
"name": "Avocados",
"description": "Avocados, 4 pack boxes",
"sizeOrAmount": {
"type": [
"QuantitativeValue"
],
"unitCode": "hg/ha",
"value": "60"
},
"weight": {
"type": [
"QuantitativeValue"
Expand Down
14 changes: 7 additions & 7 deletions docs/openapi/components/schemas/common/AgricultureProduct.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,13 @@ properties:
$linkedData:
term: product
'@id': https://www.gs1.org/voc/Product
unitQuantity:
title: Unit Quantity
description: The quantity of units making up the product.
$ref: ./QuantitativeValue.yml
$linkedData:
term: unitQuantity
'@id': https://schema.org/value
scientificName:
title: Scientific Name
description: >-
Expand Down Expand Up @@ -139,13 +146,6 @@ example: |-
"countryOfOrigin": "United States",
"name": "Handmade Fresh Hat",
"description": "The Nagasaki Lander is the trademarked name of several series of Nagasaki sport bikes, that started with the 1984 ABC800J",
"sizeOrAmount": {
"type": [
"QuantitativeValue"
],
"unitCode": "sqm",
"value": "47"
},
"weight": {
"type": [
"QuantitativeValue"
Expand Down
7 changes: 0 additions & 7 deletions docs/openapi/components/schemas/common/BillOfLading.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,13 +649,6 @@ example: |-
}
}
},
"sizeOrAmount": {
"type": [
"QuantitativeValue"
],
"unitCode": "boxes",
"value": "500"
},
"weight": {
"type": [
"QuantitativeValue"
Expand Down
14 changes: 0 additions & 14 deletions docs/openapi/components/schemas/common/FoodGradeInspection.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,13 +259,6 @@ example: |-
},
"name": "Avocados",
"description": "Avocados, 4 pack boxes",
"sizeOrAmount": {
"type": [
"QuantitativeValue"
],
"unitCode": "hg/ha",
"value": "60"
},
"weight": {
"type": [
"QuantitativeValue"
Expand Down Expand Up @@ -335,13 +328,6 @@ example: |-
},
"name": "Avocados",
"description": "Avocados, 4 pack boxes",
"sizeOrAmount": {
"type": [
"QuantitativeValue"
],
"unitCode": "hg/ha",
"value": "60"
},
"weight": {
"type": [
"QuantitativeValue"
Expand Down
7 changes: 0 additions & 7 deletions docs/openapi/components/schemas/common/FoodGradeInspectionLot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,6 @@ example: |-
},
"name": "Avocados",
"description": "Avocados, 4 pack boxes",
"sizeOrAmount": {
"type": [
"QuantitativeValue"
],
"unitCode": "hg/ha",
"value": "60"
},
"weight": {
"type": [
"QuantitativeValue"
Expand Down
14 changes: 7 additions & 7 deletions docs/openapi/components/schemas/common/GAPInspection.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,13 +326,6 @@ example: |-
},
"name": "Tomatoes",
"description": "Tomatoes, Cartons",
"sizeOrAmount": {
"type": [
"QuantitativeValue"
],
"unitCode": "cartons",
"value": "348"
},
"weight": {
"type": [
"QuantitativeValue"
Expand All @@ -342,6 +335,13 @@ example: |-
},
"sku": "164664203943"
},
"unitQuantity": {
"type": [
"QuantitativeValue"
],
"unitCode": "cartons",
"value": "348"
},
"scientificName": "Solanum lycopersicum",
"labelImageUrl": "https://img.example.org/033383401508/640/480/",
"labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
Expand Down
14 changes: 7 additions & 7 deletions docs/openapi/components/schemas/common/GAPLocationCertification.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,6 @@ example: |-
},
"name": "Tomatoes",
"description": "Tomatoes, Cartons",
"sizeOrAmount": {
"type": [
"QuantitativeValue"
],
"unitCode": "cartons",
"value": "348"
},
"weight": {
"type": [
"QuantitativeValue"
Expand All @@ -189,6 +182,13 @@ example: |-
},
"sku": "164664203943"
},
"unitQuantity": {
"type": [
"QuantitativeValue"
],
"unitCode": "cartons",
"value": "348"
},
"scientificName": "Solanum lycopersicum",
"labelImageUrl": "https://img.example.org/033383401508/640/480/",
"labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
Expand Down
7 changes: 0 additions & 7 deletions docs/openapi/components/schemas/common/Inbond.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,13 +271,6 @@ example: |-
},
"name": "Crude Oil Barrel",
"description": "Heavy Sour Dilbit",
"sizeOrAmount": {
"type": [
"QuantitativeValue"
],
"unitCode": "hg/ha",
"value": "7436"
},
"weight": {
"type": [
"QuantitativeValue"
Expand Down
9 changes: 1 addition & 8 deletions docs/openapi/components/schemas/common/OilAndGasDeliveryTicket.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,6 @@ example: |-
},
"name":"Crude Oil Barrel",
"description":"Heavy Sour Dilbit",
"sizeOrAmount":{
"type":[
"QuantitativeValue"
],
"unitCode":"hg/ha",
"value":"8438"
},
"weight":{
"type":[
"QuantitativeValue"
Expand Down Expand Up @@ -306,4 +299,4 @@ example: |-
}
}
]
}
}
14 changes: 0 additions & 14 deletions docs/openapi/components/schemas/common/OilAndGasProduct.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,20 +167,6 @@ example: |-
},
"name":"Crude Oil Barrel",
"description":"Heavy Sour Dilbit",
"sizeOrAmount":{
"type":[
"QuantitativeValue"
],
"unitCode":"hg/ha",
"value":"8438"
},
"weight":{
"type":[
"QuantitativeValue"
],
"unitCode":"hg/ha",
"value":"9813"
},
"sku":"391864383008",
"commodity": {
"type": ["Commodity"],
Expand Down
14 changes: 7 additions & 7 deletions docs/openapi/components/schemas/common/OrganicProductCertificate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,6 @@ example: |-
},
"name": "Tomatoes",
"description": "Tomatoes, Cartons",
"sizeOrAmount": {
"type": [
"QuantitativeValue"
],
"unitCode": "cartons",
"value": "348"
},
"weight": {
"type": [
"QuantitativeValue"
Expand All @@ -78,6 +71,13 @@ example: |-
"sku": "164664203943"
},
"scientificName": "Solanum lycopersicum",
"unitQuantity": {
"type": [
"QuantitativeValue"
],
"unitCode": "cartons",
"value": "348"
},
"labelImageUrl": "https://img.example.org/033383401508/640/480/",
"labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
},
Expand Down
14 changes: 7 additions & 7 deletions docs/openapi/components/schemas/common/PlantSystemsInspection.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,13 +185,6 @@ example: |-
},
"name": "Tomatoes",
"description": "Tomatoes, Cartons",
"sizeOrAmount": {
"type": [
"QuantitativeValue"
],
"unitCode": "cartons",
"value": "348"
},
"weight": {
"type": [
"QuantitativeValue"
Expand All @@ -201,6 +194,13 @@ example: |-
},
"sku": "164664203943"
},
"unitQuantity": {
"type": [
"QuantitativeValue"
],
"unitCode": "cartons",
"value": "348"
},
"scientificName": "Solanum lycopersicum",
"labelImageUrl": "https://img.example.org/033383401508/640/480/",
"labelImageHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
Expand Down
Loading
Loading