--- loncom/homework/inputtags.pm	2004/02/06 22:39:56	1.124.2.1
+++ loncom/homework/inputtags.pm	2003/12/22 22:24:21	1.125
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.124.2.1 2004/02/06 22:39:56 albertel Exp $
+# $Id: inputtags.pm,v 1.125 2003/12/22 22:24:21 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();
@@ -500,8 +498,7 @@ sub removealldata {
 sub setgradedata {
   my ($award,$id,$previously_used) = @_;
   # if the student already has it correct, don't modify the status
-  if (!$Apache::lonhomework::scantronmode &&
-      $Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
+  if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
       $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') {
     $Apache::lonhomework::results{"resource.$id.afterduedate"}=$award;
     return '';
@@ -568,28 +565,21 @@ sub setgradedata {
       }
     }
 
-    # 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';
-	}
+    # 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/ ) {
@@ -687,7 +677,9 @@ sub gradestatus {
 	      $trystr = '\vskip 0 mm ';
 	  }
       } else {
-         $trystr = "<td>".&mt('Tries')." $tries/$maxtries</td>";
+	  $trystr = "<td>".&mt('Tries')." $tries";
+	  if($ENV{'request.state'} ne 'construct') { $trystr.="/$maxtries"; }
+	  $trystr.="</td>";
       }
     }
     if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;}