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

[sakharuk]

sakharuk		Wed Mar 19 13:18:54 2003 EDT

  Modified files:              
    /loncom/homework	rankresponse.pm 
  Log:
   Improved version of module (looks better on the paper).
  
  
Index: loncom/homework/rankresponse.pm
diff -u loncom/homework/rankresponse.pm:1.4 loncom/homework/rankresponse.pm:1.5
--- loncom/homework/rankresponse.pm:1.4	Wed Mar 19 09:23:38 2003
+++ loncom/homework/rankresponse.pm	Wed Mar 19 13:18:54 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # rank style response
 #
-# $Id: rankresponse.pm,v 1.4 2003/03/19 14:23:38 sakharuk Exp $
+# $Id: rankresponse.pm,v 1.5 2003/03/19 18:18:54 sakharuk Exp $
 # Copyright Michigan State University Board of Trustees
 #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -250,7 +250,8 @@
 	my $id=$Apache::inputtags::response[-1];
 	my $part=$Apache::inputtags::part;
 	my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
-	my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
+	my %lastresponse=&Apache::lonnet::str2hash($lastresponse); 
+	my @alp = splice @alphabet, 0, $#whichopt + 1;
 	foreach my $name (@whichfoils) {
 	    my $lastopt=$lastresponse{$name};
 	    my $optionlist='';
@@ -274,21 +275,21 @@
 	    if ($target ne 'tex') {
 		$result.='<br />'.$optionlist.$text."\n";
 		if ($Apache::lonhomework::type eq 'exam') {
-		    $result.=&Apache::optionresponse::webbubbles(\@alphabet,\@whichopt);
+		    $result.=&Apache::optionresponse::webbubbles(\@alp,\@whichopt);
 		}
 	    } else {
 		if ($Apache::lonhomework::type eq 'exam') {
-		    $result.=' \framebox[5 mm][s]{\tiny\strut} '.$text."\n";
-		    $result.='\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]'.&Apache::optionresponse::bubbles(\@alphabet,\@whichopt).'\end{enumerate}\strut ';
+		    $result.='\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\vskip 0 mm - '.$text."\n";
+		    $result.=&Apache::optionresponse::bubbles(\@alp,\@whichopt).'\end{enumerate} \vskip -7 mm \strut ';
 		    &Apache::lonxml::increment_counter();
 		} else {
-		$result.=' \\\\ \framebox[5 mm][s]{\tiny\strut} '.$text."\n";
+		    $result.=' \\\\ \framebox[5 mm][s]{\tiny\strut} '.$text."\n";
 		}
 	    }
 	    $temp++;
 	}
     }
-    if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';}
+    if ($target ne 'tex') {$result.="<br />";} else {$result.=' \vskip 0 mm ';}
     return $result;
 }