Skip to content

Commit

Permalink
eforms: Replace 1.2.1 with 1.3.0 #120
Browse files Browse the repository at this point in the history
  • Loading branch information
jpmckinney committed Nov 4, 2022
1 parent aab21f6 commit b4360ab
Show file tree
Hide file tree
Showing 3 changed files with 643 additions and 643 deletions.
10 changes: 5 additions & 5 deletions 2019_regulation.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

## Create the mapping file

Start with the [fields](https://docs.ted.europa.eu/eforms/1.2.1/fields/index.html) identified by the eForms SDK (creates the file if it doesn't exist):
Start with the [fields](https://docs.ted.europa.eu/eforms/1.3.0/fields/index.html) identified by the eForms SDK (creates the file if it doesn't exist):

./manage.py update-with-sdk output/mapping/eforms/guidance.yaml

Expand All @@ -28,15 +28,15 @@ Note: This last command reports unmerged rows. As such, it's possible that some

Key | Source | Description | Notes
-- | -- | -- | --
id | [eForms SDK](https://docs.ted.europa.eu/eforms/1.2.1/fields/index.html#_field_properties) | Identifier of the field. |
id | [eForms SDK](https://docs.ted.europa.eu/eforms/1.3.0/fields/index.html#_field_properties) | Identifier of the field. |
parentNodeId | eForms SDK | Identifier of the node (XML element) that contains the field. |
name | eForms SDK | Short name of the field. |
btId | eForms SDK | Identifier of the business term to which the field corresponds. |
xpathAbsolute | eForms SDK | Location of the field in an XML notice, as an absolute XPath. | Should appear in the `eForms example`.
type | eForms SDK | Technical data type of the field. | Should match the OCDS field's type.
idScheme | eForms SDK | Indicates the identifier scheme for this `id` field.
idSchemes | eForms SDK | Indicates the identifier schemes for this `id-ref` field.
[repeatable](https://docs.ted.europa.eu/eforms/1.2.1/fields/index.html#_dynamic_properties) | eForms SDK | Indicates if the field can appear more than once inside its container. | Simplified to the boolean (removed `severity`).
[repeatable](https://docs.ted.europa.eu/eforms/1.3.0/fields/index.html#_dynamic_properties) | eForms SDK | Indicates if the field can appear more than once inside its container. | Simplified to the boolean (removed `severity`).
mandatory | eForms SDK | Indicates whether or not a field is required to have a value. | Simplified to the boolean (`true` if required on one or more forms).
codeList | eForms SDK | Identifier of the code list from which the field value must belong. Applicable only for fields of type "code" or "internal-code" | Simplified to the codelist (removed `severity`, `value.type`, `value.parentId`).
pattern | eForms SDK | Indicates that the value of the field must match a specific regular expression pattern. | Simplied to the pattern (removed `severity`).
Expand Down Expand Up @@ -79,7 +79,7 @@ The correspondence between `legalType` and `type` is:

Manually fill in in `eForms guidance`, `eForms example`, `OCDS example` and `sdk`.

1. Look up the business term in the [eForms SDK](https://docs.ted.europa.eu/eforms/1.2.1/schema/all-in-one.html)
1. Look up the business term in the [eForms SDK](https://docs.ted.europa.eu/eforms/1.3.0/schema/all-in-one.html)
1. Paste the link to the relevant documentation in `sdk`
1. Copy an abbreviated XML sample to `eForms example`
1. Write the `eForms guidance` and `OCDS example`
Expand Down Expand Up @@ -133,7 +133,7 @@ To update the progress of the guidance for the 2019 regulation, run:

### eForms

* [SDK](https://docs.ted.europa.eu/eforms/1.2.1/) ([all-in-one](https://docs.ted.europa.eu/eforms/1.2.1/schema/all-in-one.html))
* [SDK](https://docs.ted.europa.eu/eforms/1.3.0/) ([all-in-one](https://docs.ted.europa.eu/eforms/1.3.0/schema/all-in-one.html))
* [FAQ](https://docs.ted.europa.eu/home/eforms/FAQ/index.html)
* [Examples](https://github.com/OP-TED/eForms-SDK/tree/main/examples)

Expand Down
14 changes: 7 additions & 7 deletions manage.py
Original file line number Diff line number Diff line change
Expand Up @@ -354,23 +354,23 @@ def update_with_annex(filename):
~df["ID"].isin(
{
# Removed indicators in favor of corresponding scalars.
# https://docs.ted.europa.eu/eforms/1.2.1/schema/all-in-one.html#extensionsSection
# https://docs.ted.europa.eu/eforms/1.3.0/schema/all-in-one.html#extensionsSection
"BT-53", # Options (BT-54 Options Description)
# https://docs.ted.europa.eu/eforms/1.2.1/schema/all-in-one.html#toolNameSection
# https://docs.ted.europa.eu/eforms/1.3.0/schema/all-in-one.html#toolNameSection
"BT-724", # Tool Atypical (BT-124 Tool Atypical URL)
# https://docs.ted.europa.eu/eforms/1.2.1/schema/all-in-one.html#_footnotedef_21
# https://docs.ted.europa.eu/eforms/1.3.0/schema/all-in-one.html#_footnotedef_21
"BT-778", # Framework Maximum Participants (BT-113 Framework Maximum Participants Number)
# See OPT-155 and OPT-156.
# https://docs.ted.europa.eu/eforms/1.2.1/schema/competition-results.html#lotResultComponentsTable
# https://docs.ted.europa.eu/eforms/1.3.0/schema/competition-results.html#lotResultComponentsTable
"BT-715",
"BT-725",
"BT-716",
# See Table 3.
# https://docs.ted.europa.eu/eforms/1.2.1/schema/parties.html#mappingOrganizationBTsSchemaComponentsTable
# https://docs.ted.europa.eu/eforms/1.3.0/schema/parties.html#mappingOrganizationBTsSchemaComponentsTable
"BT-08",
"BT-770",
# See Table 4 (also includes BT-330 and BT-1375).
# https://docs.ted.europa.eu/eforms/1.2.1/schema/identifiers.html#pointlessDueToDesignSection
# https://docs.ted.europa.eu/eforms/1.3.0/schema/identifiers.html#pointlessDueToDesignSection
"BT-557",
"BT-1371",
"BT-1372",
Expand Down Expand Up @@ -491,7 +491,7 @@ def lint(filename, additional_properties):
Lint FILE (validate and format XML, JSON and Markdown, report unrecognized OCDS fields, update eForms SDK URLs).
"""
# From https://github.com/OP-TED/eForms-SDK/tree/main/examples
# See https://docs.ted.europa.eu/eforms/1.2.1/schema/schemas.html
# See https://docs.ted.europa.eu/eforms/1.3.0/schema/schemas.html
head = (
'<ContractNotice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" '
'xmlns:ext="urn:oasis:names:specification:ubl:schema:xsd:CommonExtensionComponents-2" '
Expand Down
Loading

0 comments on commit b4360ab

Please sign in to comment.