Skip to content

Commit d54be24

Browse files
committed
compile fix for core changes
1 parent 614abb8 commit d54be24

5 files changed

Lines changed: 15 additions & 4 deletions

File tree

org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/PublisherFields.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,7 @@ public class PublisherFields {
312312
@Getter private List<String> exemptHtmlPatterns = new ArrayList<>();
313313
Resolver.IReferenceResolver resolver;
314314
@Getter @Setter private boolean languagePack;
315+
@Getter @Setter private boolean wcagConformant;
315316

316317
public String packageId() {
317318
var ig = publishedIg == null ? sourceIg : publishedIg;

org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/PublisherIGLoader.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -791,6 +791,8 @@ else if (p.getValue().equals("no-experimental-content"))
791791
break;
792792
case "lang-pack":
793793
pf.setLanguagePack("true".equals(p.getValue()));
794+
case "wcag-conformant":
795+
pf.setWcagConformant("true".equals(p.getValue()));
794796
default:
795797
if (pc.startsWith("wantGen-")) {
796798
String code = pc.substring(8);
@@ -2312,6 +2314,7 @@ public FetchedFile load() throws Exception {
23122314
pf.rc.setChangeVersion(pf.versionToAnnotate);
23132315
pf.rc.setShowSummaryTable(false);
23142316
pf.rc.setInferResourceConformance(pf.inferResourceConformance);
2317+
pf.rc.setWcagConformant(pf.isWcagConformant());
23152318
for (FetchedFile f : pf.fileList) {
23162319
for (FetchedResource r : f.getResources()) {
23172320
if (r.getResource() instanceof CanonicalResource) {

org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/ValidationServices.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -655,6 +655,11 @@ public List<StructureDefinition> getImpliedProfilesForResource(IResourceValidato
655655
definition, structure, resource, valid, msgServices, messages);
656656
}
657657

658+
@Override
659+
public String relativeDatePlaceHolder() {
660+
return "{actual date}";
661+
}
662+
658663
@Override
659664
public boolean isSuppressMessageId(String path, String messageId) {
660665
return false;

org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/renderers/CrossViewRenderer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -607,15 +607,15 @@ private void renderTypeCell(StringBuilder b, boolean render, List<UsedType> type
607607
b.append("<td>");
608608
if (types.size() == base.size() && allMSAreSame(types)) {
609609
if (types.size() > 0 && types.get(0).ms) {
610-
b.append(" <span style=\"color:white; background-color: red; font-weight:bold\">S</span> ");
610+
b.append(" <span style=\"color:white; background-color: #D50000; font-weight:bold\">S</span> ");
611611
}
612612
b.append("(all)");
613613
} else {
614614
boolean doMS = !allMSAreSame(types);
615615
boolean first = true;
616616
for (UsedType t : types) {
617617
if (!doMS && first && t.ms) {
618-
b.append(" <span style=\"color:white; background-color: red; font-weight:bold\">S</span> ");
618+
b.append(" <span style=\"color:white; background-color: #D50000; font-weight:bold\">S</span> ");
619619
}
620620
if (first) first = false;
621621
else b.append(" | ");
@@ -626,7 +626,7 @@ private void renderTypeCell(StringBuilder b, boolean render, List<UsedType> type
626626
b.append(t.name);
627627
}
628628
if (doMS && t.ms) {
629-
b.append(" <span style=\"color:white; background-color: red; font-weight:bold\">S</span>");
629+
b.append(" <span style=\"color:white; background-color: #D50000; font-weight:bold\">S</span>");
630630
}
631631
}
632632
}

org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/renderers/ValueSetRenderer.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,9 @@ public String cld(Set<String> outputTracker) throws EOperationOutcome, FHIRExcep
9999
return "<h3>"+gen.formatPhrase(RenderingContext.VSR_LOGICAL)+"</h3>\r\n" + new XhtmlComposer(XhtmlComposer.HTML).compose(vsc.getText().getDiv());
100100
} else if (vs.hasExtension(ExtensionDefinitions.EXT_VALUESET_RULES_TEXT)) {
101101
String md = processMarkdown("ValueSet.extension", vs.getExtensionString(ExtensionDefinitions.EXT_VALUESET_RULES_TEXT));
102-
return "<h3>"+gen.formatPhrase(RenderingContext.VSR_LOGICAL)+"</h3>\r\n" +md;
102+
return "<h3>"+gen.formatPhrase(RenderingContext.VSR_LOGICAL)+"</h3>\r\n<p>"+
103+
gen.formatPhrase(RenderingContext.VSR_RULES_TEXT)+
104+
"</p>\r\n" +md;
103105
} else {
104106
return "<h3>"+gen.formatPhrase(RenderingContext.VSR_LOGICAL)+"</h3>\r\n<p>"+gen.formatPhrase(RenderingI18nContext.VSR_NO_DEF)+"</p>\r\n";
105107

0 commit comments

Comments
 (0)