--- loncom/homework/essayresponse.pm 2005/05/03 05:31:51 1.65 +++ loncom/homework/essayresponse.pm 2006/12/05 02:55:54 1.80 @@ -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.80 2006/12/05 02:55:54 albertel 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='
'; - $result.=''; + if ( $Apache::lonhomework::type eq 'survey' ) { + $result.= ' '; + } + $result.='
'. - '
'. - ''. - '
'; + if ( $Apache::lonhomework::type ne 'survey' ) { + $result.= ''; + } + if ($ncol > 0) { $result .=''; + } + + my $file_submission = + &Apache::inputtags::show_past_file_submission($part,$id); + if ($file_submission) { + $result .= ''; + } + + my $port_submission = + &Apache::inputtags::show_past_portfile_submission($part,$id); + if ($port_submission) { + $result .= ''; + } + + if ($result ne '') { + $result = + '
'. + '
'. + ''. + '
'.''.&mt('Collaborated with [_1]',$coll).''.$file_submission.''.$port_submission.'
'.$result. + '
'; + } } 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,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 $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,20 +163,19 @@ 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('Hand Graded.'); + $result.=&Apache::response::answer_part($$tagstack[-1],$answer, + {'no_verbatim' => 1}); + $result.=&Apache::response::answer_footer($$tagstack[-1]); } + if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') { &Apache::lonxml::increment_counter($increment); @@ -154,15 +188,22 @@ sub end_essayresponse { 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; @@ -178,22 +219,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"}=""; } }