--- loncom/homework/inputtags.pm	2000/12/01 00:44:48	1.9
+++ loncom/homework/inputtags.pm	2000/12/12 22:35:52	1.17
@@ -5,12 +5,13 @@ package Apache::inputtags;
 use strict;
 
 sub BEGIN {
-  &Apache::lonxml::register('Apache::inputtags',('textarea','textline','answergroup','datasubmission'));
+  &Apache::lonxml::register('Apache::inputtags',('textarea','textline','datasubmission'));
 }
 
 
 sub initialize_inputtags {
   @Apache::inputtags::input=();
+  @Apache::inputtags::inputlist=();
   @Apache::inputtags::response=();
   @Apache::inputtags::responselist=();
   @Apache::inputtags::answergroup=();
@@ -18,31 +19,50 @@ sub initialize_inputtags {
   %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 = "";
-  $Apache::inputtags::curvalue++;
+  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;
 }
 
 sub end_textarea {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;
-  return "</textarea>";
+  if ($target eq 'web') {
+    return "</textarea>";
+  } 
+  &end_input;
+  return '';
 }
 
 sub start_textline {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;
   my $result = "";
-  $Apache::inputtags::curvalue++;
-  my $args ='';
-  if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
-  my $size = &Apache::run::run("{$args;".'return $size}',$safeeval);
-  if ($size eq '') { $size=20; }
   if ($target eq 'web') {
-    $result= '<input type="text" name="HWVAL'.$Apache::inputtags::curvalue.'" value="" size="'.$size.'">';
+    my $args ='';
+    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.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"};
+    $result= '<input type="text" name="HWVAL'.$Apache::inputtags::response['-1'].'" value="'.$oldresponse.'" size="'.$size.'">';
   }
   return $result;
 }
@@ -52,38 +72,39 @@ sub end_textline {
   return "";
 }
 
-sub start_answergroup {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
-  my $args ='';
-  if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
-  my $id = &Apache::run::run("{$args;".'return $id}',$safeeval);
-  push (@Apache::inputtags::answergroup,$id);
-  if ($target == 'web') {
-    
-  }
-  return '';
-}
-
-sub end_answergroup {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
-  return ''; # <answergroup> has ben deprecated
-  my $args ='';
-  if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
-  my $id = &Apache::run::run("{$args;".'return $id}',$safeeval);
-  push (@Apache::inputtags::answergroup,$id);
-  my $result='';
-  my $button='<input type="submit" name="submit" value="Submit All Answers">';
-  my $showbutton='1';
-  my $usedtry='1';
-  my $response='';
-  if ( $target == 'web' ) {
-    if ( defined $ENV{'form.submit'}) {
-    }
-    if ($showbutton > 0) { $result.=$button }
-  }
-  pop @Apache::inputtags::answergroup;
-  return $result;
-}
+#answergroup is deprecated
+#sub start_answergroup {
+#  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+#  my $args ='';
+#  if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
+#  my $id = &Apache::run::run("{$args;".'return $id}',$safeeval);
+#  push (@Apache::inputtags::answergroup,$id);
+#  if ($target == 'web') {
+#    
+#  }
+#  return '';
+#}
+#
+#sub end_answergroup {
+#  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+#  return ''; # <answergroup> has ben deprecated
+#  my $args ='';
+#  if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
+#  my $id = &Apache::run::run("{$args;".'return $id}',$safeeval);
+#  push (@Apache::inputtags::answergroup,$id);
+#  my $result='';
+#  my $button='<input type="submit" name="submit" value="Submit All Answers">';
+#  my $showbutton='1';
+#  my $usedtry='1';
+#  my $response='';
+#  if ( $target == 'web' ) {
+#    if ( defined $ENV{'form.submit'}) {
+#    }
+#    if ($showbutton > 0) { $result.=$button }
+#  }
+#  pop @Apache::inputtags::answergroup;
+#  return $result;
+#}
 
 
 sub start_datasubmission {
@@ -94,13 +115,20 @@ sub end_datasubmission {
   if ( $target == 'web' ) {
     return '<input type="submit" name="submit" value="Submit All Data">';
   }
+  return '';
 }
 
 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' ||
@@ -110,44 +138,98 @@ 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
 }
 
+sub decideoutput {
+  my ($award)=@_;
+  my $message='';
+  my $button=0;
+  if      ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
+    $message = "Correct computer gets %s";
+    $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";
+    $button=1;
+  } elsif ($award eq 'SIG_FAIL') {
+    $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";
+    $button=1;
+  } elsif ($award eq 'UNIT_NOTNEEDED') {
+    $message = "Only a number required, Computer reads units of %s";
+    $button=1;
+  } elsif ($award eq 'NO_UNIT') {
+    $message = "Units required";
+    $button=1;
+  } elsif ($award eq 'BAD_FORMULA') {
+    $message = "Unable to understand formula";
+    $button=1;
+  } elsif ($award eq 'INCORRECT') {
+    $message = "Incorrect";
+    $button=1;
+  } else {
+    $message = "Unknown message: $award";
+    $button=1;
+  }
+  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 $showbutton='1';
-  my $usedtry='1';
   my $response='';
   if ( $target == 'web' ) {
     if ( defined $ENV{'form.submit'}) {
       my @awards = ();
+      &Apache::lonxml::debug("$#Apache::inputtags::responselist");
       foreach $response (@Apache::inputtags::responselist) {
-	my $value=$Apache::lonhomework::results{"response.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);
@@ -157,12 +239,43 @@ sub grade {
       }
       my $finalaward = &finalizeawards(@awards);
       &Apache::lonxml::debug("final award $finalaward");
+      &setgradedata($finalaward,$id);
     }
-    if ($showbutton > 0) { $result.=$button }
   }
   return $result;
 }
 
+sub gradestatus {
+  my ($id) = @_;
+  my $showbutton = 1;
+  my $message = '';
+  my $trystr='';
+    my $button='';
+  
+  my ($date,$passed) = &Apache::lonhomework::check_date("OPEN_DATE",$id);
+
+  if ( $passed ) {  
+    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("goit 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 ( $showbutton ) { 
+      $button = '<input type="submit" name="submit" value="Submit All Answers"><br></br>';
+    }
+  }
+  return $button.$message.$trystr;
+}
 1;
 __END__