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

Refactored Survey for more happy endings

Browse source 
Refactored www_submitQuestions to use utility submitQuestions sub (for ease of testing)
Replaced numeric flags, completedCode etc..
Added restart() and exitUrl() to the Expression Engine
Added more Survey instance tests
This commit is contained in:
Patrick Donelan 2009-05-12 12:36:26 +00:00
parent 4332b57ba2
commit 79db642219
6 changed files with 255 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

45
lib/WebGUI/Asset/Wobject/Survey/ExpressionEngine.pm
View file

@ -309,6 +309,35 @@ sub jump(&$) {
}
}
=head2 exitUrl ( [$url] )
Same as L<jump> except that instead of a jump, triggers survey exit
=head3 url (optional)
Url to exit to. If not given, the Survey instance's exitUrl property will be used.
=cut
sub exitUrl {
my ( $url ) = @_;
$session->log->debug("exitUrl($url)");
die( { exitUrl => $url } );
}
=head2 restart ( $sub )
Same as L<jump> except that instead of a jump, triggers the Survey to restart
=cut
sub restart {
$session->log->debug("restart()");
die( { restart => 1 } );
}
=head2 avg
Utility sub shared with Safe compartment to allows expressions to easily compute the average of a list
@ -419,6 +448,8 @@ sub run {
$compartment->share('&tagged');
$compartment->share('&taggedX');
$compartment->share('&jump');
$compartment->share('&exitUrl');
$compartment->share('&restart');
$compartment->share('&avg');
# Give them all of List::Util too
@ -440,10 +471,16 @@ sub run {
}
# A successful jump triggers a hashref containing the jump target to be thrown
if ( ref $@ && ref $@ eq 'HASH' && $@->{jump} ) {
my $jump = $@->{jump};
$session->log->debug("Returning [$jump]");
return { jump => $jump, tags => $tags };
if ( ref $@ && ref $@ eq 'HASH') {
if (my $target = $@->{jump}) {
return { jump => $target, tags => $tags };
}
if (exists $@->{exitUrl}) { # url might be undefined
return { exitUrl => $@->{exitUrl}, tags => $tags };
}
if (my $restart = $@->{restart}) {
return { restart => $restart, tags => $tags };
}
}
# See if an unresolved external reference was encountered