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 npe + render OperationDefinition parameter standards status

This commit is contained in:
Grahame Grieve 2023-02-14 12:34:19 +11:00
parent d9f98902b9
commit de3ec0d27b
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/AdditionalBindingsRenderer.java
View File

@ -320,7 +320,7 @@ public class AdditionalBindingsRenderer {
} }
private void renderPurpose(XhtmlNode td, String purpose) { private void renderPurpose(XhtmlNode td, String purpose) {
boolean r5 = context.getWorker() == null ? false : VersionUtilities.isR5Plus(context.getWorker().getVersion()); boolean r5 = context == null || context.getWorker() == null ? false : VersionUtilities.isR5Plus(context.getWorker().getVersion());
switch (purpose) { switch (purpose) {
case "maximum": case "maximum":
td.ah(r5 ? "valueset-additional-binding-purpose.html#additional-binding-purpose-maximum" : corePath+"extension-elementdefinition-maxvalueset.html", "A required binding, for use when the binding strength is 'extensible' or 'preferred'").tx("Max Binding"); td.ah(r5 ? "valueset-additional-binding-purpose.html#additional-binding-purpose-maximum" : corePath+"extension-elementdefinition-maxvalueset.html", "A required binding, for use when the binding strength is 'extensible' or 'preferred'").tx("Max Binding");

13
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/OperationDefinitionRenderer.java
View File

@ -15,6 +15,7 @@ import org.hl7.fhir.r5.renderers.utils.RenderingContext.KnownLinkType;
import org.hl7.fhir.r5.renderers.utils.Resolver.ResourceContext; import org.hl7.fhir.r5.renderers.utils.Resolver.ResourceContext;
import org.hl7.fhir.r5.utils.EOperationOutcome; import org.hl7.fhir.r5.utils.EOperationOutcome;
import org.hl7.fhir.r5.utils.ToolingExtensions; import org.hl7.fhir.r5.utils.ToolingExtensions;
import org.hl7.fhir.utilities.StandardsStatus;
import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.utilities.Utilities;
import org.hl7.fhir.utilities.xhtml.XhtmlNode; import org.hl7.fhir.utilities.xhtml.XhtmlNode;
@ -102,9 +103,17 @@ public class OperationDefinitionRenderer extends TerminologyRenderer {
XhtmlNode tr; XhtmlNode tr;
tr = tbl.tr(); tr = tbl.tr();
tr.td().addText(p.getUse().toString()); tr.td().addText(p.getUse().toString());
tr.td().addText(path+p.getName());
tr.td().addText(Integer.toString(p.getMin())+".."+p.getMax());
XhtmlNode td = tr.td(); XhtmlNode td = tr.td();
td.addText(path+p.getName());
StandardsStatus ss = ToolingExtensions.getStandardsStatus(p);
if (ss != null) {
td.tx(" ");
XhtmlNode a = td.ah("versions.html#std-process", "Standards Status = "+ss.toDisplay());
a.style("padding-left: 3px; padding-right: 3px; border: 1px grey solid; font-weight: bold; color: black; background-color: "+ss.getColor());
a.tx(ss.getAbbrev());
}
tr.td().addText(Integer.toString(p.getMin())+".."+p.getMax());
td = tr.td();
StructureDefinition sd = p.getType() != null ? context.getWorker().fetchTypeDefinition(p.getType().toCode()) : null; StructureDefinition sd = p.getType() != null ? context.getWorker().fetchTypeDefinition(p.getType().toCode()) : null;
if (sd == null) if (sd == null)
td.tx(p.hasType() ? p.getType().toCode() : ""); td.tx(p.hasType() ? p.getType().toCode() : "");

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

@ -293,7 +293,7 @@ public abstract class TerminologyRenderer extends ResourceRenderer {
ref = context.fixReference(ref); ref = context.fixReference(ref);
XhtmlNode a = li.ah(ref == null ? "?ngen-11?" : ref.replace("\\", "/")); XhtmlNode a = li.ah(ref == null ? "?ngen-11?" : ref.replace("\\", "/"));
a.addText(value); a.addText(vs.present());
} else { } else {
CodeSystem cs = getContext().getWorker().fetchCodeSystem(value); CodeSystem cs = getContext().getWorker().fetchCodeSystem(value);
if (cs != null) { if (cs != null) {