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

Added goto to sections and questions. Order of precedence is answer, question, then section.

Browse source
This commit is contained in:
Kaleb Murphy 2009-03-09 17:23:06 +00:00
parent 31341e5701
commit 0db9be4512
6 changed files with 58 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -469,6 +469,9 @@ sub recordResponses {
my $section = $self->nextResponseSection();
my @questions = $self->nextQuestions();
#GOTO jumps in the Survey. Order of precedence is Answer, Question, then Section.
my ($goto, $gotoExpression);
# Handle terminal Section..
my $terminalUrl;
my $sTerminal = 0;
@ -476,6 +479,15 @@ sub recordResponses {
$sTerminal = 1;
$terminalUrl = $section->{terminalUrl};
}
# ..and also gotos..
elsif ( $section->{goto} =~ /\w/ ) {
$goto = $section->{goto};
}
# .. and also gotoExpressions..
elsif ( $section->{gotoExpression} =~ /\w/ ) {
$gotoExpression = $section->{gotoExpression};
}
# Handle empty Section..
if ( !@questions ) {
@ -487,7 +499,6 @@ sub recordResponses {
# Process Questions in Section..
my $terminal = 0;
my $allRequiredQsAnswered = 1;
my ($goto, $gotoExpression);
for my $question (@questions) {
my $aAnswered = 0;
@ -496,6 +507,14 @@ sub recordResponses {
$terminal = 1;
$terminalUrl = $question->{terminalUrl};
}
# ..and also gotos..
elsif ( $question->{goto} =~ /\w/ ) {
$goto = $question->{goto};
}
# .. and also gotoExpressions..
elsif ( $question->{gotoExpression} =~ /\w/ ) {
$gotoExpression = $question->{gotoExpression};
}
# Record Question comment
$self->responses->{ $question->{id} }->{comment} = $responses->{ $question->{id} . 'comment' };
@ -896,7 +915,6 @@ sub nextQuestions {
my $section = $self->nextResponseSection();
my $sectionIndex = $self->nextResponseSectionIndex;
my $questionsPerPage = $self->survey->section( [ $self->nextResponseSectionIndex ] )->{questionsPerPage};
# Get all of the existing question responses (so that we can do Section and Question [[var]] replacements
my $recordedResponses = $self->recordedResponses();
@ -907,6 +925,7 @@ sub nextQuestions {
my @questions;
for my $i (1 .. $questionsPerPage ) {
my $address = $self->surveyOrder->[ $self->lastResponse + $i ];
last if(! defined $address);
my ($sIndex, $qIndex) = (sIndex($address), qIndex($address));
# Skip if this is a Section without a Question
@ -1009,6 +1028,7 @@ equal to the number of sections in the survey order.
sub surveyEnd {
my $self = shift;
return 1 if ( $self->lastResponse >= $#{ $self->surveyOrder } );
return 0;
}