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

more fixes for Questionnaire validation

This commit is contained in:
Grahame Grieve 2020-02-13 12:08:05 +11:00
parent 91e475a1a1
commit 52bc73a561
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/InstanceValidator.java
View File

@ -3629,7 +3629,10 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
Element e = list.get(i); Element e = list.get(i);
NodeStack ns = stack.push(e, i, e.getProperty().getDefinition(), e.getProperty().getDefinition()); NodeStack ns = stack.push(e, i, e.getProperty().getDefinition(), e.getProperty().getDefinition());
validateQuestionnaireElement(errors, ns, questionnaire, e, parents); validateQuestionnaireElement(errors, ns, questionnaire, e, parents);
validateQuestionannaireItem(errors, e, questionnaire, ns, list); List<Element> np = new ArrayList<Element>();
np.add(e);
np.addAll(parents);
validateQuestionannaireItem(errors, e, questionnaire, ns, np);
} }
} }
@ -3647,7 +3650,9 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
tgt = getQuestionById(questionnaire, ql); tgt = getQuestionById(questionnaire, ql);
if (rule(errors, IssueType.BUSINESSRULE, ns.literalPath, tgt != null, "Unable to find target '"+ql+"' for this question enableWhen")) { if (rule(errors, IssueType.BUSINESSRULE, ns.literalPath, tgt != null, "Unable to find target '"+ql+"' for this question enableWhen")) {
if (rule(errors, IssueType.BUSINESSRULE, ns.literalPath, tgt != item, "Target for this question enableWhen can't reference itself")) { if (rule(errors, IssueType.BUSINESSRULE, ns.literalPath, tgt != item, "Target for this question enableWhen can't reference itself")) {
warning(errors, IssueType.BUSINESSRULE, ns.literalPath, isBefore(item, tgt, parents), "The target of this enableWhen rule ("+ql+") comes after the question itself"); if (!isBefore(item, tgt, parents)) {
warning(errors, IssueType.BUSINESSRULE, ns.literalPath, false, "The target of this enableWhen rule ("+ql+") comes after the question itself");
}
} }
} }
} }
@ -3659,6 +3664,10 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
private boolean isBefore(Element item, Element tgt, List<Element> parents) { private boolean isBefore(Element item, Element tgt, List<Element> parents) {
// we work up the list, looking for tgt in the children of the parents // we work up the list, looking for tgt in the children of the parents
if (parents.contains(tgt)) {
// actually, if the target is a parent, that's automatically ok
return true;
}
for (Element p : parents) { for (Element p : parents) {
int i = findIndex(p, item); int i = findIndex(p, item);
int t = findIndex(p, tgt); int t = findIndex(p, tgt);