--- loncom/homework/essayresponse.pm	2006/03/09 01:11:12	1.71
+++ loncom/homework/essayresponse.pm	2006/10/23 10:00:29	1.79
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # essay (ungraded) style responses
 #
-# $Id: essayresponse.pm,v 1.71 2006/03/09 01:11:12 albertel Exp $
+# $Id: essayresponse.pm,v 1.79 2006/10/23 10:00:29 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,6 +31,9 @@ use strict;
 use Apache::lonxml();
 use Apache::lonnet;
 use Apache::lonlocal;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+ 
 
 BEGIN {
     &Apache::lonxml::register('Apache::essayresponse',('essayresponse'));
@@ -49,17 +52,23 @@ sub start_essayresponse {
 	my $coll= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"');
 	my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
         $uploadedfiletypes=~s/[^\w\,]//g;
-	$result='<br /><table border="1">';
-	$result.='<tr><td>'.
-            '<label>'.
-	    '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked="checked" /> '.
-	    &mt('Submit entries below as answer to receive credit').
-            '</label> <br />'.
-	    '<label>'.
-            '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no" /> '.
-	    &mt('Save entries below as a draft answer (not submitting them for credit yet)').
-	    '</label>'.
-            ' </td></tr>';
+	if ( $Apache::lonhomework::type eq 'survey' ) {
+	    $result.= '<input type="hidden" name="HWDRAFT'.$part.'_'.$id.'" value="yes" /> ';
+	}
+	$result.='<br /><table border="1">';
+	if ( $Apache::lonhomework::type ne 'survey' ) {
+	    $result.= '<tr><td>'.
+		'<label>'.
+		'<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked="checked" /> '.
+		&mt('Submit entries below as answer to receive credit').
+		'</label> <br />'.
+		'<label>'.
+		'<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no" /> '.
+		&mt('Save entries below as a draft answer (not submitting them for credit yet)').
+		'</label>'.
+		'</td></tr>';
+	}
+
 	if ($ncol > 0) {
 	    $result .='<tr><td>'.'<label>'.
 		'Collaborators: <input type="text" size="70" max="80" name="HWCOL'.
@@ -72,6 +81,32 @@ sub start_essayresponse {
 	$result.=&Apache::inputtags::file_selector($part,$id,
 						   $uploadedfiletypes,'both');
         $result.='</table>';
+    } elsif ($target eq 'web' &&
+	     $Apache::inputtags::status[-1] ne 'CAN_ANSWER') {
+	my $part= $Apache::inputtags::part;
+	my @msgs;
+	if ($Apache::lonhomework::history{"resource.$part.$id.collaborators"} =~ /\S/) {
+	    my $coll= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"');
+	    $result .= '<td>'.&mt('Collaborated with [_1]',$coll).'</td>';
+	}
+
+	my $file_submission = 
+	    &Apache::inputtags::show_past_file_submission($part,$id);
+	if ($file_submission) {
+	    $result .= '<td>'.$file_submission.'</td>';
+	}
+
+	my $port_submission = 
+	    &Apache::inputtags::show_past_portfile_submission($part,$id);
+	if ($port_submission) {
+	    $result .= '<td>'.$port_submission.'</td>';
+	}
+
+	if ($result ne '') {
+	    $result = 
+		'<table class="LC_pastsubmission"><tr>'.$result.
+		'</tr></table>';
+	}
     }
     return $result;
 }
@@ -112,14 +147,14 @@ sub end_essayresponse {
 #
                 if ($award eq 'SUBMITTED') {
 		    my ($symb,$crsid,$domain,$name)=
-			&Apache::lonxml::whichuser();
+			&Apache::lonnet::whichuser();
 		    if ($crsid) {
 			my $akey=$name.'.'.$domain.'.'.$crsid;
 			my $essayurl=
 			    &Apache::lonnet::declutter($ENV{'REQUEST_URI'});
 			my ($adom,$aname,$apath)=
 			    ($essayurl=~/^(\w+)\/(\w+)\/(.*)$/);
-                        $apath=&Apache::lonnet::escape($apath);
+                        $apath=&escape($apath);
 			$apath=~s/\W/\_/gs;
 			&Apache::lonnet::put('nohist_essay_'.$apath,
 					 { $akey => $response },$adom,$aname);
@@ -136,7 +171,9 @@ sub end_essayresponse {
 
     } elsif ($target eq 'answer') {
 	$result.=&Apache::response::answer_header($$tagstack[-1]);
-	$result.=&Apache::response::answer_part($$tagstack[-1],'');
+	my $answer = &mt('Hand Graded.');
+	$result.=&Apache::response::answer_part($$tagstack[-1],$answer,
+						{'no_verbatim' => 1});
 	$result.=&Apache::response::answer_footer($$tagstack[-1]);
     }
 
@@ -165,7 +202,7 @@ sub file_submission {
 	
 	my @submitted_files = ($files);
 	if ( $which eq 'portfiles' ) {
-	    @submitted_files = split(/,/,$files);
+	    @submitted_files = split(/\s*,\s*/,$files);
 	}
 
 	my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
@@ -183,7 +220,7 @@ sub file_submission {
 	    $$uploadedflag=1;
 	}
 	if ($$award ne 'INVALID_FILETYPE' && $which eq 'portfiles') {
-	    my ($symb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();
+	    my ($symb,$crsid,$domain,$name)=&Apache::lonnet::whichuser();
 	    &Apache::lonnet::unmark_as_readonly($domain,$name,[$symb,$crsid]);
 	    &Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,[$symb,$crsid]);
 	    &Apache::lonnet::clear_selected_files($name);
@@ -197,7 +234,7 @@ sub file_submission {
 	}
     } elsif ($which eq 'portfiles' &&
 	     $Apache::lonhomework::history{"resource.$part.$id.$which"}) {
-	my ($symb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();
+	my ($symb,$crsid,$domain,$name)=&Apache::lonnet::whichuser();
 	&Apache::lonnet::unmark_as_readonly($domain,$name,[$symb,$crsid]);
 	$Apache::lonhomework::results{"resource.$part.$id.$which"}="";
     }