--- loncom/homework/essayresponse.pm 2005/05/03 05:31:51 1.65
+++ loncom/homework/essayresponse.pm 2008/02/01 22:05:45 1.87
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# essay (ungraded) style responses
#
-# $Id: essayresponse.pm,v 1.65 2005/05/03 05:31:51 albertel Exp $
+# $Id: essayresponse.pm,v 1.87 2008/02/01 22:05:45 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -31,6 +31,8 @@ use strict;
use Apache::lonxml();
use Apache::lonnet;
use Apache::lonlocal;
+use LONCAPA;
+
BEGIN {
&Apache::lonxml::register('Apache::essayresponse',('essayresponse'));
@@ -42,23 +44,30 @@ sub start_essayresponse {
my $id = &Apache::response::start_response($parstack,$safeeval);
if ($target eq 'meta') {
$result=&Apache::response::meta_package_write('essayresponse');
- } elsif ($target eq 'web') {
+ } elsif ($target eq 'web' &&
+ $Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
my $part= $Apache::inputtags::part;
my $ncol= &Apache::lonnet::EXT("resource.$part".'_'."$id.maxcollaborators");
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'.
@@ -71,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;
}
@@ -79,7 +114,7 @@ sub end_essayresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $part = $Apache::inputtags::part;
my $id = $Apache::inputtags::response[-1];
- my $increment = 1;
+ my $increment = &Apache::response::repetition();
my $result;
if ( $target eq 'grade' ) {
my $collaborators = $env{'form.HWCOL'.$part.'_'.$id};
@@ -111,14 +146,15 @@ 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+)\/(.*)$/);
- $apath=&Apache::lonnet::escape($apath);
+ ($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/);
+ $apath=&escape($apath);
$apath=~s/\W/\_/gs;
&Apache::lonnet::put('nohist_essay_'.$apath,
{ $akey => $response },$adom,$aname);
@@ -128,48 +164,94 @@ sub end_essayresponse {
}
} elsif ($target eq 'edit') {
$result.=&Apache::edit::end_table();
- } elsif ($target eq 'tex') {
- if ($Apache::lonhomework::type eq 'exam') {
- my $repetition=&Apache::response::repetition();
- $result.='\begin{enumerate}';
- if ($env{'request.state'} eq "construct" ) {$result.='\item[\strut]';}
- for (my $i=0;$i<$repetition;$i++) {
- $result.='\item[\textbf{'.($Apache::lonxml::counter+$i).
- '}.]\textit{'.&mt('Leave blank on scoring form').
- '}\vskip 0 mm';
- }
- $result.= '\end{enumerate}';
- $increment=$repetition;
- }
+
+ } elsif ($target eq 'tex'
+ && $Apache::lonhomework::type eq 'exam') {
+ $result .= &Apache::inputtags::exam_score_line($target);
+
+ } elsif ($target eq 'answer') {
+ $result.=&Apache::response::answer_header($$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') {
- &Apache::lonxml::increment_counter($increment);
+ &Apache::lonxml::increment_counter($increment, "$part.$id");
+
+ if ($target eq 'analyze') {
+ $Apache::lonhomework::analyze{"$part.$id.type"} = 'essayresponse';
+ &Apache::lonhomework::set_bubble_lines();
+ }
}
&Apache::response::end_response;
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;
- if ($which eq 'portfiles') { $files= $env{'form.HWPORT'.$part.'_'.$id}; }
+ my $jspart=$part;
+ $jspart=~s/\./_/g;
+ if ($which eq 'portfiles') { $files= $env{'form.HWPORT'.$jspart.'_'.$id}; }
if ($which eq 'filename') {
- $files = $env{'form.HWFILE'.$part.'_'.$id.'.filename'};
+ $files = $env{'form.HWFILE'.$jspart.'_'.$id.'.filename'};
}
if ($files =~ /[^\s]/) {
$files =~s/,$//;
$Apache::lonhomework::results{"resource.$part.$id.$which"}=$files;
- my @submitted_files = split(/,/,$files);
+
+ my @submitted_files = ($files);
+ if ( $which eq 'portfiles' ) {
+ @submitted_files = split(/\s*,\s*/,$files);
+ }
+
my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
if ($uploadedfiletypes) {
$uploadedfiletypes=~s/[^\w\,]//g;
$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';
}
}
@@ -178,22 +260,22 @@ sub file_submission {
$$uploadedflag=1;
}
if ($$award ne 'INVALID_FILETYPE' && $which eq 'portfiles') {
- my ($symb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();
- &Apache::lonnet::unmark_as_readonly($domain,$name,$symb.$crsid);
- &Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,$symb.$crsid);
+ 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);
}
if ($$award ne 'INVALID_FILETYPE' && $which eq 'filename') {
$Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}=
$files;
$Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}=
- &Apache::lonnet::userfileupload('HWFILE'.$part.'_'.$id,undef,
+ &Apache::lonnet::userfileupload('HWFILE'.$jspart.'_'.$id,undef,
'essayresponse');
}
} elsif ($which eq 'portfiles' &&
$Apache::lonhomework::history{"resource.$part.$id.$which"}) {
- my ($symb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();
- &Apache::lonnet::unmark_as_readonly($domain,$name,$symb.$crsid);
+ my ($symb,$crsid,$domain,$name)=&Apache::lonnet::whichuser();
+ &Apache::lonnet::unmark_as_readonly($domain,$name,[$symb,$crsid]);
$Apache::lonhomework::results{"resource.$part.$id.$which"}="";
}
}