--- loncom/homework/inputtags.pm	2001/06/27 18:51:37	1.36
+++ loncom/homework/inputtags.pm	2001/11/12 20:27:28	1.46
@@ -17,20 +17,25 @@ sub initialize_inputtags {
   @Apache::inputtags::inputlist=();
   # list of all current response ids
   @Apache::inputtags::response=();
-  #list of all response ids seen in this problem
+  # list of all response ids seen in this problem
   @Apache::inputtags::responselist=();
+  # list of whether or not a specific response was previously used
+  @Apache::inputtags::previous=();
   # id of current part, 0 means that no part is current (inside <problem> only
   $Apache::inputtags::part='';
-  # list of problem date statuses, the first element is for <problem> 
-  #if there is a second element it is for the current <part>
+  # list of problem date statuses, the first element is for <problem>
+  # if there is a second element it is for the current <part>
   @Apache::inputtags::status=();
-  #hash of defined params for the current response
+  # hash of defined params for the current response
   %Apache::inputtags::params=();
+  # list of all ids, for <import>, these get join()ed and prepended
+  @Apache::inputtags::import=();
 }
 
 sub start_input {
   my ($parstack,$safeeval)=@_;
   my $id = &Apache::lonxml::get_param('id',$parstack,$safeeval);
+  if ($id eq '') { $id = $Apache::lonxml::curdepth; }
   push (@Apache::inputtags::input,$id);
   push (@Apache::inputtags::inputlist,$id);
   return $id;
@@ -51,8 +56,12 @@ sub start_textarea {
     if ( $cols eq '') { $cols = 80; }
     my $rows = &Apache::lonxml::get_param('rows',$parstack,$safeeval);
     if ( $rows eq '') { $rows = 10; }
-    $result= '<textarea name="HWVAL'.$Apache::inputtags::response['-1'].'" '.
-      "rows=\"$rows\" cols=\"$cols\">".$oldresponse;
+    if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+      $result= '<textarea name="HWVAL'.$Apache::inputtags::response['-1'].'" '.
+	"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("/textarea",$$parser[$#$parser]);
@@ -64,8 +73,10 @@ sub start_textarea {
 sub end_textarea {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   if ($target eq 'web') {
-    return "</textarea>";
-  } 
+    if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+      return "</textarea>";
+    }
+  }
   &end_input;
   return '';
 }
@@ -76,15 +87,22 @@ sub start_textline {
   if ($target eq 'web') {
     my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
     if ($size eq '') { $size=20; }
-    my $oldresponse = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"};
-    $result= '<input type="text" name="HWVAL'.$Apache::inputtags::response['-1'].'" value="'.$oldresponse.'" size="'.$size.'" />';
-  }
-  if ($target eq 'edit') {
-    $result.=&Apache::edit::tag_start($target,$token,&Apache::lonxml::description($token));
+    my $partid=$Apache::inputtags::part;
+    my $id=$Apache::inputtags::response['-1'];
+    my $oldresponse = 
+      $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.'" />';
+    } else {
+      $result='<i>'.$oldresponse.'</i>';
+    }
+  } elsif ($target eq 'edit') {
+    $result=&Apache::edit::tag_start($target,$token,
+				     &Apache::lonxml::description($token));
     $result.=&Apache::edit::text_arg('Size:','size',$token,'5')."</td></tr>";
     $result.=&Apache::edit::end_table;
-  }
-  if ($target eq 'modified') {
+  } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'size');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
   }
@@ -98,15 +116,37 @@ sub end_textline {
 }
 
 sub start_datasubmission {
-  return '';
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+  my $id = &Apache::response::start_response($parstack,$safeeval);
+  my $result;
+  if ($target eq 'meta') {
+    $result = &Apache::response::meta_stores_write($token->[2]->{'name'},
+						   $token->[2]->{'type'},
+						   $token->[2]->{'display'});
+    $result .= &Apache::response::meta_package_write('datasubmission');
+  }
+  return $result;
 }
 
 sub end_datasubmission {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-  if ( $target == 'web' ) {
-    return '<input type="submit" name="submit" value="Submit All Data" />';
+  my $result;
+  if ( $target eq 'web' ) {
+  } elsif ($target eq 'grade' ) {
+    if ( defined $ENV{'form.submitted'}) {
+      &Apache::response::setup_params('datasubmission');
+      my $partid = $Apache::inputtags::part;
+      my $id = $Apache::inputtags::response['-1'];
+      my $response = $ENV{'form.HWVAL'.$id};
+      my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
+      if ( $response =~ /[^\s]/) {
+	$Apache::lonhomework::results{"resource.$partid.$id.$name"}=
+	  $response;
+      }
+    }
   }
-  return '';
+  &Apache::response::end_response;
+  return $result;
 }
 
 sub finalizeawards {
@@ -155,12 +195,32 @@ sub finalizeawards {
 }
 
 sub decideoutput {
-  my ($award,$solved)=@_;
+  my ($award,$solved,$previous)=@_;
   my $message='';
   my $button=0;
-  if      ($solved =~ /^correct/ || $award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
-    $message = "<b>You are correct.</b> Your receipt is ".&Apache::lonnet::receipt;
+  my $previousmsg;
+
+  if ($previous) { $previousmsg='You have entered that answer before'; }
+
+  if      ($solved =~ /^correct/) {
+    $message = "<b>You are correct.</b> Your receipt is ".
+      &Apache::lonnet::receipt;
+    $button=0;
+    $previousmsg='';
+  } elsif ($solved =~ /^excused/) {
+    $message = "<b>You are excused from the problem.</b>";
     $button=0;
+    $previousmsg='';
+  } elsif ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
+    if ($solved =~ /^incorrect/ || $solved eq '') {
+      $message = "Incorrect";
+      $button=1;
+    } else {
+      $message = "<b>You are correct.</b> Your receipt is ".
+	&Apache::lonnet::receipt;
+      $button=0;
+      $previousmsg='';
+    }
   } elsif ($award eq 'NO_RESPONSE') {
     $message = '';
     $button=1;
@@ -195,30 +255,56 @@ sub decideoutput {
     $message = "Unknown message: $award";
     $button=1;
   }
-  return ($button,$message);
+  return ($button,$message,$previousmsg);
 }
 
 sub setgradedata {
-  my ($award,$id) = @_;
-  if ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) {
-    $Apache::lonhomework::results{"resource.$id.tries"} =
-      $Apache::lonhomework::history{"resource.$id.tries"} + 1;
-    $Apache::lonhomework::results{"resource.$id.solved"} =
-      'correct_by_student';
-    $Apache::lonhomework::results{"resource.$id.awarded"} = '1';
-  } elsif ( $award eq 'INCORRECT' ) {
-    $Apache::lonhomework::results{"resource.$id.tries"} =
-      $Apache::lonhomework::history{"resource.$id.tries"} + 1;
-    $Apache::lonhomework::results{"resource.$id.solved"} =
-      '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';
-  } else {
-    $Apache::lonhomework::results{"resource.$id.solved"} =
-      'incorrect_attempted';
+  my ($award,$id,$previously_used) = @_;
+  # if the student already has it correct, don't modify the status
+  if ( $Apache::lonhomework::history{"resource.$id.solved"} !~
+       /^correct/ ) {
+    #handle assignment of tries and solved status
+    if ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) {
+      $Apache::lonhomework::results{"resource.$id.tries"} =
+	$Apache::lonhomework::history{"resource.$id.tries"} + 1;
+      $Apache::lonhomework::results{"resource.$id.solved"} =
+	'correct_by_student';
+      $Apache::lonhomework::results{"resource.$id.awarded"} = '1';
+    } elsif ( $award eq 'INCORRECT' ) {
+      $Apache::lonhomework::results{"resource.$id.tries"} =
+	$Apache::lonhomework::history{"resource.$id.tries"} + 1;
+      $Apache::lonhomework::results{"resource.$id.solved"} =
+	'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 'NO_RESPONSE' ) {
+      return '';
+    } else {
+      $Apache::lonhomework::results{"resource.$id.solved"} =
+	'incorrect_attempted';
+    }
+
+    # 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') {
+      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
+      foreach my $key (keys(%Apache::lonhomework::results)) {
+	if ($key =~ /^resource\.$id\./) {
+	  &Apache::lonxml::debug("Removing $key");
+	  delete($Apache::lonhomework::results{$key});
+	}
+      }
+      #and since they didn't do anything we were never here
+      return '';
+    } else {
+      $Apache::lonhomework::results{"resource.$id.previous"} = '0';
+    }
   }
   $Apache::lonhomework::results{"resource.$id.award"} = $award;
 }
@@ -226,26 +312,32 @@ sub setgradedata {
 sub grade {
   my ($target) = @_;
   my $id = $Apache::inputtags::part;
-#  my $result='';
   my $response='';
-  if ( $target == 'web' ) {
-    if ( defined $ENV{'form.submitted'}) {
-      my @awards = ();
-      &Apache::lonxml::debug("$#Apache::inputtags::responselist");
-      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");
+  if ( defined $ENV{'form.submitted'}) {
+    my @awards = ();
+    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");
+      }
+    }
+    my $finalaward = &finalizeawards(@awards);
+    my $previously_used;
+    if ( $#Apache::inputtags::previous eq $#awards ) {
+      $previously_used = 'PREVIOUSLY_LAST';
+      foreach my $value (@Apache::inputtags::previous) {
+	if ($value eq 'PREVIOUSLY_USED' ) {
+	  $previously_used = $value;
+	  last;
 	}
       }
-      my $finalaward = &finalizeawards(@awards);
-      &Apache::lonxml::debug("final award $finalaward");
-      &setgradedata($finalaward,$id);
     }
+    &Apache::lonxml::debug("final award $finalaward, $previously_used");
+    &setgradedata($finalaward,$id,$previously_used);
   }
   return '';
 }
@@ -256,17 +348,23 @@ sub gradestatus {
   my $message = '';
   my $trystr='';
   my $button='';
-  
+  my $previousmsg='';
+
   my $status = $Apache::inputtags::status['-1'];
   &Apache::lonxml::debug("gradestatus has :$status:");
   if ( $status ne 'CLOSED' ) {  
     my $award = $Apache::lonhomework::history{"resource.$id.award"};
     my $solved = $Apache::lonhomework::history{"resource.$id.solved"};
+    my $previous = $Apache::lonhomework::history{"resource.$id.previous"};
     &Apache::lonxml::debug("Found Award |$award|$solved|");
     if ( $award ne '' ) {
       &Apache::lonxml::debug('Getting message');
-      ($showbutton,$message) = &decideoutput($award,$solved);
-      $message="<br /><table bgcolor=\"#aaffaa\"><tr><td>$message</td></tr></table>";
+      ($showbutton,$message,$previousmsg) =
+	&decideoutput($award,$solved,$previous);
+      $message="<td bgcolor=\"#aaffaa\">$message</td>";
+      if ($previousmsg) {
+	$previousmsg="<td bgcolor=\"#ffaaaa\">$previousmsg</td>";
+      }
     }
     my $tries = $Apache::lonhomework::history{"resource.$id.tries"};
     my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
@@ -275,14 +373,19 @@ sub gradestatus {
     if ( $maxtries eq '' ) { $maxtries = '2'; } 
     if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } 
     if ( $showbutton ) {
-      $trystr = "<br />Tries $tries/$maxtries";
+      $trystr = "<td>Tries $tries/$maxtries</td>";
     }
     if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;}
     if ( $showbutton ) { 
       $button = '<br /><input type="submit" name="submit" value="Submit All Answers" />';
     }
   }
-  return $button.$message.$trystr;
+  my $output= $previousmsg.$message.$trystr;
+  if ($output =~ /^\s*$/) {
+    return $button;
+  } else {
+    return $button.'<table><tr>'.$previousmsg.$message.$trystr.'</tr></table>';
+  }
 }
 1;
 __END__