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

Improve message when slice is missing

This commit is contained in:
Grahame Grieve 2024-01-05 12:39:53 +11:00
parent cf72798e9f
commit cadc326d26
6 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
org.hl7.fhir.utilities/src/main/resources/Messages.properties
View File

@ -244,6 +244,8 @@ Validation_VAL_Profile_Maximum_one = {3}: max allowed = {7}, but found {0} (from
Validation_VAL_Profile_Maximum_other = {3}: max allowed = {7}, but found {0} (from {1})
Validation_VAL_Profile_Minimum_one = {3}: minimum required = {7}, but only found {0} (from {1})
Validation_VAL_Profile_Minimum_other = {3}: minimum required = {7}, but only found {0} (from {1})
Validation_VAL_Profile_Minimum_SLICE_one = Slice ''{3}'': a matching slice is required, but not found (from {1}). Note that other slices are allowed in addition to this required slice
Validation_VAL_Profile_Minimum_SLICE_other = Slice ''{3}'': minimum required = {0}, but only found {7} (from {1})
VALIDATION_VAL_PROFILE_MINIMUM_MAGIC = {0}: magic LOINC code {1} required, but not found (from {2}). Note that other Observation codes are allowed in addition to this required magic code
Validation_VAL_Profile_NoCheckMax_one = {3}: Found {0} match, but unable to check max allowed ({2}) due to lack of slicing validation (from {1})
Validation_VAL_Profile_NoCheckMax_other = {3}: Found {0} matches, but unable to check max allowed ({2}) due to lack of slicing validation (from {1})
@ -1098,4 +1100,5 @@ BUNDLE_BUNDLE_ENTRY_NOTFOUND_FRAGMENT = Can''t find ''{0}'' in the bundle ({1})
BUNDLE_BUNDLE_ENTRY_FOUND_MULTIPLE_FRAGMENT = Found {0} matches for fragment {2} in resource ''{1}'' in the bundle ({3})
XHTML_IDREF_NOT_FOUND = The target of the HTML idref attribute ''{0}'' was not found in the resource
XHTML_IDREF_NOT_MULTIPLE_MATCHES = Multiple matching targets for the HTML idref attribute ''{0}'' were found in the resource
TX_GENERAL_CC_ERROR_MESSAGE = No valid coding was found for the value set ''{0}''
TX_GENERAL_CC_ERROR_MESSAGE = No valid coding was found for the value set ''{0}''
FHIRPATH_UNKNOWN_EXTENSION = Reference to an unknown extension - double check that the URL ''{0}'' is correct

4
org.hl7.fhir.utilities/src/main/resources/Messages_de.properties
View File

@ -204,8 +204,8 @@ Validation_VAL_NoType=Unbekannter Typ {0}
Validation_VAL_Profile_MatchMultiple=Profil {0}, Element stimmt mit mehr als einem Slice \u00fcberein - {1}, {2}
Validation_VAL_Profile_Maximum_one={3}: maximal erlaubt = {7}, aber gefunden {0}
Validation_VAL_Profile_Maximum_other={3}: maximal erlaubt = {7}, aber gefunden {0}
Validation_VAL_Profile_Minimum_one={3}: mindestens erforderlich = {7}, aber nur gefunden {0}
Validation_VAL_Profile_Minimum_other={3}: mindestens erforderlich = {7}, aber nur gefunden {0}
Validation_VAL_Profile_Minimum_one={3}: mindestens erforderlich = {0}, aber nur gefunden {7}
Validation_VAL_Profile_Minimum_other={3}: mindestens erforderlich = {0}, aber nur gefunden {7}
Validation_VAL_Profile_MultipleMatches_one=Es wurden mehrere passende Profile unter den Auswahlm\u00f6glichkeiten gefunden: {1}
Validation_VAL_Profile_MultipleMatches_other=Es wurden mehrere passende Profile unter den Auswahlm\u00f6glichkeiten gefunden: {1}
Validation_VAL_Profile_NoCheckMax_one={1}: Kann die maximal zul\u00e4ssige Anzahl ({1}) aufgrund fehlender Slicing-Validierung nicht \u00fcberpr\u00fcfen.

6
org.hl7.fhir.utilities/src/main/resources/Messages_es.properties
View File

@ -231,9 +231,9 @@ Validation_VAL_Profile_MatchMultiple = Perfil {0}, El elemento coincide con más
Validation_VAL_Profile_Maximum_one = {3}: max permitido = {7}, pero se han encontrado {0} (de {1})
Validation_VAL_Profile_Maximum_many = {3}: max permitido = {7}, pero se han encontrado {0} (de {1})
Validation_VAL_Profile_Maximum_other = {3}: max permitido = {7}, pero se han encontrado {0} (de {1})
Validation_VAL_Profile_Minimum_one = {3}: mínimo requerido = {7}, pero sólo se han encontrado {0} (de {1})
Validation_VAL_Profile_Minimum_many = {3}: mínimo requerido = {7}, pero sólo se han encontrado {0} (de {1})
Validation_VAL_Profile_Minimum_other = {3}: mínimo requerido = {7}, pero sólo se han encontrado {0} (de {1})
Validation_VAL_Profile_Minimum_one = {3}: mínimo requerido = {0}, pero sólo se han encontrado {7} (de {1})
Validation_VAL_Profile_Minimum_many = {3}: mínimo requerido = {0}, pero sólo se han encontrado {7} (de {1})
Validation_VAL_Profile_Minimum_other = {3}: mínimo requerido = {0}, pero sólo se han encontrado {7} (de {1})
Validation_VAL_Profile_NoCheckMax_one = {3}: Se encontró {0} coincidencia, pero es imposible verificar el max permitido ({2}) debido a la falta de validación del particionado (de {1})
Validation_VAL_Profile_NoCheckMax_many = {3}: Se encontraron {0} coincidencias, pero es imposible verificar el max permitido ({2}) debido a la falta de validación del particionado (de {1})
Validation_VAL_Profile_NoCheckMax_other = {3}: Se encontraron {0} coincidencias, pero es imposible verificar el max permitido ({2}) debido a la falta de validación del particionado (de {1})

4
org.hl7.fhir.utilities/src/main/resources/Messages_ja.properties
View File

@ -236,8 +236,8 @@ Validation_VAL_NoType = 未知の型 {0}
Validation_VAL_Profile_MatchMultiple = プロファイル{0}、要素は複数のスライスに一致します - {1}, {2}
Validation_VAL_Profile_Maximum_one = {3}: 最大許容値 = {7}、見つかった値 = {0} (from {1})
Validation_VAL_Profile_Maximum_other = {3}: 最大許容値 = {7}、見つかった値 = {0} (from {1})
Validation_VAL_Profile_Minimum_one = {3}: 最小必要値 = {7}、見つかった値 = {0} (from {1})
Validation_VAL_Profile_Minimum_other = {3}: 最小必要値 = {7}、見つかった値 = {0} (from {1})
Validation_VAL_Profile_Minimum_one = {3}: 最小必要値 = {0}、見つかった値 = {7} (from {1})
Validation_VAL_Profile_Minimum_other = {3}: 最小必要値 = {0}、見つかった値 = {7} (from {1})
Validation_VAL_Profile_NoCheckMax_one = {3}: {0}の一致が見つかりましたが、スライス検証がないため最大許容値({2})をチェックできません (from {1})
Validation_VAL_Profile_NoCheckMax_other = {3}: {0}の一致が見つかりましたが、スライス検証がないため最大許容値({2})をチェックできません (from {1})
Validation_VAL_Profile_NoCheckMin_one = {3}: {0}の一致が見つかりましたが、スライス検証がないため最小必要値({2})をチェックできません (from {1})

4
org.hl7.fhir.utilities/src/main/resources/Messages_nl.properties
View File

@ -234,8 +234,8 @@ Validation_VAL_Profile_MatchMultiple = Profiel {0}, element komt overeen met mee
## for the next 4 messages, the available parameters are: 0: profile url, 1: ed.path, 2: ed.id, 3: ed.sliceName, 4: ed.label, 5: element.path, 6: ed.min and optionally 7: actual count
Validation_VAL_Profile_Maximum_one = {3}: max toegestaan = {7}, maar gevonden {0} (uit {1})
Validation_VAL_Profile_Maximum_other = {3}: max toegestaan = {7}, maar gevonden {0} (uit {1})
Validation_VAL_Profile_Minimum_one = {3}: minimum vereist = {7}, maar gevonden {0} (uit {1})
Validation_VAL_Profile_Minimum_other = {3}: minimum vereist = {7}, maar gevonden {0} (uit {1})
Validation_VAL_Profile_Minimum_one = {3}: minimum vereist = {0}, maar gevonden {7} (uit {1})
Validation_VAL_Profile_Minimum_other = {3}: minimum vereist = {0}, maar gevonden {7} (uit {1})
Validation_VAL_Profile_NoCheckMax_one = {3}: {0} matches gevonden, maar kan max toegestaan niet controleren ({2}) vanwege missende slicing-validatie (uit {1})
Validation_VAL_Profile_NoCheckMax_other = {3}: {0} matches gevonden, maar kan max toegestaan niet controleren ({2}) vanwege missende slicing-validatie (uit {1})
Validation_VAL_Profile_NoCheckMin_one = {3}: {0} matches gevonden, maar kan min toegestaan niet controleren ({2}) vanwege missende slicing-validatie (uit {1})

4
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java
View File

@ -6566,8 +6566,10 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
if (count < ed.getMin()) {
if (isObservationMagicValue(profile, ed)) {
ok = rule(errors, NO_RULE_DATE, IssueType.STRUCTURE, element.line(), element.col(), stack.getLiteralPath(), false, I18nConstants.VALIDATION_VAL_PROFILE_MINIMUM_MAGIC, ed.getSliceName(), getFixedLOINCCode(ed, profile), profile.getVersionedUrl()) && ok;
} else if (ed.hasSliceName()) {
ok = rulePlural(errors, NO_RULE_DATE, IssueType.STRUCTURE, element.line(), element.col(), stack.getLiteralPath(), false, ed.getMin(), I18nConstants.VALIDATION_VAL_PROFILE_MINIMUM_SLICE, profile.getVersionedUrl(), ed.getPath(), ed.getId(), ed.getSliceName(),ed.getLabel(), stack.getLiteralPath(), count) && ok;
} else {
ok = rulePlural(errors, NO_RULE_DATE, IssueType.STRUCTURE, element.line(), element.col(), stack.getLiteralPath(), false, count, I18nConstants.VALIDATION_VAL_PROFILE_MINIMUM, profile.getVersionedUrl(), ed.getPath(), ed.getId(), ed.getSliceName(),ed.getLabel(), stack.getLiteralPath(), Integer.toString(ed.getMin())) && ok;
ok = rulePlural(errors, NO_RULE_DATE, IssueType.STRUCTURE, element.line(), element.col(), stack.getLiteralPath(), false, count, I18nConstants.VALIDATION_VAL_PROFILE_MINIMUM, profile.getVersionedUrl(), ed.getPath(), ed.getId(), ed.getSliceName(),ed.getLabel(), stack.getLiteralPath(), ed.getMin()) && ok;
}
}
}