--- loncom/homework/radiobuttonresponse.pm 2006/12/19 11:05:21 1.110 +++ loncom/homework/radiobuttonresponse.pm 2007/06/29 12:49:10 1.121 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # mutliple choice style responses # -# $Id: radiobuttonresponse.pm,v 1.110 2006/12/19 11:05:21 foxr Exp $ +# $Id: radiobuttonresponse.pm,v 1.121 2007/06/29 12:49:10 foxr Exp $ # # Copyright Michigan State University Board of Trustees # @@ -31,18 +31,38 @@ use strict; use HTML::Entities(); use Apache::lonlocal; use Apache::lonnet; +use Apache::response; + +my $default_bubbles_per_line = 10; + BEGIN { &Apache::lonxml::register('Apache::radiobuttonresponse',('radiobuttonresponse')); } +sub bubble_line_count { + my ($numfoils, $bubbles_per_line) = @_; + my $bubble_lines; + $bubble_lines = int($numfoils / $bubbles_per_line); + if (($numfoils % $bubbles_per_line) != 0) { + $bubble_lines++; + } + return $bubble_lines; + +} + + 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'); my $id = &Apache::response::start_response($parstack,$safeeval); + %Apache::hint::radiobutton=(); undef(%Apache::response::foilnames); if ($target eq 'meta') { @@ -136,17 +156,25 @@ sub storesurvey { return ''; } + sub grade_response { - my ($max,$randomize)=@_; + my ($max,$randomize, $bubbles_per_line)=@_; #keep the random numbers the same must always call this my ($answer,@whichfoils)=&whichfoils($max,$randomize); if ( !&Apache::response::submitted() ) { return; } my $response; + if ($env{'form.submitted'} eq 'scantron') { - $response=&Apache::response::getresponse(); + $response = &Apache::response::getresponse(1,undef, + &bubble_line_count(scalar(@whichfoils), + $bubbles_per_line), + $bubbles_per_line); + } else { $response = $env{'form.HWVAL_'.$Apache::inputtags::response['-1']}; } + + if ( $response !~ /[0-9]+/) { return; } my $part=$Apache::inputtags::part; my $id = $Apache::inputtags::response['-1']; @@ -172,6 +200,16 @@ sub end_foilgroup { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; + my $bubble_lines; + my $bubbles_per_line; + my $answer_count; + my $id = $Apache::inputtags::response['-1']; + $bubbles_per_line = + &Apache::response::get_response_param($Apache::inputtags::part."_$id", + 'numbubbles', + $default_bubbles_per_line); + + if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') { my $style = $Apache::lonhomework::type; @@ -185,20 +223,30 @@ sub end_foilgroup { } elsif ( $target eq 'grade' ) { $result=&storesurvey(); } + $answer_count = scalar(@{$Apache::response::foilgroup{'names'}}); + } else { + my $name; my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval, '-2'); my $randomize = &Apache::lonxml::get_param('randomize',$parstack, $safeeval,'-2'); + my @shown = &whichfoils($max,$randomize); + $answer_count = scalar(@shown); + if ($target eq 'web' || $target eq 'tex') { - $result=&displayfoils($target,$max,$randomize,$direction); + $result=&displayfoils($target, + $max, + $randomize, + $direction, + $bubbles_per_line); } elsif ($target eq 'answer' ) { $result=&displayanswers($max,$randomize); } elsif ( $target eq 'grade') { - &grade_response($max,$randomize); + &grade_response($max,$randomize, + $bubbles_per_line); } elsif ( $target eq 'analyze') { - my @shown = &whichfoils($max,$randomize); &Apache::response::analyze_store_foilgroup(\@shown, ['text','value','location']); my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]"; @@ -206,9 +254,15 @@ sub end_foilgroup { ('true','false')); } } + $Apache::lonxml::post_evaluate=0; } + if ($target eq 'web') { + &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(); + &Apache::lonxml::increment_counter($bubble_lines); return $result; } @@ -230,14 +284,26 @@ sub getfoilcounts { return ($truecnt,$falsecnt); } +sub format_prior_answer { + my ($mode,$answer,$other_data) = @_; + my $foil_data = $other_data->[0]; + my %response = &Apache::lonnet::str2hash($answer); + my ($name) = keys(%response); + return '<span class="LC_prior_radiobutton">'. + $foil_data->{$name.'.text'}.'</span>'; + +} + sub displayallfoils { my ($direction, $target)=@_; 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'} }; } + my $temp=0; my $i =0; my $id=$Apache::inputtags::response['-1']; @@ -289,7 +355,11 @@ sub displayallfoils { $i++; } else { $result .= '<label>'; - $result.="<input type=\"radio\" name=\"HWVAL_$Apache::inputtags::response['-1']\" value=\"$temp\" "; + $result.="<input + onchange=\"javascript:setSubmittedPart('$part');\" + type=\"radio\" + name=\"HWVAL_$Apache::inputtags::response['-1']\" + value=\"$temp\" "; if (defined($lastresponse{$name})) { $result .= 'checked="on"'; } $result .= ' />'.$Apache::response::foilgroup{$name.'.text'}. '</label>'; @@ -303,6 +373,7 @@ sub displayallfoils { } } } + if (($direction eq 'horizontal') && ($target ne 'tex')) { $result.='</tr></table>'; } return $result; } @@ -444,7 +515,7 @@ sub whichfoils { } sub displayfoils { - my ($target,$max,$randomize,$direction)=@_; + my ($target,$max,$randomize,$direction, $bubbles_per_line)=@_; my $result; my ($answer,@whichfoils)=&whichfoils($max,$randomize); @@ -489,6 +560,7 @@ sub displayfoils { } else { my @alphabet = ('A'..'Z'); my $i = 0; + my $bubble_number = 0; my $temp=0; my $id=$Apache::inputtags::response['-1']; my $part=$Apache::inputtags::part; @@ -507,13 +579,23 @@ sub displayfoils { } if ($target ne 'tex') { $result.= '<label>'; - $result.="<input type=\"radio\" name=\"HWVAL_$Apache::inputtags::response['-1']\" value=\"$temp\" "; + $result.= + "<input type=\"radio\" + onchange=\"javascript:setSubmittedPart('$part');\" + name=\"HWVAL_$Apache::inputtags::response['-1']\" + value=\"$temp\" "; if (defined($lastresponse{$name})) { $result .= 'checked="on"'; } $result .= ' />'.$Apache::response::foilgroup{$name.'.text'}."</label>"; } else { if ($Apache::lonhomework::type eq 'exam') { $result .= '{\small \textbf{'.$alphabet[$i].'}}$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\'; #' stupid emacs $i++; + $bubble_number++; + if($bubble_number >= $bubbles_per_line) { + $i = 0; + $bubble_number = 0; + $result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]'; + } } else { $result .= '\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'}; } @@ -536,7 +618,6 @@ sub displayallanswers { if ( $Apache::response::foilgroup{'names'} ) { @names= @{ $Apache::response::foilgroup{'names'} }; } - my $result=&Apache::response::answer_header('radiobuttonresponse'); foreach my $name (@names) { $result.=&Apache::response::answer_part('radiobuttonresponse',