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 problems with languages in value sets

This commit is contained in:
Grahame Grieve 2020-09-25 14:59:12 +10:00
parent cce35705a6
commit 4979a03140
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/CanonicalResourceManager.java
View File

@ -220,6 +220,7 @@ public class CanonicalResourceManager<T extends CanonicalResource> {
if (enforceUniqueId && map.containsKey(cr.getId())) {
drop(cr.getId());
}
// special case logic for UTG support prior to version 5
if (cr.getPackageInfo() != null && cr.getPackageInfo().getId().startsWith("hl7.terminology")) {
List<CachedCanonicalResource<T>> toDrop = new ArrayList<>();

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

@ -234,6 +234,7 @@ public class ValueSetRenderer extends TerminologyRenderer {
}
if (doDefinition) {
tr.td().b().tx("Definition");
doLangs = false;
} else {
// if we're not doing definitions and we don't have too many languages, we'll do them in line
if (langs.size() < MAX_LANGS_IN_LINE) {
@ -260,9 +261,9 @@ public class ValueSetRenderer extends TerminologyRenderer {
x.para().b().tx("Additional Language Displays");
t = x.table( "codes");
tr = t.tr();
tdDisp.b().tx("Code");
tr.td().b().tx("Code");
for (String lang : langs) {
tdDisp.b().addText(describeLang(lang));
tr.td().b().addText(describeLang(lang));
}
for (ValueSetExpansionContainsComponent c : vs.getExpansion().getContains()) {
addLanguageRow(c, t, langs);
@ -482,7 +483,6 @@ public class ValueSetRenderer extends TerminologyRenderer {
if ("1.0m".equals(v)) return "Jul 1999";
if ("1.0l".equals(v)) return "Jan 1998";
if ("1.0ja".equals(v)) return "Oct 1997";
return null;
}
@ -662,7 +662,9 @@ public class ValueSetRenderer extends TerminologyRenderer {
td.i().tx("("+mapping.comp.getComment()+")");
}
}
addLangaugesToRow(c, langs, tr);
if (doLangs) {
addLangaugesToRow(c, langs, tr);
}
for (ValueSetExpansionContainsComponent cc : c.getContains()) {
addExpansionRowToTable(t, cc, i+1, doLevel, doSystem, doDefinition, maps, allCS, langs, doLangs);
}