[LON-CAPA-cvs] cvs: loncom /homework matchresponse.pm

[foxr]

foxr		Mon Nov 23 12:05:37 2009 EDT

  Modified files:              
    /loncom/homework	matchresponse.pm 
  Log:
  BZ 5455 - Raisd the position of the bubbles so that they are on the same 
     line as the numbers.
  
  
Index: loncom/homework/matchresponse.pm
diff -u loncom/homework/matchresponse.pm:1.76 loncom/homework/matchresponse.pm:1.77
--- loncom/homework/matchresponse.pm:1.76	Thu Apr 16 15:04:58 2009
+++ loncom/homework/matchresponse.pm	Mon Nov 23 12:05:36 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Full matching style response
 #
-# $Id: matchresponse.pm,v 1.76 2009/04/16 15:04:58 onken Exp $
+# $Id: matchresponse.pm,v 1.77 2009/11/23 12:05:36 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -180,7 +180,7 @@
 	    $i++;
 	}
 	$table.=' \end{description}  \strut ';
-	if ($Apache::lonhomework::type eq 'exam') {$table.='\vskip -13 mm \strut ';}
+	if ($Apache::lonhomework::type eq 'exam')  {$table.='\vskip -13 mm \strut ';}
 	$Apache::matchresponse::itemtable{'display'}=$table;
 	$Apache::lonxml::post_evaluate=0;
     }
@@ -518,6 +518,8 @@
                         my $fieldname = $env{'request.symb'} . '&part_'. $Apache::inputtags::part .'&matchresponse'. '&HWVAL_' . $Apache::inputtags::response['-1'] . ':' . $temp . '&submit_' . $Apache::inputtags::part . '&';
                         $optionlist = &Apache::lonxml::print_pdf_start_combobox($fieldname);
                     } else {
+			&Apache::lonnet::logthis("Exam2");
+
                         $optionlist='\framebox[10 mm][s]{\tiny\strut}';
                     }
                 }
@@ -573,6 +575,7 @@
 		    $question.="<br />\n".$text;
 		}
 		if ($Apache::lonhomework::type eq 'exam') {
+		    &Apache::lonnet::logthis('webbubbles');
 		    my @blank;
 		    $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@blank,$temp,$last_letter);
 		}
@@ -581,20 +584,22 @@
 		# confine the bubbles to righttabsize:
 		#
 		if ($Apache::lonhomework::type eq 'exam' && $env{'form.pdfFormFields'} ne 'yes') {
+		    &Apache::lonnet::logthis('exam3');
 		    $question.=' '.$optionlist.$text."\n";
 		    my @emptyItems = ();
 		    for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';}
 		    $question.='\vskip -1 mm\noindent\begin{list}{}{\setlength{\listparindent}{0mm}\setlength{\leftmargin}{2mm}}'
 			.'\item \hskip -3mm \textbf{'.$internal_counter.'}';
 		    if (&itemdisplay('left') || &itemdisplay('right')) {
-			$question .= &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems, "", $righttabsize);
+			$question .= '\vskip -4 mm' . &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems, "", $righttabsize);
 		    }
 		    else {
-			$question .= &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems);
+			$question .= '\vskip -4 mm' . &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems);
 		    }
 		    $question .= '\end{list} \vskip -8 mm \strut ';
 		    $internal_counter++;
 	        } else {
+		    &Apache::lonnet::logthis("Exam4");
                     if($env{'form.pdfFormFields'} eq 'yes' 
                             && $Apache::inputtags::status['-1'] eq 'CAN_ANSWER') {
                         $question .= " $optionlist ". &Apache::lonxml::print_pdf_end_combobox($text).'\strut';
@@ -739,6 +744,7 @@
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
 	$target eq 'tex' || $target eq 'analyze') {
 	if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
+	    &Apache::lonnet::logthis('triangleright');
 	    $text='\vskip 5mm $\triangleright$ '.$text;
 	}
 	my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
@@ -758,11 +764,15 @@
 						     $safeeval);
 	    if ( $Apache::matchresponse::conceptgroup
 		 && !&Apache::response::showallfoils() ) {
+		&Apache::lonnet::logthis("pushing conceptgroup");
+
 		push @{ $Apache::response::conceptgroup{'names'} }, $name;
 		$Apache::response::conceptgroup{"$name.value"} = $value;
 		$Apache::response::conceptgroup{"$name.text"} = $text;
 		$Apache::response::conceptgroup{"$name.location"} = $location;
 	    } else {
+		&Apache::lonnet::logthis("pushing foilgroup.");
+
 		push @{ $Apache::response::foilgroup{'names'} }, $name;
 		$Apache::response::foilgroup{"$name.value"} = $value;
 		$Apache::response::foilgroup{"$name.text"} = $text;