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 concept link rendering problem

This commit is contained in:
Grahame Grieve 2022-09-10 15:02:48 +10:00
parent 0148208a14
commit 3fbb505722
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,7 +115,11 @@ public abstract class TerminologyRenderer extends ResourceRenderer {
for (UsedConceptMap m : maps) { for (UsedConceptMap m : maps) {
XhtmlNode td = tr.td(); XhtmlNode td = tr.td();
XhtmlNode b = td.b(); XhtmlNode b = td.b();
XhtmlNode a = b.ah(getContext().getSpecificationLink()+m.getLink()); String link = m.getLink();
if (!Utilities.isAbsoluteUrl(link)) {
link = getContext().getSpecificationLink()+link;
}
XhtmlNode a = b.ah(link);
a.addText(m.getDetails().getName()); a.addText(m.getDetails().getName());
if (m.getDetails().isDoDescription() && m.getMap().hasDescription()) if (m.getDetails().isDoDescription() && m.getMap().hasDescription())
addMarkdown(td, m.getMap().getDescription()); addMarkdown(td, m.getMap().getDescription());

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

@ -844,14 +844,15 @@ public class ValueSetRenderer extends TerminologyRenderer {
} }
private void addRefToCode(XhtmlNode td, String target, String vslink, String code) { private void addRefToCode(XhtmlNode td, String target, String vslink, String code) {
CodeSystem cs = getContext().getWorker().fetchCodeSystem(target); addCodeToTable(false, target, code, null, td);
String cslink = getCsRef(cs); // CodeSystem cs = getContext().getWorker().fetchCodeSystem(target);
XhtmlNode a = null; // String cslink = getCsRef(cs);
if (cslink != null) // String link = cslink != null ? cslink+"#"+cs.getId()+"-"+code : vslink+"#"+code;
a = td.ah(getContext().getSpecificationLink()+cslink+"#"+cs.getId()+"-"+code); // if (!Utilities.isAbsoluteUrl(link)) {
else // link = getContext().getSpecificationLink()+link;
a = td.ah(getContext().getSpecificationLink()+vslink+"#"+code); // }
a.addText(code); // XhtmlNode a = td.ah(link);
// a.addText(code);
} }
private boolean generateComposition(XhtmlNode x, ValueSet vs, boolean header, List<UsedConceptMap> maps) throws FHIRException, IOException { private boolean generateComposition(XhtmlNode x, ValueSet vs, boolean header, List<UsedConceptMap> maps) throws FHIRException, IOException {