Merge pull request #183 from onc-healthit/develop

SITE-4043
onc-healthit · Jun 4, 2024 · e4b0f9f · e4b0f9f
2 parents accc81c + 36b94d2
commit e4b0f9f
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/gui/src/app/direct/message-validator/ccda-r3/ccda-r3.js b/gui/src/app/direct/message-validator/ccda-r3/ccda-r3.js
@@ -182,7 +182,9 @@ $scope.gotodiv = function(anchor) {
 				$scope.validator.messageFilePath = $scope.validator.messageFile;
 				if ($scope.ccdaDocument) {
 					if ($scope.ccdaDocument.name && $scope.ccdaDocument.path) {
-						$scope.validator.validationObjective = $scope.ccdaDocument.path[$scope.ccdaDocument.path.length - 1];
+                        console.log("before switch $scope.ccdaParams.filename :::::"+$scope.ccdaParams.filename);             
+                        $scope.validator.validationObjective = $scope.ccdaParams.filename;
+                        console.log("before switch validationObjective :::::"+$scope.validator.validationObjective );
 						$scope.validator.referenceFileName = $scope.ccdaDocument.name;
 						CCDAR3ValidatorFactory.save($scope.validator, function(data) {
 							$scope.laddaLoading = false;

diff --git a/gui/src/app/direct/message-validator/uscdiv3/uscdiv3.js b/gui/src/app/direct/message-validator/uscdiv3/uscdiv3.js
@@ -152,7 +152,9 @@ $scope.gotodiv = function(anchor) {
                 $scope.validator.messageFilePath = $scope.validator.messageFile;
                 if ($scope.ccdaDocument) {
                     if ($scope.ccdaDocument.name && $scope.ccdaDocument.path) {
-                        $scope.validator.validationObjective = $scope.ccdaDocument.path[$scope.ccdaDocument.path.length - 1];
+                        console.log("before switch $scope.ccdaParams.filename :::::"+$scope.ccdaParams.filename);             
+                        $scope.validator.validationObjective = $scope.ccdaParams.filename;
+                        console.log("before switch validationObjective :::::"+$scope.validator.validationObjective );
                         $scope.validator.referenceFileName = $scope.ccdaDocument.name;
                         USCDIV3ValidatorFactory.save($scope.validator, function(data) {
                             $scope.laddaLoading = false;

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
@@ -20,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.beans.factory.annotation.Value;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -32,17 +33,24 @@
 public class CCDAServiceController {
 	private static Logger logger = LogManager.getLogger(CCDAServiceController.class.getName());
 
+	@Value("${ett.v1sender.github.url}")
+	String v1SenderGitHubUrl;
+	@Value("${ett.v1receiver.github.url}")
+	String v1ReceiverGitHubUrl;
+	@Value("${ett.v2sender.github.url}")
+	String v2SenderGitHubUrl;
+	@Value("${ett.v2receiver.github.url}")
+	String v2ReceiverGitHubUrl;
+	@Value("${ett.v3sender.github.url}")
+	String v3SenderGitHubUrl;
+	@Value("${ett.v3receiver.github.url}")
+	String v3ReceiverGitHubUrl;	
+
 	@RequestMapping(method = RequestMethod.GET, produces = "application/json")
 	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-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";
-		  String v3ReceiverGitHubUrl = "https://api.github.com/repos/onc-healthit/2015-edition-cures-update-uscdi-v3-testdata/contents/Cures Update Svap Uscdiv3 Receiver SUT Test Data";
-		  String gtHubUrl = v3ReceiverGitHubUrl;
+		String gtHubUrl = v3ReceiverGitHubUrl;
 
 		String returnVal ="";
 		if (ccdatype.equalsIgnoreCase("Uscdiv3")){
@@ -74,7 +82,7 @@ public class CCDAServiceController {
 
 	public static String getHtmlContent(String urlToRead, String filename) throws Exception {
 		if (StringUtils.isNotBlank(filename) && filename.length() > 1){
-		 	urlToRead = urlToRead+"/"+filename+"?ref=master";
+		 	urlToRead = urlToRead+"/"+filename+"?ref=main";
 		 }
 		 logger.info("CCDAServiceController urlToRead:::::"+urlToRead);
 		return getHtmlContent(urlToRead);