--- loncom/homework/matchresponse.pm	2008/12/11 01:33:55	1.75
+++ loncom/homework/matchresponse.pm	2010/04/27 14:11:17	1.80
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Full matching style response
 #
-# $Id: matchresponse.pm,v 1.75 2008/12/11 01:33:55 raeburn Exp $
+# $Id: matchresponse.pm,v 1.80 2010/04/27 14:11:17 onken Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -180,7 +180,7 @@ sub end_itemgroup {
 	    $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;
     }
@@ -392,9 +392,21 @@ sub grade_response {
 	$itemstr;
     $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=
 	$gradestr;
-    if ($Apache::lonhomework::type eq 'survey') {
+    if (($Apache::lonhomework::type eq 'survey') ||
+        ($Apache::lonhomework::type eq 'surveycred') ||
+        ($Apache::lonhomework::type eq 'anonsurvey') ||
+        ($Apache::lonhomework::type eq 'anonsurveycred')) {
 	if ($ignored == 0) {
-	    my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED';
+	    my $ad;
+            if ($Apache::lonhomework::type eq 'anonsurvey') {
+                $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS';
+            } elsif ($Apache::lonhomework::type eq 'anonsurveycred') {
+                $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS_CREDIT';
+            } elsif ($Apache::lonhomework::type eq 'surveycred') {
+                $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED_CREDIT';
+            } else {
+                $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED';
+            }
 	    &Apache::response::handle_previous(\%previous,$ad);
 	} elsif ($wrong==0 && $right==0) {
 	} else {
@@ -500,7 +512,10 @@ sub displayfoils {
 	my $temp=1;
 	my $id=$Apache::inputtags::response[-1];
 	my $part=$Apache::inputtags::part;
-	my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
+        my $lastresponse;
+        unless ((($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') || ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) && (defined($env{'form.grade_symb'}))) {
+	    $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));
@@ -513,10 +528,12 @@ sub displayfoils {
 		$optionlist="<option></option>\n";
 	    } else {
 		if ($Apache::lonhomework::type ne 'exam') {
-                    if($env{'form.pdfFormFields'} eq 'yes') {
+                    if($env{'form.pdfFormFields'} eq 'yes'
+                       && $Apache::inputtags::status['-1'] eq 'CAN_ANSWER') {
                         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 {
+
                         $optionlist='\framebox[10 mm][s]{\tiny\strut}';
                     }
                 }
@@ -526,13 +543,17 @@ sub displayfoils {
 		if ($option eq $last_letter) {
 		    if ($target ne 'tex') {
                         $optionlist.="<option selected=\"on\">$option</option>\n";
-                    } elsif ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') {
+                    } elsif ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes'
+                             && $Apache::inputtags::status['-1'] eq 'CAN_ANSWER'
+                             && $Apache::lonhomework::type ne 'exam') {
                         $optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option);
                     }
 		} else {
 		    if ($target ne 'tex') {
                         $optionlist.="<option>$option</option>\n";
-                    } elsif ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') {
+                    } elsif ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes'
+                             && $Apache::inputtags::status['-1'] eq 'CAN_ANSWER'
+                             && $Apache::lonhomework::type ne 'exam') {
                         $optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option);
                     }
 		}
@@ -577,22 +598,23 @@ sub displayfoils {
 		# Note that if left or right positioned, we must
 		# confine the bubbles to righttabsize:
 		#
-		if ($Apache::lonhomework::type eq 'exam' && $env{'form.pdfFormFields'} ne 'yes') {
+		if ($Apache::lonhomework::type eq 'exam') {
 		    $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 {
-                    if($env{'form.pdfFormFields'} eq 'yes') {
+                    if($env{'form.pdfFormFields'} eq 'yes' 
+                            && $Apache::inputtags::status['-1'] eq 'CAN_ANSWER') {
                         $question .= " $optionlist ". &Apache::lonxml::print_pdf_end_combobox($text).'\strut';
                     } else {
                         $question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n";
@@ -754,11 +776,13 @@ sub end_foil {
 						     $safeeval);
 	    if ( $Apache::matchresponse::conceptgroup
 		 && !&Apache::response::showallfoils() ) {
+
 		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 {
+
 		push @{ $Apache::response::foilgroup{'names'} }, $name;
 		$Apache::response::foilgroup{"$name.value"} = $value;
 		$Apache::response::foilgroup{"$name.text"} = $text;