--- loncom/homework/essayresponse.pm 2003/04/29 20:32:21 1.32 +++ loncom/homework/essayresponse.pm 2004/12/14 20:38:51 1.55 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # essay (ungraded) style responses # -# $Id: essayresponse.pm,v 1.32 2003/04/29 20:32:21 www Exp $ +# $Id: essayresponse.pm,v 1.55 2004/12/14 20:38:51 albertel 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,49 @@ 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='
'; $result.=''; + ' '. + &mt('Submit entries below as answer to receive credit').'
'. + ' '. + &mt('Save entries below as a draft answer (not submitting them for credit yet)'). + ' '; if ($ncol > 0) { $result .=''; } if ($uploadedfiletypes) { - $result.= -''; } @@ -94,7 +104,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,28 +114,45 @@ 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}; + &Apache::lonnet::logthis("portfiles now $portfiles"); + 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'; } my $uploadedflag=0; if ($filename =~ /[^\s]/) { - my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes"); - $uploadedfiletypes=~s/[^\w\,]//g; - $uploadedfiletypes=','.$uploadedfiletypes.','; - my ($extension)=($filename=~/\.(\w+)$/); - 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); - $uploadedflag=1; - } else { - $award='INVALID_FILETYPE'; - } + my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes"); + $uploadedfiletypes=~s/[^\w\,]//g; + $uploadedfiletypes=','.$uploadedfiletypes.','; + my ($extension)=($filename=~/\.(\w+)$/); + 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,undef,'essayresponse'); + $uploadedflag=1; + } else { + $award='INVALID_FILETYPE'; + } + } else { + $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}=""; + $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}=""; } + if ($portfiles =~ /[^\s]/) { + $portfiles =~s/,$//; + $Apache::lonhomework::results{"resource.$part.$id.portfiles"}=$portfiles; + my @submitted_files = split /,/,$portfiles; + my ($dsymb,$crsid,$domain,$name)=&Apache::lonxml::whichuser(); + &Apache::lonnet::unmark_as_readonly($domain,$name,$dsymb.$crsid); + &Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,$dsymb.$crsid); + &Apache::lonnet::clear_selected_files($name); + $uploadedflag=1; + } else { + $Apache::lonhomework::results{"resource.$part.$id.portfiles"}=""; + } $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); @@ -147,20 +174,23 @@ sub end_essayresponse { &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' || @@ -168,6 +198,7 @@ sub end_essayresponse { &Apache::lonxml::increment_counter($increment); } &Apache::response::end_response; + return $result; }
'. - ''. - ' Submit entries below as answer to receive credit
'. - ''. - ' Save entries below as a draft answer (not submitting them for credit yet) '. - '
'. 'Collaborators:
'. - '(Enter maximum '.$ncol.' collaborators using username or username@domain, e.g. '. - 'smithje or smithje@'.$ENV{'user.domain'}.'.)
'; + &mt('(Enter maximum [_1] collaborators using username or username@domain, e.g. smithje or smithje@[_2].)',$ncol,$ENV{'user.domain'}).'
'; $result .= &check_collaborators($ncol,$coll) if ($coll =~ /\w+/); $result .='
Submit a file:
Allowed filetypes: '.$uploadedfiletypes.'
'; - if ($uploadedfile) { - $result.='Currently submitted: '.$uploadedfile.''; + $result.='
'.&mt('Submit a file: (only one file can be uploaded)'). + '

'. + &mt('Allowed filetypes: [_1]',$uploadedfiletypes).'
'. + 'OR:
Select Portfolio Files'. + '
'. + ''. + '
'; + if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}=~/[^\s]/){ + $result.="Portfolio files previously selected: ".&Apache::lonnet::unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"})."
"; + } + + if ($uploadedfile) { + my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}; + push (@Apache::lonxml::extlinks,$url); + &Apache::lonnet::allowuploaded('/adm/essayresponse',$url); + my $curfile=' '. + $uploadedfile.''; + $result.=&mt('Currently submitted: [_1]',$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.='