Revert "Merge branch '1.1.3' into 1.1.2"

This reverts commit 5cdbe60, reversing changes made to 876e085.
WorldHealthOrganization · Apr 25, 2024 · 52d85e0 · 52d85e0
1 parent 5cdbe60
commit 52d85e0
Show file tree

Hide file tree

Showing 53 changed files with 77 additions and 27,725 deletions.
diff --git a/README.md b/README.md
@@ -13,11 +13,13 @@ This is the WHO SMART Trust Implementation Guide
 ###
 ### Publication
 This ImplementationGuide is published in the following locations:
- 
- 
+
+
 Continuous Build:  __https://worldhealthorganization.github.io/smart-trust__  
 Canonical / permanent URL: __https://smart.who.int/trust__  
-<br/>
+
+<br> </br>
+
 ### Issues
 Issues and change requests are managed here:  
 

diff --git a/input/fsh/actors/Credential.Holder.fsh b/input/fsh/actors/Credential.Holder.fsh
diff --git a/input/fsh/actors/Credential.Issuer.fsh b/input/fsh/actors/Credential.Issuer.fsh
diff --git a/input/fsh/actors/GDHCN.fsh b/input/fsh/actors/GDHCN.fsh
diff --git a/input/fsh/actors/TNG.fsh b/input/fsh/actors/TNG.fsh
diff --git a/input/fsh/actors/TNP.fsh b/input/fsh/actors/TNP.fsh
diff --git a/input/fsh/codesystems/WHO.TRUST.DOMAIN.fsh b/input/fsh/codesystems/WHO.TRUST.DOMAIN.fsh
diff --git a/input/fsh/codesystems/WHO.TRUST.KEYUSAGE.fsh b/input/fsh/codesystems/WHO.TRUST.KEYUSAGE.fsh
diff --git a/input/fsh/models/cose_header.fsh → input/fsh/cose_header.fsh b/input/fsh/models/cose_header.fsh → input/fsh/cose_header.fsh
diff --git a/input/fsh/models/cwt.fsh → input/fsh/cwt.fsh b/input/fsh/models/cwt.fsh → input/fsh/cwt.fsh
diff --git a/input/fsh/models/cwt_payload.fsh → input/fsh/cwt_payload.fsh b/input/fsh/models/cwt_payload.fsh → input/fsh/cwt_payload.fsh
diff --git a/input/fsh/hcert.fsh b/input/fsh/hcert.fsh
@@ -0,0 +1,30 @@
+Alias: $IPS = http://hl7.org/fhir/uv/ips/StructureDefinition/Bundle-uv-ips
+Alias: $HCertDCC = http://smart.who.int/ddcc/StructureDefinition/HCertDCC
+Alias: $DDCCVS = http://smart.who.int/ddcc/StructureDefinition/DDCCCoreDataSet.VS
+Alias: $DDCCTR = http://smart.who.int/ddcc/StructureDefinition/DDCCCoreDataSet.TR
+Alias: $SmartHealthLink = http://smart.who.int/ips-pilgrimage/StructureDefinition/SmartHealthLink
+
+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](/smart-trust/hcert_spec.html)
+
+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 sub claim 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
+- While this logical model mentions assigned subclaims (below), the ones listed in the Electronic Health Certificate Specification are considered authoritative
+"
+
+
+* ^url = "http://smart.who.int/trust/StructureDefinition/HCert"
+* ^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)" 
+* 3 0..* $DDCCVS "Vaccination Core Data Set claim" "DDCC Vaccination claim (PROPOSED)"
+* 4 0..* $DDCCTR "Test Result Core Data Set claim" "DDCC Test Result claim (PROPOSED)"
+* 5 0..* $SmartHealthLink "SMART Health Link claim" "SMART Health Link (PROPOSED)"
+//* 6 0..* $IPS "IPS" "IPS Bundle (EXAMPLE)"
+
diff --git a/input/fsh/models/SmartHealthLink.fsh b/input/fsh/models/SmartHealthLink.fsh
diff --git a/input/fsh/models/SmartHealthLinkPayload.fsh b/input/fsh/models/SmartHealthLinkPayload.fsh
diff --git a/input/fsh/models/hcert.fsh b/input/fsh/models/hcert.fsh
diff --git a/input/fsh/models/scheme_information.fsh b/input/fsh/models/scheme_information.fsh
diff --git a/input/fsh/valuesets/WHO.TRUST.DOMAIN.fsh b/input/fsh/valuesets/WHO.TRUST.DOMAIN.fsh
diff --git a/input/fsh/valuesets/WHO.TRUST.KEYUSAGE.fsh b/input/fsh/valuesets/WHO.TRUST.KEYUSAGE.fsh
diff --git a/input/images/Letter_of_Application_DDCC-Arabic.docx b/input/images/Letter_of_Application_DDCC-Arabic.docx
diff --git a/input/images/Letter_of_Application_DDCC-Spanish.docx b/input/images/Letter_of_Application_DDCC-Spanish.docx
diff --git a/input/images/Letter_of_Application_DDCC_Chinese.docx b/input/images/Letter_of_Application_DDCC_Chinese.docx
diff --git a/input/images/Letter_of_Application_DDCC_French.docx b/input/images/Letter_of_Application_DDCC_French.docx
diff --git a/input/images/Letter_of_Application_DDCC_Russian.docx b/input/images/Letter_of_Application_DDCC_Russian.docx
diff --git a/input/images/openapi/.gitignore b/input/images/openapi/.gitignore
diff --git a/input/images/openapi/favicon-16x16.png b/input/images/openapi/favicon-16x16.png
diff --git a/input/images/openapi/favicon-32x32.png b/input/images/openapi/favicon-32x32.png
diff --git a/input/images/openapi/index.html b/input/images/openapi/index.html