BB 2.0 enhancements

hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/hapi-fhir-tester-config.xml

@@ -12,7 +12,8 @@
 	<bean class="ca.uhn.fhir.to.TesterConfig">
 		<property name="servers">
 			<list>
-				<value>local     , DSTU1 , Local Gaj's Server (DSTU1 FHIR)             , http://localhost:8080/hapi-fhir-jpaserver/baseDstu1</value>
+				<value>local     , DSTU1 , Local Gaj's Server (DSTU1 FHIR)             , http://localhost:8080/fhir/baseDstu1</value>
+				<value>local     , DSTU2 , Local Gaj's Server (DSTU2 FHIR)             , http://localhost:8080/fhir/baseDstu2</value>
 				<value>home     , DSTU1 , UHN/HAPI Server (DSTU1 FHIR)                 , http://fhirtest.uhn.ca/baseDstu1</value>
 				<value>home_dev , DSTU2 , UHN/HAPI Server (DSTU2 FHIR)                 , http://fhirtest.uhn.ca/baseDstu2</value>
 				<value>home     , DSTU1 , UHN/HAPI Server (DSTU1 FHIR)                 , http://fhirtest.uhn.ca/baseDstu1</value>

hapi-fhir-testpage-overlay/src/main/webapp/WEB-INF/templates/result.html

@@ -44,6 +44,19 @@
 									<li><a href="#" th:name="${requestUrl} + '/$everything?_format=xml'" id="getXml">FHIR XML</a></li>
 								</ul>
 							</div>
+
+							<div class="well" id="resultWell">
+								FHIR API - Patient Consent/Proxy Access to 3rd Parties
+								<a href="https://healthauth.org/login" target="_blank">UMA Profile Using OIDC/OAuth 2.0</a>
+							</div>
+
+							<div class="well" id="resultWell">
+								JSON:<br />
+								<a th:href="${requestUrl} + '/$everything?_format=json'" th:utext="${requestUrlText} + '/$everything?_format=json'"/>
+								<br /><br />
+								XML:<br />
+								<a th:href="${requestUrl} + '/$everything?_format=xml'" th:utext="${requestUrlText} + '/$everything?_format=xml'"/>
+							</div>
 						</div>
 
 						<p>&nbsp;</p>

hapi-fhir-testpage-overlay/src/main/webapp/js/bluebutton2.js

@@ -1,8 +1,10 @@
 // Download the JSON
 $("#getJson").bind("click",function(){
-    var url = $(this).attr('name').replace("baseDstu1", "baseDstu2");
     console.info("Downloading Data from FHIR API as JSON: " + url);
 
+    // If baseDstu1 then replace it otherwise regular pass through
+    var url = $(this).attr('name').replace("baseDstu1", "baseDstu2");
+
     d3.json(url,function(data){
         console.log(data);
         var href = "data:application/octet-stream," + encodeURIComponent(JSON.stringify(data));
@@ -14,9 +16,11 @@ $("#getJson").bind("click",function(){
 
 // Download the XML
 $("#getXml").bind("click",function(){
-    var url = $(this).attr('name').replace("baseDstu1", "baseDstu2");
     console.info("Downloading Data from FHIR API as XML: " + url);
 
+    // If baseDstu1 then replace it otherwise regular pass through
+    var url = $(this).attr('name').replace("baseDstu1", "baseDstu2");
+
     d3.xml(url, function(data){
         // Need to serialize it before encode it
         var xml = new XMLSerializer().serializeToString(data);