--- loncom/homework/radiobuttonresponse.pm 2007/10/22 09:29:58 1.130 +++ loncom/homework/radiobuttonresponse.pm 2009/05/23 05:04:58 1.143 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # mutliple choice style responses # -# $Id: radiobuttonresponse.pm,v 1.130 2007/10/22 09:29:58 foxr Exp $ +# $Id: radiobuttonresponse.pm,v 1.143 2009/05/23 05:04:58 onken Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,6 +25,8 @@ # http://www.lon-capa.org/ # + + package Apache::radiobuttonresponse; use strict; use HTML::Entities(); @@ -65,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"; @@ -100,9 +104,15 @@ 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 .= &Apache::lonxml::print_pdf_hiddenfield('meta', $env{'user.name'}, $env{'user.domain'}); + $result .= "\n\\\\\n\\\\\n"; + } 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; @@ -112,7 +122,9 @@ 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' and ($env{'form.pdfFormFields'} ne 'yes' or $Apache::inputtags::status[-1] ne 'CAN_ANSWER')) { + $result .= '\end{enumerate}'; + } &Apache::response::end_response; pop @Apache::lonxml::namespace; &Apache::lonxml::deregister('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup')); @@ -346,13 +358,27 @@ 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']; + my $value = $temp; + my $text = $Apache::response::foilgroup{$name.'.text'}; + $result .= &Apache::lonxml::print_pdf_radiobutton($fieldname, + $value, + $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 .= ''; } @@ -379,33 +405,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)=@_; @@ -441,7 +440,7 @@ sub whichfoils { } } if (!$havetrue && $Apache::lonhomework::type ne 'survey') { - &Apache::lonxml::error("There are no true statements available.
"); + &Apache::lonxml::error(&mt('There are no true statements available.').'
'); } } else { my $current=0; @@ -502,7 +501,7 @@ sub whichfoils { my $dosplice=1; if ($notrue && $Apache::lonhomework::type ne 'survey') { $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) { @@ -566,9 +565,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.="