--- loncom/homework/radiobuttonresponse.pm	2012/01/05 11:56:34	1.153
+++ loncom/homework/radiobuttonresponse.pm	2012/01/21 21:40:41	1.153.6.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # mutliple choice style responses
 #
-# $Id: radiobuttonresponse.pm,v 1.153 2012/01/05 11:56:34 foxr Exp $
+# $Id: radiobuttonresponse.pm,v 1.153.6.3 2012/01/21 21:40:41 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,6 +33,9 @@ use Apache::lonnet;
 use Apache::response;
 
 my $default_bubbles_per_line = 10;
+my @alphabet      = ( 'A' .. 'Z' ); # Foil labels.
+
+
 
 BEGIN {
     &Apache::lonxml::register( 'Apache::radiobuttonresponse',
@@ -387,6 +390,7 @@ sub format_prior_answer {
 
 }
 
+##
 sub displayallfoils {
     my ( $direction, $target ) = @_;
     my $result;
@@ -767,6 +771,185 @@ sub whichfoils {
     &Apache::lonxml::debug("Answer is $answer");
     return ( $answer, @whichfalse );
 }
+##
+# Generate the HTML for a single html foil.
+# @param $part           - The part for which the response is being generated.
+# @param $fieldname      - The basename of the radiobutton field
+# @param $name           - The foilname.
+# @param $last_responses - Reference to a hash that holds the most recent
+#                          responses.
+# @param $value          - radiobutton value.
+# 
+# @return text
+# @retval The generated html.
+#
+sub html_radiobutton {
+    my ($part, $fieldname, $name, $last_responses, $value) = @_;
+
+    my $result='<label>';
+    
+    $result .= '<input type="radio"
+                onchange="javascript:setSubmittedPart(' . "'$part');\""
+		. 'name="HWVAL_' . $fieldname . '"'
+		. "value='$value'";
+
+    if (defined($last_responses->{$name})) {
+	$result .= '  checked="checked" ';
+    }
+    $result .= ' />';
+    $result .= $Apache::response::foilgroup{$name . '.text'};
+    $result .= '</label>';
+
+    return $result;
+
+}
+##
+# Return a reference to the last response hash. This hash has exactly
+# one or zero entries.  The one entry is keyed by the foil 'name' of
+# the prior response
+#
+# @param $part - Number of the problem part.
+# 
+# @return reference to a hash.
+# @retval see above.
+#
+sub get_last_response {
+    my ($part) = @_;
+
+    my $id = $Apache::inputtags::response['-1'];
+    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);
+
+    return \%lastresponse;
+}
+
+##
+# Display foils in html rendition.:
+#
+# @param $whichfoils - Set of foils to display.
+# @param $target     - Rendition target...there are several html targets.
+# @param $direction  - 'horizontal' if layout is horizontal.
+# @param $part       - Part of the problem that's being displayed.
+# @param $solved     - Solution state of the problem.
+# @param $show_answer- True if answers should be shown.
+#
+# @return string
+# @retval generated html.
+#
+sub display_foils_html {
+    my ($whichfoils, $target, $direction, $part, $solved, $show_answer) = @_;
+    my $result;
+
+    # if the answers get shown, we need to label each item as correct or
+    # incorrect.
+
+    if ($show_answer) {
+	my $item_pretext     = '<br />'; # html prior to each item
+	my $item_posttext    = '';	 # html after each item.
+	my $finalclose       = '';	 # html to close off the whole shebang
+
+
+	# Horizontal layout is a table with each foil in a cell
+
+	if ($direction eq 'horizontal') {
+	    $result        = '<table><tr>';
+	    $item_pretext  = '<td>' . $item_pretext;
+	    $item_posttext = '</td>';
+	    $finalclose    = '</tr></table>';
+	} 
+
+	foreach my $name (@{$whichfoils}) {
+
+	    # If the item gets further surrounded by tags, this 
+	    # holds the closures for those tages.
+
+	    my $item_closetag = '';
+
+	    $result .= $item_pretext;
+
+	    # Label each foil as correct or incorrect:
+
+	    if ($Apache::response::foilgroup{$name . '.value'} eq 'true') {
+		$result .= &mt('Correct:') . '<b>';
+		$item_closetag .= '</b>';
+		
+	    } else {
+		$result .= &mt('Incorrect');
+	    }
+
+	    # Web rendition encloses the 
+	    # item text in a label tag as well:
+
+	    if ($target eq 'web') {
+		$result .= '<label>';
+		$item_closetag = '</label>' . $item_closetag;
+	    }
+	    $result .= $Apache::response::foilgroup{$name . '.text'};
+	    $result .= $item_closetag;
+	    $result .= $item_posttext;
+	    $result .= "\n";	# make the html a bit more readable.
+	}
+
+	$result .= $finalclose;
+
+    } else {
+	$result .= '<br />';	# end line prior to foilgroup:
+
+	#  Not showing the answers, we need to generate the HTML appropriate
+	#  to allowing the student to respond.
+	
+	my $item_pretext;
+	my $item_posttext;
+	my $lastresponse = &get_last_response($part);
+
+	if ( $direction eq 'horizontal' ) {
+	    $item_pretext  = '<td>';
+	    $item_posttext = '</td>';
+	}
+	else {
+	    $item_pretext = '<br/>';
+	}
+	my $item_no = 0;
+	foreach my $name (@{$whichfoils}) {
+	    $result .= $item_pretext;
+	    $result .= &html_radiobutton(
+		$part, $Apache::inputtags::response[-1],
+		$name, $lastresponse, $item_no
+		);
+	    $result .= $item_posttext;
+	    $item_no++;
+	}
+
+	if ($direction eq 'horizontal' ) {
+            $result .= "</tr></table>";
+        } else {
+	     $result .= "<br />"; 
+	}	
+    }
+
+    return $result;
+}
+
+
+##
 
 sub displayfoils {
     my ( $target, $answer, $whichfoils, $direction, $bubbles_per_line ) = @_;
@@ -777,193 +960,113 @@ sub displayfoils {
     if ( ( $target ne 'tex' )
         && &Apache::response::show_answer() )
     {
-        if ( $direction eq 'horizontal' ) {
-            if ( $target ne 'tex' ) {
-                $result .= '<table><tr>';
-            }
-        }
-        foreach my $name ( @{$whichfoils} ) {
-            if ( $direction eq 'horizontal' ) {
-                if ( $target ne 'tex' ) { $result .= '<td>'; }
-            }
-            if ( $target ne 'tex' ) {
-                $result .= "<br />";
-            }
-            else {
-                $result .= '\item \vskip -2 mm  ';
-            }
-            if ( $Apache::response::foilgroup{ $name . '.value' } eq 'true' ) {
-                if ( $target ne 'tex' ) {
-                    $result .= &mt('Correct:') . '<b>';
-                }
-                else {
-                    $result .= &mt('Correct:') . ' \textbf{';
-                }
-            }
-            else {
-                $result .= &mt('Incorrect:');
-            }
-            if ( $target eq 'web' ) { $result .= "<label>"; }
-            $result .= $Apache::response::foilgroup{ $name . '.text' };
-            if ( $target eq 'web' ) { $result .= "</label>"; }
-            if ( $Apache::response::foilgroup{ $name . '.value' } eq 'true' ) {
-                if   ( $target ne 'tex' ) { $result .= '</b>'; }
-                else                      { $result .= '}'; }
-            }
-            if ( $direction eq 'horizontal' ) {
-                if ( $target ne 'tex' ) { $result .= '</td>'; }
-            }
-        }
-        if ( $direction eq 'horizontal' ) {
-            if ( $target ne 'tex' ) {
-                $result .= '</tr></table>';
-            }
-        }
-    }
-    else {
-        my @alphabet      = ( 'A' .. 'Z' );
+
+	$result = &display_foils_html(
+	    $whichfoils, $target, $direction, $part, $solved, 1);
+
+    }  else {
         my $i             = 0;
         my $bubble_number = 0;
         my $line          = 0;
         my $temp          = 0;
         my $id            = $Apache::inputtags::response['-1'];
         my $part          = $Apache::inputtags::part;
-        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 .= "<table><tr>";
-        }
-        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' ) {
-                    $result .= "<td>";
-                }
-                else {
-                    $result .= "<br />";
-                }
-            }
-            if ( $target ne 'tex' ) {
-                $result .= '<label>';
-                $result .= "<input type=\"radio\"
-                            onchange=\"javascript:setSubmittedPart('$part');\"
-                            name=\"HWVAL_$Apache::inputtags::response['-1']\"
-                            value=\"$temp\"";
-                if ( defined( $lastresponse{$name} ) ) {
-                    $result .= ' checked="checked"';
-                }
-                $result .= ' />'
-                  . $Apache::response::foilgroup{ $name . '.text' }
-                  . "</label>";
-            }
-            else {
-                if ( $Apache::lonhomework::type eq 'exam' ) {
-                    if ( $bubble_number >= $bubbles_per_line ) {
-                        $line++;
-                        $i             = 0;
-                        $bubble_number = 0;
-                    }
-                    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 {
-                    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 .= "</td>";
-            }
-            $temp++;
-        }
-        if ( $target ne 'tex' && $direction eq 'horizontal' ) {
-            $result .= "</tr></table>";
-        }
-    }
-    if ( $target ne 'tex' ) {
-        if ( $direction ne 'horizontal' ) { $result .= "<br />"; }
+	if ($target ne 'tex') {
+	    $result = &display_foils_html($whichfoils, $target, $direction, $part,
+				0, 0);
+	} else {
+
+
+	    my $numlines;
+	    
+	    
+	    
+	    # Rendering for latex exams.
+	    
+	    if ( ( $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 . '}.]';
+		}
+	    }			# tex/exam
+	    
+	    
+	    foreach my $name ( @{$whichfoils} ) {
+		
+		
+		if ( $Apache::lonhomework::type eq 'exam' ) {
+		    if ( $bubble_number >= $bubbles_per_line ) {
+			$line++;
+			$i             = 0;
+			$bubble_number = 0;
+		    }
+		    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 {
+		    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' };
+		    }
+		}
+		
+		$temp++;
+	    }
+	    if ($target eq 'tex') {
+		$result .= '\vskip 0 mm '; 
+	    }
+	}
     }
-    else { $result .= '\vskip 0 mm '; }
     return $result;
 }