--- loncom/homework/inputtags.pm	2009/12/06 21:00:15	1.260.4.1
+++ loncom/homework/inputtags.pm	2010/02/28 23:27:36	1.261
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.260.4.1 2009/12/06 21:00:15 raeburn Exp $
+# $Id: inputtags.pm,v 1.261 2010/02/28 23:27:36 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -573,8 +573,10 @@ sub valid_award {
 			       'BAD_FORMULA', 'INTERNAL_ERROR', 'SIG_FAIL', 'INCORRECT', 
 			       'MISORDERED_RANK', 'INVALID_FILETYPE',
                                'EXCESS_FILESIZE', 'DRAFT',
-			       'SUBMITTED', 'ASSIGNED_SCORE',
-			       'APPROX_ANS', 'EXACT_ANS','COMMA_FAIL') {
+			       'SUBMITTED', 'SUBMITTED_CREDIT', 
+                               'ANONYMOUS', 'ANONYMOUS_CREDIT',
+                               'ASSIGNED_SCORE', 'APPROX_ANS',
+			       'EXACT_ANS','COMMA_FAIL') {
 	if ($award eq $possibleaward) { return 1; }
     }
     return 0;
@@ -588,6 +590,7 @@ sub valid_award {
 		  'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', 'INTERNAL_ERROR',
 		  'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK',
 		  'INVALID_FILETYPE', 'EXCESS_FILESIZE', 'DRAFT', 'SUBMITTED',
+                  'SUBMITTED_CREDIT', 'ANONYMOUS', 'ANONYMOUS_CREDIT',
                   'ASSIGNED_SCORE', 'APPROX_ANS', 'EXACT_ANS');
     my $i=0;
     my %fwd_awards = map { ($_,$i++) } @awards;
@@ -611,7 +614,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;
@@ -869,15 +872,20 @@ sub decideoutput {
 	$css_class=$possible_class{'charged_try'};
 	$button=1;
     } elsif ($award eq 'SUBMITTED') {
-        if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') {
-            if ($target eq 'web') {
-                $message .= '<br />'.&mt('Thank you for making a submission to the Geosciences Concept Inventory via the GCI Web Center.');
-            }
-        } else {
-	    $message = &mt("Your submission has been recorded.");
-        }
+	$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("Copy saved but not submitted.");
 	$css_class=$possible_class{'not_charged_try'};
@@ -928,14 +936,7 @@ sub decideoutput {
     if (&Apache::lonhomework::hide_problem_status()
 	&& $Apache::inputtags::status[-1] ne 'SHOW_ANSWER'
 	&& &hide_award($award)) {
-        if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') {
-            if ($target eq 'web') {
-                $message = &mt("Your submission has been recorded.").'<br />'.
-                           &mt('Thank you for making a submission to the Geosciences Concept Inventory via the GCI Web Center.');
-            }
-        } else {
-	    $message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
-        }
+	$message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
 	$css_class=$possible_class{'no_grade'};
 	$button=1;
     }
@@ -1048,6 +1049,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;
@@ -1062,6 +1075,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' ) {
@@ -1121,6 +1139,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 {
@@ -1235,6 +1257,9 @@ sub get_grade_messages {
     if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } 
     my $tries_text=&mt('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) {
 	$tries_text=&mt('Submissions');
     }
@@ -1250,19 +1275,15 @@ sub get_grade_messages {
 		$trystr = '\vskip 0 mm ';
 	    }
 	} else {
-            $trystr = '<td><span class="LC_nobreak">';
-            my %parmhash=&Apache::lonnet::coursedescription($env{'request.course.id'});
-            if ($parmhash{'suppress_tries'} ne 'yes') {
-                $trystr .= "$tries_text $tries";
-	        if ($Apache::lonhomework::parsing_a_task) {
-	        } elsif($env{'request.state'} ne 'construct') {
-		    $trystr.="/$maxtries";
-	        } else {
-		    if (defined($Apache::inputtags::params{'maxtries'})) {
-		        $trystr.="/".$Apache::inputtags::params{'maxtries'};
-		    }
-	        }
-            }
+	    $trystr = '<td><span class="LC_nobreak">'.$tries_text." $tries";
+	    if ($Apache::lonhomework::parsing_a_task) {
+	    } elsif($env{'request.state'} ne 'construct') {
+		$trystr.="/$maxtries";
+	    } else {
+		if (defined($Apache::inputtags::params{'maxtries'})) {
+		    $trystr.="/".$Apache::inputtags::params{'maxtries'};
+		}
+	    }
 	    $trystr.="</span></td>";
 	}
     }
@@ -1305,14 +1326,10 @@ sub gradestatus {
 	}
 	if ( $showbutton ) { 
 	    if ($target ne 'tex') {
-                my $submit_text = &mt('Submit Answer');
-                if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') {
-                    $submit_text = &mt('Submit Questions');
-                }
 		$button = 
             '<input onmouseup="javascript:setSubmittedPart(\''.$id.'\')"
                     type="submit" name="submit_'.$id.'"
-                    value="'.$submit_text.'" />';
+                    value="'.&mt('Submit Answer').'" />';
 	    }
 	}
 
@@ -1408,12 +1425,8 @@ 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 $pagetitle = 'Previous Tries';
-    if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') {
-        $pagetitle = 'Submission History';
-    }
     my $start_page =
-	&Apache::loncommon::start_page($pagetitle, undef,
+	&Apache::loncommon::start_page('Previous Tries', undef,
 				       {'only_body'      => 1,
 					'bgcolor'        => '#FFFFFF',
 					'js_ready'       => 1,
@@ -1424,15 +1437,11 @@ sub previous_tries {
     $prefix =~ tr{.}{_};
     my $function_name = "LONCAPA_previous_tries_".$prefix.
 	$Apache::lonxml::curdepth.'_'.$env{'form.counter'};
-    my $triestext = &mt('Previous Tries');
-    if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') {
-        $triestext = &mt('Submission History');
-    }
     my $result ="<script type=\"text/javascript\">
 // <![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);\">".$triestext."</a><br />";
+</script><a href=\"javascript:$function_name();void(0);\">".&mt("Previous Tries")."</a><br />";
     #use Data::Dumper;
     #&Apache::lonnet::logthis(&Dumper(\%Apache::inputtags::submission_display));
     return $result;