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

Fixed Survey's handling of multi-answer questions (e.g. maxAnswers != 1)

Browse source 
Now stores all supplied answers to multi-answer question as arrayref
Variable [[var]] text replacement converts to comma-separated list
Expression Engine's value() returns appropriate value depending on context
Expression Engine's score() does sum of multi-answers, as you would expect
Updated related i18n & hover-help, and tests
Cleaned up survey js somewhat
This commit is contained in:
Patrick Donelan 2009-05-08 08:00:04 +00:00
parent 88d6a0d067
commit cf98c81461
6 changed files with 220 additions and 203 deletions
Download patch file Download diff file Expand all files Collapse all files

5
t/Asset/Wobject/Survey/ExpressionEngine.t
View file

@ -22,7 +22,7 @@ my $session = WebGUI::Test->session;
#----------------------------------------------------------------------------
# Tests
my $tests = 50;
my $tests = 52;
plan tests => $tests + 1;
#----------------------------------------------------------------------------
@ -46,6 +46,7 @@ SKIP: {
my %values = (
n => 5,
s1 => 'my string',
multi => [ 'answer1', 'answer2' ],
);
my %scores = (
@ -76,6 +77,8 @@ SKIP: {
q{jump { sum(value(n),1,1,1) == 8 } target}, # List::Util sum, etc..
q{jump { score(n1) == 1 && score(n2) == 2 } target}, # score() works
q{jump { answered(n) && !answered(X) } target}, # answered() works
q{jump { value(multi) eq 'answer1, answer2' } target}, # multi-answer question stringifies in scalar context
q{jump { (value(multi))[1] eq 'answer2' } target}, # multi-answer question returns list in list context
);
my @should_not_jump = (

75
t/Asset/Wobject/Survey/ResponseJSON.t
View file

@ -22,7 +22,7 @@ my $session = WebGUI::Test->session;
#----------------------------------------------------------------------------
# Tests
my $tests = 87;
my $tests = 91;
plan tests => $tests + 1;
#----------------------------------------------------------------------------
@ -445,56 +445,35 @@ $rJSON->processExpression('tag(b,50); jump {tagged(a) + tagged(b) == 150} s1');
cmp_deeply($rJSON->tags, { a => 100, b => 50 }, 'Tag data cumulative');
is($rJSON->nextResponse, 3, '..and is useful for jump expressions');
# Check mult-answer questions
$rJSON->survey->question([0,2])->{maxAnswers} = 2; # Make it possible to select both "Yes" and "No" to this Yes/No mc question
$rJSON->survey->answer([0,2,0])->{value} = 4; # set 'Yes' answer score
$rJSON->survey->answer([0,2,1])->{value} = 6; # set 'No' answer score
# Record the next question in section 0
$rJSON->nextResponse(2); # pretend we just finished s0q2
$rJSON->recordResponses({
'0-2-0' => 'I chose both Yes',
'0-2-1' => '..and No to this mc question',
});
is($rJSON->nextResponse, 3, 'nextResponse at 3 (s1q0) after first response');
$rJSON->processExpression(q{jump { value(s0q2) eq '1, 0' } s2});
is($rJSON->nextResponse, 5, 'value() understands multi-answer questions, and knows how to stringify');
$rJSON->nextResponse(2); # pretend we just finished s0q2
$rJSON->processExpression(q{jump { (value(s0q2))[0] == 1 && (value(s0q2))[1] == 0 } s2});
is($rJSON->nextResponse, 5, '..and it can give us a list if thats what we want');
$rJSON->nextResponse(2); # pretend we just finished s0q2
$rJSON->processExpression(q{jump { score(s0q2) == 10 } s2});
is($rJSON->nextResponse, 5, '..and score() knows how to sum multi-answer questions');
# Clean up after this set of tests
$rJSON->responses({});
$rJSON->questionsAnswered(-1 * $rJSON->questionsAnswered);
####################################################
#
# recordedNamedResponses (coming soon)
#
####################################################
# {
#
# # $rJSON->survey->question([1,0])->{questionType} = 'Multiple Choice';
# # $rJSON->survey->answer([1,0,0])->{value} = 5;
# # cmp_deeply($rJSON->recordedNamedResponses, {}, 'recordedNamedResponses initially empty');
# # $rJSON->lastResponse(2);
# # $rJSON->recordResponses({
# # '1-0comment' => 'Section 1, question 0 comment',
# # '1-0-0' => 'My chosen answer',
# # '1-0-0comment' => 'Section 1, question 0, answer 0 comment',
# # });
# # cmp_deeply($rJSON->recordedNamedResponses, { s1q0 => 5 }, '..now shows multi-choice answer value');
# # $rJSON->survey->answer([1,0,0])->{value} = 'blah';
# # cmp_deeply($rJSON->recordedNamedResponses, { s1q0 => 'blah' }, '..also works with string value');
# # $rJSON->survey->loadTypes;
# # my $a =
# # diag(Dumper ($rJSON->survey->multipleChoiceTypes));
#
# $rJSON->survey->question([1,0])->{variable} = 's1q0';
#
# # First try with generic Multi Choice
# $rJSON->survey->question( [ 1, 0 ] )->{questionType} = 'Multiple Choice';
# $rJSON->survey->answer( [ 1, 0, 0 ] )->{recordedAnswer} = 'My recordedAnswer';
# $rJSON->lastResponse(2);
# $rJSON->recordResponses( { '1-0-0' => 'My chosen answer', } );
# is( $rJSON->responses->{'1-0-0'}->{value}, 'My recordedAnswer', 'Multi-choice uses recordedAnswer' );
#
# # Then with Yes/No bundle
# $rJSON->survey->question( [ 1, 0 ] )->{questionType} = 'Yes/No';
# $rJSON->lastResponse(2);
# $rJSON->recordResponses( { '1-0-0' => 'My chosen answer', } );
# is( $rJSON->responses->{'1-0-0'}->{value}, 'My recordedAnswer', 'Multi-choice bundle also uses recordedAnswer' );
#
# # Then with Text
# $rJSON->survey->question( [ 1, 0 ] )->{questionType} = 'Text';
# $rJSON->lastResponse(2);
# $rJSON->recordResponses( { '1-0-0' => 'My entered text', } );
# is( $rJSON->responses->{'1-0-0'}->{value}, 'My entered text', 'Text type uses entered text' );
# diag( Dumper( $rJSON->responses ) );
# diag( Dumper( $rJSON->recordedNamedResponses ) );
# }
####################################################
#
# recordResponses