From f5a9e2b2423ca796984d78cec3650db27d79ad00 Mon Sep 17 00:00:00 2001 From: Vassil Peytchev Date: Thu, 1 Aug 2024 14:13:02 -0500 Subject: [PATCH] Updating to the current version --- .../fhir/r5/renderers/CapabilityStatementRenderer.java | 10 +++++----- .../fhir/r5/renderers/OperationDefinitionRenderer.java | 4 ++-- .../hl7/fhir/utilities/i18n/RenderingI18nContext.java | 2 ++ .../src/main/resources/rendering-phrases.properties | 4 +++- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/CapabilityStatementRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/CapabilityStatementRenderer.java index dd6166e64..457c7284e 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/CapabilityStatementRenderer.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/CapabilityStatementRenderer.java @@ -525,7 +525,7 @@ public class CapabilityStatementRenderer extends ResourceRenderer { } } if (igMays.size() > 0) { - x.h(3,"shouldIGs").addText(context.formatPhrase(RenderingContext.CAPABILITY_SHOULD_SUPP)); + x.h(3,"mayIGs").addText(context.formatPhrase(RenderingContext.CAPABILITY_MAY_SUPP)); ul = x.ul(); for (String url : igMays) { addResourceLink(ul.li(), url, url); @@ -563,7 +563,7 @@ public class CapabilityStatementRenderer extends ResourceRenderer { capExpectation = getExtValueCode(c.getExtensionByUrl(EXPECTATION)); if (!Utilities.noString(capExpectation)) { lItem.addTag("strong").addText(capExpectation); - lItem.addText(context.formatPhrase(RenderingContext.CAPABILITY_SUPP) + " "); + lItem.addText(context.formatPhrase(" " + RenderingContext.CAPABILITY_SUPP) + " "); } lItem.code().addText(c.getCode()); first = false; @@ -680,10 +680,10 @@ public class CapabilityStatementRenderer extends ResourceRenderer { for (Map interactionMap : interactions) { item = uList.li(); if (Utilities.noString(verb)) { - item.addText(context.formatPhrase(RenderingContext.CAPABILITY_SUPP_THE) + " "); + item.addText(context.formatPhrase(RenderingContext.CAPABILITY_SUPPS_THE) + " "); } else { - item.addTag("strong").addText(verb); + item.addTag("strong").addText(verb + " "); item.addText(context.formatPhrase(RenderingContext.CAPABILITY_SUPP_THE) + " "); } interaction = interactionMap.keySet().toArray()[0].toString(); @@ -718,7 +718,7 @@ public class CapabilityStatementRenderer extends ResourceRenderer { } else { item.addTag("strong").addText(verb); - item.addText(context.formatPhrase(RenderingContext.CAPABILITY_SUPP) + " "); + item.addText(" " + context.formatPhrase(RenderingContext.CAPABILITY_SUPP) + " "); } applyInteractionsList(item, interactions); diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/OperationDefinitionRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/OperationDefinitionRenderer.java index 33200efb3..4d2563c99 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/OperationDefinitionRenderer.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/OperationDefinitionRenderer.java @@ -77,8 +77,8 @@ public class OperationDefinitionRenderer extends TerminologyRenderer { p.ah(sd.getWebPath()).tx(sd.present()); } } - - x.h(3, context.formatPhrase(RenderingContext.GENERAL_PARS)); + + x.h3().tx(context.formatPhrase(RenderingContext.GENERAL_PARS)); //x.para().tx(context.formatPhrase(RenderingContext.GENERAL_PARS)); XhtmlNode tbl = x.table( "grid"); XhtmlNode tr = tbl.tr(); diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/RenderingI18nContext.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/RenderingI18nContext.java index 67881a418..6f38342f7 100644 --- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/RenderingI18nContext.java +++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/RenderingI18nContext.java @@ -94,6 +94,7 @@ public class RenderingI18nContext extends I18nBase { public static final String CAPABILITY_INTER_SUPP = "CAPABILITY_INTER_SUPP"; public static final String CAPABILITY_INT_DESC = "CAPABILITY_INT_DESC"; public static final String CAPABILITY_INT_SUMM = "CAPABILITY_INT_SUMM"; + public static final String CAPABILITY_MAY_SUPP = "CAPABILITY_MAY_SUPP"; public static final String CAPABILITY_MULT_EXT = "CAPABILITY_MULT_EXT"; public static final String CAPABILITY_NOTE_CAP = "CAPABILITY_NOTE_CAP"; public static final String CAPABILITY_OP = "CAPABILITY_OP"; @@ -132,6 +133,7 @@ public class RenderingI18nContext extends I18nBase { public static final String CAPABILITY_SUPP_PATCH_FORM = "CAPABILITY_SUPP_PATCH_FORM"; public static final String CAPABILITY_SUPP_PROFS = "CAPABILITY_SUPP_PROFS"; public static final String CAPABILITY_SUPP_THE = "CAPABILITY_SUPP_THE"; + public static final String CAPABILITY_SUPPS_THE = "CAPABILITY_SUPPS_THE"; public static final String GENERAL_TYPE = "GENERAL_TYPE"; public static final String CAPABILITY_TYPS = "CAPABILITY_TYPS"; public static final String CAPABILITY_TYP_PRES = "CAPABILITY_TYP_PRES"; diff --git a/org.hl7.fhir.utilities/src/main/resources/rendering-phrases.properties b/org.hl7.fhir.utilities/src/main/resources/rendering-phrases.properties index 0aa5bed7e..417298940 100644 --- a/org.hl7.fhir.utilities/src/main/resources/rendering-phrases.properties +++ b/org.hl7.fhir.utilities/src/main/resources/rendering-phrases.properties @@ -91,6 +91,7 @@ CAPABILITY_INT = interaction. CAPABILITY_INTER_SUPP = The interactions supported by each resource ( CAPABILITY_INT_DESC = interaction described as follows: CAPABILITY_INT_SUMM = Interaction summary +CAPABILITY_MAY_SUPP = MAY Support the Following Implementation Guides CAPABILITY_MULT_EXT = this mark indicates that there are more than one expectation extensions present CAPABILITY_NOTE_CAP = Note to Implementers: FHIR Capabilities CAPABILITY_OP = Operations @@ -128,7 +129,8 @@ CAPABILITY_SUPPS = Supports CAPABILITY_SUPP_FORM = Supported Formats: CAPABILITY_SUPP_PATCH_FORM = Supported Patch Formats: CAPABILITY_SUPP_PROFS = Supported Profiles -CAPABILITY_SUPP_THE = Supports the +CAPABILITY_SUPP_THE = support the +CAPABILITY_SUPPS_THE = Supports the GENERAL_TYPE = Type CAPABILITY_TYPS = Types CAPABILITY_TYP_PRES = ype are only present if at least one of the resources has support for them.