--- loncom/homework/essayresponse.pm	2006/09/21 21:23:19	1.74
+++ loncom/homework/essayresponse.pm	2006/10/17 15:11:11	1.77
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # essay (ungraded) style responses
 #
-# $Id: essayresponse.pm,v 1.74 2006/09/21 21:23:19 albertel Exp $
+# $Id: essayresponse.pm,v 1.77 2006/10/17 15:11:11 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -52,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'.
@@ -141,7 +147,7 @@ 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=
@@ -164,9 +170,18 @@ sub end_essayresponse {
 	$result .= &Apache::inputtags::exam_score_line($target);
 
     } elsif ($target eq 'answer') {
-	$result.=&Apache::response::answer_header($$tagstack[-1]);
-	$result.=&Apache::response::answer_part($$tagstack[-1],'');
-	$result.=&Apache::response::answer_footer($$tagstack[-1]);
+	if ($env{'form.answer_output_mode'} eq 'tex') {
+	    $result .= '\begin{tabular}{|l|}';
+	    $result .= '\hline';
+	    $result .= ' Answer for essay will be hand graded \\\\  ';
+	    $result .= '\\hline';
+	    $result .= '\end{tabular}';
+	    $result .= '\vskip 3mm';
+	} else {
+	    $result.=&Apache::response::answer_header($$tagstack[-1]);
+	    $result.=&Apache::response::answer_part($$tagstack[-1],'');
+	    $result.=&Apache::response::answer_footer($$tagstack[-1]);
+	}
     }
 
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
@@ -212,7 +227,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);
@@ -226,7 +241,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"}="";
     }