honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix rendering for most resources - remove empty tables (e.g. text element, that shouldn't render)

This commit is contained in:
Grahame Grieve 2021-06-16 07:20:37 +10:00
parent 8088cedb66
commit a777ab53a8
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ProfileDrivenRenderer.java
View File

@ -701,18 +701,24 @@ public class ProfileDrivenRenderer extends ResourceRenderer {
} }
} }
} else if (canDoTable(path, p, grandChildren, x)) { } else if (canDoTable(path, p, grandChildren, x)) {
x.addTag(getHeader()).addText(Utilities.capitalize(Utilities.camelCase(Utilities.pluralizeMe(p.getName())))); XhtmlNode xn = new XhtmlNode(NodeType.Element, getHeader());
XhtmlNode tbl = x.table("grid"); xn.addText(Utilities.capitalize(Utilities.camelCase(Utilities.pluralizeMe(p.getName()))));
XhtmlNode tbl = new XhtmlNode(NodeType.Element, "table");
tbl.setAttribute("class", "grid");
XhtmlNode tr = tbl.tr(); XhtmlNode tr = tbl.tr();
tr.td().tx("-"); // work around problem with empty table rows tr.td().tx("-"); // work around problem with empty table rows
addColumnHeadings(tr, grandChildren); boolean add = addColumnHeadings(tr, grandChildren);
for (BaseWrapper v : p.getValues()) { for (BaseWrapper v : p.getValues()) {
if (v != null) { if (v != null) {
tr = tbl.tr(); tr = tbl.tr();
tr.td().tx("*"); // work around problem with empty table rows tr.td().tx("*"); // work around problem with empty table rows
addColumnValues(res, tr, grandChildren, v, showCodeDetails, displayHints, path, indent); add = addColumnValues(res, tr, grandChildren, v, showCodeDetails, displayHints, path, indent) || add;
} }
} }
if (add) {
x.add(xn);
x.add(tbl);
}
} else if (isExtension(p)) { } else if (isExtension(p)) {
for (BaseWrapper v : p.getValues()) { for (BaseWrapper v : p.getValues()) {
if (v != null) { if (v != null) {
@ -776,6 +782,7 @@ public class ProfileDrivenRenderer extends ResourceRenderer {
if (x.getName().equals("p")) { if (x.getName().equals("p")) {
return false; return false;
} }
for (ElementDefinition e : grandChildren) { for (ElementDefinition e : grandChildren) {
List<PropertyWrapper> values = getValues(path, p, e); List<PropertyWrapper> values = getValues(path, p, e);
if (values.size() > 1 || !isPrimitive(e) || !canCollapse(e)) if (values.size() > 1 || !isPrimitive(e) || !canCollapse(e))
@ -812,24 +819,32 @@ public class ProfileDrivenRenderer extends ResourceRenderer {
return false; return false;
} }
private void addColumnHeadings(XhtmlNode tr, List<ElementDefinition> grandChildren) { private boolean addColumnHeadings(XhtmlNode tr, List<ElementDefinition> grandChildren) {
for (ElementDefinition e : grandChildren) boolean b = false;
for (ElementDefinition e : grandChildren) {
b = true;
tr.td().b().addText(Utilities.capitalize(tail(e.getPath()))); tr.td().b().addText(Utilities.capitalize(tail(e.getPath())));
}
return b;
} }
private void addColumnValues(ResourceWrapper res, XhtmlNode tr, List<ElementDefinition> grandChildren, BaseWrapper v, boolean showCodeDetails, Map<String, String> displayHints, String path, int indent) throws FHIRException, UnsupportedEncodingException, IOException, EOperationOutcome { private boolean addColumnValues(ResourceWrapper res, XhtmlNode tr, List<ElementDefinition> grandChildren, BaseWrapper v, boolean showCodeDetails, Map<String, String> displayHints, String path, int indent) throws FHIRException, UnsupportedEncodingException, IOException, EOperationOutcome {
boolean b = false;
for (ElementDefinition e : grandChildren) { for (ElementDefinition e : grandChildren) {
PropertyWrapper p = v.getChildByName(e.getPath().substring(e.getPath().lastIndexOf(".")+1)); PropertyWrapper p = v.getChildByName(e.getPath().substring(e.getPath().lastIndexOf(".")+1));
XhtmlNode td = tr.td(); XhtmlNode td = tr.td();
if (p == null || p.getValues().size() == 0 || p.getValues().get(0) == null) if (p == null || p.getValues().size() == 0 || p.getValues().get(0) == null) {
b = true;
td.tx(" "); td.tx(" ");
else { } else {
for (BaseWrapper vv : p.getValues()) { for (BaseWrapper vv : p.getValues()) {
b = true;
td.sep(", "); td.sep(", ");
renderLeaf(res, vv, e, td, td, false, showCodeDetails, displayHints, path, indent); renderLeaf(res, vv, e, td, td, false, showCodeDetails, displayHints, path, indent);
} }
} }
} }
return b;
} }
private void filterGrandChildren(List<ElementDefinition> grandChildren, String string, PropertyWrapper prop) { private void filterGrandChildren(List<ElementDefinition> grandChildren, String string, PropertyWrapper prop) {