--- loncom/homework/essayresponse.pm 2006/08/01 14:04:32 1.73
+++ loncom/homework/essayresponse.pm 2007/09/26 00:31:23 1.84
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# essay (ungraded) style responses
#
-# $Id: essayresponse.pm,v 1.73 2006/08/01 14:04:32 albertel Exp $
+# $Id: essayresponse.pm,v 1.84 2007/09/26 00:31:23 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -31,7 +31,6 @@ use strict;
use Apache::lonxml();
use Apache::lonnet;
use Apache::lonlocal;
-use lib '/home/httpd/lib/perl/';
use LONCAPA;
@@ -52,17 +51,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'.
@@ -75,6 +80,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;
}
@@ -115,13 +146,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 $akey=join('.',&escape($name),&escape($domain),
+ &escape($crsid));
my $essayurl=
&Apache::lonnet::declutter($ENV{'REQUEST_URI'});
my ($adom,$aname,$apath)=
- ($essayurl=~/^(\w+)\/(\w+)\/(.*)$/);
+ ($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/);
$apath=&escape($apath);
$apath=~s/\W/\_/gs;
&Apache::lonnet::put('nohist_essay_'.$apath,
@@ -139,9 +171,16 @@ sub end_essayresponse {
} elsif ($target eq 'answer') {
$result.=&Apache::response::answer_header($$tagstack[-1]);
- $result.=&Apache::response::answer_part($$tagstack[-1],'');
+ my $answer = &mt('Essay will be hand graded.');
+ $result.=&Apache::response::answer_part($$tagstack[-1],$answer,
+ {'no_verbatim' => 1});
$result.=&Apache::response::answer_footer($$tagstack[-1]);
}
+ if ($target eq 'web') {
+ &Apache::response::setup_prior_tries_hash(\&format_prior_response,
+ ['portfiles',
+ 'uploadedurl']);
+ }
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
$target eq 'tex' || $target eq 'analyze') {
@@ -152,6 +191,36 @@ sub end_essayresponse {
return $result;
}
+sub format_prior_response {
+ my ($mode,$answer,$other_data) = @_;
+ my $output;
+
+ my (undef,undef,$udom,$uname) = &Apache::lonnet::whichuser();
+ my $port_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/';
+
+ my $file_list;
+
+ foreach my $file (split(/\s*,\s*/,
+ $other_data->[0].','.$other_data->[1])) {
+ next if ($file!~/\S/);
+ if ($file !~ m{^/uploaded/}) { $file=$port_url.$file; }
+ $file=~s|/+|/|g;
+ &Apache::lonnet::allowuploaded('/adm/essayresponse',$file);
+ $file_list.='<li><span class="LC_nobreak"><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.
+ &Apache::loncommon::icon($file).'" alt="file icon" border="0" /> '.$file.
+ '</a></span></li>'."\n";
+ }
+ if ($file_list) {
+ $output.= &mt('Submitted Files').'<ul>'.$file_list.'</ul>';
+ }
+ if ($answer =~ /\S/) {
+ $output.='<p>'.&mt('Submitted text').
+ '<blockquote>'.$answer.'</blockquote></p>';
+ }
+
+ return '<div class="LC_prior_essay">'.$output.'</div>';
+}
+
sub file_submission {
my ($part,$id,$which,$award,$uploadedflag)=@_;
my $files;
@@ -177,7 +246,7 @@ sub file_submission {
$uploadedfiletypes=','.$uploadedfiletypes.',';
foreach my $file (@submitted_files) {
my ($extension)=($file=~/\.(\w+)$/);
- unless ($uploadedfiletypes=~/\,$extension\,/i) {
+ unless ($uploadedfiletypes=~/\,\s*\Q$extension\E\s*\,/i) {
$$award='INVALID_FILETYPE';
}
}
@@ -186,7 +255,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);
@@ -200,7 +269,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"}="";
}