--- loncom/homework/inputtags.pm	2008/12/15 20:24:53	1.254
+++ loncom/homework/inputtags.pm	2010/06/17 00:13:20	1.264
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.254 2008/12/15 20:24:53 raeburn Exp $
+# $Id: inputtags.pm,v 1.264 2010/06/17 00:13:20 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -388,12 +388,13 @@ sub start_textline {
 	     && $Apache::lonhomework::type ne 'exam') {
 	my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
 	if ($size != 0) {$size=$size*2; $size.=' mm';} else {$size='40 mm';}
-	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.
                                  '&textresponse'.
                                  '&HWVAL_' . $Apache::inputtags::response['-1'];
-            $result="\n\\\\\n".'\textField{'.$fieldname.'}{'.$size.'}{12 bp}';
+            $result='\textField{'.$fieldname.'}{'.$size.'}{12 bp}';
         } else {
             $result='\framebox['.$size.'][s]{\tiny\strut}';
         }
@@ -571,9 +572,11 @@ sub valid_award {
 			       'UNIT_NOTNEEDED', 'WANTED_NUMERIC',
 			       'BAD_FORMULA', 'INTERNAL_ERROR', 'SIG_FAIL', 'INCORRECT', 
 			       'MISORDERED_RANK', 'INVALID_FILETYPE',
-                               'EXCESS_FILESIZE', 'DRAFT',
-			       'SUBMITTED', 'ASSIGNED_SCORE',
-			       'APPROX_ANS', 'EXACT_ANS','COMMA_FAIL') {
+                               'EXCESS_FILESIZE', 'FILENAME_INUSE', 
+			       'DRAFT', 'SUBMITTED', 'SUBMITTED_CREDIT', 
+                               'ANONYMOUS', 'ANONYMOUS_CREDIT',
+                               'ASSIGNED_SCORE', 'APPROX_ANS',
+			       'EXACT_ANS','COMMA_FAIL') {
 	if ($award eq $possibleaward) { return 1; }
     }
     return 0;
@@ -586,7 +589,9 @@ sub valid_award {
 		  'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT',
 		  'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', 'INTERNAL_ERROR',
 		  'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK',
-		  'INVALID_FILETYPE', 'EXCESS_FILESIZE', 'DRAFT', 'SUBMITTED',
+		  'INVALID_FILETYPE', 'EXCESS_FILESIZE', 'FILENAME_INUSE', 
+                  'DRAFT', 'SUBMITTED',
+                  'SUBMITTED_CREDIT', 'ANONYMOUS', 'ANONYMOUS_CREDIT',
                   'ASSIGNED_SCORE', 'APPROX_ANS', 'EXACT_ANS');
     my $i=0;
     my %fwd_awards = map { ($_,$i++) } @awards;
@@ -610,7 +615,7 @@ sub hide_award {
 	return 1;
     }
     if ($award =~
-	/^(?:EXACT_ANS|APPROX_ANS|SUBMITTED|ASSIGNED_SCORE|INCORRECT)/) {
+	/^(?:EXACT_ANS|APPROX_ANS|SUBMITTED|SUBMITTED_CREDIT|ANONYMOUS|ANONYMOUS_CREDIT|ASSIGNED_SCORE|INCORRECT)/) {
 	return 1;
     }
     return 0;
@@ -735,7 +740,7 @@ sub decideoutput {
 			      '.disable_receipt_display'} ne 'yes') &&
                     ($Apache::lonhomework::type ne 'practice')) { 
 		    $message.=(($target eq 'web')?'<br />':' ').
-			&mt('Your receipt is [_1]',
+			&mt('Your receipt no. is [_1]',
 			    (&Apache::lonnet::receipt($Apache::inputtags::part).
 			     (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'')));
 		}
@@ -816,8 +821,18 @@ sub decideoutput {
         $message = &mt('Submission won\'t be graded. The combined size of submitted files exceeded the amount allowed.');
         $css_class=$possible_class{'not_charged_try'};
         $button=1;
+    } elsif ($award eq 'FILENAME_INUSE') {
+        $message = &mt('You have already uploaded a file with that filename.');
+        if ($target eq 'tex') {
+            $message.= "\\\\\n";
+        } else {
+            $message .= '<br />';
+        }
+        $message .= &mt('Please use a different file name.');
+        $css_class=$possible_class{'not_charged_try'};
+        $button=1;
     } elsif ($award eq 'INVALID_FILETYPE') {
-	$message = &mt('Submission won\'t be graded. The type of file submitted is not allowed.');
+	$message = &mt("Submission won't be graded. The type of file submitted is not allowed.");
 	$css_class=$possible_class{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'SIG_FAIL') {
@@ -871,8 +886,19 @@ sub decideoutput {
 	$message = &mt("Your submission has been recorded.");
 	$css_class=$possible_class{'no_grade'};
 	$button=1;
+    } elsif ($award eq 'SUBMITTED_CREDIT') {
+        $message = &mt("Your submission has been recorded, and credit awarded.");
+        $css_class=$possible_class{'correct'};
+        $button=1;
+    } elsif ($award eq 'ANONYMOUS') {
+        $message = &mt("Your anonymous submission has been recorded.");
+        $css_class=$possible_class{'no_grade'};
+        $button=1;
+    } elsif ($award eq 'ANONYMOUS_CREDIT') {
+        $message = &mt("Your anonymous submission has been recorded, and credit awarded.");
+        $css_class=$possible_class{'correct'};
     } elsif ($award eq 'DRAFT') {
-	$message = &mt("A draft copy has been saved.");
+	$message = &mt("Copy saved but not submitted.");
 	$css_class=$possible_class{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'ASSIGNED_SCORE') {
@@ -1034,6 +1060,18 @@ sub setgradedata {
 	    $Apache::lonhomework::results{"resource.$id.solved"} =
 		$solvemsg;
 	    $Apache::lonhomework::results{"resource.$id.awarded"} = '1';
+        } elsif ( $award eq 'SUBMITTED_CREDIT' ) {
+            $Apache::lonhomework::results{"resource.$id.tries"} =
+                $Apache::lonhomework::history{"resource.$id.tries"} + 1;
+            $Apache::lonhomework::results{"resource.$id.solved"} =
+                'credit_attempted';
+            $Apache::lonhomework::results{"resource.$id.awarded"} = '1';
+        }  elsif ( $award eq 'ANONYMOUS_CREDIT' ) {
+            $Apache::lonhomework::results{"resource.$id.tries"} =
+                $Apache::lonhomework::history{"resource.$id.tries"} + 1;
+            $Apache::lonhomework::results{"resource.$id.solved"} =
+                'credit_attempted';
+            $Apache::lonhomework::results{"resource.$id.awarded"} = '1';
 	} elsif ( $award eq 'INCORRECT' ) {
 	    $Apache::lonhomework::results{"resource.$id.tries"} =
 		$Apache::lonhomework::history{"resource.$id.tries"} + 1;
@@ -1048,6 +1086,11 @@ sub setgradedata {
 		$Apache::lonhomework::history{"resource.$id.tries"} + 1;
 	    $Apache::lonhomework::results{"resource.$id.solved"} =
 		'ungraded_attempted';
+        }  elsif ( $award eq 'ANONYMOUS' ) {
+            $Apache::lonhomework::results{"resource.$id.tries"} =
+                $Apache::lonhomework::history{"resource.$id.tries"} + 1;
+            $Apache::lonhomework::results{"resource.$id.solved"} =
+                'ungraded_attempted';
 	} elsif ( $award eq 'DRAFT' ) {
 	    $Apache::lonhomework::results{"resource.$id.solved"} = '';
 	} elsif ( $award eq 'NO_RESPONSE' ) {
@@ -1107,6 +1150,10 @@ sub setgradedata {
     if ($award eq 'SUBMITTED') {
 	&Apache::response::add_to_gradingqueue();
     }
+    if (($Apache::lonhomework::type eq 'anonsurvey') ||
+        ($Apache::lonhomework::type eq 'anonsurveycred')) {
+        $Apache::lonhomework::results{"resource.$id.type"} = $Apache::lonhomework::type;
+    }
 }
 
 sub find_which_previous {
@@ -1219,12 +1266,7 @@ sub get_grade_messages {
     if ( $tries eq '' ) { $tries = '0'; }
     if ( $maxtries eq '' ) { $maxtries = '2'; } 
     if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } 
-    my $tries_text=&mt('Tries');
-    if ( $Apache::lonhomework::type eq 'survey' ||
-	 $Apache::lonhomework::parsing_a_task) {
-	$tries_text=&mt('Submissions');
-    }
-
+    my $tries_text= &get_tries_text();;
     if ($showbutton) {
 	if ($target eq 'tex') {
 	    if ($env{'request.state'} ne "construct"
@@ -1236,7 +1278,7 @@ sub get_grade_messages {
 		$trystr = '\vskip 0 mm ';
 	    }
 	} else {
-	    $trystr = '<td><span class="LC_nobreak">'.$tries_text." $tries";
+	    $trystr = '<td><span class="LC_nobreak">'.&mt($tries_text)." $tries";
 	    if ($Apache::lonhomework::parsing_a_task) {
 	    } elsif($env{'request.state'} ne 'construct') {
 		$trystr.="/$maxtries";
@@ -1288,11 +1330,9 @@ sub gradestatus {
 	if ( $showbutton ) { 
 	    if ($target ne 'tex') {
 		$button = 
-		    '<input 
-                          onmouseup="javascript:setSubmittedPart(\''.$id.'\')"
-                           onsubmit="javascript:setSubmittedPart(\''.$id.'\')"
-                        type="submit" name="submit_'.$id.'"
-                         value="'.&mt('Submit Answer').'" />';
+            '<input onmouseup="javascript:setSubmittedPart(\''.$id.'\');this.form.action+=\'#'.&escape($id).'\';"
+                    type="submit" name="submit_'.$id.'"
+                    value="'.&mt('Submit Answer').'" />';
 	    }
 	}
 
@@ -1325,7 +1365,13 @@ sub previous_tries {
 
     foreach my $i (1..$Apache::lonhomework::history{'version'}) {
 	my $prefix = $i.":resource.$id";
-
+        my $is_anon; 
+        if (defined($env{'form.grade_symb'})) {
+            if (($Apache::lonhomework::history{"$prefix.type"} eq 'anonsurvey') || 
+                ($Apache::lonhomework::history{"$prefix.type"} eq 'anonsurveycred')) {
+                $is_anon = 1;
+            }
+        }
 	next if (!exists($Apache::lonhomework::history{"$prefix.award"}));
 	$count++;
 	$count_lookup{$i} = $count;
@@ -1370,7 +1416,11 @@ sub previous_tries {
 		    $submission = 
 			$Apache::lonhomework::history{"$prefix.submission"};
 		}
-		$output.='<td>'.$submission.'</td>';
+                if ($is_anon) {
+                    $output.='<td>'.&mt('(only shown to submitter)').'</td>';
+                } else {
+		    $output.='<td>'.$submission.'</td>';
+                }
 	    } else {
 		$output.='<td></td>';
 	    }
@@ -1388,8 +1438,9 @@ sub previous_tries {
     $output.='<br /><form action=""><center><input type="button" name="close" value="'.&mt('Close Window').'" onClick="window.close()" /></center></form>';
 
     my $windowopen=&Apache::lonhtmlcommon::javascript_docopen();
+    my $tries_text = &get_tries_text('link');
     my $start_page =
-	&Apache::loncommon::start_page('Previous Tries', undef,
+	&Apache::loncommon::start_page($tries_text, undef,
 				       {'only_body'      => 1,
 					'bgcolor'        => '#FFFFFF',
 					'js_ready'       => 1,
@@ -1404,12 +1455,34 @@ sub previous_tries {
 // <![CDATA[
     function $function_name() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('$start_page $output $end_page');newWindow.document.close();newWindow.focus()}
 // ]]>
-</script><a href=\"javascript:$function_name();void(0);\">".&mt("Previous Tries")."</a><br />";
+</script><a href=\"javascript:$function_name();void(0);\">".&mt($tries_text)."</a><br />";
     #use Data::Dumper;
     #&Apache::lonnet::logthis(&Dumper(\%Apache::inputtags::submission_display));
     return $result;
 }
 
+sub get_tries_text {
+    my ($context) = @_;
+    my $tries_text;
+    if ($context eq 'link') {
+        $tries_text = 'Previous Tries';
+    } else {
+        $tries_text = 'Tries';
+    }
+    if ( $Apache::lonhomework::type eq 'survey' ||
+         $Apache::lonhomework::type eq 'surveycred' ||
+         $Apache::lonhomework::type eq 'anonsurvey' ||
+         $Apache::lonhomework::type eq 'anonsurveycred' ||
+         $Apache::lonhomework::parsing_a_task) {
+        if ($context eq 'link') {
+            $tries_text = 'Previous Submissions';
+        } else {
+            $tries_text = 'Submissions';
+        }
+    }
+    return $tries_text;
+}
+
 1;
 __END__