commit

WorldHealthOrganization · Feb 26, 2024 · c5f4e1e · c5f4e1e
1 parent ed95931
commit c5f4e1e
Show file tree

Hide file tree

Showing 8 changed files with 88 additions and 60 deletions.
diff --git a/input/fsh/cose_header.fsh b/input/fsh/cose_header.fsh
@@ -5,7 +5,6 @@ Title:          "COSE Headers (DRAFT)"
 Description:    "Data elements for COSE Headers https://www.iana.org/assignments/cose/cose.xhtml#header-parameters"
 
 * ^url = "http://smart.who.int/trust/StructureDefinition/COSEHeader"
-* ^version = "1.1.1"
 * ^status = #active
 
 * 1 0..1 string "Encryption Algorithm" "alg(1)"

diff --git a/input/fsh/cwt.fsh b/input/fsh/cwt.fsh
@@ -5,7 +5,6 @@ Title:          "CBOR Web Token (CWT) Claim"
 Description:    "Logical Model for Data elements in CBOR Web Token (CWT) https://www.iana.org/assignments/cwt/cwt.xhtml"
 
 * ^url = "http://smart.who.int/trust/StructureDefinition/CWT"
-* ^version = "1.1.1"
 * ^abstract = true
 * ^status = #active
 * header 0..1 COSEHeader "COSE Header" "Header"

diff --git a/input/fsh/cwt_payload.fsh b/input/fsh/cwt_payload.fsh
@@ -5,7 +5,6 @@ Description:   "Logical Model for CBOR Web Token (CWT) Payload Logical Modelin C
 
 
 * ^url = "http://smart.who.int/trust/StructureDefinition/CWTPayload"
-* ^version = "1.1.1"
 * ^status = #active
 
 * 1 0..1 Coding "Issuer Code (iss)" "Issuer"

diff --git a/input/fsh/hcert.fsh b/input/fsh/hcert.fsh
@@ -8,18 +8,17 @@ Logical:        HCert
 Title:          "Health Certificate"
 Description:    "Logical Model for the HCERT
 
-The full data structure and encoding mechanisms for HCERT are defined here: [Electronic Health Certificate Specification](http://smart.who.int/trust/hcert_spec.html)
+The full data structure and encoding mechanisms for HCERT are defined here: [Electronic Health Certificate Specification](/hcert_spec.html)
 
-An HCERT is claim -260 [CBOR Web Token (CWT) Claim](https://www.rfc-editor.org/rfc/rfc8392.html).
-
-The general usage of the HCERT Claim is defined [here](https://github.com/ehn-dcc-development/eu-dcc-hcert-spec/blob/main/hcert_spec.md#32-structure-of-the-payload) with
+An HCERT is claim -260 within the [CBOR Web Token (CWT) Claim](https://www.rfc-editor.org/rfc/rfc8392.html).
 
+Note for subclaims:
+- subclaims 0 and above are reserved by WHO to be assigned, a new subclaim can be requested for by requesting to create a new trust domain
+- subclaims for negative integer values are for development purposes and are free to use
 "
 
-
 
 * ^url = "http://smart.who.int/trust/StructureDefinition/HCert"
-* ^version = "1.1.1"
 * ^status = #active
 * 1 0..1 $HCertDCC "HCERT EU DCC"  "HCERT EU DCC"
 //* 2 0..* $RACSEL_DDVC "RACSEL Vaccination Certficate Data Set claim" "RACSEL Vaccination Certificate (PROPOSED)" 

diff --git a/input/includes/menu.xml b/input/includes/menu.xml
diff --git a/input/pagecontent/indices.md b/input/pagecontent/indices.md
diff --git a/input/pagecontent/intro.xml b/input/pagecontent/intro.xml
@@ -9,7 +9,7 @@
     </p>
 
     <p>
-      The GDHCN is a digital reflection of the trust WHO already has with Member States. The GDHCN is a digital trust network is based on proven <a href="concepts.html"> concepts</a> which are used to describe the specifications and mechanisms for establishing trust.  Eligible participants of the trust network may apply to join by following an <a href="concepts_onboarding.html">on-boarding process</a>.   The GDHCN is operated under the <a href="GDHCN_Administrative_and_Operational_Framework.pdf">GDHCN Administrative and Operational Framework</a>.
+      The GDHCN is a digital reflection of the trust WHO already has with Member States. The GDHCN is a digital trust network is based on proven <a href="concepts.html"> concepts</a> which are used to describe the specifications and mechanisms for establishing trust, which allow eligible participants to establish new <a>trust domains</a> for exchange of verifiable digital health records. Eligible participants of the trust network may apply to join by following an <a href="concepts_onboarding.html">on-boarding process</a>.   The GDHCN is operated under the <a href="GDHCN_Administrative_and_Operational_Framework.pdf">GDHCN Administrative and Operational Framework</a>.
     </p>
 
 {% include img.html img="trust_network.png" caption="Trust Network" width="70%" %}    

diff --git a/sushi-config.yaml b/sushi-config.yaml
@@ -29,3 +29,85 @@ dependencies:
 #    who.ips-pilgrimage: current
     who.ddcc: dev
     who.ips-pilgrimage: dev
+
+pages:
+  index.xml:
+    title: Home
+    changes.xml:
+      title: Changes
+    dependencies.xml:
+      title: Dependencies
+    references.xml:
+      title: References
+    adapting_guidelines.xml:
+      title: Adapting Guidelines for Country use
+    faq.md:
+      title: Frequently Asked Questions
+    requirements.xml:
+      title: Business Requirements
+    concepts.md:
+      title: Concepts
+    use_cases.md:
+      title: Use Cases
+    decision_support.md:
+      title: Decision Support Logic
+    functional.md:
+      title: Functional Requirements
+  data_exchange.xml:
+    title: Data Models and Exchange
+    actors.md:
+      title: System Actors
+    transactions.md:
+      title: Transactions
+    workflows.md:
+      title: Workflows
+    content_profiles.md:                                                                                                                                                        
+      title: Content profiles 
+  deployment.xml:
+    title: Deployment
+    video_tutorial.md:
+      title: Video Tutorials
+    security_privacy.xml:
+      title: Security and Privacy Considerations
+    testing.xml: 
+      title: Testing
+    reference_implementation.md: 
+      title: Reference Implementations
+    downloads.xml: 
+      title: Downloads
+  indices.md:
+    title: Indices
+    artifacts.html: 
+      title: Artifact Index
+    maps.xml: 
+      title: Mappings
+
+
+menu:
+  Home: 
+    Summary: index.html
+    Changes: changes.html
+    Dependencies: dependencies.html
+    References: references.html
+    Adapting Guidelines for Country use: adapting_guidelines.html
+    Frequently Asked Questions: faq.html
+  Business Requirements: 
+    Concepts: concepts.html
+    Use Cases: use_cases.html
+    Decision Support Logic: decision_support.html
+    Functional Requirements: functional.html
+  Data Models and Exchange:
+    System Actors: actors.html
+    Transactions: transactions.html
+    Workflows: workflows.html
+    Content Profiles: content_profiles.html
+  Deployment:
+    Video Tutorials: video_tutorial.html
+    Security and Privacy Considerations: security_privacy.html
+    Testing: testing.html
+    Reference Implementations: reference_implementation.html
+    Downloads: downloads.html
+  Indices:
+    Artifact Index: artifacts.html
+    Mappings: maps.html
+