--- loncom/homework/radiobuttonresponse.pm 2008/12/11 03:29:30 1.134.2.1 +++ loncom/homework/radiobuttonresponse.pm 2011/09/13 21:42:58 1.151 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # mutliple choice style responses # -# $Id: radiobuttonresponse.pm,v 1.134.2.1 2008/12/11 03:29:30 raeburn Exp $ +# $Id: radiobuttonresponse.pm,v 1.151 2011/09/13 21:42:58 raeburn 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,7 +67,7 @@ sub start_radiobuttonresponse { if ($target eq 'meta') { $result=&Apache::response::meta_package_write('radiobuttonresponse'); } elsif ($target eq 'edit' ) { - $result.=&Apache::edit::start_table($token) + $result.=&Apache::edit::start_table($token) .''.&Apache::lonxml::description($token) .&Apache::loncommon::help_open_topic('Radio_Response_Problems') .'' @@ -102,7 +104,11 @@ 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'; @@ -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')); @@ -126,17 +138,14 @@ sub end_radiobuttonresponse { %Apache::response::foilgroup=(); sub start_foilgroup { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - my $result; %Apache::response::foilgroup=(); $Apache::radiobuttonresponse::conceptgroup=0; - &Apache::response::pushrandomnumber(); - if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') { - $result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]'; - } - return $result; + &Apache::response::pushrandomnumber(undef,$target); + return; } 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 +159,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 ''; @@ -200,28 +218,25 @@ sub end_foilgroup { my $result; my $bubble_lines; - my $bubbles_per_line; my $answer_count; my $id = $Apache::inputtags::response['-1']; my $part = $Apache::inputtags::part; - $bubbles_per_line = - &Apache::response::get_response_param($Apache::inputtags::part."_$id", - 'numbubbles', - $default_bubbles_per_line); - + my $bubbles_per_line = &getbubblesnum($part,$id); if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') { 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'}}); @@ -236,7 +251,7 @@ sub end_foilgroup { $answer_count = scalar(@shown); if ($target eq 'web' || $target eq 'tex') { - $result=&displayfoils($target, + $result=&displayfoils($target, $answer, \@shown, $direction, $bubbles_per_line); @@ -271,6 +286,20 @@ sub end_foilgroup { return $result; } +sub getbubblesnum { + my ($part,$id) = @_; + my $bubbles_per_line; + my $default_numbubbles = $default_bubbles_per_line; + if (($env{'form.bubbles_per_row'} =~ /^\d+$/) && + ($env{'form.bubbles_per_row'} > 0)) { + $default_numbubbles = $env{'form.bubbles_per_row'}; + } + $bubbles_per_line = + &Apache::response::get_response_param($part."_$id",'numbubbles', + $default_numbubbles); + return $bubbles_per_line; +} + sub getfoilcounts { my @names; my $truecnt=0; @@ -312,11 +341,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')) { @@ -349,13 +391,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 .= ''; } @@ -382,33 +434,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)=@_; @@ -443,7 +468,11 @@ 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') { + 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 { @@ -503,7 +532,11 @@ 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(&mt('There are no true statements available.').'
'); } @@ -527,8 +560,12 @@ sub whichfoils { $dosplice=0; } else { if ($topcount>0 || $bottomcount>0) { - $answer = int(&Math::Random::random_uniform() * ($#whichfalse+1)) - + $topcount; + my $inc = 1; + if (($bottomcount > 0) && ($Apache::lonhomework::type ne 'exam')) { + $inc = 2; + } + $answer=int(&Math::Random::random_uniform() * ($#whichfalse+$inc)) + + $topcount; } } &Apache::lonxml::debug("Answer now wants $answer"); @@ -600,11 +637,46 @@ sub displayfoils { my $temp=0; my $id=$Apache::inputtags::response['-1']; my $part=$Apache::inputtags::part; - my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"}; + my ($lastresponse,$newvariation); + 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; + } + } + unless ($newvariation) { + $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"}; + } my %lastresponse=&Apache::lonnet::str2hash($lastresponse); if ($target ne 'tex' && $direction eq 'horizontal') { $result.=""; } + my $numlines; + if (($target eq 'tex') && ($Apache::lonhomework::type eq 'exam')) { + my $numitems = scalar(@{ $whichfoils }); + $numlines = int($numitems/$bubbles_per_line); + if (($numitems % $bubbles_per_line) != 0) { + $numlines ++; + } + if ($numlines < 1) { + $numlines = 1; + } + if ($numlines > 1) { + my $linetext; + for (my $i=0; $i<$numlines; $i++) { + $linetext .= $Apache::lonxml::counter+$i.', '; + } + $linetext =~ s/,\s$//; + $result .= '\item[\small {\textbf{'.$linetext.'}}]'. + ' {\footnotesize '. + &mt('(Bubble once in [_1] lines)',$numlines). + '} \hspace*{\fill} \\\\'; + } else { + $result .= '\item[\textbf{'.$Apache::lonxml::counter.'}.]'; + } + } foreach my $name (@{ $whichfoils }) { if ($target ne 'tex') { if ($direction eq 'horizontal') { @@ -619,8 +691,8 @@ sub displayfoils { ""; } else { if ($Apache::lonhomework::type eq 'exam') { @@ -628,14 +700,24 @@ sub displayfoils { $line++; $i = 0; $bubble_number = 0; - $result.='\item[\textbf{'.($Apache::lonxml::counter+$line).'}.]'; } - $result .= '{\small \textbf{'.$alphabet[$i].'}}$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\'; #' stupid emacs + my $identifier; + if ($numlines > 1) { + $identifier = $Apache::lonxml::counter+$line; + } + $result .= '{\small \textbf{'.$identifier.$alphabet[$i].'}}$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\'; #' stupid emacs $i++; $bubble_number++; } else { - $result .= '\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'}; - } + 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 .= '\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'}; + } + } } if ($target ne 'tex' && $direction eq 'horizontal') { $result.=""; @@ -769,6 +851,9 @@ sub end_foil { &Apache::lonxml::warning(&mt('Foils without names exist. This can cause problems to malfunction.')); $name=$Apache::lonxml::curdepth; } + if ($name eq "0") { + &Apache::lonxml::error(&mt('Foil name [_1] is not supported. Please choose another name.',''.$name.'')); + } if (defined($Apache::response::foilnames{$name})) { &Apache::lonxml::error(&mt('Foil name [_1] appears more than once. Foil names need to be unique.',''.$name.'')); } @@ -799,6 +884,90 @@ sub insert_foil { '; } + 1; __END__ + + + +=head1 NAME + +Apache::radiobuttonresponse + +=head1 SYNOPSIS + +Handles multiple-choice style responses. + +This is part of the LearningOnline Network with CAPA project +described at http://www.lon-capa.org. + +=head1 SUBROUTINES + +=over + +=item start_radiobuttonresponse() + +=item bubble_line_count() + +=item end_radiobuttonresponse() + +=item start_foilgroup() + +=item storesurvey() + +=item grade_response() + +=item end_foilgroup() + +=item getfoilcounts() + +=item format_prior_answer() + +=item displayallfoils() + +=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 + +=item displayfoils() + +=item displayallanswers() + +=item displayanswers() + +=item start_conceptgroup() + +=item end_conceptgroup() + +=item insert_conceptgroup() + +=item start_foil() + +=item end_foil() + +=item insert_foil() + +=back + +=cut