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

[sakharuk]

sakharuk		Tue Mar 25 17:21:20 2003 EDT

  Modified files:              
    /loncom/homework	matchresponse.pm 
  Log:
  Enumeration is corrected for exam mode (see notes for optionresponse or rankresponse).
  
  
Index: loncom/homework/matchresponse.pm
diff -u loncom/homework/matchresponse.pm:1.12 loncom/homework/matchresponse.pm:1.13
--- loncom/homework/matchresponse.pm:1.12	Thu Mar 20 14:38:41 2003
+++ loncom/homework/matchresponse.pm	Tue Mar 25 17:21:20 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Full matching style response
 #
-# $Id: matchresponse.pm,v 1.12 2003/03/20 19:38:41 albertel Exp $
+# $Id: matchresponse.pm,v 1.13 2003/03/25 22:21:20 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,6 +33,8 @@
 use Math::Random();
 use Apache::optionresponse;
 
+my @Items = ();
+
 BEGIN {
     &Apache::lonxml::register('Apache::matchresponse',('matchresponse'));
 }
@@ -87,7 +89,6 @@
     my $result;
     %Apache::response::itemgroup=();
     %Apache::matchresponse::itemtable=();
-
     if ($target eq 'edit') {
 	$result=&Apache::edit::tag_start($target,$token);
 	$result.=&Apache::edit::select_arg('Randomize Order:','randomize',
@@ -127,9 +128,10 @@
     foreach my $name (@names) {
 	$letter_name_map{$alphabet[$i]}=$name;
 	$name_letter_map{$name}=$alphabet[$i];
+	$Items[$i] = $alphabet[$i];
 	$i++;
     }
-    $Apache::response::itemgroup{'letter_name_map'}=\%letter_name_map;
+     $Apache::response::itemgroup{'letter_name_map'}=\%letter_name_map;
     $Apache::response::itemgroup{'name_letter_map'}=\%name_letter_map;
     if ($target eq 'web') {
 	my $table='<table>';
@@ -384,7 +386,7 @@
 	my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
 	my %lastresponse=&Apache::lonnet::str2hash($lastresponse);    
 	my @alphabet=('A'..'Z');
-	my @used_letters=sort(keys(%letter_name_map));
+        my @Items_letter = splice @alphabet, 0, $#Items + 1;
 	foreach my $name (@whichfoils) {
 	    my $lastopt=$lastresponse{$name};
 	    my $last_letter=$name_letter_map{$lastopt};
@@ -394,12 +396,10 @@
 	    } else {
 		if ($Apache::lonhomework::type ne 'exam') {
 		    $optionlist='\framebox[5 mm][s]{\tiny\strut}';
-		} else {
-		    $optionlist='\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]';
 		}
 	    }
 	    my $option;
-	    foreach $option (@used_letters) {
+	    foreach $option (sort(keys(%letter_name_map))) {
 		if ($option eq $last_letter) {
 		    if ($target ne 'tex') {$optionlist.="<option selected=\"on\">$option</option>\n";}
 		} else {
@@ -410,19 +410,19 @@
 	        $optionlist='<select name="HWVAL_'.
 		    $Apache::inputtags::response[-1].':'.$temp.'">'.
 		        $optionlist."</select>\n";
-	    } else {
-		$optionlist=$optionlist;
 	    }
 	    my $text=$Apache::response::foilgroup{$name.'.text'};
 	    if ($target ne 'tex') {
 		$question.='<br />'.$optionlist.$text."\n";
 		if ($Apache::lonhomework::type eq 'exam') {
-		    $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@used_letters);
+		    $question.=&Apache::optionresponse::webbubbles(\@Items_letter,\@Items);
 		}
 	    } else {		
 		if ($Apache::lonhomework::type eq 'exam') {
 		    $question.=' '.$optionlist.$text."\n";
-		    $question.=&Apache::optionresponse::bubbles(\@used_letters,\@used_letters).'\end{enumerate} \vskip -7 mm \strut ';
+		    my @emptyItems = ();
+		    for (my $i=0;$i<=$#Items;$i++) {push @emptyItems, ' ';}
+		    $question.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@Items_letter,\@emptyItems).'}\end{enumerate}} \vskip -3 mm \strut ';
 	        } else {
 		    $question.=' \\\\ '.$optionlist.$text."\n";
 		}