--- loncom/homework/inputtags.pm	2000/12/12 22:35:52	1.17
+++ loncom/homework/inputtags.pm	2001/04/23 18:01:05	1.31
@@ -1,5 +1,6 @@
 # The LearningOnline Network with CAPA
 # input  definitons
+# 2/19 Guy 
 
 package Apache::inputtags;
 use strict;
@@ -16,6 +17,7 @@ sub initialize_inputtags {
   @Apache::inputtags::responselist=();
   @Apache::inputtags::answergroup=();
   $Apache::inputtags::part='';
+  @Apache::inputtags::status=();
   %Apache::inputtags::params=();
 }
 
@@ -39,7 +41,19 @@ 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 $args ='';
+    if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
+    my $cols = &Apache::run::run("{$args;".'return $cols}',$safeeval);
+    if ( $cols eq '') { $cols = 80; }
+    my $rows = &Apache::run::run("{$args;".'return $rows}',$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;
 }
@@ -62,7 +76,7 @@ sub start_textline {
     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.'">';
+    $result= '<input type="text" name="HWVAL'.$Apache::inputtags::response['-1'].'" value="'.$oldresponse.'" size="'.$size.'" />';
   }
   return $result;
 }
@@ -93,12 +107,12 @@ sub end_textline {
 #  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 $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 ( defined $ENV{'form.submitted'}) {
 #    }
 #    if ($showbutton > 0) { $result.=$button }
 #  }
@@ -113,7 +127,7 @@ sub start_datasubmission {
 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 '';
 }
@@ -128,6 +142,9 @@ sub finalizeawards {
   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 (@_) { 
@@ -151,6 +168,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'; }
@@ -162,7 +182,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> Your receipt is ".&Apache::lonnet::receipt;
     $button=0;
   } elsif ($award eq 'NO_RESPONSE') {
     $message = '';
@@ -174,13 +194,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";
@@ -191,6 +211,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;
@@ -211,6 +234,11 @@ sub setgradedata {
       $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.$id.solved"} =
       'incorrect_attempted';
@@ -221,17 +249,17 @@ 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'}) {
+    if ( defined $ENV{'form.submitted'}) {
       my @awards = ();
       &Apache::lonxml::debug("$#Apache::inputtags::responselist");
       foreach $response (@Apache::inputtags::responselist) {
 	&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");
@@ -242,7 +270,7 @@ sub grade {
       &setgradedata($finalaward,$id);
     }
   }
-  return $result;
+  return '';
 }
 
 sub gradestatus {
@@ -250,28 +278,30 @@ 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 '' ) {
       &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("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";
+      $trystr = "<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 /><input type="submit" name="submit" value="Submit All Answers" />';
     }
   }
   return $button.$message.$trystr;