From b7e38626cc14f3927f39742a78fa1d73168c841e Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Sat, 4 Jan 2025 10:33:02 +1100 Subject: [PATCH] Add support for multiple lines in the first cell in heirarchical tables Also add support for suppressing lines and inner borders --- .../src/main/resources/Messages.properties | 4 +++- .../src/main/resources/rendering-phrases.properties | 13 +++++++++++++ .../instance/type/CodeSystemValidator.java | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/org.hl7.fhir.utilities/src/main/resources/Messages.properties b/org.hl7.fhir.utilities/src/main/resources/Messages.properties index 8aeb73438..e350e1a4b 100644 --- a/org.hl7.fhir.utilities/src/main/resources/Messages.properties +++ b/org.hl7.fhir.utilities/src/main/resources/Messages.properties @@ -1196,4 +1196,6 @@ VS_EXP_IMPORT_ERROR_X = Unable to expand excluded value set ''{0}'': {1} VS_EXP_IMPORT_ERROR_X = Unable to expand excluded value set ''{0}'', but no error VS_EXP_IMPORT_ERROR_TOO_COSTLY = Unable to expand excluded value set ''{0}'': too costly VS_EXP_FILTER_UNK = ValueSet ''{0}'' Filter by property ''{1}'' and op ''{2}'' is not supported yet - \ No newline at end of file +CONCEPTMAP_VS_NOT_A_VS = Reference must be to a ValueSet, but found a {0} instead +SD_DERIVATION_NO_CONCRETE = {0} is labeled as an abstract type, but no concrete descendents were found (check definitions - this is usually an error unless concrete definitions are in some other package) + \ No newline at end of file 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 aed58115a..cfb7839b1 100644 --- a/org.hl7.fhir.utilities/src/main/resources/rendering-phrases.properties +++ b/org.hl7.fhir.utilities/src/main/resources/rendering-phrases.properties @@ -934,3 +934,16 @@ MATURITY_PUBLISHER = Publisher: {0} MATURITY_STATUS = Status MATURITY_MATURITY = Maturity Level: {0} MATURITY_STDS_STATUS = Standards Status: {0} +DATA_REND_MORNING = Morning +DATA_REND_MORNING_EARLY = Early Morning +DATA_REND_MORNING_LATE = Late Morning +DATA_REND_NOON = Noon +DATA_REND_AFTERNOON = Afternoon +DATA_REND_AFTERNOON_EARLY = Early Afternoon +DATA_REND_AFTERNOON_LATE = Late Afternoon +DATA_REND_EVENING = Evening +DATA_REND_EVENING_EARLY = Early Evening +DATA_REND_EVENING_LATE = Late Evening +DATA_REND_NIGHT = Night +DATA_REND_AFTER_SLEEP = After Sleep +DATA_REND_IMMEDIATE = Immediate diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/CodeSystemValidator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/CodeSystemValidator.java index 1246af2f9..c318dd9f0 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/CodeSystemValidator.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/CodeSystemValidator.java @@ -526,7 +526,7 @@ public class CodeSystemValidator extends BaseValidator { } private void metaChecks(List errors, Element cs, NodeStack stack, String url, String content, String caseSensitive, String hierarchyMeaning, boolean isSupplement, int count, String supp) { - if (forPublication && (url.contains("hl7.org"))) { + if (forPublication && url != null && (url.contains("hl7.org"))) { hint(errors, "2024-03-07", IssueType.BUSINESSRULE, cs.line(), cs.col(), stack.getLiteralPath(), url.contains("terminology.hl7.org") || url.contains("hl7.org/cda/stds/core"), I18nConstants.CODESYSTEM_THO_CHECK); } if (isSupplement) {