From cfd96f20b7fbb03ceb66656bf30c0be3cdb4a273 Mon Sep 17 00:00:00 2001 From: Josh Mandel Date: Sat, 4 May 2024 23:09:44 -0500 Subject: [PATCH 1/3] Add classes to profile header content --- .../StructureDefinitionRenderer.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/renderers/StructureDefinitionRenderer.java b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/renderers/StructureDefinitionRenderer.java index 01fb134d..038aa524 100644 --- a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/renderers/StructureDefinitionRenderer.java +++ b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/renderers/StructureDefinitionRenderer.java @@ -1289,25 +1289,25 @@ private List getMap(ElementDefinition e, Stri public String header() throws Exception { StringBuilder b = new StringBuilder(); - b.append("

\r\n"); - b.append("The official URL for this profile is:" + "\r\n"); - b.append("

\r\n"); - b.append("
" + sd.getUrl() + "
\r\n"); - b.append("

\r\n"); + b.append("

\\r\\n"); + b.append("The official URL for this profile is:" + "\\r\\n"); + b.append("

\\r\\n"); + b.append("
" + sd.getUrl() + "
\\r\\n"); + b.append("
\\r\\n"); b.append(processMarkdown("description", sd.getDescriptionElement())); - b.append("

\r\n"); + b.append("
\\r\\n"); if (sd.getDerivation() == TypeDerivationRule.CONSTRAINT) { - b.append("

\r\n"); + b.append("

\\r\\n"); StructureDefinition sdb = context.fetchResource(StructureDefinition.class, sd.getBaseDefinition()); if (sdb != null) - b.append(/*#!*/"This profile builds on" + " " + gen.getTranslated(sdb.getNameElement()) + "."); + b.append(/\*#!\*/"This profile builds on" + " " + gen.getTranslated(sdb.getNameElement()) + "."); else - b.append(/*#!*/"This profile builds on" + " " + sd.getBaseDefinition() + "."); - b.append("

\r\n"); + b.append(/\*#!\*/"This profile builds on" + " " + sd.getBaseDefinition() + "."); + b.append("

\\r\\n"); } - b.append("

\r\n"); - b.append(gen.formatMessage(RenderingContext.SD_SUMMARY_PUBLICATION, renderDate(sd.getDateElement()), gen.getTranslated(sd.getStatusElement()), gen.getTranslated(sd.getPublisherElement()))+"\r\n"); - b.append("

\r\n"); + b.append("

\\r\\n"); + b.append(gen.formatMessage(RenderingContext.SD_SUMMARY_PUBLICATION, renderDate(sd.getDateElement()), gen.getTranslated(sd.getStatusElement()), gen.getTranslated(sd.getPublisherElement()))+"\\r\\n"); + b.append("

\\r\\n"); return b.toString(); } From 5f6e22884caa05d4013f520a8b326b83f6f2981d Mon Sep 17 00:00:00 2001 From: Josh Mandel Date: Sat, 4 May 2024 23:14:08 -0500 Subject: [PATCH 2/3] Update StructureDefinitionRenderer.java --- .../StructureDefinitionRenderer.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/renderers/StructureDefinitionRenderer.java b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/renderers/StructureDefinitionRenderer.java index 038aa524..3fe05d6b 100644 --- a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/renderers/StructureDefinitionRenderer.java +++ b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/renderers/StructureDefinitionRenderer.java @@ -1289,25 +1289,25 @@ private List getMap(ElementDefinition e, Stri public String header() throws Exception { StringBuilder b = new StringBuilder(); - b.append("

\\r\\n"); - b.append("The official URL for this profile is:" + "\\r\\n"); - b.append("

\\r\\n"); - b.append("
" + sd.getUrl() + "
\\r\\n"); - b.append("
\\r\\n"); + b.append("

\r\n"); + b.append("The official URL for this profile is:" + "\r\n"); + b.append("

\r\n"); + b.append("
" + sd.getUrl() + "
\r\n"); + b.append("
\r\n"); b.append(processMarkdown("description", sd.getDescriptionElement())); - b.append("
\\r\\n"); + b.append("
\r\n"); if (sd.getDerivation() == TypeDerivationRule.CONSTRAINT) { - b.append("

\\r\\n"); + b.append("

\r\n"); StructureDefinition sdb = context.fetchResource(StructureDefinition.class, sd.getBaseDefinition()); if (sdb != null) b.append(/\*#!\*/"This profile builds on" + " " + gen.getTranslated(sdb.getNameElement()) + "."); else b.append(/\*#!\*/"This profile builds on" + " " + sd.getBaseDefinition() + "."); - b.append("

\\r\\n"); + b.append("

\r\n"); } - b.append("

\\r\\n"); - b.append(gen.formatMessage(RenderingContext.SD_SUMMARY_PUBLICATION, renderDate(sd.getDateElement()), gen.getTranslated(sd.getStatusElement()), gen.getTranslated(sd.getPublisherElement()))+"\\r\\n"); - b.append("

\\r\\n"); + b.append("

\r\n"); + b.append(gen.formatMessage(RenderingContext.SD_SUMMARY_PUBLICATION, renderDate(sd.getDateElement()), gen.getTranslated(sd.getStatusElement()), gen.getTranslated(sd.getPublisherElement()))+"\r\n"); + b.append("

\r\n"); return b.toString(); } From 0bdd759257af8d5b6baa7b87c873146d507285bb Mon Sep 17 00:00:00 2001 From: Josh Mandel Date: Sat, 4 May 2024 23:17:29 -0500 Subject: [PATCH 3/3] Update StructureDefinitionRenderer.java --- .../fhir/igtools/renderers/StructureDefinitionRenderer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/renderers/StructureDefinitionRenderer.java b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/renderers/StructureDefinitionRenderer.java index 3fe05d6b..79873f23 100644 --- a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/renderers/StructureDefinitionRenderer.java +++ b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/renderers/StructureDefinitionRenderer.java @@ -1300,9 +1300,9 @@ public String header() throws Exception { b.append("

\r\n"); StructureDefinition sdb = context.fetchResource(StructureDefinition.class, sd.getBaseDefinition()); if (sdb != null) - b.append(/\*#!\*/"This profile builds on" + " " + gen.getTranslated(sdb.getNameElement()) + "."); + b.append(/*#!*/"This profile builds on" + " " + gen.getTranslated(sdb.getNameElement()) + "."); else - b.append(/\*#!\*/"This profile builds on" + " " + sd.getBaseDefinition() + "."); + b.append(/*#!*/"This profile builds on" + " " + sd.getBaseDefinition() + "."); b.append("

\r\n"); } b.append("

\r\n");