--- loncom/homework/inputtags.pm	2002/01/17 12:23:31	1.50
+++ loncom/homework/inputtags.pm	2002/08/01 15:18:58	1.59
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.50 2002/01/17 12:23:31 harris41 Exp $
+# $Id: inputtags.pm,v 1.59 2002/08/01 15:18:58 ng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -28,6 +28,7 @@
 # 2/19 Guy 
 
 package Apache::inputtags;
+use HTML::Entities();
 use strict;
 
 BEGIN {
@@ -75,21 +76,31 @@ sub start_textfield {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $result = "";
   my $id = &start_input($parstack,$safeeval);
+  my $resid=$Apache::inputtags::response[-1];
   if ($target eq 'web') {
-    my $oldresponse = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"};
+    $Apache::lonxml::evaluate--;
+    my $partid=$Apache::inputtags::part;
+    my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$resid.submission"});
     my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval);
     if ( $cols eq '') { $cols = 80; }
     my $rows = &Apache::lonxml::get_param('rows',$parstack,$safeeval);
     if ( $rows eq '') { $rows = 10; }
     if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
-      $result= '<textarea name="HWVAL'.$Apache::inputtags::response['-1'].'" '.
+      $result= '<textarea name="HWVAL'.$resid.'" '.
 	"rows=\"$rows\" cols=\"$cols\">".$oldresponse;
     } else {
       $result='<table border="1"><tr><td><i>'.$oldresponse.'</i></td></tr></table>';
     }
     if ($oldresponse ne '') {
       #get rid of any startup text if the user has already responded
-      &Apache::lonxml::get_all_text("/textfield",$$parser[$#$parser]);
+      &Apache::lonxml::get_all_text("/textfield",$$parser[-1]);
+    }
+  }
+  if ($target eq 'grade') {
+    my $seedtext=&Apache::lonxml::get_all_text("/textfield",$$parser[-1]);
+    if ($seedtext eq $ENV{'form.HWVAL'.$resid}) {
+      # if the seed text is still there it wasn't a real submission
+      $ENV{'form.HWVAL'.$resid}='';
     }
   }
   return $result;
@@ -98,6 +109,7 @@ sub start_textfield {
 sub end_textfield {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   if ($target eq 'web') {
+    $Apache::lonxml::evaluate++;
     if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
       return "</textarea>";
     }
@@ -110,12 +122,12 @@ sub start_textline {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $result = "";
   if ($target eq 'web') {
+    $Apache::lonxml::evaluate--;
     my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
     if ($size eq '') { $size=20; }
     my $partid=$Apache::inputtags::part;
-    my $id=$Apache::inputtags::response['-1'];
-    my $oldresponse = 
-      $Apache::lonhomework::history{"resource.$partid.$id.submission"};
+    my $id=$Apache::inputtags::response[-1];
+    my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"});
     if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
       $result= '<input type="text" name="HWVAL'.$id.'" value="'.
 	$oldresponse.'" size="'.$size.'" />';
@@ -135,7 +147,8 @@ sub start_textline {
 
 sub end_textline {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-  if ($target eq 'edit') { return ('','no'); }
+  if    ($target eq 'web') { $Apache::lonxml::evaluate++; }
+  elsif ($target eq 'edit') { return ('','no'); }
   return "";
 }
 
@@ -178,7 +191,17 @@ sub finalizeawards {
   my $award;
   if ($#_ == '-1') { $result = "NO_RESPONSE"; }
   if ($result eq '' ) {
-    foreach $award (@_) { if ($award eq '') {$result='MISSING_ANSWER'; last;}}
+    my $blankcount;
+    foreach $award (@_) {
+      if ($award eq '') {
+	$result='MISSING_ANSWER';
+	$blankcount++;
+      }
+    }
+    if ($blankcount == ($#_ + 1)) { $result = 'NO_RESPONSE'; }
+  }
+  if ($result eq '' ) {
+    foreach $award (@_) { if ($award eq 'MISSING_ANSWER') {$result='MISSING_ANSWER'; last;}}
   }
   if ($result eq '' ) {
     foreach $award (@_) { if ($award eq 'ERROR') {$result='ERROR'; last;}}
@@ -209,6 +232,9 @@ sub finalizeawards {
     foreach $award (@_) { if ($award eq 'INCORRECT') {$result=$award; last;} }
   }
   if ($result eq '' ) {
+    foreach $award (@_) { if ($award eq 'DRAFT') {$result=$award; last;} }
+  }
+  if ($result eq '' ) {
     foreach $award (@_) { if ($award eq 'SUBMITTED') {$result=$award; last;} }
   }
   if ($result eq '' ) {
@@ -275,6 +301,9 @@ sub decideoutput {
   } elsif ($award eq 'SUBMITTED') {
     $message = "Your submission has been recorded.";
     $button=1;
+  } elsif ($award eq 'DRAFT') {
+    $message = "A draft copy has been saved.";
+    $button=1;
   } else {
     $message = "Unknown message: $award";
     $button=1;
@@ -285,9 +314,15 @@ sub decideoutput {
 sub setgradedata {
   my ($award,$id,$previously_used) = @_;
   # if the student already has it correct, don't modify the status
-  if ( $Apache::lonhomework::history{"resource.$id.solved"} !~
+  if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER') {
+    $Apache::lonhomework::results{"resource.$id.afterduedate"}=$award;
+    return '';
+  } elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~
        /^correct/ ) {
     #handle assignment of tries and solved status
+    if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) {
+      $Apache::lonhomework::results{"resource.$id.afterduedate"}='';
+    }
     if ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) {
       $Apache::lonhomework::results{"resource.$id.tries"} =
 	$Apache::lonhomework::history{"resource.$id.tries"} + 1;
@@ -298,12 +333,14 @@ sub setgradedata {
       $Apache::lonhomework::results{"resource.$id.tries"} =
 	$Apache::lonhomework::history{"resource.$id.tries"} + 1;
       $Apache::lonhomework::results{"resource.$id.solved"} =
-	'incorrect_attempted';
+	'incorrect_attempted'
     } elsif ( $award eq 'SUBMITTED' ) {
       $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' ) {
       return '';
     } else {
@@ -317,9 +354,10 @@ sub setgradedata {
       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
+      #delete all data as they student didn't do anything, but save
+      #the list of collaborators.
       foreach my $key (keys(%Apache::lonhomework::results)) {
-	if ($key =~ /^resource\.$id\./) {
+	if (($key =~ /^resource\.$id\./) && ($key !~ /\.collaborators$/)) {
 	  &Apache::lonxml::debug("Removing $key");
 	  delete($Apache::lonhomework::results{$key});
 	}
@@ -342,12 +380,8 @@ sub grade {
     foreach $response (@Apache::inputtags::responselist) {
       &Apache::lonxml::debug("looking for response.$id.$response.awarddetail");
       my $value=$Apache::lonhomework::results{"resource.$id.$response.awarddetail"};
-      if ( $value ne '' ) {
-	&Apache::lonxml::debug("keeping $value from $response for $id");
-	push (@awards,$value);
-      } else {
-	&Apache::lonxml::debug("skipping $value from $response for $id");
-      }
+      &Apache::lonxml::debug("keeping $value from $response for $id");
+      push (@awards,$value);
     }
     my $finalaward = &finalizeawards(@awards);
     my $previously_used;
@@ -370,6 +404,7 @@ sub gradestatus {
   my ($id) = @_;
   my $showbutton = 1;
   my $message = '';
+  my $latemessage = '';
   my $trystr='';
   my $button='';
   my $previousmsg='';
@@ -401,14 +436,18 @@ sub gradestatus {
     }
     if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;}
     if ( $showbutton ) { 
-      $button = '<br /><input type="submit" name="submit" value="Submit All Answers" />';
+      $button = '<br /><input type="submit" name="submit" value="Submit Answer" />';
+    }
+    if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) {
+      #last submissions was after due date
+      $latemessage="<td bgcolor=\"#ffaaaa\">The last submission was after the Due Date</td>";
     }
   }
-  my $output= $previousmsg.$message.$trystr;
+  my $output= $previousmsg.$latemessage.$message.$trystr;
   if ($output =~ /^\s*$/) {
     return $button;
   } else {
-    return $button.'<table><tr>'.$previousmsg.$message.$trystr.'</tr></table>';
+    return $button.'<table><tr>'.$output.'</tr></table>';
   }
 }
 1;