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

Improvements to ValueSet definition rendering

This commit is contained in:
Grahame Grieve 2020-03-06 12:30:13 +11:00
parent 2050052c95
commit 9bbdb8d9b1
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/NarrativeGenerator.java
View File

@ -3476,10 +3476,10 @@ public class NarrativeGenerator implements INarrativeGenerator {
return false; return false;
} }
private void generateCopyright(XhtmlNode x, ValueSet vs) { private void generateCopyright(XhtmlNode x, ValueSet vs) throws FHIRFormatError, DefinitionException, IOException {
XhtmlNode p = x.para(); XhtmlNode p = x.para();
p.b().tx("Copyright Statement:"); p.b().tx("Copyright Statement:");
smartAddText(p, " " + vs.getCopyright()); addMarkdown(x, vs.getCopyright());
} }
private XhtmlNode addTableHeaderRowStandard(XhtmlNode t, boolean hasHierarchy, boolean hasDisplay, boolean definitions, boolean comments, boolean version, boolean deprecated, String lang, List<PropertyComponent> properties) { private XhtmlNode addTableHeaderRowStandard(XhtmlNode t, boolean hasHierarchy, boolean hasDisplay, boolean definitions, boolean comments, boolean version, boolean deprecated, String lang, List<PropertyComponent> properties) {
@ -3887,18 +3887,22 @@ public class NarrativeGenerator implements INarrativeGenerator {
if (vs.hasCopyrightElement()) if (vs.hasCopyrightElement())
generateCopyright(x, vs); generateCopyright(x, vs);
} }
XhtmlNode p = x.para();
p.tx("This value set includes codes from the following code systems:");
XhtmlNode ul = x.ul(); XhtmlNode ul = x.ul();
XhtmlNode li; if (vs.getCompose().getInclude().size() == 1 && vs.getCompose().getExclude().size() == 0) {
for (ConceptSetComponent inc : vs.getCompose().getInclude()) { hasExtensions = genInclude(rcontext, ul, vs.getCompose().getInclude().get(0), "Include", langs, maps) || hasExtensions;
hasExtensions = genInclude(rcontext, ul, inc, "Include", langs, maps) || hasExtensions; } else {
} XhtmlNode p = x.para();
for (ConceptSetComponent exc : vs.getCompose().getExclude()) { p.tx("This value set includes codes based on the following rules:");
hasExtensions = genInclude(rcontext, ul, exc, "Exclude", langs, maps) || hasExtensions;
}
XhtmlNode li;
for (ConceptSetComponent inc : vs.getCompose().getInclude()) {
hasExtensions = genInclude(rcontext, ul, inc, "Include", langs, maps) || hasExtensions;
}
for (ConceptSetComponent exc : vs.getCompose().getExclude()) {
hasExtensions = genInclude(rcontext, ul, exc, "Exclude", langs, maps) || hasExtensions;
}
}
// now, build observed languages // now, build observed languages
if (langs.size() > 0) { if (langs.size() > 0) {
@ -4000,6 +4004,10 @@ public class NarrativeGenerator implements INarrativeGenerator {
if (inc.getConcept().size() > 0) { if (inc.getConcept().size() > 0) {
li.addText(type+" these codes as defined in "); li.addText(type+" these codes as defined in ");
addCsRef(inc, li, e); addCsRef(inc, li, e);
if (inc.hasVersion()) {
li.addText(" version ");
li.code(inc.getVersion());
}
XhtmlNode t = li.table("none"); XhtmlNode t = li.table("none");
boolean hasComments = false; boolean hasComments = false;