Merge pull request #181 from onc-healthit/develop

SITE-4040
onc-healthit · May 6, 2024 · accc81c · accc81c
2 parents 61d2967 + 2dd5363
commit accc81c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/gui/src/app/direct/message-validator/ccda-r2/ccda-r2.tpl.html b/gui/src/app/direct/message-validator/ccda-r2/ccda-r2.tpl.html
@@ -176,7 +176,7 @@ <h2><i class="fa fa-pie-chart"></i> C-CDA R2.1 Validator for 2015 Edition</h2>
 					</ui-select>
 			</div>
 			<div>
-					<a ng-href="{{ccdaDocument.link}}" target="_self" class="btn btn-primary" download="{{ccdaDocument.name}}" ng-disabled="!ccdaDocument.path">
+					<a ng-href="{{ccdaDocument.download_url}}" target="_blank" class="btn btn-primary" download="{{ccdaDocument.name}}" ng-disabled="!ccdaDocument.path">
 						<span>Download</span>
 					</a>
 					<a ng-href="{{properties.githubZip}}" target="_blank" class="btn btn-primary">

diff --git a/gui/src/app/direct/message-validator/ccda-r3/ccda-r3.tpl.html b/gui/src/app/direct/message-validator/ccda-r3/ccda-r3.tpl.html
@@ -174,7 +174,7 @@ <h2><i class="fa fa-pie-chart"></i> C-CDA R2.1 Validator for USCDI v1</h2>
 					</ui-select>
 			</div>
 			<div>
-					<a ng-href="{{ccdaDocument.link}}" target="_self" class="btn btn-primary" download="{{ccdaDocument.name}}" ng-disabled="!ccdaDocument.path">
+					<a ng-href="{{ccdaDocument.download_url}}" target="_blank" class="btn btn-primary" download="{{ccdaDocument.name}}" ng-disabled="!ccdaDocument.path">
 						<span>Download</span>
 					</a>
 					<a ng-href="{{properties.githubCuresZip}}" target="_blank" class="btn btn-primary">

diff --git a/gui/src/app/direct/message-validator/svap/svap.tpl.html b/gui/src/app/direct/message-validator/svap/svap.tpl.html
@@ -173,7 +173,7 @@ <h2><i class="fa fa-pie-chart"></i> C-CDA R2.1 Validator for 2015 Edition Cures
 					</ui-select>
 			</div>
 			<div>
-					<a ng-href="{{ccdaDocument.link}}" target="_self" class="btn btn-primary" download="{{ccdaDocument.name}}" ng-disabled="!ccdaDocument.path">
+					<a ng-href="{{ccdaDocument.download_url}}" target="_blank" class="btn btn-primary" download="{{ccdaDocument.name}}" ng-disabled="!ccdaDocument.path">
 						<span>Download</span>
 					</a>
 					<a ng-href="{{properties.githubSvapZip}}" target="_blank" class="btn btn-primary">

diff --git a/gui/src/app/direct/message-validator/uscdiv3/uscdiv3.tpl.html b/gui/src/app/direct/message-validator/uscdiv3/uscdiv3.tpl.html
@@ -173,7 +173,7 @@ <h2><i class="fa fa-pie-chart"></i> C-CDA R2.1 Validator for USCDI v3</h2>
 					</ui-select>
 			</div>
 			<div>
-					<a ng-href="{{ccdaDocument.link}}" target="_self" class="btn btn-primary" download="{{ccdaDocument.name}}" ng-disabled="!ccdaDocument.path">
+					<a ng-href="{{ccdaDocument.download_url}}" target="_blank" class="btn btn-primary" download="{{ccdaDocument.name}}" ng-disabled="!ccdaDocument.path">
 						<span>Download</span>
 					</a>
 					<a ng-href="{{properties.githubUscdiv3Zip}}" target="_blank" class="btn btn-primary">

diff --git a/...src/main/java/gov/nist/healthcare/ttt/webapp/common/controller/CCDAServiceController.java b/...src/main/java/gov/nist/healthcare/ttt/webapp/common/controller/CCDAServiceController.java
@@ -36,8 +36,8 @@ public class CCDAServiceController {
 	public @ResponseBody HashMap<String, Object> getCcdaDocument(@RequestParam(value = "ccdatype") String ccdatype, 
 		@RequestParam(value = "sutrole")  String sutrole,
 		@RequestParam(value = "filename")  String filename) throws Exception {
-		  String v1SenderGitHubUrl = "https://api.github.com/repos/onc-healthit/2015-certification-ccda-testdata/contents/Sender SUT Test Data";
-		  String v1ReceiverGitHubUrl = "https://api.github.com/repos/onc-healthit/2015-certification-ccda-testdata/contents/Receiver SUT Test Data";
+		  String v1SenderGitHubUrl = "https://api.github.com/repos/onc-healthit/2015-edition-cures-update-data/contents/Cures Update Sender SUT Test Data";
+		  String v1ReceiverGitHubUrl = "https://api.github.com/repos/onc-healthit/2015-edition-cures-update-data/contents/Cures Update Receiver SUT Test Data";
 		  String v2SenderGitHubUrl = "https://api.github.com/repos/onc-healthit/2015-edition-cures-update-uscdi-v2-testdata/contents/Cures Update Svap Uscdiv2 Sender SUT Test Data";
 		  String v2ReceiverGitHubUrl = "https://api.github.com/repos/onc-healthit/2015-edition-cures-update-uscdi-v2-testdata/contents/Cures Update Svap Uscdiv2 Receiver SUT Test Data";
 		  String v3SenderGitHubUrl = "https://api.github.com/repos/onc-healthit/2015-edition-cures-update-uscdi-v3-testdata/contents/Cures Update Svap Uscdiv3 Sender SUT Test Data";