--- loncom/homework/rankresponse.pm	2004/02/09 19:38:00	1.28
+++ loncom/homework/rankresponse.pm	2007/03/27 19:20:49	1.51
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # rank style response
 #
-# $Id: rankresponse.pm,v 1.28 2004/02/09 19:38:00 albertel Exp $
+# $Id: rankresponse.pm,v 1.51 2007/03/27 19:20:49 albertel Exp $
 # Copyright Michigan State University Board of Trustees
 #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -28,7 +28,8 @@
 package Apache::rankresponse;
 use strict;
 use HTML::Entities();
-use Apache::optionresponse;
+use Apache::optionresponse();
+use Apache::lonlocal;
 
 BEGIN {
     &Apache::lonxml::register('Apache::rankresponse',('rankresponse'));
@@ -43,6 +44,7 @@ sub start_rankresponse {
     push (@Apache::lonxml::namespace,'rankresponse');
     my $id = &Apache::response::start_response($parstack,$safeeval);
     %Apache::hint::rank=();
+    undef(%Apache::response::foilnames);
     if ($target eq 'meta') {
 	$result=&Apache::response::meta_package_write('rankresponse');
     } elsif ($target eq 'edit' ) {
@@ -77,6 +79,7 @@ sub end_rankresponse {
     pop @Apache::lonxml::namespace;
     &Apache::lonxml::deregister('Apache::rankresponse',
 				('foilgroup','foil','conceptgroup'));
+    undef(%Apache::response::foilnames);
     return $result;
 }
 
@@ -86,7 +89,7 @@ sub start_foilgroup {
     my $result;
     %Apache::response::foilgroup=();
     $Apache::rankresponse::conceptgroup=0;
-    &Apache::response::setrandomnumber();
+    &Apache::response::pushrandomnumber();
     return $result;
 }
 
@@ -102,6 +105,7 @@ sub end_foilgroup {
 	if (!defined($tol)) { $tol=0; }
 	if ($target eq 'web' || $target eq 'tex') {
 	    $result=&displayfoils($target,$max,$randomize,$tol);
+	    $Apache::lonxml::post_evaluate=0;
 	} elsif ($target eq 'answer' ) {
 	    $result=&displayanswers($max,$randomize,$tol);
 	} elsif ( $target eq 'grade') {
@@ -110,11 +114,15 @@ sub end_foilgroup {
 	    my @shown = &whichfoils($max,$randomize);
 	    &Apache::response::analyze_store_foilgroup(\@shown,
 						  ['text','value','location']);
+	    my $part_id=
+		"$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+	    $Apache::lonhomework::analyze{"$part_id.tol"}=$tol;
 	}
 	&Apache::lonxml::increment_counter(&getfoilcounts($max));
     } elsif ($target eq 'edit') {
 	$result=&Apache::edit::end_table();
     }
+    &Apache::response::poprandomnumber();
     return $result;
 }
 
@@ -159,18 +167,31 @@ sub displayanswers {
     if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; }
     my @names = @{ $Apache::response::foilgroup{'names'} };
     my @whichfoils = &whichfoils($max,$randomize);
-    my $result=&Apache::response::answer_header('rankresponse');
     my @correctorder=&get_correct_order($tol,@whichfoils);
-    foreach my $order (@correctorder) {
-	$result.=&Apache::response::answer_part('rankresponse',$order);
+    my $result;
+    if ($Apache::lonhomework::type eq 'exam') {
+	my @alphabet = ('A'..'Z');
+	my $i=0;
+	foreach my $order (@correctorder) {
+	    $result.=&Apache::response::answer_header('rankresponse',$i++);
+	    $result.=&Apache::response::answer_part('rankresponse',
+						    $alphabet[$order-1]);
+	    $result.=&Apache::response::answer_part('rankresponse',$order);
+	    $result.=&Apache::response::answer_footer('rankresponse');
+	}
+    } else {
+	$result=&Apache::response::answer_header('rankresponse');
+	foreach my $order (@correctorder) {
+	    $result.=&Apache::response::answer_part('rankresponse',$order);
+	}
+	$result.=&Apache::response::answer_footer('rankresponse');
     }
-    $result.=&Apache::response::answer_footer('rankresponse');
     return $result;
 }
 
 sub check_response_order {
     my (%responsehash)=@_;
-    my @order=sort(values(%responsehash));
+    my @order=sort( {$a <=> $b} values(%responsehash));
     my $lastvalue=0;
     my $expected=1;
     my $malformed=0;
@@ -188,13 +209,13 @@ sub check_response_order {
 sub grade_response {
     my ($max,$randomize,$tol)=@_;
     my (@whichfoils)=&whichfoils($max,$randomize);
-    if (!defined($ENV{'form.submitted'})) { return; }
+    if (!&Apache::response::submitted()) { return; }
     my %responsehash;
     my %grade;
     my ($temp,$right,$wrong,$ignored)=(1,0,0,0);
     my @correctorder=&get_correct_order($tol,@whichfoils);
     foreach my $name (@whichfoils) {
-	my $response = &Apache::response::getresponse($temp);
+	my $response = &Apache::response::getresponse($temp,'A is 1');
 	my $value=shift(@correctorder);
 	if ( $response =~ /[^\s]/) {
 	    $responsehash{$name}=$response;
@@ -231,9 +252,14 @@ sub grade_response {
 	    $ad='MISSING_ANSWER';
 	}
     }
+    if ($Apache::lonhomework::type eq 'survey' &&
+	($ad eq 'INCORRECT' || $ad eq 'EXACT_ANS') ) {
+	$ad='SUBMITTED';
+    } else {
+	$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr;
+    }
     $Apache::lonhomework::results{"resource.$part.$id.submission"}=
 	$responsestr;
-    $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr;
     $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;
     &Apache::response::handle_previous(\%previous,$ad);
 }
@@ -251,12 +277,15 @@ sub displayfoils {
 	foreach my $name (@whichfoils) {
 	    my $text=$Apache::response::foilgroup{$name.'.text'};
 	    my $value=shift(@correctorder);
-	    if ($target eq 'web') {$result.='<br />';} else {$result.=' \strut\\\\\strut ';}
-	    $result.=$value.':'.$text;
+	    if ($target eq 'web') {
+		$result.='<br /><b>'.$value.':</b> '.$text;
+	    } else {
+		$result.=' \strut\\\\\strut '.$value.':'.$text;
+	    }
 	}
     } else {
 	my $i = 0;
-	my $temp=0;
+	my $temp=1;
 	my $id=$Apache::inputtags::response[-1];
 	my $part=$Apache::inputtags::part;
 	my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
@@ -276,7 +305,8 @@ sub displayfoils {
 		}
 	    }
 	    if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') {
-		$optionlist='<select name="HWVAL_'.
+		$optionlist='<select onchange="javascript:setSubmittedPart(\''.
+		  $part.'\');" name="HWVAL_'.
 		    $Apache::inputtags::response[-1].':'.$temp.'">'.
 		        $optionlist."</select>\n";
 	    } else {
@@ -295,8 +325,8 @@ sub displayfoils {
 		}
 	    } else {
 		if ($Apache::lonhomework::type eq 'exam') {
-		    $result.='\vskip 0 mm   '.$text.' \vskip -3 mm '."\n";
-		    $result.='\vskip -5 mm\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@alp,\@whichopt).'}\end{enumerate} \vskip -5 mm \strut ';
+		    $result.='\vskip 0 mm   '.$text.' \vskip 0 mm '."\n";
+		    $result.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&Apache::optionresponse::bubbles(\@alp,\@whichopt,'rankresponse').'\end{enumerate} \vskip -8 mm \strut ';
 		    $internal_counter++;
 		} else {
 		    $result.=' \vskip 0mm \framebox[5 mm][s]{\tiny\strut} '.$text."\n";
@@ -372,6 +402,9 @@ sub start_foil {
     my $result='';
     if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
 	&Apache::lonxml::startredirection;
+	if ($target eq 'analyze') {
+	    &Apache::response::check_if_computed($token,$parstack,$safeeval,'value');
+	}
     } elsif ($target eq 'edit') {
 	$result=&Apache::edit::tag_start($target,$token,"Foil");
 	my $level='-2';
@@ -404,34 +437,33 @@ sub end_foil {
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
 	$target eq 'tex' || $target eq 'analyze') {
 	my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
+	if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
+	    $text='\vskip 5mm $\triangleright$ '.$text;
+	}
 	if ($value ne 'unused') {
 	    my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
-	    my $location =&Apache::lonxml::get_param('location',$parstack,$safeeval);
 	    &Apache::lonxml::debug("Got a name of :$name:");
-	    if (!$name) { $name=$Apache::lonxml::curdepth; }
+	    if ($name eq "") {
+		&Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction.");
+		$name=$Apache::lonxml::curdepth;
+	    }
 	    &Apache::lonxml::debug("Using a name of :$name:");
+	    if (defined($Apache::response::foilnames{$name})) {
+		&Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name));
+	    }
+	    $Apache::response::foilnames{$name}++;
+	    my $location =&Apache::lonxml::get_param('location',$parstack,
+						     $safeeval);
 	    if ( $Apache::rankresponse::conceptgroup
 		 && !&Apache::response::showallfoils() ) {
 		push @{ $Apache::response::conceptgroup{'names'} }, $name;
 		$Apache::response::conceptgroup{"$name.value"} = $value;
-		if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
-		    $Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text;
-		} else {
-		    $Apache::response::conceptgroup{"$name.text"} = $text;
-		}
+		$Apache::response::conceptgroup{"$name.text"} = $text;
 		$Apache::response::conceptgroup{"$name.location"} = $location;
 	    } else {
 		push @{ $Apache::response::foilgroup{'names'} }, $name;
 		$Apache::response::foilgroup{"$name.value"} = $value;
-		if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
-		    $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;
-		} else {
-		    if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
-			$Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text;
-		    } else {
-			$Apache::response::foilgroup{"$name.text"} = $text;
-		    } 
-		}
+		$Apache::response::foilgroup{"$name.text"} = $text;
 		$Apache::response::foilgroup{"$name.location"} = $location;
 	    }
 	}