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

Obligation rendering improvements

This commit is contained in:
Grahame Grieve 2024-06-27 07:03:54 +10:00
parent d441fa58aa
commit 749b073de1
4 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
RELEASE_NOTES.md
View File

@ -15,6 +15,7 @@
* don't raise needless and wrong exceptions about extension definitions when rendering
* fix duplicate link creation
* Stop recursive rendering crash
* Obligation rendering improvements
* Handle extra profiles on resources in an IG when converting between versions
* Fixed issue with actor title not rendering in obligations
* Test and adaption for dateOp #1655

12
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CanonicalType.java
View File

@ -33,6 +33,8 @@ package org.hl7.fhir.r5.model;
import java.net.URI;
import org.hl7.fhir.r5.utils.ToolingExtensions;
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
/**
@ -87,6 +89,16 @@ public class CanonicalType extends UriType {
var s = primitiveValue();
return s == null || !s.contains("|") ? null : s.substring(s.indexOf("|")+1);
}
public String getCanonical() {
if (hasPrimitiveValue()) {
return primitiveValue();
}
if (hasExtension(ToolingExtensions.EXT_ALTERNATE_CANONICAL)) {
return getExtensionString(ToolingExtensions.EXT_ALTERNATE_CANONICAL);
}
return null;
}
}

29
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ObligationsRenderer.java
View File

@ -19,6 +19,7 @@ import org.hl7.fhir.r5.model.ValueSet;
import org.hl7.fhir.r5.renderers.CodeResolver.CodeResolution;
import org.hl7.fhir.r5.renderers.utils.RenderingContext;
import org.hl7.fhir.r5.renderers.utils.ResourceWrapper;
import org.hl7.fhir.utilities.DebugUtilities;
import org.hl7.fhir.utilities.xhtml.HierarchicalTableGenerator;
import org.hl7.fhir.utilities.xhtml.HierarchicalTableGenerator.Cell;
import org.hl7.fhir.utilities.xhtml.HierarchicalTableGenerator.Piece;
@ -406,7 +407,7 @@ public class ObligationsRenderer extends Renderer {
if (!ob.actors.isEmpty() || ob.compare.actors.isEmpty()) {
boolean firstActor = true;
for (CanonicalType anActor : ob.actors) {
ActorDefinition ad = context.getContext().fetchResource(ActorDefinition.class, anActor.getValue());
ActorDefinition ad = context.getContext().fetchResource(ActorDefinition.class, anActor.getCanonical());
boolean existingActor = ob.compare != null && ob.compare.actors.contains(anActor);
if (!firstActor) {
@ -416,7 +417,11 @@ public class ObligationsRenderer extends Renderer {
if (!existingActor)
actorId.style(STYLE_UNCHANGED);
actorId.addText(ad.getTitle());
if (ad == null) {
actorId.addText(anActor.getCanonical());
} else {
actorId.ah(ad.getWebPath()).tx(ad.getTitle());
}
}
if (ob.compare != null) {
@ -428,7 +433,9 @@ public class ObligationsRenderer extends Renderer {
firstActor = true;
}
actorId = actorId.span(STYLE_REMOVED, null);
if (compAd.hasWebPath()) {
if (compAd == null) {
actorId.ah(context.prefixLocalHref(compActor.toString()), compActor.toString()).tx(compActor.toString());
} else if (compAd.hasWebPath()) {
actorId.ah(context.prefixLocalHref(compAd.getWebPath()), compActor.toString()).tx(compAd.present());
} else {
actorId.span(null, compActor.toString()).tx(compAd.present());
@ -446,13 +453,15 @@ public class ObligationsRenderer extends Renderer {
for (String eid : ob.elementIds) {
elementIds.sep(", ");
ElementDefinition ed = profile.getSnapshot().getElementById(eid);
boolean inScope = inScopePaths.contains(ed.getPath());
String name = eid.substring(eid.indexOf(".") + 1);
if (ed != null && inScope) {
String link = defPath + "#" + anchorPrefix + eid;
elementIds.ah(context.prefixLocalHref(link)).tx(name);
} else {
elementIds.code().tx(name);
if (ed != null) {
boolean inScope = inScopePaths.contains(ed.getPath());
String name = eid.substring(eid.indexOf(".") + 1);
if (ed != null && inScope) {
String link = defPath + "#" + anchorPrefix + eid;
elementIds.ah(context.prefixLocalHref(link)).tx(name);
} else {
elementIds.code().tx(name);
}
}
}

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

@ -274,6 +274,7 @@ public class ToolingExtensions {
public static final String EXT_IG_URL = "http://hl7.org/fhir/tools/StructureDefinition/implementationguide-resource-uri";
public static final String EXT_VS_CS_SUPPL_NEEDED = "http://hl7.org/fhir/StructureDefinition/valueset-supplement";
public static final String EXT_TYPE_PARAMETER = "http://hl7.org/fhir/tools/StructureDefinition/type-parameter";
public static final String EXT_ALTERNATE_CANONICAL = "http://hl7.org/fhir/StructureDefinition/alternate-canonical";
// specific extension helpers