--- loncom/homework/radiobuttonresponse.pm 2007/06/29 17:32:31 1.123 +++ loncom/homework/radiobuttonresponse.pm 2011/05/27 18:40:37 1.148 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # mutliple choice style responses # -# $Id: radiobuttonresponse.pm,v 1.123 2007/06/29 17:32:31 albertel Exp $ +# $Id: radiobuttonresponse.pm,v 1.148 2011/05/27 18:40:37 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -18,14 +18,15 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with LON-CAPA; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# along with LON-CAPA; if not, write to the Free Software# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # /home/httpd/html/adm/gpl.txt # # http://www.lon-capa.org/ # + + package Apache::radiobuttonresponse; use strict; use HTML::Entities(); @@ -56,8 +57,6 @@ sub start_radiobuttonresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; - - #when in a radiobutton response use these &Apache::lonxml::register('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup')); push (@Apache::lonxml::namespace,'radiobuttonresponse'); @@ -68,19 +67,21 @@ sub start_radiobuttonresponse { if ($target eq 'meta') { $result=&Apache::response::meta_package_write('radiobuttonresponse'); } elsif ($target eq 'edit' ) { - $result.=&Apache::edit::start_table($token). - ''.&Apache::lonxml::description($token). - &Apache::loncommon::help_open_topic('Radio_Response_Problems'). - "Delete:". - &Apache::edit::deletelist($target,$token) - ." ".&Apache::edit::end_row() - .&Apache::edit::start_spanning_row(); + $result.=&Apache::edit::start_table($token) + .''.&Apache::lonxml::description($token) + .&Apache::loncommon::help_open_topic('Radio_Response_Problems') + .'' + .''.&mt('Delete?').' ' + .&Apache::edit::deletelist($target,$token) + .'' + .' '.&Apache::edit::end_row() + .&Apache::edit::start_spanning_row(); $result.= &Apache::edit::text_arg('Max Number Of Shown Foils:','max', - $token,'4'). - &Apache::edit::select_arg('Randomize Foil Order','randomize', - ['yes','no'],$token). - &Apache::edit::select_arg('Display Direction','direction', + $token,'4').' 'x 3 . + &Apache::edit::select_arg('Randomize Foil Order:','randomize', + ['yes','no'],$token).' 'x 3 . + &Apache::edit::select_arg('Display Direction:','direction', ['vertical','horizontal'],$token). &Apache::edit::end_row(). &Apache::edit::start_spanning_row()."\n"; @@ -103,9 +104,14 @@ sub start_radiobuttonresponse { } else { $result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.}'; } - $result .= '\begin{enumerate}'; + if($env{'form.pdfFormFields'} eq 'yes' && $Apache::inputtags::status[-1] eq 'CAN_ANSWER') { + $result .= '\begin{itemize}'; + } else { + $result .= '\begin{enumerate}'; + } } elsif ($target eq 'analyze') { my $part_id="$Apache::inputtags::part.$id"; + $Apache::lonhomework::analyze{"$part_id.type"} = 'radiobuttonresponse'; push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); } return $result; @@ -115,7 +121,13 @@ sub end_radiobuttonresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; if ($target eq 'edit') { $result=&Apache::edit::end_table(); } - if ($target eq 'tex') { $result .= '\end{enumerate}'; } + if ($target eq 'tex' ) { + if($env{'form.pdfFormFields'} eq 'yes' and $Apache::inputtags::status[-1] eq 'CAN_ANSWER') { + $result .= '\end{itemize}'; + } else { + $result .= '\end{enumerate}'; + } + } &Apache::response::end_response; pop @Apache::lonxml::namespace; &Apache::lonxml::deregister('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup')); @@ -129,7 +141,7 @@ sub start_foilgroup { my $result; %Apache::response::foilgroup=(); $Apache::radiobuttonresponse::conceptgroup=0; - &Apache::response::pushrandomnumber(); + &Apache::response::pushrandomnumber(undef,$target); if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') { $result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]'; } @@ -137,6 +149,7 @@ sub start_foilgroup { } sub storesurvey { + my ($style) = @_; if ( !&Apache::response::submitted() ) { return ''; } my $response = $env{'form.HWVAL_'.$Apache::inputtags::response['-1']}; &Apache::lonxml::debug("Here I am!:$response:"); @@ -150,7 +163,16 @@ sub storesurvey { $Apache::lonhomework::results{"resource.$part.$id.submission"}= $responsestr; my %previous=&Apache::response::check_for_previous($responsestr,$part,$id); - my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED'; + my $ad; + if ($style eq 'anonsurvey') { + $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS'; + } elsif ($style eq 'anonsurveycred') { + $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS_CREDIT'; + } elsif ($style eq 'surveycred') { + $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED_CREDIT'; + } else { + $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED'; + } &Apache::response::handle_previous(\%previous,$ad); &Apache::lonxml::debug("submitted a $response
\n"); return ''; @@ -202,7 +224,8 @@ sub end_foilgroup { my $bubble_lines; my $bubbles_per_line; my $answer_count; - my $id = $Apache::inputtags::response['-1']; + my $id = $Apache::inputtags::response['-1']; + my $part = $Apache::inputtags::part; $bubbles_per_line = &Apache::response::get_response_param($Apache::inputtags::part."_$id", 'numbubbles', @@ -214,13 +237,15 @@ sub end_foilgroup { my $style = $Apache::lonhomework::type; my $direction = &Apache::lonxml::get_param('direction',$parstack, $safeeval,'-2'); - if ( $style eq 'survey' && $target ne 'analyze') { + if ( (($style eq 'survey') || ($style eq 'surveycred') || + ($style eq 'anonsurvey') || ($style eq 'anonsurveycred')) + && ($target ne 'analyze')) { if ($target eq 'web' || $target eq 'tex') { $result=&displayallfoils($direction, $target); } elsif ( $target eq 'answer' ) { $result=&displayallanswers(); } elsif ( $target eq 'grade' ) { - $result=&storesurvey(); + $result=&storesurvey($style); } $answer_count = scalar(@{$Apache::response::foilgroup{'names'}}); @@ -240,15 +265,18 @@ sub end_foilgroup { $direction, $bubbles_per_line); } elsif ($target eq 'answer' ) { - $result=&displayanswers($answer, \@shown); + $result=&displayanswers($answer, \@shown, $bubbles_per_line); } elsif ( $target eq 'grade') { &grade_response($answer, \@shown, $bubbles_per_line); } elsif ( $target eq 'analyze') { + my $bubble_lines = &bubble_line_count($answer_count, + $bubbles_per_line); &Apache::response::analyze_store_foilgroup(\@shown, ['text','value','location']); - my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]"; + my $part_id="$part.$id"; push (@{ $Apache::lonhomework::analyze{"$part_id.options"} }, ('true','false')); + } } $Apache::lonxml::post_evaluate=0; @@ -257,9 +285,13 @@ sub end_foilgroup { &Apache::response::setup_prior_tries_hash(\&format_prior_answer, [\%Apache::response::foilgroup]); } - $bubble_lines = &bubble_line_count($answer_count, $bubbles_per_line); &Apache::response::poprandomnumber(); - &Apache::lonxml::increment_counter($bubble_lines); + $bubble_lines = &bubble_line_count($answer_count, $bubbles_per_line); + &Apache::lonxml::increment_counter($bubble_lines, + "$part.$id"); + if ($target eq 'analyze') { + &Apache::lonhomework::set_bubble_lines(); + } return $result; } @@ -296,7 +328,6 @@ sub displayallfoils { my $result; &Apache::lonxml::debug("survey style display"); my @names; - &Apache::lonnet::loghthis("Display all foils"); if ( $Apache::response::foilgroup{'names'} ) { @names= @{ $Apache::response::foilgroup{'names'} }; } @@ -305,11 +336,24 @@ sub displayallfoils { my $i =0; my $id=$Apache::inputtags::response['-1']; my $part=$Apache::inputtags::part; - my $lastresponse= - $Apache::lonhomework::history{"resource.$part.$id.submission"}; + my ($lastresponse,$newvariation,$showanswer); + if ((($Apache::lonhomework::history{"resource.$part.type"} eq 'randomizetry') || + ($Apache::lonhomework::type eq 'randomizetry')) && + ($Apache::inputtags::status[-1] eq 'CAN_ANSWER')) { + if ($env{'form.'.$part.'.rndseed'} ne + $Apache::lonhomework::history{"resource.$part.rndseed"}) { + $newvariation = 1; + } + } + $showanswer = &Apache::response::show_answer(); + unless ((($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') || ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) && (defined($env{'form.grade_symb'})) || + ($newvariation && !$showanswer)) { + $lastresponse = + $Apache::lonhomework::history{"resource.$part.$id.submission"}; + } if ($direction eq 'horizontal') { $result.=''; } my %lastresponse=&Apache::lonnet::str2hash($lastresponse); - if (&Apache::response::show_answer() ) { + if ($showanswer) { foreach my $name (@names) { if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') { if (($direction eq 'horizontal') && ($target ne 'tex')) { @@ -342,13 +386,22 @@ sub displayallfoils { $result.="
"; } else { if ($target eq 'tex') { - $result .= '\item \vskip -2mm '; - } else { + if($env{'form.pdfFormFields'} eq 'yes' && $Apache::inputtags::status[-1] eq 'CAN_ANSWER') { + my $fieldname = $env{'request.symb'}.'&part_'. $Apache::inputtags::part + .'&radiobuttonresponse'.'&HWVAL_'.$Apache::inputtags::response['-1']; + $result .= '\item[{'.&Apache::lonxml::print_pdf_radiobutton($fieldname,$temp).'}]' + .$Apache::response::foilgroup{$name.'.text'}."\n"; + } else { + $result .= '\item \vskip -2mm '; + } + } else { $result.="
"; } } if ($target eq 'tex') { - $result .= '$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\'; #' stupid emacs + if($env{'form.pdfFormFields'} ne 'yes' or $Apache::inputtags::status[-1] ne 'CAN_ANSWER') { + $result .= '$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\'; #' stupid emacs + } $i++; } else { $result .= ''; } @@ -375,33 +429,6 @@ sub displayallfoils { return $result; } -=pod - -=item &whichfoils($max,$randomize) - -Randomizes the list of foils. -Respects - - each foils desire to be randomized - - the existance of Concept groups of foils (select 1 foil from each) - - and selects a single correct statement from all possilble true statments - - and limits it to a toal of $max foils - -WARNING: this routine uses the random number generator, it should only -be called once per target, otherwise it can cause randomness changes in -homework problems. - -Arguments - $max - maximum number of foils to select (including the true one) - (so a max of 5 is: 1 true, 4 false) - - $randomize - whether to randomize the listing of foils, by default - will randomize, only if randomize is 'no' will it not - -Returns - $answer - location in the array of the correct answer - @foils - array of foil names in to display order - -=cut sub whichfoils { my ($max,$randomize)=@_; @@ -436,8 +463,12 @@ sub whichfoils { &Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in ",'<>&"')); } } - if (!$havetrue && $Apache::lonhomework::type ne 'survey') { - &Apache::lonxml::error("There are no true statements available.
"); + if ((!$havetrue) && + ($Apache::lonhomework::type ne 'survey') && + ($Apache::lonhomework::type ne 'surveycred') && + ($Apache::lonhomework::type ne 'anonsurvey') && + ($Apache::lonhomework::type ne 'anonsurveycred')) { + &Apache::lonxml::error(&mt('There are no true statements available.').'
'); } } else { my $current=0; @@ -496,9 +527,13 @@ sub whichfoils { &Apache::lonxml::debug("Answer wants $answer"); my $truename=$truelist[$whichtrue]; my $dosplice=1; - if ($notrue && $Apache::lonhomework::type ne 'survey') { + if (($notrue) && + ($Apache::lonhomework::type ne 'survey') && + ($Apache::lonhomework::type ne 'surveycred') && + ($Apache::lonhomework::type ne 'anonsurvey') && + ($Apache::lonhomework::type ne 'anonsurveycred')) { $dosplice=0; - &Apache::lonxml::error("There are no true statements available.
"); + &Apache::lonxml::error(&mt('There are no true statements available.').'
'); } #insert the true statement, keeping track of where it wants to be if ($Apache::response::foilgroup{$truename.'.location'} eq 'top' && $dosplice) { @@ -562,9 +597,13 @@ sub displayfoils { $result.='\item \vskip -2 mm '; } if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { - if ($target ne 'tex') { $result.='Correct:'; } else { $result.='Correct: \textbf{';} + if ($target ne 'tex') { + $result.=&mt('Correct:').''; + } else { + $result.=&mt('Correct:').' \textbf{'; + } } else { - $result.='Incorrect:'; + $result.=&mt('Incorrect:'); } if ($target eq 'web') { $result.="