--- loncom/homework/rankresponse.pm	2008/12/11 04:04:15	1.57.2.1
+++ loncom/homework/rankresponse.pm	2010/02/28 23:43:21	1.62
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # rank style response
 #
-# $Id: rankresponse.pm,v 1.57.2.1 2008/12/11 04:04:15 raeburn Exp $
+# $Id: rankresponse.pm,v 1.62 2010/02/28 23:43:21 raeburn Exp $
 # Copyright Michigan State University Board of Trustees
 #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -30,6 +30,8 @@ use strict;
 use HTML::Entities();
 use Apache::optionresponse();
 use Apache::lonlocal;
+use Apache::lonxml;
+use Apache::lonnet;
 
 BEGIN {
     &Apache::lonxml::register('Apache::rankresponse',('rankresponse'));
@@ -48,9 +50,9 @@ sub start_rankresponse {
     if ($target eq 'meta') {
 	$result=&Apache::response::meta_package_write('rankresponse');
     } elsif ($target eq 'edit' ) {
-        $result.=&Apache::edit::start_table($token)
+	$result.=&Apache::edit::start_table($token)
            .'<tr><td>'.&Apache::lonxml::description($token).'</td>'
-           .'<td>span class="LC_nobreak">'.&mt('Delete?').' '
+           .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
            .&Apache::edit::deletelist($target,$token)
            .'</span></td>'
            .'<td>&nbsp;'.&Apache::edit::end_row()
@@ -263,9 +265,18 @@ sub grade_response {
 	    $ad='MISSING_ANSWER';
 	}
     }
-    if ($Apache::lonhomework::type eq 'survey' &&
-	($ad eq 'INCORRECT' || $ad eq 'EXACT_ANS') ) {
-	$ad='SUBMITTED';
+    if (($ad eq 'INCORRECT' || $ad eq 'EXACT_ANS')) {
+        if ($Apache::lonhomework::type eq 'survey') {
+            $ad='SUBMITTED';
+        } elsif ($Apache::lonhomework::type eq 'surveycred') {
+	    $ad='SUBMITTED_CREDIT';
+        } elsif ($Apache::lonhomework::type eq 'anonsurvey') {
+            $ad='ANONYMOUS';
+        } elsif ($Apache::lonhomework::type eq 'anonsurveycred') {
+            $ad='ANONYMOUS_CREDIT';
+        } else {
+            $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr;
+        }
     } else {
 	$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr;
     }
@@ -315,28 +326,50 @@ 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 @alp = splice @alphabet, 0, $#whichopt + 1;
 	my $internal_counter=$Apache::lonxml::counter;
-	foreach my $name (@whichfoils) {
+        if($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') {
+            $result .= '\strut \\\\ \strut \\\\' ;
+        }
+        foreach my $name (@whichfoils) {
 	    my $lastopt=$lastresponse{$name};
 	    my $optionlist='';
-	    if ($target ne 'tex') {$optionlist="<option></option>\n";}
+	    if ($target ne 'tex') {
+                $optionlist = "<option></option>\n";
+            } 
+            if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') {
+                my $fieldname = $env{'request.symb'}.'&part_'.$Apache::inputtags::part.'&rankresponse'.'&HWVAL_'.$Apache::inputtags::response['-1'].':'.$temp;
+                $optionlist =  &Apache::lonxml::print_pdf_start_combobox($fieldname);
+            }
 	    my $option;
 	    foreach $option (@whichopt) {
 		if ($option eq $lastopt) {
-		    if ($target ne 'tex') {$optionlist.="<option selected=\"on\">$option</option>\n";}
+		    if ($target ne 'tex' ) {
+                        $optionlist.="<option selected=\"on\">$option</option>\n";
+                    } elsif ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') {
+                        $optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option); 
+                    }
 		} else {
-		    if ($target ne 'tex') {$optionlist.="<option>$option</option>\n";}
-		}
+		    if ($target ne 'tex') {
+                        $optionlist.="<option>$option</option>\n";
+                    } elsif ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') {
+                        $optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option); 
+                    }
+		} 
 	    }
 	    if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') {
 		$optionlist='<select onchange="javascript:setSubmittedPart(\''.
 		  $part.'\');" name="HWVAL_'.
 		    $Apache::inputtags::response[-1].':'.$temp.'">'.
 		        $optionlist."</select>\n";
-	    } else {
+	    } elsif ($env{'form.pdfFormFields'} eq 'yes') {
+                #do nothing
+            } else {
 		$optionlist=' '.$temp.' '.$optionlist.' ';
 	    }
 	    my $text=$Apache::response::foilgroup{$name.'.text'};
@@ -356,7 +389,11 @@ sub displayfoils {
 		    $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";
+                    if($env{'form.pdfFormFields'} ne 'yes') {
+		        $result.=' \vskip 0mm \framebox[5 mm][s]{\tiny\strut} '.$text."\n";
+                    } else {
+                        $result.= $optionlist.' '. &Apache::lonxml::print_pdf_end_combobox($text).'\strut \\\\';
+                    }
 		}
 	    }
 	    $temp++;