Skip to content

Commit

Permalink
Merge Catalogeu into 2023
Browse files Browse the repository at this point in the history
  • Loading branch information
AndreasSchmitzUKL committed Sep 27, 2023
2 parents 1fd3596 + 2612850 commit d2726f4
Show file tree
Hide file tree
Showing 190 changed files with 15,598 additions and 10 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build-and-deploy-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
- feature/p012
- feature/p013
- 2023
- Pre-Award_Catalogue

jobs:
build:
Expand Down
8 changes: 8 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

181 changes: 181 additions & 0 deletions guides/profiles/p035/codes/elements.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,181 @@
[[element-codes]]
= Code lists for coded elements


== Attachment description code

[cols="1,4"]
|===
h| Qualifier
| `UNCL1001` (listID)
h| Document location
| `cbc:DocumentTypeCode`
h| Source codelist
| link:https://www.unece.org/fileadmin/DAM/trade/untdid/d17a/tred/tred1001.htm[UN/CEFACT code list 1001, D.17A]
|===


== Mime code of attached document

[cols="1,4"]
|===
h| Qualifier
| _None_
h| Document location
| `cbc:EmbeddedDocumentBinaryObject/@mimeCode`
h| Source codelist
|
Subset of link:http://www.iana.org/assignments/media-types[IANA] and link:http://filext.com/file-extension/DWG[AutoCAD file type].
|===

[cols="1,4"]
.Code list
|===
.1+h| Structured content
| application/xml

.1+h| Documents
| application/pdf

.3+h| Images
| image/png
| image/jpeg
| image/tiff

.1+h| Video
| video/mp4

.4+h| Drawings
| application/acad
| application/autocad_dwg
| application/dwg
| drawing/dwg
|===


== Country code

[cols="1,4"]
|===
h| Qualifier
| `ISO3166-1:Alpha2` (listID)
h| Document location
| `cac:Country/cbc:IdentificationCode` +
`cac:OriginCountry/cbc:IdentificationCode` +
h| Source codelist
| link:http://www.iso.org/iso/home/standards/country_codes.htm[ISO 3166-1]
|===


== Hazardous item UNDG code

[cols="1,4"]
|===
h| Qualifier
| `UNCL8273` (listID)
h| Document location
| `cbc:UNDGCode`
h| Source codelist
| link:https://www.unece.org/fileadmin/DAM/trade/untdid/d17a/tred/tred8273.htm[UN/CEFACT code list 8273, D.17A]
|===


== Contract type (procurement project identifier)

[cols="1,4"]
|===
h| Qualifier
| `UNCL1001` (listID)
h| Document location
| `cbc:ContractTypeCode`
h| Source codelist
| Subset of link:https://www.unece.org/fileadmin/DAM/trade/untdid/d17a/tred/tred1001.htm[UN/CEFACT code list 1001, D.17A]
|===

[cols="1,4", options="header"]
.Code list
|===
| Code
| Description

>| 311
| Request for quote
|===


== Item price type

[cols="1,4"]
|===
h| Qualifier
| `UNCL5387` (listID)
h| Document location
| `cbc:PriceTypeCode`
h| Source codelist
| link:https://www.unece.org/fileadmin/DAM/trade/untdid/d17a/tred/tred5387.htm[UN/CEFACT code list 5387, D.17A]
|===


== Unit of measure

[cols="1,4"]
|===
h| Qualifier
| _None_
h| Document location
| `cbc:*/@unitCode`
h| Source codelist
| link:https://www.unece.org/fileadmin/DAM/cefact/recommendations/rec20/rec20_Rev11e_2015.xls[UN/ECE Recommendation 20, Revision 11 (2015)]
|===


== Currency identifier

[cols="1,4"]
|===
h| Qualifier
| _None_
h| Document location
| `cbc:*/@currencyID`
h| Source codelist
| link:https://www.iso.org/iso-4217-currency-codes.html[ISO 4217:2015]
|===


== Item VAT category code

[cols="1,4"]
|===
h| Qualifier
| UNCL5305 (schemeID)
h| Document location
| `cac:ClassifiedTaxCategory/cbc:ID`
h| Source codelist
| Subset of link:https://www.unece.org/fileadmin/DAM/trade/untdid/d17a/tred/tred5305.htm[UN/CEFACT code list 5305]
|===


[cols="1,4", options="header"]
.Code list
|===
| Code
| Description

| AE
| Vat Reverse Charge

| E
| Exempt from Tax

| S
| Standard rate

| Z
| Zero rated goods

| H
| Higher rate

| AA
| Lower rate
|===
19 changes: 19 additions & 0 deletions guides/profiles/p035/codes/id_schemes.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[[id_schemes]]
= Code lists for identifier schemes

.Code lists used to constrain values of schemeIDs for identifiers
[cols="2,3,3", options="header"]
|====
|Business Term
|Applicable XPath
|Code list (link or subset values)

| Electronic address identifier (Endpoint)
| cbc:EndpointID[@schemeID]
a| {policy8}

| Party identifier
| cac:PartyIdentification/cbc:ID[@schemeID]
a| {policy8}

|====
10 changes: 10 additions & 0 deletions guides/profiles/p035/codes/index.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[[codelist]]
= Code lists

:leveloffset: +1

include::elements.adoc[]

include::id_schemes.adoc[]

:leveloffset: -1
13 changes: 13 additions & 0 deletions guides/profiles/p035/contributors/index.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@


= Contributors

[cols="2,5,5", options="header"]
|===
| Country | Name | Organization
| DE | Andreas Schmitz | University of Koblenz
| DE | Cedric Pauken | University of Koblenz
| DE | Ansgar Mondorf | Mondorf IT / University of Koblenz-Landau
| DE | Rolf Kewitz | Beschaffungsamt des BMI
| DE | Felicia Tsakonas | adesso SE
|===
29 changes: 29 additions & 0 deletions guides/profiles/p035/descriptions/attachments.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
= Attachments

Attachments can be sent on line level in the Catalogue. This can be images or additional descriptions of a product. It is strongly recommended to use external references in the form of URI’s for attachments.

If binary objects are attached to the PreAward Catalogue, the valid values for mimetype can be found in section <<Mime code of attached document>>

[source]
.Example of using external reference
----
<cac:Item>
...
<cac:ItemSpecificationDocumentReference>
<cbc:ID>LK8788</cbc:ID>
<cbc:DocumentDescription>Product image</cbc:DocumentDescription>
<cac:Attachment>
<cac:ExternalReference>
<cbc:URI>http://img.trioving.net/Låskasser/LK8788_PRD_FPM_000.JPG</cbc:URI>
</cac:ExternalReference>
</cac:Attachment>
</cac:ItemSpecificationDocumentReference>
...
</cac:Item>
----

[source, xml, indent=0]
.Example of using attached binary objects
----
include::../../../../structure/snippets/Snippet_68.xml[tags=attachment]
----
15 changes: 15 additions & 0 deletions guides/profiles/p035/descriptions/hazardous-item.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
= Hazardous Item

If a product is classified as Hazardous item, a reference to the relevant UNDG-code shall be stated and further specification shall be provided in an attached document or on a web-site (URI).

.Example of UNDG code
[source, xml, indent=0]
----
include::../../../../structure/snippets/Snippet_68_undg.xml[tags=undg]
----

.Example of attachement with further specification
[source, xml, indent=0]
----
include::../../../../structure/snippets/Snippet_68_undg.xml[tags=undg-ref]
----
23 changes: 23 additions & 0 deletions guides/profiles/p035/descriptions/index.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
[[descriptions]]
= Descriptions of selected parts of the transaction

:leveloffset: +1


include::parties.adoc[]
include::procurement-ref.adoc[]
include::validity-period.adoc[]
include::related-products-and-accessories.adoc[]
include::quantities-and-units.adoc[]
include::logistics-information.adoc[]
include::attachments.adoc[]
include::prices.adoc[]
include::label.adoc[]
include::item-properties.adoc[]
include::item-dates.adoc[]
include::hazardous-item.adoc[]
include::keyword.adoc[]
include::vat.adoc[]
include::order-interval.adoc[]

:leveloffset: -1
10 changes: 10 additions & 0 deletions guides/profiles/p035/descriptions/item-dates.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@

= Best before date and expiry date

In the Pre-Award Catalogue Request, the contracting authority (CA) may ask for a certain vaccine to be offered. Because this vaccine is defined as perishable goods, the CA asks the economic operator (EO) to specify the best before date and expiry date in the tender. The fields will guide the CA in planning the vaccine program and logistics in regard to the country that it will be used in and when to order the vaccine. This information will also be used in the electronic catalogue if the EO must update information.

.Example of best before and expiry date
[source, xml, indent=0]
----
include::../../../../structure/snippets/Snippet_date.xml[tags=expiry]
----
41 changes: 41 additions & 0 deletions guides/profiles/p035/descriptions/item-properties.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
[[item_prop]]
= Additional Item Properties

Additional properties are meant for product properties that cannot be sent in any of the defined elements in PreAward Catalogue. Additional properties consist of the Name of the property and the actual Value.

.Example of additional properties:
* Color
* Nutrition +
Stated with amount per 100 g/ml.
* Genetically modified +
Legal values: True, False

.Example of use in the PreAward PreAward Catalogue message
====
[source]
----
<cac:AdditionalItemProperty>
<cbc:Name languageID="en">Color</cbc:Name>
<cbc:Value languageID="en">Red</cbc:Value>
<cbc:ValueQualifier>Color</cbc:ValueQualifier>
</cac:AdditionalItemProperty>
----
[source]
----
<cac:AdditionalItemProperty>
<cbc:Name>NutritionProtein</cbc:Name>
<cbc:ValueQuantity unitCode="GRM" unitCodeListID="UNECERec20">2.5</cbc:ValueQuantity>
<cbc:ValueQualifier>Nutrition</cbc:ValueQualifier>
</cac:AdditionalItemProperty>
----
[source]
----
<cac:AdditionalItemProperty>
<cbc:Name>GeneticallyModified</cbc:Name>
<cbc:Value>True</cbc:Value>
</cac:AdditionalItemProperty>
----
====
Loading

0 comments on commit d2726f4

Please sign in to comment.