--- loncom/homework/inputtags.pm	2000/12/11 23:47:36	1.14
+++ loncom/homework/inputtags.pm	2001/06/01 15:52:50	1.34
@@ -1,5 +1,6 @@
 # The LearningOnline Network with CAPA
 # input  definitons
+# 2/19 Guy 
 
 package Apache::inputtags;
 use strict;
@@ -10,20 +11,26 @@ sub BEGIN {
 
 
 sub initialize_inputtags {
+  # list of current input ids
   @Apache::inputtags::input=();
+  # list of all input ids seen in this problem
   @Apache::inputtags::inputlist=();
+  # list of all current response ids
   @Apache::inputtags::response=();
+  #list of all response ids seen in this problem
   @Apache::inputtags::responselist=();
-  @Apache::inputtags::answergroup=();
+  # 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>
+  @Apache::inputtags::status=();
+  #hash of defined params for the current response
   %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);
+  my $id = &Apache::lonxml::get_param('id',$parstack,$safeeval);
   push (@Apache::inputtags::input,$id);
   push (@Apache::inputtags::inputlist,$id);
   return $id;
@@ -39,7 +46,17 @@ sub start_textarea {
   my $result = "";
   my $id = &start_input($parstack,$safeeval);
   if ($target eq 'web') {
-    $result= '<textarea name="HWVAL'.$id.'" value="">';
+    my $oldresponse = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"};
+    my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval);
+    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 ($oldresponse ne '') {
+      #get rid of any startup text if the user has already responded
+      &Apache::lonxml::get_all_text("/textarea",$$parser[$#$parser]);
+    }
   }
   return $result;
 }
@@ -57,12 +74,10 @@ sub start_textline {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;
   my $result = "";
   if ($target eq 'web') {
-    my $args ='';
-    if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
-    my $size = &Apache::run::run("{$args;".'return $size}',$safeeval);
+    my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
     if ($size eq '') { $size=20; }
-    my $oldresponse = $Apache::lonhomework::history{"resource.submission.$Apache::inputtags::part.$Apache::inputtags::response['-1']"};
-    $result= '<input type="text" name="HWVAL'.$Apache::inputtags::response['-1'].'" value="'.$oldresponse.'" 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;
 }
@@ -72,48 +87,14 @@ sub end_textline {
   return "";
 }
 
-#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 {
+  return '';
 }
 
 sub end_datasubmission {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;
   if ( $target == 'web' ) {
-    return '<input type="submit" name="submit" value="Submit All Data">';
+    return '<input type="submit" name="submit" value="Submit All Data" />';
   }
   return '';
 }
@@ -122,7 +103,16 @@ 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 'NO_RESPONSE') {$result='NO_RESPONSE'; last;} }
+  }
+
   if ($result eq '' ) {
     foreach $award (@_) { 
       if ($award eq 'UNIT_FAIL' ||
@@ -145,6 +135,9 @@ sub finalizeawards {
     foreach $award (@_) { if ($award eq 'INCORRECT') {$result=$award; last;} }
   }
   if ($result eq '' ) {
+    foreach $award (@_) { if ($award eq 'SUBMITTED') {$result=$award; last;} }
+  }
+  if ($result eq '' ) {
     foreach $award (@_) { if ($award eq 'APPROX_ANS') {$result=$award; last;} }
   }
   if ($result eq '' ) { $result='EXACT_ANS'; }
@@ -152,11 +145,11 @@ sub finalizeawards {
 }
 
 sub decideoutput {
-  my ($award)=@_;
+  my ($award,$solved)=@_;
   my $message='';
   my $button=0;
-  if      ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
-    $message = "Correct computer gets %s";
+  if      ($solved =~ /^correct/ || $award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
+    $message = "<b>You are correct.</b> Your receipt is ".&Apache::lonnet::receipt;
     $button=0;
   } elsif ($award eq 'NO_RESPONSE') {
     $message = '';
@@ -168,13 +161,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";
@@ -185,6 +178,9 @@ sub decideoutput {
   } elsif ($award eq 'INCORRECT') {
     $message = "Incorrect";
     $button=1;
+  } elsif ($award eq 'SUBMITTED') {
+    $message = "Your submission has been recorded.";
+    $button=1;
   } else {
     $message = "Unknown message: $award";
     $button=1;
@@ -195,37 +191,42 @@ 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';
+  } 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.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'}) {
+    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");
+	  &Apache::lonxml::debug("keeping $value from $response for $id");
 	  push (@awards,$value);
 	} else {
 	  &Apache::lonxml::debug("skipping $value from $response for $id");
@@ -236,31 +237,40 @@ 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 ne 'CLOSED' ) {  
+    my $award = $Apache::lonhomework::history{"resource.$id.award"};
+    my $solved = $Apache::lonhomework::history{"resource.$id.solved"};
+    &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>";
+    }
+    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;
 }