--- loncom/homework/radiobuttonresponse.pm 2006/03/27 21:18:16 1.106 +++ loncom/homework/radiobuttonresponse.pm 2007/06/26 10:42:09 1.120 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # mutliple choice style responses # -# $Id: radiobuttonresponse.pm,v 1.106 2006/03/27 21:18:16 albertel Exp $ +# $Id: radiobuttonresponse.pm,v 1.120 2007/06/26 10:42:09 foxr Exp $ # # Copyright Michigan State University Board of Trustees # @@ -31,6 +31,11 @@ use strict; use HTML::Entities(); use Apache::lonlocal; use Apache::lonnet; +use Apache::response; + +my $default_bubbles_per_line = 10; +my $bubbles_per_line; +my $bubble_lines = 1; BEGIN { &Apache::lonxml::register('Apache::radiobuttonresponse',('radiobuttonresponse')); @@ -39,10 +44,18 @@ BEGIN { 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); + $bubbles_per_line = + &Apache::response::get_response_param($Apache::inputtags::part."_$id", + 'numbubbles', + $default_bubbles_per_line); + %Apache::hint::radiobutton=(); undef(%Apache::response::foilnames); if ($target eq 'meta') { @@ -124,6 +137,7 @@ sub storesurvey { my $part = $Apache::inputtags::part; my $id = $Apache::inputtags::response['-1']; my @whichfoils=@{ $Apache::response::foilgroup{'names'} }; + &bubble_line_count(scalar(@whichfoils)); my %responsehash; $responsehash{$whichfoils[$response]}=$response; my $responsestr=&Apache::lonnet::hash2str(%responsehash); @@ -136,17 +150,40 @@ sub storesurvey { return ''; } +sub bubble_line_count { + my ($numfoils) = @_; + $bubble_lines = int($numfoils / $bubbles_per_line); + if (($numfoils % $bubbles_per_line) != 0) { + $bubble_lines++; + } + return $bubble_lines; + +} + sub grade_response { my ($max,$randomize)=@_; #keep the random numbers the same must always call this my ($answer,@whichfoils)=&whichfoils($max,$randomize); if ( !&Apache::response::submitted() ) { return; } my $response; + + # Need to know how many foils we have so that I know how many + # bubble lines to consume: + + my $numfoils = scalar(@whichfoils); + &bubble_line_count($numfoils); + + + if ($env{'form.submitted'} eq 'scantron') { - $response=&Apache::response::getresponse(); + $response = &Apache::response::getresponse(1,undef,$bubble_lines, + $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']; @@ -179,7 +216,7 @@ sub end_foilgroup { $safeeval,'-2'); if ( $style eq 'survey' && $target ne 'analyze') { if ($target eq 'web' || $target eq 'tex') { - $result=&displayallfoils($direction); + $result=&displayallfoils($direction, $target); } elsif ( $target eq 'answer' ) { $result=&displayallanswers(); } elsif ( $target eq 'grade' ) { @@ -199,6 +236,7 @@ sub end_foilgroup { &grade_response($max,$randomize); } elsif ( $target eq 'analyze') { my @shown = &whichfoils($max,$randomize); + &bubble_line_count(scalar(@shown)); &Apache::response::analyze_store_foilgroup(\@shown, ['text','value','location']); my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]"; @@ -206,9 +244,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]); } + &Apache::response::poprandomnumber(); - &Apache::lonxml::increment_counter(); + &Apache::lonxml::increment_counter($bubble_lines); return $result; } @@ -230,15 +274,29 @@ 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 ''. + $foil_data->{$name.'.text'}.''; + +} + sub displayallfoils { - my ($direction)=@_; + 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'} }; } + &bubble_line_count(scalar(@names)); + my $temp=0; + my $i =0; my $id=$Apache::inputtags::response['-1']; my $part=$Apache::inputtags::part; my $lastresponse= @@ -248,19 +306,27 @@ sub displayallfoils { if (&Apache::response::show_answer() ) { foreach my $name (@names) { if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') { - if ($direction eq 'horizontal') { + if (($direction eq 'horizontal') && ($target ne 'tex')) { $result.=""; } else { - $result.="
"; + if ($target eq 'tex') { + $result .= '\item \vskip -2mm '; + } else { + $result.="
"; + } } if (defined($lastresponse{$name})) { - $result.=''; + if ($target eq 'tex') { + $result .= '}'; + } else { + $result.=''; + } } $result .= $Apache::response::foilgroup{$name.'.text'}; - if (defined($lastresponse{$name})) { + if (defined($lastresponse{$name}) && ($target ne 'tex')) { $result.=''; } - if ($direction eq 'horizontal') { $result.=""; } + if (($direction eq 'horizontal') && ($target ne 'tex')) { $result.=""; } } } } else { @@ -269,19 +335,37 @@ sub displayallfoils { if ($direction eq 'horizontal') { $result.=""; } else { - $result.="
"; + if ($target eq 'tex') { + $result .= '\item \vskip -2mm '; + } else { + $result.="
"; + } + } + if ($target eq 'tex') { + $result .= '$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\'; #' stupid emacs + $i++; + } else { + $result .= '