honeymoose/org.hl7.fhir.core
1
0
Fork 0
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git synced 2025-03-02 01:19:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

rendering fixes for IGs

Browse Source
This commit is contained in:
Grahame Grieve 2023-08-17 18:29:59 +10:00
parent 0d1072616e
commit f7c606e88b
4 changed files with 45 additions and 45 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/comparison/StructureDefinitionComparer.java
View File

@ -392,7 +392,6 @@ public class StructureDefinitionComparer extends CanonicalResourceComparer imple
boolean def = false; boolean def = false;
boolean ch = false; boolean ch = false;
System.out.println(left.getId());
// not allowed to be different: // not allowed to be different:
// ruleEqual(comp, res, left.current().getDefaultValue(), right.current().getDefaultValue(), "defaultValue", path); // ruleEqual(comp, res, left.current().getDefaultValue(), right.current().getDefaultValue(), "defaultValue", path);

13
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/VersionComparisonAnnotation.java
View File

@ -124,4 +124,17 @@ public class VersionComparisonAnnotation {
return result.isEmpty() ? null : result.get(0); return result.isEmpty() ? null : result.get(0);
} }
public static CanonicalResourceComparison<? extends CanonicalResource> artifactComparison(Base base) {
if (base.hasUserData(USER_DATA_NAME)) {
VersionComparisonAnnotation self = (VersionComparisonAnnotation) base.getUserData(USER_DATA_NAME);
return self.comp;
} else {
return null;
}
}
} }

75
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/Renderer.java
View File

@ -194,48 +194,37 @@ public class Renderer extends TranslatingUtilities {
} }
} }
// public static void renderStatusSummary(Base base, XhtmlNode x, String version, String... metadataFields) {
// if (base.hasUserData(VersionComparisonAnnotation.USER_DATA_NAME)) {
//public static CanonicalResourceComparison<? extends CanonicalResource> artifactComparison(Base base) { VersionComparisonAnnotation self = (VersionComparisonAnnotation) base.getUserData(VersionComparisonAnnotation.USER_DATA_NAME);
// if (base.hasUserData(USER_DATA_NAME)) { switch (self.getType()) {
// VersionComparisonAnnotation self = (VersionComparisonAnnotation) base.getUserData(USER_DATA_NAME); case Added:
// return self.comp; XhtmlNode spanInner = x.span("background-color: #fff2ff; border-left: solid 3px #ffa0ff; margin: 2px; padding: 2px", "This content has been added since "+version);
// } else { spanInner.img("icon-change-add.png", "icon");
// return null; spanInner.tx(" Added");
// } return;
//} case Changed:
// if (self.getComp().noChangeOtherThanMetadata(metadataFields)) {
//public static void renderSummary(Base base, XhtmlNode x, String version, String... metadataFields) { x.span("color: #eeeeee").tx("n/c");
// if (base.hasUserData(USER_DATA_NAME)) { return;
// VersionComparisonAnnotation self = (VersionComparisonAnnotation) base.getUserData(USER_DATA_NAME); } else {
// switch (self.type) { spanInner = x.span("background-color: #fff2ff; border-left: solid 3px #ffa0ff; margin: 2px; padding: 2px", "This content has been changed since "+version+(self.getOriginal() != null ? " (was '"+(self.getOriginal())+"')" : ""));
// case Added: spanInner.img("icon-change-edit.png", "icon");
// XhtmlNode spanInner = x.span("background-color: #fff2ff; border-left: solid 3px #ffa0ff; margin: 2px; padding: 2px", "This content has been added since "+version); spanInner.tx(" Changed");
// spanInner.img("icon-change-add.png", "icon"); }
// spanInner.tx(" Added"); return;
// return; case Deleted:
// case Changed: spanInner = x.span("background-color: #fff2ff; border-left: solid 3px #ffa0ff; margin: 2px; padding: 2px", "This content has been added since "+version);
// if (self.comp.noChangeOtherThanMetadata(metadataFields)) { spanInner.img("icon-change-remove.png", "icon");
// x.span("color: #eeeeee").tx("n/c"); spanInner.tx(" Removed");
// return; return;
// } else { default:
// spanInner = x.span("background-color: #fff2ff; border-left: solid 3px #ffa0ff; margin: 2px; padding: 2px", "This content has been changed since "+version+(self.original != null ? " (was '"+(self.original.primitiveValue())+"')" : "")); x.span("color: #eeeeee").tx("n/c");
// spanInner.img("icon-change-edit.png", "icon"); return;
// spanInner.tx(" Changed"); }
// } } else {
// return; x.span("color: #eeeeee").tx("--");
// case Deleted: }
// spanInner = x.span("background-color: #fff2ff; border-left: solid 3px #ffa0ff; margin: 2px; padding: 2px", "This content has been added since "+version); }
// spanInner.img("icon-change-remove.png", "icon");
// spanInner.tx(" Removed");
// return;
// default:
// x.span("color: #eeeeee").tx("n/c");
// return;
// }
// } else {
// x.span("color: #eeeeee").tx("--");
// }
//}
} }

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

@ -3476,7 +3476,6 @@ public class StructureDefinitionRenderer extends ResourceRenderer {
} }
private void generateElementInner(XhtmlNode tbl, StructureDefinition sd, ElementDefinition d, int mode, ElementDefinition value, ElementDefinition compare, ElementDefinition compareValue, boolean strikethrough) throws FHIRException, IOException { private void generateElementInner(XhtmlNode tbl, StructureDefinition sd, ElementDefinition d, int mode, ElementDefinition value, ElementDefinition compare, ElementDefinition compareValue, boolean strikethrough) throws FHIRException, IOException {
System.out.println(d.getPath());
boolean root = !d.getPath().contains("."); boolean root = !d.getPath().contains(".");
boolean slicedExtension = d.hasSliceName() && (d.getPath().endsWith(".extension") || d.getPath().endsWith(".modifierExtension")); boolean slicedExtension = d.hasSliceName() && (d.getPath().endsWith(".extension") || d.getPath().endsWith(".modifierExtension"));
// int slicedExtensionMode = (mode == GEN_MODE_KEY) && slicedExtension ? GEN_MODE_SNAP : mode; // see ProfileUtilities.checkExtensionDoco / Task 3970 // int slicedExtensionMode = (mode == GEN_MODE_KEY) && slicedExtension ? GEN_MODE_SNAP : mode; // see ProfileUtilities.checkExtensionDoco / Task 3970