Merge branch 'master' into SITE-3838

onc-healthit · Jan 29, 2024 · e3fbc10 · e3fbc10
2 parents 8f6de00 + cc0c2e7
commit e3fbc10
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 4 deletions.
diff --git a/gui/src/app/direct/directHeader.tpl.html b/gui/src/app/direct/directHeader.tpl.html
@@ -51,7 +51,7 @@
                     </li>
                     <li><a ui-sref=".svap">USCDI v2 R2.1</a>
                     </li>
-                    <li><a ui-sref=".uscdiv3">USCDI v3</a></li>
+                    <li><a ui-sref=".uscdiv3">USCDI v3 R2.1</a></li>
                 </ul>
             </li>
             <li uib-dropdown ng-class="{active: $state.includes('direct.dcdt2')}">

diff --git a/gui/src/app/direct/send/V13/senddirect13.js b/gui/src/app/direct/send/V13/senddirect13.js
@@ -39,6 +39,7 @@ directSendV13.controller('DirectSendV13Ctrl', ['$scope', 'SettingsFactory', 'Sen
 
 		$scope.signingCertificate = [
     		{ name: 'GOOD_CERT', val: 'GOOD' },
+            { name: 'GOOD_ECDSA_CERT', val: 'GOOD_ECDSA_CERT' },
     		{ name: 'INVALID_CERT', val: 'INVALID' },
     		{ name: 'EXPIRED_CERT', val: 'EXPIRED' },
     		{ name: 'DIFFERENT_TRUST_ANCHOR', val: 'DIFF'  },
@@ -53,7 +54,7 @@ directSendV13.controller('DirectSendV13Ctrl', ['$scope', 'SettingsFactory', 'Sen
     		{ name: 'CERT_WITH_4096_BITS', val: 'CERT_4096' },
   		];
 
-		$scope.signingAlgorithm = [
+		$scope.signingAlgorithmNonEcdsa = [
     		{ name: 'SHA-256', val: 'sha256' },
     		{ name: 'SHA-384', val: 'sha384' },
     		{ name: 'SHA-512', val: 'sha512' },
@@ -64,7 +65,16 @@ directSendV13.controller('DirectSendV13Ctrl', ['$scope', 'SettingsFactory', 'Sen
     		{ name: 'ECDSA with SHA-384', val: 'edsasha384' },
     		{ name: 'AES with CBC', val: 'aescbc' },
     		{ name: 'AES with GCM', val: 'aesgcm' },
-  		];  		
+  		];  
+
+        $scope.signingAlgorithmEcdsa = [
+            { name: 'ECDSA with P-256', val: 'edsap256'  },
+            { name: 'ECDSA with SHA-256', val: 'edsasha256' },
+            { name: 'ECDSA with P-384', val: 'edsap384' },
+            { name: 'ECDSA with SHA-384', val: 'edsasha384' }
+        ];  
+
+        $scope.signingAlgorithm = $scope.signingAlgorithmNonEcdsa;
 
         $scope.success = function(message) {
             $scope.fileInfo = angular.fromJson(message);
@@ -101,6 +111,11 @@ directSendV13.controller('DirectSendV13Ctrl', ['$scope', 'SettingsFactory', 'Sen
                 $scope.invalidDigest = true;
             }else{
 	 			$scope.invalidDigest = false;
+                if (type.val === 'GOOD_ECDSA_CERT') {
+                    $scope.signingAlgorithm = $scope.signingAlgorithmEcdsa;
+                }else{
+                    $scope.signingAlgorithm = $scope.signingAlgorithmNonEcdsa;
+                }
 			}
         };
 

diff --git a/gui/src/app/message-validators/validator-home/validator-home.tpl.html b/gui/src/app/message-validators/validator-home/validator-home.tpl.html
@@ -20,7 +20,21 @@ <h2><i class="fa fa-paper-plane-o"></i> Validator Home</h2>
                         <a href="https://www.hl7.org/documentcenter/public/standards/dstu/CDAR2_IG_CCDA2.1_COMPANION_R2_STU1_2019OCT_2021OCTwithErrata.zip"> HL7® CDA R2 Implementation Guide: C-CDA Templates for Clinical Notes R2.1 Companion Guide, Release 2-US Realm, Oct 2021 (with errata) </a></td>
                     <td>USCDI v1</td>
                     <td>December 31, 2025</td>
-                </tr>                                                           
+                </tr> 
+				<tr>
+                        <td>USCDI v3</td>
+                        <td><a href="https://www.hl7.org/documentcenter/public/standards/dstu/CDAR2_IG_CCDA_COMPANION_R4.1_STU_2023JUN.zip">
+                        HL7 CDA® R2 Implementation Guide: C-CDA Templates for Clinical Notes R2.1 Companion Guide, Release 4.1-US Realm, June 2023
+                        </a></br>
+                        </br>
+                        Visit the  
+                        <a href="https://www.healthit.gov/topic/standards-version-advancement-process-svap">
+                        Standards Version Advancement Process (SVAP) ONC webpage
+                        </a>for more details on current approved SVAP standards versions.
+                        </td>
+                        <td>USCDI v3</td>
+                        <td>Required by December 31, 2025</td>
+                    </tr>  				
             </tbody>
         </table>