Skip to content

Commit

Permalink
Merge pull request #174 from onc-healthit/develop
Browse files Browse the repository at this point in the history
Merge develop into master for 3.1.45/R2.6 Release
  • Loading branch information
drbgfc authored Apr 6, 2021
2 parents be38b2f + d03c58e commit 0c6995a
Show file tree
Hide file tree
Showing 9 changed files with 509 additions and 36 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public Void ccdascorecardservice(MultipartFile ccdaFile)
formConverter.setCharset(Charset.forName("UTF8"));
restTemplate.getMessageConverters().add(formConverter);
restTemplate.getMessageConverters().add(new MappingJackson2HttpMessageConverter());
response = restTemplate.postForObject("https://site.healthit.gov/scorecard/ccdascorecardservice2",
response = restTemplate.postForObject("https://ccda.healthit.gov/scorecard/ccdascorecardservice2",
requestEntity, String.class);
tempFile.delete();
}catch(Exception exc)
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
<artifactId>scorecard</artifactId>
<packaging>war</packaging>
<!-- Update version for each new release and apply the old version to previousProjectVersion -->
<version>2.5</version>
<version>2.6</version>
<name>ccda-smart-scorecard Maven Webapp </name>
<url>http://maven.apache.org</url>

<properties>
<!-- Update previousProjectVersion to what the version tag was previously
for each new release. Then run a mvn clean, commit/merge the updated files,
then run a build of the war and deploy -->
<previousProjectVersion>2.4</previousProjectVersion>
<previousProjectVersion>2.5</previousProjectVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<org.springframework.version>4.1.0.RELEASE</org.springframework.version>
</properties>
Expand Down
9 changes: 7 additions & 2 deletions src/main/webapp/detailedResults.html
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ <h3>Description</h3>
<div ng-show="detailsToShow === 'XML'">
<ol>
<li ng-repeat="occurrence in rubric.issuesList">
<table class="table table-striped table-condensed">
<table class="table table-condensed"
style="table-layout: fixed">
<thead>
<tr>
<th>
Expand All @@ -103,7 +104,11 @@ <h3>Description</h3>
</thead>
<tbody ng-show="showSnippet">
<tr>
<td>{{occurrence.xmlString}}</td>
<td>
<div style="width: 100%; overflow: auto;">
<pre class="prettyprint lang-xml"></pre>
</div>
</td>
</tr>
</tbody>
</table>
Expand Down
23 changes: 14 additions & 9 deletions src/main/webapp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
<title>SITE - C-CDA Scorecard</title>
<!-- favicon -->
<link href="images/site-favicon.ico" rel="Shortcut Icon" />
<!-- local 3rd party stylesheets -->
<!-- 3rd party stylesheets -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
<!-- local custom stylesheets -->
<!-- Note: Applied version query parameter after css (here), js (here), and html files (scApp.js)
This helps enforces cache refresh and is controlled by the maven build version and previousProjectVersion
Note: For Eclipse IDE to remove the invalid error 'Undefined <X> file':
In project preferences: Web -> HTML FIles -> Web Resources -> Unknown - change from error to warning or ignore -->
<link rel="stylesheet" href="css/custom/custom.css?version=R2.4">
<link rel="stylesheet" href="css/custom/site-ui-mock-2017.css?version=R2.4">
<link rel="stylesheet" href="css/custom/scorecardStyle.css?version=R2.4">
<link rel="stylesheet" href="css/custom/custom.css?version=R2.6">
<link rel="stylesheet" href="css/custom/site-ui-mock-2017.css?version=R2.6">
<link rel="stylesheet" href="css/custom/scorecardStyle.css?version=R2.6">
<!-- Google Analytics -->
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
Expand Down Expand Up @@ -70,15 +70,20 @@
<script src="lib/d3/3.5.6/d3.min.js" charset="utf-8"></script>
<script src="lib/nvd3/1.8.1/nv.d3.min.js"></script>
<script src="lib/angular-nvd3/1.0.5/angular-nvd3.min.js"></script>
<!-- code-prettify_and_vkbeautify (for XML (or any language) formatting) -->
<!-- Docs: https://github.com/googlearchive/code-prettify/blob/master/docs/getting_started.md -->
<script src="lib/code-prettify_and_vkbeautify/run_prettify.js"></script>
<script src="lib/code-prettify_and_vkbeautify/prettify.js"></script>
<script src="lib/code-prettify_and_vkbeautify/vkbeautify.js"></script>
<!-- Environment Variables -->
<script src="env.js"></script>
<!-- Module, Routes, and Directives -->
<script src="scApp.js?version=R2.4"></script>
<script src="scApp.js?version=R2.6"></script>
<!-- Controllers -->
<script src="MainController.js?version=R2.4"></script>
<script src="SiteNavbarController.js?version=R2.4"></script>
<script src="SiteUploadController.js?version=R2.4"></script>
<script src="ScorecardController.js?version=R2.4"></script>
<script src="MainController.js?version=R2.6"></script>
<script src="SiteNavbarController.js?version=R2.6"></script>
<script src="SiteUploadController.js?version=R2.6"></script>
<script src="ScorecardController.js?version=R2.6"></script>

</body>

Expand Down
30 changes: 30 additions & 0 deletions src/main/webapp/lib/code-prettify_and_vkbeautify/prettify.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 0c6995a

Please sign in to comment.