honeymoose/org.hl7.fhir.core
1
0
Fork 0
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git synced 2025-03-06 11:29:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

rendering fixes for implementers

Browse Source
This commit is contained in:
Grahame Grieve 2024-08-09 07:52:15 +08:00
parent 255a225e51
commit dc6d4fc912
3 changed files with 61 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/BundleRenderer.java
View File

@ -2,6 +2,7 @@ package org.hl7.fhir.r5.renderers;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.List;
import org.hl7.fhir.exceptions.DefinitionException;
@ -154,13 +155,14 @@ public class BundleRenderer extends ResourceRenderer {
ResourceWrapper comp = (ResourceWrapper) entries.get(0).child("resource");
XhtmlNode sum = renderResourceTechDetails(b, docSection(x, "Document Details"), comp.primitiveValueMN("title", "name"));
List<ResourceWrapper> subjectList = comp.children("subject");
if (sum != null) {
XhtmlNode p = sum.para();
p.startScript("doc");
renderDataType(status, p.param("status"), comp.child("status"));
renderDataType(status, p.param("date"), comp.child("date"));
renderDataType(status, p.param("author"), comp.child("author"));
renderDataType(status, p.param("subject"), comp.child("subject"));
renderDataTypes(status, p.param("author"), comp.children("author"));
renderDataTypes(status, p.param("subject"), subjectList);
if (comp.has("encounter")) {
renderDataType(status, p.param("encounter"), comp.child("encounter"));
p.paramValue("has-encounter", "true");
@ -174,19 +176,23 @@ public class BundleRenderer extends ResourceRenderer {
x.hr();
}
ResourceWrapper subject = resolveReference(entries, comp.child("subject"));
XhtmlNode sec = docSection(x, "Document Subject");
if (subject != null) {
if (subject.hasNarrative()) {
sec.addChildren(subject.getNarrative());
List<ResourceWrapper> subjects = resolveReferences(entries, subjectList);
int i = 0;
for (ResourceWrapper subject : subjects) {
XhtmlNode sec = docSection(x, "Document Subject");
if (subject != null) {
if (subject.hasNarrative()) {
sec.addChildren(subject.getNarrative());
} else {
RendererFactory.factory(subject, context).buildNarrative(status, sec, subject);
}
} else {
RendererFactory.factory(subject, context).buildNarrative(status, sec, subject);
sec.para().b().tx("Unable to resolve subject '"+displayReference(subjects.get(i))+"'");
}
} else {
sec.para().b().tx("Unable to resolve subject '"+displayReference(comp.child("subject"))+"'");
i++;
}
x.hr();
sec = docSection(x, "Document Content");
XhtmlNode sec = docSection(x, "Document Content");
if (comp.hasNarrative()) {
sec.addChildren(comp.getNarrative());
sec.hr();
@ -197,6 +203,16 @@ public class BundleRenderer extends ResourceRenderer {
}
}
private void renderDataTypes(RenderingStatus status, XhtmlNode param, List<ResourceWrapper> children) throws FHIRFormatError, DefinitionException, IOException {
if (children != null && !children.isEmpty()) {
boolean first = true;
for (ResourceWrapper child : children) {
if (first) {first = false; } else {param.tx(", "); }
renderDataType(status, param, child);
}
}
}
private XhtmlNode docSection(XhtmlNode x, String name) {
XhtmlNode div = x.div();
div.style("border: 1px solid maroon; padding: 10px; background-color: #f2faf9; min-height: 160px;");
@ -231,6 +247,28 @@ public class BundleRenderer extends ResourceRenderer {
// children
}
private List<ResourceWrapper> resolveReferences(List<ResourceWrapper> entries, List<ResourceWrapper> baselist) throws UnsupportedEncodingException, FHIRException, IOException {
List<ResourceWrapper> list = new ArrayList<>();
if (baselist != null) {
for (ResourceWrapper base : baselist) {
ResourceWrapper res = null;
ResourceWrapper prop = base.child("reference");
if (prop != null && prop.hasPrimitiveValue()) {
for (ResourceWrapper entry : entries) {
if (entry.has("fullUrl")) {
String fu = entry.primitiveValue("fullUrl");
if (prop.primitiveValue().equals(fu)) {
res = entry.child("resource");
}
}
}
list.add(res);
}
}
}
return list;
}
private ResourceWrapper resolveReference(List<ResourceWrapper> entries, ResourceWrapper base) throws UnsupportedEncodingException, FHIRException, IOException {
if (base == null) {
return null;

3
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java
View File

@ -749,6 +749,9 @@ public class DataRenderer extends Renderer implements CodeResolver {
return renderDataType(status, null, x, type);
}
public boolean renderDataType(RenderingStatus status, XhtmlNode parent, XhtmlNode x, ResourceWrapper type) throws FHIRFormatError, DefinitionException, IOException {
if (type == null) {
return false;
}
switch (type.fhirType()) {
case "dateTime":
case "date" :

12
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ValueSetRenderer.java
View File

@ -743,12 +743,18 @@ public class ValueSetRenderer extends TerminologyRenderer {
return "?cs-n?";
}
String ref = (String) cs.getUserData("filename");
if (ref == null)
if (ref == null) {
ref = (String) cs.getWebPath();
if (ref == null)
}
if (ref == null && cs.hasUserData("webroot")) {
ref = (String) cs.getUserData("webroot");
}
if (ref == null) {
return "?ngen-14?.html";
if (!ref.contains(".html"))
}
if (!ref.contains(".html")) {
ref = ref + ".html";
}
return ref.replace("\\", "/");
}