--- loncom/homework/inputtags.pm	2000/12/11 23:47:36	1.14
+++ loncom/homework/inputtags.pm	2001/01/04 22:24:23	1.20
@@ -16,6 +16,7 @@ sub initialize_inputtags {
   @Apache::inputtags::responselist=();
   @Apache::inputtags::answergroup=();
   $Apache::inputtags::part='';
+  @Apache::inputtags::status=();
   %Apache::inputtags::params=();
 }
 
@@ -61,7 +62,7 @@ sub start_textline {
     if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
     my $size = &Apache::run::run("{$args;".'return $size}',$safeeval);
     if ($size eq '') { $size=20; }
-    my $oldresponse = $Apache::lonhomework::history{"resource.submission.$Apache::inputtags::part.$Apache::inputtags::response['-1']"};
+    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;
@@ -122,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' ||
@@ -156,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 = '';
@@ -195,35 +202,35 @@ sub decideoutput {
 sub setgradedata {
   my ($award,$id) = @_;
   if ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) {
-    $Apache::lonhomework::results{"resource.tries.$id"} =
-      $Apache::lonhomework::history{"resource.tries.$id"} + 1;
-    $Apache::lonhomework::results{"resource.solved.$id"} =
+    $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.awarded.$id"} = '1';
+    $Apache::lonhomework::results{"resource.$id.awarded"} = '1';
   } elsif ( $award eq 'INCORRECT' ) {
-    $Apache::lonhomework::results{"resource.tries.$id"} =
-      $Apache::lonhomework::history{"resource.tries.$id"} + 1;
-    $Apache::lonhomework::results{"resource.solved.$id"} =
+    $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.solved.$id"} =
+    $Apache::lonhomework::results{"resource.$id.solved"} =
       'incorrect_attempted';
   }
-  $Apache::lonhomework::results{"resource.award.$id"} = $award;
+  $Apache::lonhomework::results{"resource.$id.award"} = $award;
 }
 
 sub grade {
   my ($target) = @_;
   my $id = $Apache::inputtags::part;
-  my $result='';
+#  my $result='';
   my $response='';
   if ( $target == 'web' ) {
     if ( defined $ENV{'form.submit'}) {
       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);
@@ -236,31 +243,38 @@ sub grade {
       &setgradedata($finalaward,$id);
     }
   }
-  return $result;
+  return '';
 }
 
 sub gradestatus {
   my ($id) = @_;
   my $showbutton = 1;
   my $message = '';
-  my $award = $Apache::lonhomework::history{"resource.award.$id"};
-  &Apache::lonxml::debug("Found Award |$award|");
-  if ( $award ne '' ) {
-    &Apache::lonxml::debug('Getting message');
-    ($showbutton,$message) = &decideoutput($award);
-  }
-  my $button='';
-  my $tries = $Apache::lonhomework::history{"resource.tries.$id"};
-  my $maxtries = $Apache::lonhomework::history{"resource.maxtries.$id"};
-  if ( $tries eq '' ) { $tries = '0'; }
-  if ( $maxtries eq '' ) { $maxtries = '2'; } 
   my $trystr='';
-  if ( $showbutton ) {
-    $trystr = "<br></br>Tries $tries/$maxtries";
-  }
-  if ( $tries >= $maxtries ) { $showbutton = 0; }
-  if ( $showbutton ) { 
-    $button = '<input type="submit" name="submit" value="Submit All Answers"><br></br>';
+  my $button='';
+  
+  my $status = $Apache::inputtags::status['-1'];
+  &Apache::lonxml::debug("gradestatus has :$status:");
+  if ( $status eq 'CAN_ANSWER' || $status eq 'SHOW_ANSWER' ) {  
+    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);
+    }
+    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 ( $showbutton ) {
+      $trystr = "<br></br>Tries $tries/$maxtries";
+    }
+    if ( $tries >= $maxtries ) { $showbutton = 0; }
+    if ( $status eq 'SHOW_ANSWER' ) { $showbutton = 0; }
+    if ( $showbutton ) { 
+      $button = '<br></br><input type="submit" name="submit" value="Submit All Answers"><br></br>';
+    }
   }
   return $button.$message.$trystr;
 }