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

more rendering work

This commit is contained in:
Grahame Grieve 2024-03-25 16:57:37 +11:00
parent 459f04a490
commit 9c74556770
7 changed files with 53 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/CapabilityStatementRenderer.java
View File

@ -289,18 +289,18 @@ public class CapabilityStatementRenderer extends ResourceRenderer {
x.h(2,"title").addText(conf.getTitle());
XhtmlNode uList = x.ul();
uList.li().addText("Implementation Guide Version: " + igVersion);
uList.li().addText("FHIR Version: " + currentVersion.toCode());
uList.li().addText(/*!#*/"Implementation Guide Version: " + igVersion);
uList.li().addText(/*!#*/"FHIR Version: " + currentVersion.toCode());
addSupportedFormats(uList, conf);
uList.li().addText("Published on: " + context.toStr(conf.getDateElement()));
uList.li().addText("Published by: " + conf.getPublisherElement().asStringValue());
uList.li().addText(/*!#*/"Published on: " + context.toStr(conf.getDateElement()));
uList.li().addText(/*!#*/"Published by: " + conf.getPublisherElement().asStringValue());
XhtmlNode block = x.addTag("blockquote").attribute("class","impl-note");
block.addTag("p").addTag("strong").addText("Note to Implementers: FHIR Capabilities");
block.addTag("p").addText("Any FHIR capability may be 'allowed' by the system unless explicitly marked as \"SHALL NOT\". A few items are marked as MAY in the Implementation Guide to highlight their potential relevance to the use case.");
block.addTag("p").addTag("strong").addText(/*!#*/"Note to Implementers: FHIR Capabilities");
block.addTag("p").addText(/*!#*/"Any FHIR capability may be 'allowed' by the system unless explicitly marked as \"SHALL NOT\". A few items are marked as MAY in the Implementation Guide to highlight their potential relevance to the use case.");
addSupportedIGs(x, conf);
@ -308,11 +308,11 @@ public class CapabilityStatementRenderer extends ResourceRenderer {
int restNum = conf.getRest().size();
int nextLevel = 3;
if (restNum > 0) {
x.h(2,"rest").addText("FHIR RESTful Capabilities");
x.h(2,"rest").addText(/*!#*/"FHIR RESTful Capabilities");
int count=1;
for (CapabilityStatementRestComponent rest : conf.getRest()) {
if (restNum > 1) {
x.h(3,"rest"+Integer.toString(count)).addText("REST Configuration " + Integer.toString(count));
x.h(3,"rest"+Integer.toString(count)).addText(/*!#*/"REST Configuration " + Integer.toString(count));
nextLevel = 4;
}
addRestConfigPanel(x, rest, nextLevel, count);
@ -330,8 +330,8 @@ public class CapabilityStatementRenderer extends ResourceRenderer {
hasUpdates = hasUpdates || hasOp(r, TypeRestfulInteraction.HISTORYINSTANCE);
}
if (rest.getResource().size() >0) {
x.h(nextLevel,"resourcesCap" + Integer.toString(count)).addText("Capabilities by Resource/Profile");
x.h(nextLevel+1,"resourcesSummary" + Integer.toString(count)).addText("Summary");
x.h(nextLevel,"resourcesCap" + Integer.toString(count)).addText(/*!#*/"Capabilities by Resource/Profile");
x.h(nextLevel+1,"resourcesSummary" + Integer.toString(count)).addText(/*!#*/"Summary");
addSummaryIntro(x);
addSummaryTable(x, rest, hasVRead, hasPatch, hasDelete, hasHistory, hasUpdates, count);
x.addTag("hr");
@ -442,7 +442,7 @@ public class CapabilityStatementRenderer extends ResourceRenderer {
}
XhtmlNode ul = null;
if (igShalls.size() > 0) {
x.h(3,"shallIGs").addText("SHALL Support the Following Implementation Guides");
x.h(3,"shallIGs").addText(/*!#*/"SHALL Support the Following Implementation Guides");
ul = x.ul();
for (String url : igShalls) {
addResourceLink(ul.li(), url, url);
@ -450,7 +450,7 @@ public class CapabilityStatementRenderer extends ResourceRenderer {
}
}
if (igShoulds.size() > 0) {
x.h(3,"shouldIGs").addText("SHOULD Support the Following Implementation Guides");
x.h(3,"shouldIGs").addText(/*!#*/"SHOULD Support the Following Implementation Guides");
ul = x.ul();
for (String url : igShoulds) {
addResourceLink(ul.li(), url, url);
@ -458,7 +458,7 @@ public class CapabilityStatementRenderer extends ResourceRenderer {
}
}
if (igMays.size() > 0) {
x.h(3,"shouldIGs").addText("SHOULD Support the Following Implementation Guides");
x.h(3,"shouldIGs").addText(/*!#*/"SHOULD Support the Following Implementation Guides");
ul = x.ul();
for (String url : igMays) {
addResourceLink(ul.li(), url, url);
@ -471,7 +471,7 @@ public class CapabilityStatementRenderer extends ResourceRenderer {
private void addSupportedFormats(XhtmlNode uList, CapabilityStatement conf) {
XhtmlNode lItem = uList.li();
lItem.addText("Supported Formats: ");
lItem.addText(/*!#*/"Supported Formats: ");
Boolean first = true;
String capExpectation = null;
for (CodeType c : conf.getFormat()) {
@ -481,13 +481,13 @@ public class CapabilityStatementRenderer extends ResourceRenderer {
capExpectation = getExtValueCode(c.getExtensionByUrl(EXPECTATION));
if (!Utilities.noString(capExpectation)) {
lItem.addTag("strong").addText(capExpectation);
lItem.addText(" support ");
lItem.addText(" "+/*!#*/"support ");
}
lItem.code().addText(c.getCode());
first = false;
}
lItem = uList.li();
lItem.addText("Supported Patch Formats: ");
lItem.addText(/*!#*/"Supported Patch Formats: ");
first=true;
for (CodeType c : conf.getPatchFormat()) {
if (!first) {
@ -496,7 +496,7 @@ public class CapabilityStatementRenderer extends ResourceRenderer {
capExpectation = getExtValueCode(c.getExtensionByUrl(EXPECTATION));
if (!Utilities.noString(capExpectation)) {
lItem.addTag("strong").addText(capExpectation);
lItem.addText(" support ");
lItem.addText(/*!#*/" support ");
}
lItem.code().addText(c.getCode());
first = false;
@ -533,16 +533,16 @@ public class CapabilityStatementRenderer extends ResourceRenderer {
addMarkdown(body.blockquote(),mdText);
}
}
body.div().attribute("class","lead").addTag("em").addText("Summary of System-wide Interactions");
body.div().attribute("class","lead").addTag("em").addText(/*!#*/"Summary of System-wide Interactions");
addSystemInteractions(body, rest.getInteraction());
}
private String getCorsText(boolean on) {
if (on) {
return "Enable CORS: yes";
return /*!#*/"Enable CORS: yes";
}
return "Enable CORS: no";
return /*!#*/"Enable CORS: no";
}
private List<String> getSecServices(List<CodeableConcept> services)
@ -613,20 +613,20 @@ public class CapabilityStatementRenderer extends ResourceRenderer {
for (Map<String,String> interactionMap : interactions) {
item = uList.li();
if (Utilities.noString(verb)) {
item.addText("Supports the ");
item.addText(/*!#*/"Supports the ");
}
else {
item.addTag("strong").addText(verb);
item.addText(" support the ");
item.addText(/*!#*/" support the ");
}
interaction = interactionMap.keySet().toArray()[0].toString();
item.code(interaction);
documentation = interactionMap.get(interaction);
if (Utilities.noString(documentation)) {
item.addText(" interaction.");
item.addText(/*!#*/" interaction.");
}
else {
item.addText(" interaction described as follows:");
item.addText(/*!#*/" interaction described as follows:");
try {
addMarkdown(item, documentation);
} catch (FHIRFormatError e) {
@ -647,11 +647,11 @@ public class CapabilityStatementRenderer extends ResourceRenderer {
if (interactions.size() == 0) return;
XhtmlNode item = uList.li();
if (Utilities.noString(verb)) {
item.addText("Supports ");
item.addText(/*!#*/"Supports ");
}
else {
item.addTag("strong").addText(verb);
item.addText(" support ");
item.addText(/*!#*/" support ");
}
addSeparatedListOfCodes(item, interactions, ",");
item.addText(".");
@ -660,11 +660,11 @@ public class CapabilityStatementRenderer extends ResourceRenderer {
private void addSummaryIntro(XhtmlNode x) {
XhtmlNode uList = null;
XhtmlNode lItem = null;
x.para().addText("The summary table lists the resources that are part of this configuration, and for each resource it lists:");
x.para().addText(/*!#*/"The summary table lists the resources that are part of this configuration, and for each resource it lists:");
uList=x.ul();
uList.li().addText("The relevant profiles (if any)");
uList.li().addText(/*!#*/"The relevant profiles (if any)");
lItem = uList.li();
lItem.addText("The interactions supported by each resource (");
lItem.addText(/*!#*/"The interactions supported by each resource (");
lItem.b().addTag("span").attribute("class","bg-info").addText("R");
lItem.addText("ead, ");
lItem.b().addTag("span").attribute("class","bg-info").addText("S");
@ -686,15 +686,15 @@ public class CapabilityStatementRenderer extends ResourceRenderer {
lItem.b().addTag("span").attribute("class","bg-info").addText("H");
lItem.addText("istory on ");
lItem.b().addTag("span").attribute("class","bg-info").addText("T");
lItem.addText("ype are only present if at least one of the resources has support for them.");
uList.li().addTag("span").addText("The required, recommended, and some optional search parameters (if any). ");
lItem.addText(/*!#*/"ype are only present if at least one of the resources has support for them.");
uList.li().addTag("span").addText(/*!#*/"The required, recommended, and some optional search parameters (if any). ");
lItem = uList.li();
lItem.addText("The linked resources enabled for ");
lItem.addText(/*!#*/"The linked resources enabled for ");
lItem.code().addText("_include");
lItem = uList.li();
lItem.addText("The other resources enabled for ");
lItem.addText(/*!#*/"The other resources enabled for ");
lItem.code().addText("_revinclude");
uList.li().addText("The operations on the resource (if any)");
uList.li().addText(/*!#*/"The operations on the resource (if any)");
}
private void addSummaryTable(XhtmlNode x, CapabilityStatement.CapabilityStatementRestComponent rest, boolean hasVRead, boolean hasPatch, boolean hasDelete, boolean hasHistory, boolean hasUpdates, int count) throws IOException {

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

@ -330,7 +330,7 @@ public class DataRenderer extends Renderer implements CodeResolver {
if (JurisdictionUtilities.isJurisdiction(system)) {
return JurisdictionUtilities.displayJurisdiction(system+"#"+code);
}
ValidationResult t = getContext().getWorker().validateCode(getContext().getTerminologyServiceOptions().withVersionFlexible(true), system, version, code, null);
ValidationResult t = getContext().getWorker().validateCode(getContext().getTerminologyServiceOptions().withLanguage(context.getLang()).withVersionFlexible(true), system, version, code, null);
if (t != null && t.getDisplay() != null)
return t.getDisplay();
@ -1130,11 +1130,11 @@ public class DataRenderer extends Renderer implements CodeResolver {
return;
}
String s = cc.getText();
String s = context.getTranslated(cc.getTextElement());
if (Utilities.noString(s)) {
for (Coding c : cc.getCoding()) {
if (c.hasDisplayElement()) {
s = c.getDisplay();
s = context.getTranslated(c.getDisplayElement());
break;
}
}

2
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/PatientRenderer.java
View File

@ -185,7 +185,7 @@ public class PatientRenderer extends ResourceRenderer {
String gender = null;
pw = getProperty(pat, "gender");
if (valued(pw)) {
pw.value().getBase().primitiveValue();
gender = pw.value().getBase().primitiveValue();
}
DateType dt = null;
pw = getProperty(pat, "birthDate");

11
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ResourceRenderer.java
View File

@ -195,8 +195,7 @@ public abstract class ResourceRenderer extends DataRenderer {
} else {
r.getText().getDiv().getChildNodes().removeIf(c -> !"div".equals(c.getName()) || !c.hasAttribute("xml:lang"));
}
x.setAttribute("lang", context.getLang());
x.setAttribute("xml:lang", context.getLang());
markLanguage(x);
r.getText().getDiv().getChildNodes().add(x);
} else {
if (!x.hasAttribute("xmlns"))
@ -829,4 +828,12 @@ public abstract class ResourceRenderer extends DataRenderer {
}
}
}
public void markLanguage(XhtmlNode x) {
x.setAttribute("lang", context.getLang());
x.setAttribute("xml:lang", context.getLang());
x.addTag(0, "hr");
x.addTag(0, "p").b().tx(context.getLocale().getDisplayName());
x.addTag(0, "hr");
}
}

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

@ -248,8 +248,7 @@ public class ElementWrappers {
} else {
xd.getChildNodes().removeIf(c -> !"div".equals(c.getName()) || !c.hasAttribute("xml:lang"));
}
x.setAttribute("lang", context.getLang());
x.setAttribute("xml:lang", context.getLang());
renderer.markLanguage(x);
xd.getChildNodes().add(x);
} else {
if (!x.hasAttribute("xmlns")) {

5
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/RenderingContext.java
View File

@ -23,6 +23,7 @@ import org.hl7.fhir.r5.model.DateTimeType;
import org.hl7.fhir.r5.model.DomainResource;
import org.hl7.fhir.r5.model.Extension;
import org.hl7.fhir.r5.model.PrimitiveType;
import org.hl7.fhir.r5.model.StringType;
import org.hl7.fhir.r5.renderers.utils.Resolver.IReferenceResolver;
import org.hl7.fhir.r5.utils.ToolingExtensions;
import org.hl7.fhir.utilities.FhirPublication;
@ -501,7 +502,9 @@ public class RenderingContext extends RenderingI18nContext {
public RenderingContext setLang(String lang) {
this.lang = lang;
setLocale(new Locale(lang));
if (lang != null) {
setLocale(new Locale(lang));
}
return this;
}

2
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/ToolingExtensions.java
View File

@ -795,7 +795,7 @@ public class ToolingExtensions {
if (e1 != null && e1.getValue() != null && e1.getValue() instanceof CodeType && ((CodeType) e1.getValue()).getValue().equals(lang)) {
e1 = ExtensionHelper.getExtension(e, "content");
return ((StringType) e.getValue()).getValue();
return ((StringType) e1.getValue()).getValue();
}
}
}