--- loncom/homework/essayresponse.pm 2003/04/21 20:59:02 1.31
+++ loncom/homework/essayresponse.pm 2004/10/26 21:27:10 1.43
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# essay (ungraded) style responses
#
-# $Id: essayresponse.pm,v 1.31 2003/04/21 20:59:02 albertel Exp $
+# $Id: essayresponse.pm,v 1.43 2004/10/26 21:27:10 banghart Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,13 +25,12 @@
#
# http://www.lon-capa.org/
#
-# 4/3 Guy
-# July, 2002, H. K. Ng
-#
+
package Apache::essayresponse;
use strict;
-use Apache::lonxml;
-use Apache::lonnet;
+use Apache::lonxml();
+use Apache::lonnet();
+use Apache::lonlocal;
BEGIN {
&Apache::lonxml::register('Apache::essayresponse',('essayresponse'));
@@ -45,38 +44,51 @@ sub start_essayresponse {
$result=&Apache::response::meta_package_write('essayresponse');
} elsif ($target eq 'web') {
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 $coll= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"');
my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
$uploadedfiletypes=~s/[^\w\,]//g;
- my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"});
+ my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"');
$result='<br /><table border="1">';
$result.='<tr><td>'.
- '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked>'.
- ' Submit entries below as answer to receive credit <br />'.
- '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no">'.
- ' Save entries below as a draft answer (not submitting them for credit yet) '.
- '</td></tr>';
+ '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked> '.
+ &mt('Submit entries below as answer to receive credit').' <br />'.
+ '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no"> '.
+ &mt('Save entries below as a draft answer (not submitting them for credit yet)').
+ ' </td></tr>';
if ($ncol > 0) {
$result .='<tr><td>'.
'Collaborators: <input type="text" size="70" max="80" name="HWCOL'.
$part.'_'.$id.'" value="'.$coll.'" /><br />'.
- '(Enter maximum '.$ncol.' collaborators using username or username@domain, e.g. '.
- 'smithje or smithje@'.$ENV{'user.domain'}.'.)<br />';
+ &mt('(Enter maximum [_1] collaborators using username or username@domain, e.g. smithje or smithje@[_2].)',$ncol,$ENV{'user.domain'}).'<br />';
$result .= &check_collaborators($ncol,$coll) if ($coll =~ /\w+/);
$result .='</td></tr>';
}
if ($uploadedfiletypes) {
- $result.=
-'<tr><td>Submit a file: <input type="file" size="50" name="HWFILE'.
+ $result.='<tr><td>'.&mt('Submit a file:').
+ ' <br /><input type="file" size="50" name="HWFILE'.
$part.'_'.$id.'" onFocus="this.form.enctype='.
-"'multipart/form-data'".';" /><br />Allowed filetypes: <b>'.$uploadedfiletypes.'</b><br />';
- if ($uploadedfile) {
- $result.='Currently submitted: <tt><a href="'.
- &Apache::lonnet::tokenwrapper($Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}).'"><img src="/adm/lonIcons/unknown.gif" border=0"> '.$uploadedfile.'</a></tt>';
+ "'multipart/form-data'".';" /><br />'.
+ &mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).'<br />'.
+ '<strong>OR:</strong><br /><a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&fieldname=HWPORT'.$part.'_'.$id.'","cat","height=400,'.
+ 'width=500,scrollbars=1,resizable=1,menubar=0,location=1"))'."'".'>Select Portfolio Files</a>'.
+ '<br />'.
+ '<input type="text" size="50" name="HWPORT'.$part.'_'.$id.'" value="" />'.
+ '<br />';
+ if ($portfile=~/[^\s]/){
+ $result.="Portfolio files previously selected: <strong>".$Apache::lonhomework::history{"resource.$part.$id.portfiles"}."</strong><br />";
+ }
+
+ if ($uploadedfile) {
+ my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"};
+ push (@Apache::lonxml::extlinks,$url);
+ &Apache::lonnet::allowuploaded('/adm/essayresponse',$url);
+ my $curfile='<a href="'.$url.
+ '"><img src="/adm/lonIcons/unknown.gif" border=0" /> '.
+ $uploadedfile.'</a>';
+ $result.=&mt('Currently submitted: <tt>[_1]</tt>',$curfile);
} else {
- $result.='(Hand in a file you have prepared on your computer)';
+ $result.=&mt('(Hand in a file you have prepared on your computer)');
}
$result.='</td></tr>';
}
@@ -94,7 +106,7 @@ sub end_essayresponse {
if ( $target eq 'grade' ) {
my $collaborators = $ENV{'form.HWCOL'.$part.'_'.$id};
if ($collaborators =~ /[^\s]/) {
- my $previous_list= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"});
+ my $previous_list= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"');
$Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators
if ($collaborators ne $previous_list);
}
@@ -104,9 +116,10 @@ sub end_essayresponse {
} elsif ( defined($ENV{'form.submitted'}) ) {
my $response = $ENV{'form.HWVAL_'.$id};
my $filename= $ENV{'form.HWFILE'.$part.'_'.$id.'.filename'};
- if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/)) {
+ my $portfiles = $ENV{'form.HWPORT'.$part.'_'.$id};
+ if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/) || ($portfiles =~ /[^\s]/)) {
my $award;
- if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {
+ if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {
$award='SUBMITTED';
} else {
$award='DRAFT';
@@ -120,29 +133,55 @@ sub end_essayresponse {
if ($uploadedfiletypes=~/\,$extension\,/i) {
$Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}=$filename;
$Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}=
- &Apache::lonnet::userfileupload('HWFILE'.$part.'_'.$id);
+ &Apache::lonnet::userfileupload('HWFILE'.$part.'_'.$id,undef,'essayresponse');
$uploadedflag=1;
} else {
$award='INVALID_FILETYPE';
}
}
+ if ($portfiles =~ /[^\s]/) {
+ $Apache::lonhomework::results{"resource.$part.$id.portfiles"}=$portfiles;
+ $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}=$portfiles;
+ $uploadedflag=1;
+ }
$Apache::lonhomework::results{"resource.$part.$id.submission"}=$response;
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$award;
my %previous=&Apache::response::check_for_previous($response,$part,$id);
unless ($uploadedflag) { &Apache::response::handle_previous(\%previous,$award); }
+#
+# Store with resource author for similarity testing
+#
+ if ($award eq 'SUBMITTED') {
+ my ($symb,$crsid,$domain,$name)=
+ &Apache::lonxml::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=~s/\W/\_/gs;
+ &Apache::lonnet::put('nohist_essay_'.$apath,
+ { $akey => $response },$adom,$aname);
+ }
+ }
}
- }
+ }
} 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{Leave blank on scoring form}\vskip 0 mm';
+ '}.]\textit{'.&mt('Leave blank on scoring form').
+ '}\vskip 0 mm';
}
$result.= '\end{enumerate}';
+ $increment=$repetition;
}
}
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
@@ -150,6 +189,7 @@ sub end_essayresponse {
&Apache::lonxml::increment_counter($increment);
}
&Apache::response::end_response;
+
return $result;
}