--- loncom/homework/inputtags.pm	2001/08/18 07:56:51	1.44
+++ loncom/homework/inputtags.pm	2002/01/30 17:32:42	1.52
@@ -1,12 +1,37 @@
 # The LearningOnline Network with CAPA
 # input  definitons
+#
+# $Id: inputtags.pm,v 1.52 2002/01/30 17:32:42 albertel Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # 2/19 Guy 
 
 package Apache::inputtags;
 use strict;
 
-sub BEGIN {
-  &Apache::lonxml::register('Apache::inputtags',('textarea','textline','datasubmission'));
+BEGIN {
+  &Apache::lonxml::register('Apache::inputtags',('textfield','textline','datasubmission'));
 }
 
 
@@ -23,11 +48,13 @@ sub initialize_inputtags {
   @Apache::inputtags::previous=();
   # 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>
+  # 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
+  # hash of defined params for the current response
   %Apache::inputtags::params=();
+  # list of all ids, for <import>, these get join()ed and prepended
+  @Apache::inputtags::import=();
 }
 
 sub start_input {
@@ -44,7 +71,7 @@ sub end_input {
   return '';
 }
 
-sub start_textarea {
+sub start_textfield {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $result = "";
   my $id = &start_input($parstack,$safeeval);
@@ -54,21 +81,34 @@ sub start_textarea {
     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 ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+      $result= '<textarea name="HWVAL'.$Apache::inputtags::response['-1'].'" '.
+	"rows=\"$rows\" cols=\"$cols\">".$oldresponse;
+    } else {
+      $result='<table border="1"><tr><td><i>'.$oldresponse.'</i></td></tr></table>';
+    }
     if ($oldresponse ne '') {
       #get rid of any startup text if the user has already responded
-      &Apache::lonxml::get_all_text("/textarea",$$parser[$#$parser]);
+      &Apache::lonxml::get_all_text("/textfield",$$parser[-1]);
+    }
+  }
+  if ($target eq 'grade') {
+    my $seedtext=&Apache::lonxml::get_all_text("/textfield",$$parser[-1]);
+    if ($seedtext eq $ENV{'form.HWVAL'.$Apache::inputtags::response[-1]}) {
+      # if the seed text is still there it wasn't a real submission
+      $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']}='';
     }
   }
   return $result;
 }
 
-sub end_textarea {
+sub end_textfield {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   if ($target eq 'web') {
-    return "</textarea>";
-  } 
+    if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+      return "</textarea>";
+    }
+  }
   &end_input;
   return '';
 }
@@ -83,11 +123,14 @@ sub start_textline {
     my $id=$Apache::inputtags::response['-1'];
     my $oldresponse = 
       $Apache::lonhomework::history{"resource.$partid.$id.submission"};
-    $result= '<input type="text" name="HWVAL'.$id.'" value="'.
-      $oldresponse.'" size="'.$size.'" />';
+    if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+      $result= '<input type="text" name="HWVAL'.$id.'" value="'.
+	$oldresponse.'" size="'.$size.'" />';
+    } else {
+      $result='<i>'.$oldresponse.'</i>';
+    }
   } elsif ($target eq 'edit') {
-    $result=&Apache::edit::tag_start($target,$token,
-				     &Apache::lonxml::description($token));
+    $result=&Apache::edit::tag_start($target,$token);
     $result.=&Apache::edit::text_arg('Size:','size',$token,'5')."</td></tr>";
     $result.=&Apache::edit::end_table;
   } elsif ($target eq 'modified') {
@@ -365,7 +408,7 @@ sub gradestatus {
     }
     if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;}
     if ( $showbutton ) { 
-      $button = '<br /><input type="submit" name="submit" value="Submit All Answers" />';
+      $button = '<br /><input type="submit" name="submit" value="Submit Answer" />';
     }
   }
   my $output= $previousmsg.$message.$trystr;