oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed Survey jump target and jump expression precedence order across

Browse source 
Answer, Question and Section (and improved documentation in API)
This commit is contained in:
Patrick Donelan 2009-05-07 06:42:27 +00:00
parent 1fb9c4877b
commit 330c8f416c
2 changed files with 32 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -8,6 +8,7 @@
- fixed: Crud handling of Form fields with database types that cannot have default values. - fixed: Crud handling of Form fields with database types that cannot have default values.
- fixed: Crud serialization. - fixed: Crud serialization.
- fixed: i18n typo in Survey exit URL hover help. - fixed: i18n typo in Survey exit URL hover help.
- fixed: Survey jump target and jump expression precedence order across Section, Question, Answer.
7.7.5 7.7.5
- Adding StoryManager. - Adding StoryManager.

44
lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm
View file

@ -449,11 +449,26 @@ and answers being answered in L<"surveyOrder">.
=head3 Branch processing =head3 Branch processing
gotos are handled similarly as with terminalUrls. The last goto in the set of questions wins. Jump targets (gotos) and jump expressions (gotoExpressions) are attempted in the following
order:
In contrast, all gotoExpressions are passed to the Expression Engine (in order of: Answer, Question, Section). =over3
Expressions are not guaranteed to trigger a jump, and thus we give every expression in turn a change to run.
The first expression to trigger a jump will cause any remaining expressions to be skipped. =item * answer goto
=item * answer gotoExpression
=item * question goto
=item * question gotoExpression
=item * question goto
=item * question gotoExpression
=back
The first to trigger a jump short-circuits the process, and subsequent items are not attempted.
=cut =cut
@ -471,7 +486,7 @@ sub recordResponses {
my @questions = $self->nextQuestions(); my @questions = $self->nextQuestions();
#GOTO jumps in the Survey. Order of precedence is Answer, Question, then Section. #GOTO jumps in the Survey. Order of precedence is Answer, Question, then Section.
my ($goto, $sectionExpression, $questionExpression, $answerExpression); my ($sectionGoto, $questionGoto, $answerGoto, $sectionExpression, $questionExpression, $answerExpression);
# Handle terminal Section.. # Handle terminal Section..
my $terminalUrl; my $terminalUrl;
@ -482,7 +497,7 @@ sub recordResponses {
} }
# ..and also gotos.. # ..and also gotos..
elsif ( $section->{goto} =~ /\w/ ) { elsif ( $section->{goto} =~ /\w/ ) {
$goto = $section->{goto}; $sectionGoto = $section->{goto};
} }
# .. and also gotoExpressions.. # .. and also gotoExpressions..
elsif ( $section->{gotoExpression} =~ /\w/ ) { elsif ( $section->{gotoExpression} =~ /\w/ ) {
@ -509,7 +524,7 @@ sub recordResponses {
} }
# ..and also gotos.. # ..and also gotos..
elsif ( $question->{goto} =~ /\w/ ) { elsif ( $question->{goto} =~ /\w/ ) {
$goto = $question->{goto}; $questionGoto = $question->{goto};
} }
# .. and also gotoExpressions.. # .. and also gotoExpressions..
elsif ( $question->{gotoExpression} =~ /\w/ ) { elsif ( $question->{gotoExpression} =~ /\w/ ) {
@ -569,7 +584,7 @@ sub recordResponses {
# ..and also gotos.. # ..and also gotos..
elsif ( $answer->{goto} =~ /\w/ ) { elsif ( $answer->{goto} =~ /\w/ ) {
$goto = $answer->{goto}; $answerGoto = $answer->{goto};
} }
# .. and also gotoExpressions.. # .. and also gotoExpressions..
@ -595,11 +610,14 @@ sub recordResponses {
# Move the lastResponse index to the last question answered # Move the lastResponse index to the last question answered
$self->lastResponse( $self->lastResponse + @questions ); $self->lastResponse( $self->lastResponse + @questions );
# Do any requested branching.. # Process jumps and jump expressions in precedence order of:
$self->processGoto($goto) if ( defined $goto ); ## no critic # answer goto, answer expression, question goto, question expression, section..
$self->processExpression($answerExpression) if ( defined $answerExpression ); ## no critic $self->processGoto($answerGoto) if defined $answerGoto; ## no critic
$self->processExpression($questionExpression) if ( defined $questionExpression ); ## no critic $self->processExpression($answerExpression) if defined $answerExpression; ## no critic
$self->processExpression($sectionExpression) if ( defined $sectionExpression ); ## no critic $self->processGoto($questionGoto) if defined $questionGoto; ## no critic
$self->processExpression($questionExpression) if defined $questionExpression; ## no critic
$self->processGoto($sectionGoto) if defined $sectionGoto; ## no critic
$self->processExpression($sectionExpression) if defined $sectionExpression; ## no critic
# Handle next logic Section.. # Handle next logic Section..
my $section = $self->nextResponseSection(); my $section = $self->nextResponseSection();