--- loncom/homework/inputtags.pm	2002/07/25 20:55:13	1.58
+++ loncom/homework/inputtags.pm	2002/09/23 17:25:24	1.62
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.58 2002/07/25 20:55:13 ng Exp $
+# $Id: inputtags.pm,v 1.62 2002/09/23 17:25:24 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -79,43 +79,64 @@ sub start_textfield {
   my $resid=$Apache::inputtags::response[-1];
   if ($target eq 'web') {
     $Apache::lonxml::evaluate--;
-    my $partid=$Apache::inputtags::part;
-    my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$resid.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; }
     if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
-      $result= '<textarea name="HWVAL'.$resid.'" '.
-	"rows=\"$rows\" cols=\"$cols\">".$oldresponse;
+	my $partid=$Apache::inputtags::part;
+	my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$resid.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'.$resid.'" '.
+	    "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("/textfield",$$parser[-1]);
+	}
     } else {
-      $result='<table border="1"><tr><td><i>'.$oldresponse.'</i></td></tr></table>';
+	#right or wrong don't show it
+	#$result='<table border="1"><tr><td><i>'.$oldresponse.'</i></td></tr></table>';
+	$result='';
+	#get rid of any startup text
+	&Apache::lonxml::get_all_text("/textfield",$$parser[-1]);
     }
-    if ($oldresponse ne '') {
-      #get rid of any startup text if the user has already responded
-      &Apache::lonxml::get_all_text("/textfield",$$parser[-1]);
-    }
-  }
-  if ($target eq 'grade') {
+  } elsif ($target eq 'grade') {
     my $seedtext=&Apache::lonxml::get_all_text("/textfield",$$parser[-1]);
     if ($seedtext eq $ENV{'form.HWVAL'.$resid}) {
       # if the seed text is still there it wasn't a real submission
       $ENV{'form.HWVAL'.$resid}='';
     }
+  } elsif ($target eq 'edit') {
+    $result.=&Apache::edit::tag_start($target,$token);
+    $result.=&Apache::edit::text_arg('Rows:','rows',$token,4);
+    $result.=&Apache::edit::text_arg('Columns:','cols',$token,4);
+    my $bodytext=&Apache::lonxml::get_all_text("/textfield",$$parser[-1]);
+    $result.=&Apache::edit::editfield($token->[1],$bodytext,'Text you want to appear by default:',80,2);
+  } elsif ($target eq 'modified') {
+    my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+						 $safeeval,'rows','cols');
+    if ($constructtag) {
+      $result = &Apache::edit::rebuild_tag($token);
+    } else {
+      $result=$token->[4];
+    }
+    $result.=&Apache::edit::modifiedfield();
   }
   return $result;
 }
 
 sub end_textfield {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+  my $result;
   if ($target eq 'web') {
     $Apache::lonxml::evaluate++;
     if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
       return "</textarea>";
     }
+  } elsif ($target eq 'edit') {
+    $result=&Apache::edit::end_table();
   }
   &end_input;
-  return '';
+  return $result;
 }
 
 sub start_textline {
@@ -123,16 +144,18 @@ sub start_textline {
   my $result = "";
   if ($target eq 'web') {
     $Apache::lonxml::evaluate--;
-    my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
-    if ($size eq '') { $size=20; }
-    my $partid=$Apache::inputtags::part;
-    my $id=$Apache::inputtags::response[-1];
-    my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"});
     if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+      my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
+      if ($size eq '') { $size=20; }
+      my $partid=$Apache::inputtags::part;
+      my $id=$Apache::inputtags::response[-1];
+      my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"});
       $result= '<input type="text" name="HWVAL'.$id.'" value="'.
 	$oldresponse.'" size="'.$size.'" />';
     } else {
-      $result='<i>'.$oldresponse.'</i>';
+      #right or wrong don't show what was last typed in.
+      #$result='<i>'.$oldresponse.'</i>';
+      $result='';
     }
   } elsif ($target eq 'edit') {
     $result=&Apache::edit::tag_start($target,$token);
@@ -232,6 +255,9 @@ sub finalizeawards {
     foreach $award (@_) { if ($award eq 'INCORRECT') {$result=$award; last;} }
   }
   if ($result eq '' ) {
+    foreach $award (@_) { if ($award eq 'DRAFT') {$result=$award; last;} }
+  }
+  if ($result eq '' ) {
     foreach $award (@_) { if ($award eq 'SUBMITTED') {$result=$award; last;} }
   }
   if ($result eq '' ) {
@@ -298,6 +324,9 @@ sub decideoutput {
   } elsif ($award eq 'SUBMITTED') {
     $message = "Your submission has been recorded.";
     $button=1;
+  } elsif ($award eq 'DRAFT') {
+    $message = "A draft copy has been saved.";
+    $button=1;
   } else {
     $message = "Unknown message: $award";
     $button=1;
@@ -327,12 +356,14 @@ sub setgradedata {
       $Apache::lonhomework::results{"resource.$id.tries"} =
 	$Apache::lonhomework::history{"resource.$id.tries"} + 1;
       $Apache::lonhomework::results{"resource.$id.solved"} =
-	'incorrect_attempted';
+	'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';
+    } elsif ( $award eq 'DRAFT' ) {
+      $Apache::lonhomework::results{"resource.$id.solved"} = '';
     } elsif ( $award eq 'NO_RESPONSE' ) {
       return '';
     } else {