Skip to content

Commit

Permalink
Feat/new json schema (#94)
Browse files Browse the repository at this point in the history 
* changes for schema 1.3.0

* validation with modified schema

* release 3.1

* misc

Co-authored-by: fOppenheimer <[email protected]>
Co-authored-by: Gordon Grund <[email protected]>
  • Loading branch information
@ggrund-tsi @fOppenheimer
3 people authored Jun 14, 2021
1 parent d038d4e commit fe8bffa
Show file tree
Hide file tree
Showing 13 changed files with 322 additions and 298 deletions.
153 changes: 89 additions & 64 deletions public/DGC.combined-schema.json
View file
Original file line number Diff line number Diff line change
@@ -1,37 +1,60 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://id.uvci.eu/DGC.combined-schema.json",
"title": "EU DGC",
"description": "EU Digital Green Certificate",
"$comment": "Schema version 1.0.0",
"required": [
"ver",
"nam",
"dob"
],
"$id": "https://id.uvci.eu/DCC.combined-schema.json",
"title": "EU DCC",
"description": "EU Digital Covid Certificate",
"$comment": "Schema version 1.3.0",
"type": "object",
"oneOf": [
{
"required": [
"ver",
"nam",
"dob",
"v"
]
},
{
"required": [
"ver",
"nam",

This comment has been minimized.

Sign in to view

Copy link
@rossi68

rossi68 Oct 30, 2021

dan
"dob",
"t"
]
},
{
"required": [
"ver",
"nam",
"dob",
"r"
]
}
],
"properties": {
"ver": {
"title": "Schema version",
"description": "Version of the schema, according to Semantic versioning (ISO, https://semver.org/ version 2.0.0 or newer)",
"type": "string",
"pattern": "^\\d+.\\d+.\\d+$",
"examples": [
"1.0.0"
"1.3.0"
]
},
"nam": {
"description": "Surname(s), given name(s) - in that order",
"description": "Surname(s), forename(s) - in that order",
"$ref": "#/$defs/person_name"
},
"dob": {
"title": "Date of birth",
"description": "Date of Birth of the person addressed in the DGC. ISO 8601 date format restricted to range 1900-2099",
"description": "Date of Birth of the person addressed in the DCC. ISO 8601 date format restricted to range 1900-2099 or empty",
"type": "string",
"format": "date",
"pattern": "(19|20)\\d{2}-\\d{2}-\\d{2}",
"pattern": "^((19|20)\\d\\d(-\\d\\d){0,2}){0,1}$",
"examples": [
"1979-04-14"
"1979-04-14",
"1950",
"1901-08",
""
]
},
"v": {
Expand All @@ -40,83 +63,80 @@
"items": {
"$ref": "#/$defs/vaccination_entry"
},
"minItems": 1
"minItems": 1,
"maxItems": 1
},
"t": {
"description": "Test Group",
"type": "array",
"items": {
"$ref": "#/$defs/test_entry"
},
"minItems": 1
"minItems": 1,
"maxItems": 1
},
"r": {
"description": "Recovery Group",
"type": "array",
"items": {
"$ref": "#/$defs/recovery_entry"
},
"minItems": 1
"minItems": 1,
"maxItems": 1
}
},
"$defs": {
"dose_posint": {
"description": "Dose Number / Total doses in Series: positive integer, range: [1,9]",
"description": "Dose Number / Total doses in Series: positive integer",
"type": "integer",
"minimum": 1,
"maximum": 9
},
"country_vt": {
"description": "Country of Vaccination / Test, ISO 3166 where possible",
"type": "string",
"pattern": "[A-Z]{1,10}"
"minimum": 1
},
"issuer": {
"description": "Certificate Issuer",
"type": "string",
"maxLength": 50
"maxLength": 80
},
"person_name": {
"description": "Person name: Surname(s), given name(s) - in that order",
"description": "Person name: Surname(s), forename(s) - in that order",
"required": [
"fnt"
],
"type": "object",
"properties": {
"fn": {
"title": "Family name",
"description": "The family or primary name(s) of the person addressed in the certificate",
"title": "Surname",
"description": "The surname or primary name(s) of the person addressed in the certificate",
"type": "string",
"maxLength": 50,
"maxLength": 80,
"examples": [
"d'Červenková Panklová"
]
},
"fnt": {
"title": "Standardised family name",
"description": "The family name(s) of the person transliterated",
"title": "Standardised surname",
"description": "The surname(s) of the person, transliterated ICAO 9303",
"type": "string",
"pattern": "^[A-Z<]*$",
"maxLength": 50,
"maxLength": 80,
"examples": [
"DCERVENKOVA<PANKLOVA"
]
},
"gn": {
"title": "Given name",
"description": "The given name(s) of the person addressed in the certificate",
"title": "Forename",
"description": "The forename(s) of the person addressed in the certificate",
"type": "string",
"maxLength": 50,
"maxLength": 80,
"examples": [
"Jiřina-Maria Alena"
]
},
"gnt": {
"title": "Standardised given name",
"description": "The given name(s) of the person transliterated",
"title": "Standardised forename",
"description": "The forename(s) of the person, transliterated ICAO 9303",
"type": "string",
"pattern": "^[A-Z<]*$",
"maxLength": 50,
"maxLength": 80,
"examples": [
"JIRINA<MARIA<ALENA"
]
Expand All @@ -126,7 +146,7 @@
"certificate_id": {
"description": "Certificate Identifier, format as per UVCI: Annex 2 in https://ec.europa.eu/health/sites/health/files/ehealth/docs/vaccination-proof_interoperability-guidelines_en.pdf",
"type": "string",
"maxLength": 50
"maxLength": 80
},
"vaccination_entry": {
"description": "Vaccination Entry",
Expand Down Expand Up @@ -169,10 +189,9 @@
"$ref": "#/$defs/dose_posint"
},
"dt": {
"description": "Date of Vaccination",
"description": "ISO8601 complete date: Date of Vaccination",
"type": "string",
"format": "date",
"$comment": "SemanticSG: constrain to specific date range?"
"format": "date"
},
"co": {
"description": "Country of Vaccination",
Expand All @@ -195,7 +214,6 @@
"tt",
"sc",
"tr",
"tc",
"co",
"is",
"ci"
Expand All @@ -207,11 +225,12 @@
},
"tt": {
"description": "Type of Test",
"type": "string"
"$ref": "#/$defs/test-type"
},
"nm": {
"description": "NAA Test Name",
"type": "string"
"type": "string",
"maxLength": 80
},
"ma": {
"description": "RAT Test name and manufacturer",
Expand All @@ -222,19 +241,14 @@
"type": "string",
"format": "date-time"
},
"dr": {
"description": "Date/Time of Test Result",
"type": "string",
"format": "date-time"
},
"tr": {
"description": "Test Result",
"$ref": "#/$defs/test-result"
},
"tc": {
"description": "Testing Centre",
"type": "string",
"maxLength": 50
"maxLength": 80
},
"co": {
"description": "Country of Test",
Expand Down Expand Up @@ -267,7 +281,7 @@
"$ref": "#/$defs/disease-agent-targeted"
},
"fr": {
"description": "ISO 8601 Date of First Positive Test Result",
"description": "ISO 8601 complete date of first positive NAA test result",
"type": "string",
"format": "date"
},
Expand All @@ -280,12 +294,12 @@
"$ref": "#/$defs/issuer"
},
"df": {
"description": "ISO 8601 Date: Certificate Valid From",
"description": "ISO 8601 complete date: Certificate Valid From",
"type": "string",
"format": "date"
},
"du": {
"description": "Certificate Valid Until",
"description": "ISO 8601 complete date: Certificate Valid Until",
"type": "string",
"format": "date"
},
Expand All @@ -296,34 +310,45 @@
}
},
"disease-agent-targeted": {
"description": "EU eHealthNetwork: Value Sets for Digital Green Certificates. version 1.0, 2021-04-16, section 2.1",
"description": "EU eHealthNetwork: Value Sets for Digital Covid Certificates. version 1.0, 2021-04-16, section 2.1",
"type": "string",
"valueset-uri": "valuesets/disease-agent-targeted.json"
},
"vaccine-prophylaxis": {
"description": "EU eHealthNetwork: Value Sets for Digital Green Certificates. version 1.0, 2021-04-16, section 2.2",
"description": "EU eHealthNetwork: Value Sets for Digital Covid Certificates. version 1.0, 2021-04-16, section 2.2",
"type": "string",
"valueset-uri": "valuesets/vaccine-prophylaxis.json"
},
"vaccine-medicinal-product": {
"description": "EU eHealthNetwork: Value Sets for Digital Green Certificates. version 1.0, 2021-04-16, section 2.3",
"description": "EU eHealthNetwork: Value Sets for Digital Covid Certificates. version 1.0, 2021-04-16, section 2.3",
"type": "string",
"valueset-uri": "valuesets/vaccine-medicinal-product.json"
},
"vaccine-mah-manf": {
"description": "EU eHealthNetwork: Value Sets for Digital Green Certificates. version 1.0, 2021-04-16, section 2.4",
"description": "EU eHealthNetwork: Value Sets for Digital Covid Certificates. version 1.0, 2021-04-16, section 2.4",
"type": "string",
"valueset-uri": "valuesets/vaccine-mah-manf.json"
},
"country_vt": {
"description": "Country of Vaccination / Test, ISO 3166 alpha-2 where possible",
"type": "string",
"pattern": "[A-Z]{1,10}",
"valueset-uri": "valuesets/country-2-codes.json"
},
"test-manf": {
"description": "EU eHealthNetwork: Value Sets for Digital Green Certificates. version 1.0, 2021-04-16, section 2.8",
"description": "EU eHealthNetwork: Value Sets for Digital Covid Certificates. version 1.0, 2021-04-16, section 2.8",
"type": "string",
"valueset-uri": "valuesets/test-manf.json"
},
"test-result": {
"description": "EU eHealthNetwork: Value Sets for Digital Green Certificates. version 1.0, 2021-04-16, section 2.9",
"description": "EU eHealthNetwork: Value Sets for Digital Covid Certificates. version 1.0, 2021-04-16, section 2.9",
"type": "string",
"valueset-uri": "valuesets/test-result.json"
},
"test-type": {
"description": "EU eHealthNetwork: Value Sets for Digital Covid Certificates. version 1.0, 2021-04-16, section 2.7",
"type": "string",
"valueset-uri": "valuesets/test-results.json"
"valueset-uri": "valuesets/test-type.json"
}
}
}
}
9 changes: 4 additions & 5 deletions src/components/modules/form-group.component.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,14 +215,14 @@ export const PersonInputs = (props: any) => {
<FormGroupInput controlId='formGivenNameInput' title={t('translation:first-name')}
value={givenName}
onChange={(evt: any) => setGivenName(evt.target.value)}
maxLength={50}
maxLength={80}
/>

{/* name input */}
<FormGroupInput controlId='formNameInput' title={t('translation:name')}
value={familyName}
onChange={(evt: any) => setFamilyName(evt.target.value)}
maxLength={50}
maxLength={80}
/>

<hr />
Expand All @@ -232,7 +232,7 @@ export const PersonInputs = (props: any) => {
value={standardisedGivenName}
onChange={(evt: any) => handleStandardisedNameChanged(evt.target.value, setStandardisedGivenName)}
pattern={utils.pattern.standardisedName}
maxLength={50}
maxLength={80}
/>

{/*standardised name input */}
Expand All @@ -241,7 +241,7 @@ export const PersonInputs = (props: any) => {
onChange={(evt: any) => handleStandardisedNameChanged(evt.target.value, setStandardisedFamilyName)}
required
pattern={utils.pattern.standardisedName}
maxLength={50}
maxLength={80}
/>

<hr />
Expand Down Expand Up @@ -274,7 +274,6 @@ export const PersonInputs = (props: any) => {
maxDate={new Date()}
minDate={new Date(1900, 0, 1, 12)}
openToDate={new Date(1990, 0, 1)}
required
/>
</Col>
</Form.Group>
Expand Down
Loading

0 comments on commit fe8bffa

Please sign in to comment.