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

last qa fixes for R5 preview

This commit is contained in:
Grahame Grieve 2023-03-01 23:46:32 +11:00
parent 7cf15f248d
commit 042c1dd29e
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1286,6 +1286,9 @@ public class DataRenderer extends Renderer implements CodeResolver {
} }
protected void renderMoney(XhtmlNode x, Money money) { protected void renderMoney(XhtmlNode x, Money money) {
if (x.getName().equals("blockquote")) {
x = x.para();
}
Currency c = Currency.getInstance(money.getCurrency()); Currency c = Currency.getInstance(money.getCurrency());
if (c != null) { if (c != null) {
XhtmlNode s = x.span(null, c.getDisplayName()); XhtmlNode s = x.span(null, c.getDisplayName());
@ -1300,30 +1303,34 @@ public class DataRenderer extends Renderer implements CodeResolver {
protected void renderExpression(XhtmlNode x, Expression expr) { protected void renderExpression(XhtmlNode x, Expression expr) {
// there's two parts: what the expression is, and how it's described. // there's two parts: what the expression is, and how it's described.
// we start with what it is, and then how it's desceibed // we start with what it is, and then how it's described
XhtmlNode p = x;
if (p.getName().equals("blockquote")) {
p = p.para();
}
if (expr.hasExpression()) { if (expr.hasExpression()) {
XhtmlNode c = x;
if (expr.hasReference()) { if (expr.hasReference()) {
c = x.ah(expr.getReference()); p = x.ah(expr.getReference());
} }
XhtmlNode c = p;
if (expr.hasLanguage()) { if (expr.hasLanguage()) {
c = c.span(null, expr.getLanguage()); c = c.span(null, expr.getLanguage());
} }
c.code().tx(expr.getExpression()); c.code().tx(expr.getExpression());
} else if (expr.hasReference()) { } else if (expr.hasReference()) {
x.ah(expr.getReference()).tx("source"); p.ah(expr.getReference()).tx("source");
} }
if (expr.hasName() || expr.hasDescription()) { if (expr.hasName() || expr.hasDescription()) {
x.tx("("); p.tx("(");
if (expr.hasName()) { if (expr.hasName()) {
x.b().tx(expr.getName()); p.b().tx(expr.getName());
} }
if (expr.hasDescription()) { if (expr.hasDescription()) {
x.tx("\""); p.tx("\"");
x.tx(expr.getDescription()); p.tx(expr.getDescription());
x.tx("\""); p.tx("\"");
} }
x.tx(")"); p.tx(")");
} }
} }