--- loncom/homework/inputtags.pm	2000/12/12 22:35:52	1.17
+++ loncom/homework/inputtags.pm	2001/01/10 21:49:43	1.23
@@ -16,6 +16,7 @@ sub initialize_inputtags {
   @Apache::inputtags::responselist=();
   @Apache::inputtags::answergroup=();
   $Apache::inputtags::part='';
+  @Apache::inputtags::status=();
   %Apache::inputtags::params=();
 }
 
@@ -162,7 +163,7 @@ sub decideoutput {
   my $message='';
   my $button=0;
   if      ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
-    $message = "Correct computer gets %s";
+    $message = "<b>You are correct.</b> You receipt is ".&Apache::lonnet::receipt;
     $button=0;
   } elsif ($award eq 'NO_RESPONSE') {
     $message = '';
@@ -174,13 +175,13 @@ sub decideoutput {
     $message = "This question expects a numeric answer";
     $button=1;
   } elsif ($award eq 'SIG_FAIL') {
-    $message = "Please adjust significant figures, you provided %s significant figures";
+    $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";
+    $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";
+    $message = "Only a number required.";# Computer reads units of %s";
     $button=1;
   } elsif ($award eq 'NO_UNIT') {
     $message = "Units required";
@@ -221,7 +222,7 @@ sub setgradedata {
 sub grade {
   my ($target) = @_;
   my $id = $Apache::inputtags::part;
-  my $result='';
+#  my $result='';
   my $response='';
   if ( $target == 'web' ) {
     if ( defined $ENV{'form.submit'}) {
@@ -242,7 +243,7 @@ sub grade {
       &setgradedata($finalaward,$id);
     }
   }
-  return $result;
+  return '';
 }
 
 sub gradestatus {
@@ -250,11 +251,11 @@ sub gradestatus {
   my $showbutton = 1;
   my $message = '';
   my $trystr='';
-    my $button='';
+  my $button='';
   
-  my ($date,$passed) = &Apache::lonhomework::check_date("OPEN_DATE",$id);
-
-  if ( $passed ) {  
+  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 '' ) {
@@ -263,15 +264,16 @@ sub gradestatus {
     }
     my $tries = $Apache::lonhomework::history{"resource.$id.tries"};
     my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
-    &Apache::lonxml::debug("goit maxtries of :$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></br>Tries $tries/$maxtries";
     }
-    if ( $tries >= $maxtries ) { $showbutton = 0; }
+    if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;}
     if ( $showbutton ) { 
-      $button = '<input type="submit" name="submit" value="Submit All Answers"><br></br>';
+      $button = '<br></br><input type="submit" name="submit" value="Submit All Answers"><br></br>';
     }
   }
   return $button.$message.$trystr;