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

Updating to the current version

This commit is contained in:
Vassil Peytchev 2024-08-01 14:13:02 -05:00
parent 376d5f26fa
commit f5a9e2b242
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/CapabilityStatementRenderer.java
View File

@ -525,7 +525,7 @@ public class CapabilityStatementRenderer extends ResourceRenderer {
} }
} }
if (igMays.size() > 0) { 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(); ul = x.ul();
for (String url : igMays) { for (String url : igMays) {
addResourceLink(ul.li(), url, url); addResourceLink(ul.li(), url, url);
@ -563,7 +563,7 @@ public class CapabilityStatementRenderer extends ResourceRenderer {
capExpectation = getExtValueCode(c.getExtensionByUrl(EXPECTATION)); capExpectation = getExtValueCode(c.getExtensionByUrl(EXPECTATION));
if (!Utilities.noString(capExpectation)) { if (!Utilities.noString(capExpectation)) {
lItem.addTag("strong").addText(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()); lItem.code().addText(c.getCode());
first = false; first = false;
@ -680,10 +680,10 @@ public class CapabilityStatementRenderer extends ResourceRenderer {
for (Map<String,String> interactionMap : interactions) { for (Map<String,String> interactionMap : interactions) {
item = uList.li(); item = uList.li();
if (Utilities.noString(verb)) { if (Utilities.noString(verb)) {
item.addText(context.formatPhrase(RenderingContext.CAPABILITY_SUPP_THE) + " "); item.addText(context.formatPhrase(RenderingContext.CAPABILITY_SUPPS_THE) + " ");
} }
else { else {
item.addTag("strong").addText(verb); item.addTag("strong").addText(verb + " ");
item.addText(context.formatPhrase(RenderingContext.CAPABILITY_SUPP_THE) + " "); item.addText(context.formatPhrase(RenderingContext.CAPABILITY_SUPP_THE) + " ");
} }
interaction = interactionMap.keySet().toArray()[0].toString(); interaction = interactionMap.keySet().toArray()[0].toString();
@ -718,7 +718,7 @@ public class CapabilityStatementRenderer extends ResourceRenderer {
} }
else { else {
item.addTag("strong").addText(verb); item.addTag("strong").addText(verb);
item.addText(context.formatPhrase(RenderingContext.CAPABILITY_SUPP) + " "); item.addText(" " + context.formatPhrase(RenderingContext.CAPABILITY_SUPP) + " ");
} }
applyInteractionsList(item, interactions); applyInteractionsList(item, interactions);

2
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/OperationDefinitionRenderer.java
View File

@ -78,7 +78,7 @@ public class OperationDefinitionRenderer extends TerminologyRenderer {
} }
} }
x.h(3, context.formatPhrase(RenderingContext.GENERAL_PARS)); x.h3().tx(context.formatPhrase(RenderingContext.GENERAL_PARS));
//x.para().tx(context.formatPhrase(RenderingContext.GENERAL_PARS)); //x.para().tx(context.formatPhrase(RenderingContext.GENERAL_PARS));
XhtmlNode tbl = x.table( "grid"); XhtmlNode tbl = x.table( "grid");
XhtmlNode tr = tbl.tr(); XhtmlNode tr = tbl.tr();

2
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/RenderingI18nContext.java
View File

@ -94,6 +94,7 @@ public class RenderingI18nContext extends I18nBase {
public static final String CAPABILITY_INTER_SUPP = "CAPABILITY_INTER_SUPP"; 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_DESC = "CAPABILITY_INT_DESC";
public static final String CAPABILITY_INT_SUMM = "CAPABILITY_INT_SUMM"; 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_MULT_EXT = "CAPABILITY_MULT_EXT";
public static final String CAPABILITY_NOTE_CAP = "CAPABILITY_NOTE_CAP"; public static final String CAPABILITY_NOTE_CAP = "CAPABILITY_NOTE_CAP";
public static final String CAPABILITY_OP = "CAPABILITY_OP"; 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_PATCH_FORM = "CAPABILITY_SUPP_PATCH_FORM";
public static final String CAPABILITY_SUPP_PROFS = "CAPABILITY_SUPP_PROFS"; 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_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 GENERAL_TYPE = "GENERAL_TYPE";
public static final String CAPABILITY_TYPS = "CAPABILITY_TYPS"; public static final String CAPABILITY_TYPS = "CAPABILITY_TYPS";
public static final String CAPABILITY_TYP_PRES = "CAPABILITY_TYP_PRES"; public static final String CAPABILITY_TYP_PRES = "CAPABILITY_TYP_PRES";

4
org.hl7.fhir.utilities/src/main/resources/rendering-phrases.properties
View File

@ -91,6 +91,7 @@ CAPABILITY_INT = interaction.
CAPABILITY_INTER_SUPP = The interactions supported by each resource ( CAPABILITY_INTER_SUPP = The interactions supported by each resource (
CAPABILITY_INT_DESC = interaction described as follows: CAPABILITY_INT_DESC = interaction described as follows:
CAPABILITY_INT_SUMM = Interaction summary 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_MULT_EXT = this mark indicates that there are more than one expectation extensions present
CAPABILITY_NOTE_CAP = Note to Implementers: FHIR Capabilities CAPABILITY_NOTE_CAP = Note to Implementers: FHIR Capabilities
CAPABILITY_OP = Operations CAPABILITY_OP = Operations
@ -128,7 +129,8 @@ CAPABILITY_SUPPS = Supports
CAPABILITY_SUPP_FORM = Supported Formats: CAPABILITY_SUPP_FORM = Supported Formats:
CAPABILITY_SUPP_PATCH_FORM = Supported Patch Formats: CAPABILITY_SUPP_PATCH_FORM = Supported Patch Formats:
CAPABILITY_SUPP_PROFS = Supported Profiles CAPABILITY_SUPP_PROFS = Supported Profiles
CAPABILITY_SUPP_THE = Supports the CAPABILITY_SUPP_THE = support the
CAPABILITY_SUPPS_THE = Supports the
GENERAL_TYPE = Type GENERAL_TYPE = Type
CAPABILITY_TYPS = Types CAPABILITY_TYPS = Types
CAPABILITY_TYP_PRES = ype are only present if at least one of the resources has support for them. CAPABILITY_TYP_PRES = ype are only present if at least one of the resources has support for them.