--- loncom/homework/inputtags.pm	2000/12/04 21:15:33	1.10
+++ loncom/homework/inputtags.pm	2001/02/19 20:34:20	1.27
@@ -11,18 +11,36 @@ sub BEGIN {
 
 sub initialize_inputtags {
   @Apache::inputtags::input=();
+  @Apache::inputtags::inputlist=();
   @Apache::inputtags::response=();
   @Apache::inputtags::responselist=();
   @Apache::inputtags::answergroup=();
   $Apache::inputtags::part='';
+  @Apache::inputtags::status=();
   %Apache::inputtags::params=();
 }
 
+sub start_input {
+  my ($parstack,$safeeval)=@_;
+  my $args ='';
+  if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
+  my $id = &Apache::run::run("{$args;".'return $id}',$safeeval);
+  push (@Apache::inputtags::input,$id);
+  push (@Apache::inputtags::inputlist,$id);
+  return $id;
+}
+
+sub end_input {
+  pop @Apache::inputtags::input;
+  return '';
+}
+
 sub start_textarea {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;
   my $result = "";
+  my $id = &start_input($parstack,$safeeval);
   if ($target eq 'web') {
-    $result= '<textarea name="HWVAL'.$Apache::inputtags::curvalue.'" value="">';
+    $result= '<textarea name="HWVAL'.$id.'" value="">';
   }
   return $result;
 }
@@ -32,6 +50,7 @@ sub end_textarea {
   if ($target eq 'web') {
     return "</textarea>";
   } 
+  &end_input;
   return '';
 }
 
@@ -43,7 +62,8 @@ sub start_textline {
     if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
     my $size = &Apache::run::run("{$args;".'return $size}',$safeeval);
     if ($size eq '') { $size=20; }
-    $result= '<input type="text" name="HWVAL'.$Apache::inputtags::curvalue.'" value="" size="'.$size.'">';
+    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.'">';
   }
   return $result;
 }
@@ -79,7 +99,7 @@ sub end_textline {
 #  my $usedtry='1';
 #  my $response='';
 #  if ( $target == 'web' ) {
-#    if ( defined $ENV{'form.submit'}) {
+#    if ( defined $ENV{'form.submitted'}) {
 #    }
 #    if ($showbutton > 0) { $result.=$button }
 #  }
@@ -103,7 +123,13 @@ sub finalizeawards {
   my $result='';
   my $award;
   if ($#_ == '-1') { $result = "NO_RESPONSE"; }
-  foreach $award (@_) { if ($award eq '') {$result='MISSING_ANSWER'; last;}}
+  if ($result eq '' ) {
+    foreach $award (@_) { if ($award eq '') {$result='MISSING_ANSWER'; last;}}
+  }
+  if ($result eq '' ) {
+    foreach $award (@_) { if ($award eq 'ERROR') {$result='ERROR'; last;}}
+  }
+
   if ($result eq '' ) {
     foreach $award (@_) { 
       if ($award eq 'UNIT_FAIL' ||
@@ -113,28 +139,22 @@ sub finalizeawards {
       }
     }
   }
-  &Apache::lonxml::debug("1 $result");
   if ($result eq '' ) {
     foreach $award (@_) { 
       if ($award eq 'WANTED_NUMERIC' || 
 	  $award eq 'BAD_FORMULA') {$result=$award; last;}
     }
   }
-  &Apache::lonxml::debug("2 $result");
   if ($result eq '' ) {
     foreach $award (@_) { if ($award eq 'SIG_FAIL') {$result=$award; last;} }
   }
-  &Apache::lonxml::debug("3 $result");
   if ($result eq '' ) {
     foreach $award (@_) { if ($award eq 'INCORRECT') {$result=$award; last;} }
   }
-  &Apache::lonxml::debug("4 $result");
   if ($result eq '' ) {
     foreach $award (@_) { if ($award eq 'APPROX_ANS') {$result=$award; last;} }
   }
-  &Apache::lonxml::debug("5 $result");
   if ($result eq '' ) { $result='EXACT_ANS'; }
-  &Apache::lonxml::debug("6 $result");
   return $result
 }
 
@@ -142,52 +162,75 @@ sub decideoutput {
   my ($award)=@_;
   my $message='';
   my $button=0;
-  my $tries=0;
   if      ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
-    $message = "Yes, Computer gets: ";
-    $tries=1; $button=0;
-    
+    $message = "<b>You are correct.</b> Your receipt is ".&Apache::lonnet::receipt;
+    $button=0;
+  } elsif ($award eq 'NO_RESPONSE') {
+    $message = '';
+    $button=1;
+  } elsif ($award eq 'MISSING_ANSWER') {
+    $message = 'Some parts were not submitted';
+    $button = 1;
   } elsif ($award eq 'WANTED_NUMERIC') {
     $message = "This question expects a numeric answer";
-    $tries=0; $button=1;
+    $button=1;
   } elsif ($award eq 'SIG_FAIL') {
-    $message = "Please adjust significant figures, you provided %s significant figures";
-    $tries=0; $button=1;
+    $message = "Please adjust significant figures.";# you provided %s significant figures";
+    $button=1;
   } elsif ($award eq 'UNIT_FAIL') {
-    $message = "Units incorrect, Computer reads units as %s";
-    $tries=0; $button=1;
+    $message = "Units incorrect."; #Computer reads units as %s";
+    $button=1;
   } elsif ($award eq 'UNIT_NOTNEEDED') {
-    $message = "Only a number required, Computer reads units of %s";
-    $tries=0; $button=1;
+    $message = "Only a number required.";# Computer reads units of %s";
+    $button=1;
   } elsif ($award eq 'NO_UNIT') {
     $message = "Units required";
-    $tries=0; $button=1;
+    $button=1;
   } elsif ($award eq 'BAD_FORMULA') {
     $message = "Unable to understand formula";
-    $tries=0; $button=1;
+    $button=1;
   } elsif ($award eq 'INCORRECT') {
     $message = "Incorrect";
-    $tries=0; $button=1;
+    $button=1;
   } else {
     $message = "Unknown message: $award";
-    $tries=0; $button=1;
+    $button=1;
   }
-  return ($tries,$button,$message);
+  return ($button,$message);
+}
+
+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';
+  } else {
+    $Apache::lonhomework::results{"resource.$id.solved"} =
+      'incorrect_attempted';
+  }
+  $Apache::lonhomework::results{"resource.$id.award"} = $award;
 }
 
 sub grade {
   my ($target) = @_;
   my $id = $Apache::inputtags::part;
-  my $result='';
-  my $button='<input type="submit" name="submit" value="Submit All Answers">';
+#  my $result='';
   my $response='';
   if ( $target == 'web' ) {
-    if ( defined $ENV{'form.submit'}) {
+    if ( defined $ENV{'form.submitted'}) {
       my @awards = ();
       &Apache::lonxml::debug("$#Apache::inputtags::responselist");
       foreach $response (@Apache::inputtags::responselist) {
-	&Apache::lonxml::debug("looking for response.awarddetail.$id.$response");
-	my $value=$Apache::lonhomework::results{"resource.awarddetail.$id.$response"};
+	&Apache::lonxml::debug("looking for response.$id.$response.awarddetail");
+	my $value=$Apache::lonhomework::results{"resource.$id.$response.awarddetail"};
 	if ( $value ne '' ) {
 	  &Apache::lonxml::debug("keep ing $value from $response for $id");
 	  push (@awards,$value);
@@ -196,16 +239,46 @@ sub grade {
 	}
       }
       my $finalaward = &finalizeawards(@awards);
-      my ($triesinc,$showbutton,$message) = &decideoutput($finalaward);
-      $Apache::lonhomework::results{"resource.tries.$id"} =
-	$Apache::lonhomework::history{"resource.tries.$id"} + 1;
       &Apache::lonxml::debug("final award $finalaward");
+      &setgradedata($finalaward,$id);
     }
-    if ($showbutton > 0) { $result.=$button }
   }
-  return $result;
+  return '';
 }
 
+sub gradestatus {
+  my ($id) = @_;
+  my $showbutton = 1;
+  my $message = '';
+  my $trystr='';
+  my $button='';
+  
+  my $status = $Apache::inputtags::status['-1'];
+  &Apache::lonxml::debug("gradestatus has :$status:");
+  if ( $status ne 'CLOSED' ) {  
+    my $award = $Apache::lonhomework::history{"resource.$id.award"};
+    &Apache::lonxml::debug("Found Award |$award|");
+    if ( $award ne '' ) {
+      &Apache::lonxml::debug('Getting message');
+      ($showbutton,$message) = &decideoutput($award);
+      $message="<br /><table bgcolor=\"#aaffaa\"><tr><td>$message</td></tr></table>";
+    }
+    my $tries = $Apache::lonhomework::history{"resource.$id.tries"};
+    my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
+    &Apache::lonxml::debug("got maxtries of :$maxtries:");
+    if ( $tries eq '' ) { $tries = '0'; }
+    if ( $maxtries eq '' ) { $maxtries = '2'; } 
+    if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } 
+    if ( $showbutton ) {
+      $trystr = "<br />Tries $tries/$maxtries";
+    }
+    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;
+}
 1;
 __END__