--- loncom/homework/inputtags.pm	2003/11/25 23:04:58	1.124
+++ loncom/homework/inputtags.pm	2004/02/24 22:34:51	1.131
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.124 2003/11/25 23:04:58 www Exp $
+# $Id: inputtags.pm,v 1.131 2004/02/24 22:34:51 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -24,8 +24,6 @@
 # /home/httpd/html/adm/gpl.txt
 #
 # http://www.lon-capa.org/
-#
-# 2/19 Guy 
 
 package Apache::inputtags;
 use HTML::Entities();
@@ -480,7 +478,7 @@ sub decideoutput {
   }
   if (lc($Apache::lonhomework::problemstatus) eq 'no'  && 
       $Apache::inputtags::status[-1] ne 'SHOW_ANSWER') {
-      $message = &mt("Answer Submitted");
+      $message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
       $bgcolor=$possiblecolors{'correct'};
       $button=1;
   }
@@ -500,7 +498,8 @@ sub removealldata {
 sub setgradedata {
   my ($award,$id,$previously_used) = @_;
   # if the student already has it correct, don't modify the status
-  if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
+  if (!$Apache::lonhomework::scantronmode &&
+      $Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
       $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') {
     $Apache::lonhomework::results{"resource.$id.afterduedate"}=$award;
     return '';
@@ -567,21 +566,28 @@ sub setgradedata {
       }
     }
 
-    # check if this was a previous submission if it was delete the
-    # unneeded data and update the previously_used attribute
-    if ( $previously_used eq 'PREVIOUSLY_USED') {
-	if (lc($Apache::lonhomework::problemstatus) ne 'no') {
-	    delete($Apache::lonhomework::results{"resource.$id.tries"});
-	    $Apache::lonhomework::results{"resource.$id.previous"} = '1';
-	}
-    } elsif ( $previously_used eq 'PREVIOUSLY_LAST') {
-      #delete all data as they student didn't do anything, but save
-      #the list of collaborators.
-      &removealldata($id);
-      #and since they didn't do anything we were never here
-      return '';
-    } else {
-      $Apache::lonhomework::results{"resource.$id.previous"} = '0';
+    # did either of the overall awards chage? If so ignore the 
+    # previous check
+    if (($Apache::lonhomework::results{"resource.$id.awarded"} eq
+	 $Apache::lonhomework::history{"resource.$id.awarded"}) &&
+        ($Apache::lonhomework::results{"resource.$id.solved"} eq
+         $Apache::lonhomework::history{"resource.$id.solved"})) {
+	# check if this was a previous submission if it was delete the
+	# unneeded data and update the previously_used attribute
+	if ( $previously_used eq 'PREVIOUSLY_USED') {
+	    if (lc($Apache::lonhomework::problemstatus) ne 'no') {
+		delete($Apache::lonhomework::results{"resource.$id.tries"});
+		$Apache::lonhomework::results{"resource.$id.previous"} = '1';
+	    }
+	} elsif ( $previously_used eq 'PREVIOUSLY_LAST') {
+	    #delete all data as they student didn't do anything, but save
+	    #the list of collaborators.
+	    &removealldata($id);
+	    #and since they didn't do anything we were never here
+	    return '';
+	} else {
+	    $Apache::lonhomework::results{"resource.$id.previous"} = '0';
+	}
     }
   } elsif ( $Apache::lonhomework::history{"resource.$id.solved"} =~
 	    /^correct/ ) {
@@ -655,7 +661,7 @@ sub gradestatus {
       ($showbutton,$bgcolor,$message,$previousmsg) =
 	&decideoutput($award,$solved,$previous,$target);
       if ($target eq 'tex') {
-	$message=' '.$message.' ';
+	$message='\vskip 2 mm '.$message.' ';
       } else {
 	$message="<td bgcolor=\"$bgcolor\">$message</td>";
 	if ($previousmsg) {
@@ -671,21 +677,31 @@ sub gradestatus {
     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') { $tries_text=&mt('Submissions'); }
     if ( $showbutton ) {
       if ($target eq 'tex') {
 	  if ($ENV{'request.state'} ne "construct" && $Apache::lonhomework::type ne 'exam') {
-	      $trystr = ' {\vskip 1 mm \small \textit{'.&mt('Tries').'} '.$tries.'/'.$maxtries.'} \vskip 2 mm ';
+	      $trystr = ' {\vskip 1 mm \small \textit{'.$tries_text.'} '.$tries.'/'.$maxtries.'} \vskip 2 mm ';
 	  } else {
 	      $trystr = '\vskip 0 mm ';
 	  }
       } else {
-         $trystr = "<td>".&mt('Tries')." $tries/$maxtries</td>";
+	  $trystr = "<td>".$tries_text." $tries";
+	  if($ENV{'request.state'} ne 'construct') {
+	      $trystr.="/$maxtries";
+	  } else {
+	      if (defined($Apache::inputtags::params{'maxtries'})) {
+		  $trystr.="/".$Apache::inputtags::params{'maxtries'};
+	      }
+	  }
+	  $trystr.="</td>";
       }
     }
     if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;}
     if ( $showbutton ) { 
       if ($target ne 'tex') {
-        $button = '<br /><input type="submit" name="submit" value="'.&mt('Submit Answer').'" />';
+        $button = '<input type="submit" name="submit" value="'.&mt('Submit Answer').'" />';
       }
     }
     if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) {
@@ -704,7 +720,7 @@ sub gradestatus {
     if ($target eq 'tex') {
       return $button.' \vskip 0 mm '.$output.' ';
     } else {
-      return $button.'<table><tr>'.$output.'</tr></table>';
+      return '<table><tr><td>'.$button.'</td>'.$output.'</tr></table>';
     }
   }
 }