--- loncom/homework/inputtags.pm	2001/02/19 20:34:20	1.27
+++ loncom/homework/inputtags.pm	2001/04/26 21:22:35	1.32
@@ -1,5 +1,6 @@
 # The LearningOnline Network with CAPA
 # input  definitons
+# 2/19 Guy 
 
 package Apache::inputtags;
 use strict;
@@ -40,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;
 }
@@ -63,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;
 }
@@ -94,7 +107,7 @@ 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='';
@@ -114,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 '';
 }
@@ -129,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 (@_) { 
@@ -152,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'; }
@@ -159,10 +178,10 @@ sub finalizeawards {
 }
 
 sub decideoutput {
-  my ($award)=@_;
+  my ($award,$solved)=@_;
   my $message='';
   my $button=0;
-  if      ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
+  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') {
@@ -192,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;
@@ -212,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';
@@ -232,7 +259,7 @@ sub grade {
 	&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");
@@ -257,10 +284,11 @@ sub gradestatus {
   &Apache::lonxml::debug("gradestatus has :$status:");
   if ( $status ne 'CLOSED' ) {  
     my $award = $Apache::lonhomework::history{"resource.$id.award"};
-    &Apache::lonxml::debug("Found Award |$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);
+      ($showbutton,$message) = &decideoutput($award,$solved);
       $message="<br /><table bgcolor=\"#aaffaa\"><tr><td>$message</td></tr></table>";
     }
     my $tries = $Apache::lonhomework::history{"resource.$id.tries"};