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 bug where slicing and grouping gets mixed up rendering profile tree

This commit is contained in:
Grahame Grieve 2024-04-27 21:46:03 +10:00
parent 2833d1da62
commit d8741f72e6
1 changed files with 51 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/StructureDefinitionRenderer.java
View File

@ -725,6 +725,7 @@ public class StructureDefinitionRenderer extends ResourceRenderer {
if (!onlyInformationIsMapping(all, element)) { if (!onlyInformationIsMapping(all, element)) {
Row row = gen.new Row(); Row row = gen.new Row();
row.setId(element.getPath());
row.setAnchor(element.getPath()); row.setAnchor(element.getPath());
row.setColor(context.getProfileUtilities().getRowColor(element, isConstraintMode)); row.setColor(context.getProfileUtilities().getRowColor(element, isConstraintMode));
if (element.hasSlicing()) if (element.hasSlicing())
@ -820,6 +821,7 @@ public class StructureDefinitionRenderer extends ResourceRenderer {
if (standardExtensionSlicing(element)) { if (standardExtensionSlicing(element)) {
used.used = true; // doesn't matter whether we have a type, we're used if we're setting up slicing ... element.hasType() && element.getType().get(0).hasProfile(); used.used = true; // doesn't matter whether we have a type, we're used if we're setting up slicing ... element.hasType() && element.getType().get(0).hasProfile();
showMissing = false; //? showMissing = false; //?
slicingRow = row;
} else { } else {
row.setIcon("icon_slice.png", HierarchicalTableGenerator.TEXT_ICON_SLICE); row.setIcon("icon_slice.png", HierarchicalTableGenerator.TEXT_ICON_SLICE);
slicingRow = row; slicingRow = row;
@ -843,6 +845,7 @@ public class StructureDefinitionRenderer extends ResourceRenderer {
if (slicingRow != originalRow && !children.isEmpty()) { if (slicingRow != originalRow && !children.isEmpty()) {
// we've entered a slice; we're going to create a holder row for the slice children // we've entered a slice; we're going to create a holder row for the slice children
Row hrow = gen.new Row(); Row hrow = gen.new Row();
hrow.setId(element.getPath());
hrow.setAnchor(element.getPath()); hrow.setAnchor(element.getPath());
hrow.setColor(context.getProfileUtilities().getRowColor(element, isConstraintMode)); hrow.setColor(context.getProfileUtilities().getRowColor(element, isConstraintMode));
hrow.setLineColor(1); hrow.setLineColor(1);
@ -868,6 +871,7 @@ public class StructureDefinitionRenderer extends ResourceRenderer {
if (typesRow != null && !children.isEmpty()) { if (typesRow != null && !children.isEmpty()) {
// we've entered a typing slice; we're going to create a holder row for the all types children // we've entered a typing slice; we're going to create a holder row for the all types children
Row hrow = gen.new Row(); Row hrow = gen.new Row();
hrow.setId(element.getPath());
hrow.setAnchor(element.getPath()); hrow.setAnchor(element.getPath());
hrow.setColor(context.getProfileUtilities().getRowColor(element, isConstraintMode)); hrow.setColor(context.getProfileUtilities().getRowColor(element, isConstraintMode));
hrow.setLineColor(1); hrow.setLineColor(1);
@ -890,18 +894,47 @@ public class StructureDefinitionRenderer extends ResourceRenderer {
row = hrow; row = hrow;
} }
Row currRow = row; Row slicer = null;
List<ElementChoiceGroup> groups = readChoices(element, children); List<ElementChoiceGroup> groups = readChoices(element, children);
boolean isExtension = Utilities.existsInList(tail(element.getPath()), "extension", "modifierExtension"); boolean isExtension = Utilities.existsInList(tail(element.getPath()), "extension", "modifierExtension");
if (!element.prohibited()) { if (!element.prohibited()) {
for (ElementDefinition child : children) { for (ElementDefinition child : children) {
if (!child.hasSliceName()) { Row parent = null;
currRow = row; if (child.hasSliceName()) {
// ok, we're a slice
if (slicer == null || !slicer.getId().equals(child.getPath())) {
parent = gen.new Row();
parent.setId(child.getPath());
parent.setAnchor(child.getPath());
parent.setColor(context.getProfileUtilities().getRowColor(child, isConstraintMode));
parent.setLineColor(1);
parent.setIcon("icon_slice.png", HierarchicalTableGenerator.TEXT_ICON_SLICE);
parent.getCells().add(gen.new Cell(null, null, "Slices for "+ child.getName(), "", null));
switch (context.getStructureMode()) {
case BINDINGS:
case OBLIGATIONS:
for (Column col : columns) {
parent.getCells().add(gen.new Cell());
}
break;
case SUMMARY:
parent.getCells().add(gen.new Cell());
parent.getCells().add(gen.new Cell());
parent.getCells().add(gen.new Cell());
parent.getCells().add(gen.new Cell(null, null, context.formatMessage(RenderingContext.STRUC_DEF_CONT_RULE), "", null));
break;
}
row.getSubRows().add(parent);
slicer = parent;
} else {
parent = slicer;
}
} else {
parent = chooseChildRowByGroup(gen, row, groups, child, element, isConstraintMode);
} }
Row childRow = chooseChildRowByGroup(gen, currRow, groups, child, element, isConstraintMode);
if (logicalModel || !child.getPath().endsWith(".id") || (child.getPath().endsWith(".id") && (profile != null) && (profile.getDerivation() == TypeDerivationRule.CONSTRAINT))) { if (logicalModel || !child.getPath().endsWith(".id") || (child.getPath().endsWith(".id") && (profile != null) && (profile.getDerivation() == TypeDerivationRule.CONSTRAINT))) {
currRow = genElement(defPath, gen, childRow.getSubRows(), child, all, profiles, showMissing, profileBaseFileName, isExtension, snapshot, corePath, imagePath, false, logicalModel, isConstraintMode, allInvariants, currRow, mustSupport, rc, anchorPrefix, srcSD, columns); slicer = genElement(defPath, gen, parent.getSubRows(), child, all, profiles, showMissing, profileBaseFileName, isExtension, snapshot, corePath, imagePath, false, logicalModel, isConstraintMode, allInvariants, slicer, mustSupport, rc, anchorPrefix, srcSD, columns);
} }
} }
} }
@ -917,6 +950,11 @@ public class StructureDefinitionRenderer extends ResourceRenderer {
return slicingRow; return slicingRow;
} }
private boolean isTypeSlice(ElementDefinition child) {
ElementDefinition derived = (ElementDefinition) child.getUserData("derived.pointer");
return derived != null && derived.getBase().getPath().endsWith("[x]");
}
private boolean isExtension(ElementDefinition element) { private boolean isExtension(ElementDefinition element) {
if (element.getType().isEmpty()) { if (element.getType().isEmpty()) {
return true; return true;
@ -1195,6 +1233,7 @@ public class StructureDefinitionRenderer extends ResourceRenderer {
return prow; return prow;
} }
Row row = gen.new Row(); Row row = gen.new Row();
row.setId(parent.getPath()+"-"+grp.getName());
row.setAnchor(parent.getPath()+"-"+grp.getName()); row.setAnchor(parent.getPath()+"-"+grp.getName());
row.setColor(context.getProfileUtilities().getRowColor(parent, isConstraintMode)); row.setColor(context.getProfileUtilities().getRowColor(parent, isConstraintMode));
row.setLineColor(1); row.setLineColor(1);
@ -2042,6 +2081,7 @@ public class StructureDefinitionRenderer extends ResourceRenderer {
if (!onlyInformationIsMapping(all, element)) { if (!onlyInformationIsMapping(all, element)) {
Row row = gen.new Row(); Row row = gen.new Row();
row.setId(s);
row.setAnchor(element.getPath()); row.setAnchor(element.getPath());
row.setColor(context.getProfileUtilities().getRowColor(element, isConstraintMode)); row.setColor(context.getProfileUtilities().getRowColor(element, isConstraintMode));
if (element.hasSlicing()) if (element.hasSlicing())
@ -2202,6 +2242,7 @@ public class StructureDefinitionRenderer extends ResourceRenderer {
if (t.getValues().size() == 0 || (t.getValues().size() == 1 && t.getValues().get(0).isEmpty())) { if (t.getValues().size() == 0 || (t.getValues().size() == 1 && t.getValues().get(0).isEmpty())) {
if (!skipnoValue) { if (!skipnoValue) {
Row row = gen.new Row(); Row row = gen.new Row();
row.setId(ed.getPath());
erow.getSubRows().add(row); erow.getSubRows().add(row);
Cell c = gen.new Cell(); Cell c = gen.new Cell();
row.getCells().add(c); row.getCells().add(c);
@ -2246,6 +2287,7 @@ public class StructureDefinitionRenderer extends ResourceRenderer {
} else { } else {
for (Base b : t.getValues()) { for (Base b : t.getValues()) {
Row row = gen.new Row(); Row row = gen.new Row();
row.setId(ed.getPath());
erow.getSubRows().add(row); erow.getSubRows().add(row);
row.setIcon("icon_fixed.gif", context.formatMessage(RenderingContext.STRUC_DEF_FIXED) /*HierarchicalTableGenerator.TEXT_ICON_FIXED*/); row.setIcon("icon_fixed.gif", context.formatMessage(RenderingContext.STRUC_DEF_FIXED) /*HierarchicalTableGenerator.TEXT_ICON_FIXED*/);
@ -2633,6 +2675,7 @@ public class StructureDefinitionRenderer extends ResourceRenderer {
if (!mustSupportMode || allTypesMustSupport(element) || isMustSupport(tr)) { if (!mustSupportMode || allTypesMustSupport(element) || isMustSupport(tr)) {
boolean used = false; boolean used = false;
Row choicerow = gen.new Row(); Row choicerow = gen.new Row();
choicerow.setId(element.getPath());
String t = tr.getWorkingCode(); String t = tr.getWorkingCode();
if (isReference(t)) { if (isReference(t)) {
used = true; used = true;
@ -2933,6 +2976,7 @@ public class StructureDefinitionRenderer extends ResourceRenderer {
private void genSpanEntry(HierarchicalTableGenerator gen, List<Row> rows, SpanEntry span) throws IOException { private void genSpanEntry(HierarchicalTableGenerator gen, List<Row> rows, SpanEntry span) throws IOException {
Row row = gen.new Row(); Row row = gen.new Row();
row.setId("??");
rows.add(row); rows.add(row);
row.setAnchor(span.getId()); row.setAnchor(span.getId());
//row.setColor(..?); //row.setColor(..?);
@ -3071,6 +3115,7 @@ public class StructureDefinitionRenderer extends ResourceRenderer {
vdeep = vdeep || eld.getPath().contains("Extension.extension.extension."); vdeep = vdeep || eld.getPath().contains("Extension.extension.extension.");
} }
Row r = gen.new Row(); Row r = gen.new Row();
r.setId("Extension");
model.getRows().add(r); model.getRows().add(r);
String en; String en;
if (!full) if (!full)
@ -3111,6 +3156,7 @@ public class StructureDefinitionRenderer extends ResourceRenderer {
ElementDefinition ued = getUrlFor(ed, c); ElementDefinition ued = getUrlFor(ed, c);
if (ved != null && ued != null) { if (ved != null && ued != null) {
Row r1 = gen.new Row(); Row r1 = gen.new Row();
r1.setId(ued.getPath());
r.getSubRows().add(r1); r.getSubRows().add(r1);
r1.getCells().add(gen.new Cell(null, defFile == null ? "" : defFile+"-definitions.html#"+ed.getId()+"."+c.getId(), ((UriType) ued.getFixed()).getValue(), null, null)); r1.getCells().add(gen.new Cell(null, defFile == null ? "" : defFile+"-definitions.html#"+ed.getId()+"."+c.getId(), ((UriType) ued.getFixed()).getValue(), null, null));
r1.getCells().add(gen.new Cell()); r1.getCells().add(gen.new Cell());