--- loncom/homework/radiobuttonresponse.pm	2007/03/01 02:31:20	1.112
+++ loncom/homework/radiobuttonresponse.pm	2007/06/29 17:24:03	1.122
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # mutliple choice style responses
 #
-# $Id: radiobuttonresponse.pm,v 1.112 2007/03/01 02:31:20 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.122 2007/06/29 17:24:03 albertel 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;
@@ -180,31 +218,35 @@ sub end_foilgroup {
 	if ( $style eq 'survey'  && $target ne 'analyze') {
 	    if ($target eq 'web' || $target eq 'tex') {
 		$result=&displayallfoils($direction, $target);
-		if ($target eq 'web') {
-		    &setup_prior_tries_hash();
-		}
 	    } elsif ( $target eq 'answer' ) {
 		$result=&displayallanswers();
 	    } 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 ($answer,@shown) = &whichfoils($max,$randomize);
+	    $answer_count = scalar(@shown);
+
 	    if ($target eq 'web' || $target eq 'tex') {
-		$result=&displayfoils($target,$max,$randomize,$direction);
-		if ($target eq 'web') {
-		    &setup_prior_tries_hash();
-		}
+		$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]";
@@ -214,8 +256,13 @@ sub end_foilgroup {
 	}
 	$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;
 }
 
@@ -237,18 +284,14 @@ sub getfoilcounts {
     return ($truecnt,$falsecnt);
 }
 
-sub setup_prior_tries_hash {
-    my $part=$Apache::inputtags::part;
-    my $id=$Apache::inputtags::response[-1];	
-    foreach my $i (1..$Apache::lonhomework::history{'version'}) {
-	my $key = "$i:resource.$part.$id.submission";
-	next if (!exists($Apache::lonhomework::history{"$key"}));
-	my %response = 
-	    &Apache::lonnet::str2hash($Apache::lonhomework::history{$key});
-	my ($name) = keys(%response);
-	$Apache::inputtags::submission_display{$key} = 
-	    $Apache::response::foilgroup{$name.'.text'}
-    }
+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 {
@@ -256,9 +299,11 @@ 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'} };
     }
+
     my $temp=0;
     my $i   =0;
     my $id=$Apache::inputtags::response['-1'];
@@ -310,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>';
@@ -324,10 +373,35 @@ sub displayallfoils {
 	    }
 	}
     }
+    
     if (($direction eq 'horizontal') && ($target ne 'tex')) { $result.='</tr></table>'; }
     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
+
+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)=@_;
 
@@ -465,7 +539,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);
@@ -510,6 +584,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;
@@ -528,13 +603,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'};
 		}
@@ -557,7 +642,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',