--- loncom/homework/essayresponse.pm 2005/11/15 22:19:57 1.69 +++ loncom/homework/essayresponse.pm 2006/10/17 15:11:11 1.77 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # essay (ungraded) style responses # -# $Id: essayresponse.pm,v 1.69 2005/11/15 22:19:57 albertel Exp $ +# $Id: essayresponse.pm,v 1.77 2006/10/17 15:11:11 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -31,6 +31,9 @@ use strict; use Apache::lonxml(); use Apache::lonnet; use Apache::lonlocal; +use lib '/home/httpd/lib/perl/'; +use LONCAPA; + BEGIN { &Apache::lonxml::register('Apache::essayresponse',('essayresponse')); @@ -49,17 +52,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='
'; - $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; } @@ -80,7 +115,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}; @@ -112,14 +147,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); + $apath=&escape($apath); $apath=~s/\W/\_/gs; &Apache::lonnet::put('nohist_essay_'.$apath, { $akey => $response },$adom,$aname); @@ -129,20 +164,26 @@ 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') { + if ($env{'form.answer_output_mode'} eq 'tex') { + $result .= '\begin{tabular}{|l|}'; + $result .= '\hline'; + $result .= ' Answer for essay will be hand graded \\\\ '; + $result .= '\\hline'; + $result .= '\end{tabular}'; + $result .= '\vskip 3mm'; + } else { + $result.=&Apache::response::answer_header($$tagstack[-1]); + $result.=&Apache::response::answer_part($$tagstack[-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); @@ -168,7 +209,7 @@ sub file_submission { my @submitted_files = ($files); if ( $which eq 'portfiles' ) { - @submitted_files = split(/,/,$files); + @submitted_files = split(/\s*,\s*/,$files); } my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes"); @@ -186,7 +227,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 +241,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"}=""; }