version 1.29, 2003/04/18 22:27:28
|
version 1.78, 2006/10/17 17:09:44
|
Line 25
|
Line 25
|
# |
# |
# http://www.lon-capa.org/ |
# http://www.lon-capa.org/ |
# |
# |
# 4/3 Guy |
|
# July, 2002, H. K. Ng |
|
# |
|
package Apache::essayresponse; |
package Apache::essayresponse; |
use strict; |
use strict; |
use Apache::lonxml; |
use Apache::lonxml(); |
use Apache::lonnet; |
use Apache::lonnet; |
|
use Apache::lonlocal; |
|
use lib '/home/httpd/lib/perl/'; |
|
use LONCAPA; |
|
|
|
|
BEGIN { |
BEGIN { |
&Apache::lonxml::register('Apache::essayresponse',('essayresponse')); |
&Apache::lonxml::register('Apache::essayresponse',('essayresponse')); |
Line 43 sub start_essayresponse {
|
Line 45 sub start_essayresponse {
|
my $id = &Apache::response::start_response($parstack,$safeeval); |
my $id = &Apache::response::start_response($parstack,$safeeval); |
if ($target eq 'meta') { |
if ($target eq 'meta') { |
$result=&Apache::response::meta_package_write('essayresponse'); |
$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 $part= $Apache::inputtags::part; |
|
|
my $ncol= &Apache::lonnet::EXT("resource.$part".'_'."$id.maxcollaborators"); |
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"); |
my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes"); |
$uploadedfiletypes=~s/[^\w\,]//g; |
$uploadedfiletypes=~s/[^\w\,]//g; |
my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"}); |
if ( $Apache::lonhomework::type eq 'survey' ) { |
$result='<br /><table border="1">'; |
$result.= '<input type="hidden" name="HWDRAFT'.$part.'_'.$id.'" value="yes" /> '; |
$result.='<tr><td>'. |
} |
'<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked>'. |
$result.='<br /><table border="1">'; |
' Submit entries below as answer to receive credit <br />'. |
if ( $Apache::lonhomework::type ne 'survey' ) { |
'<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no">'. |
$result.= '<tr><td>'. |
' Save entries below as a draft answer (not submitting them for credit yet) '. |
'<label>'. |
'</td></tr>'; |
'<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) { |
if ($ncol > 0) { |
$result .='<tr><td>'. |
$result .='<tr><td>'.'<label>'. |
'Collaborators: <input type="text" size="70" max="80" name="HWCOL'. |
'Collaborators: <input type="text" size="70" max="80" name="HWCOL'. |
$part.'_'.$id.'" value="'.$coll.'" /><br />'. |
$part.'_'.$id.'" value="'.$coll.'" /><br />'. |
'(Enter maximum '.$ncol.' collaborators using username or username@domain, e.g. '. |
&mt('(Enter maximum [_1] collaborators using username or username@domain, e.g. smithje or smithje@[_2].)',$ncol,$env{'user.domain'}). |
'smithje or smithje@'.$ENV{'user.domain'}.'.)<br />'; |
'</label><br />'; |
$result .= &check_collaborators($ncol,$coll) if ($coll =~ /\w+/); |
$result .= &check_collaborators($ncol,$coll) if ($coll =~ /\w+/); |
$result .='</td></tr>'; |
$result .='</td></tr>'; |
} |
} |
if ($uploadedfiletypes) { |
$result.=&Apache::inputtags::file_selector($part,$id, |
$result.= |
$uploadedfiletypes,'both'); |
'<tr><td>Submit a file: <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>'; |
|
} else { |
|
$result.='(Hand in a file you have prepared on your computer)'; |
|
} |
|
$result.='</td></tr>'; |
|
} |
|
$result.='</table>'; |
$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; |
return $result; |
} |
} |
Line 89 sub end_essayresponse {
|
Line 115 sub end_essayresponse {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $part = $Apache::inputtags::part; |
my $part = $Apache::inputtags::part; |
my $id = $Apache::inputtags::response[-1]; |
my $id = $Apache::inputtags::response[-1]; |
my $increment = 1; |
my $increment = &Apache::response::repetition(); |
my $result; |
my $result; |
if ( $target eq 'grade' ) { |
if ( $target eq 'grade' ) { |
my $collaborators = $ENV{'form.HWCOL'.$part.'_'.$id}; |
my $collaborators = $env{'form.HWCOL'.$part.'_'.$id}; |
if ($collaborators =~ /[^\s]/) { |
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 |
$Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators |
if ($collaborators ne $previous_list); |
if ($collaborators ne $previous_list); |
} |
} |
if ( defined($ENV{'form.submitted'}) && |
if ( &Apache::response::submitted('scantron') ) { |
$ENV{'form.submitted'} eq 'scantron' ) { |
$increment=&Apache::response::scored_response($part,$id); |
my $repetition=&Apache::response::repetition(); |
} elsif ( &Apache::response::submitted() ) { |
$increment=$repetition; |
my $response = $env{'form.HWVAL_'.$id}; |
my $score=0; |
my $filename= $env{'form.HWFILE'.$part.'_'.$id.'.filename'}; |
for (my $i=0;$i<$repetition;$i++) { |
my $portfiles = $env{'form.HWPORT'.$part.'_'.$id}; |
my $increase=&Apache::response::getresponse($i+1); |
if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/) || ($portfiles =~ /[^\s]/)) { |
if ($increase ne '') { $score+=$increase+1; } |
my $award='DRAFT'; |
} |
if ($env{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') { |
my $weight = &Apache::lonnet::EXT("resource.$id.weight"); |
|
my $pcr=$score/$weight; |
|
#FIXME, won't work for multiple essay in a single part |
|
$Apache::lonhomewok::results{"resource.$id.awarded"}=$pcr; |
|
} 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 $award; |
|
if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') { |
|
$award='SUBMITTED'; |
$award='SUBMITTED'; |
} else { |
|
$award='DRAFT'; |
|
} |
} |
my $uploadedflag=0; |
my $uploadedflag=0; |
if ($filename =~ /[^\s]/) { |
&file_submission($part,$id,'filename',\$award,\$uploadedflag); |
my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes"); |
&file_submission($part,$id,'portfiles',\$award,\$uploadedflag); |
$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'; |
|
} |
|
} |
|
$Apache::lonhomework::results{"resource.$part.$id.submission"}=$response; |
$Apache::lonhomework::results{"resource.$part.$id.submission"}=$response; |
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$award; |
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$award; |
my %previous=&Apache::response::check_for_previous($response,$part,$id); |
my %previous=&Apache::response::check_for_previous($response,$part,$id); |
unless ($uploadedflag) { &Apache::response::handle_previous(\%previous,$award); } |
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::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=&escape($apath); |
|
$apath=~s/\W/\_/gs; |
|
&Apache::lonnet::put('nohist_essay_'.$apath, |
|
{ $akey => $response },$adom,$aname); |
|
} |
|
} |
} |
} |
} |
} |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=&Apache::edit::end_table(); |
$result.=&Apache::edit::end_table(); |
} elsif ($target eq 'tex') { |
|
if ($Apache::lonhomework::type eq 'exam') { |
} elsif ($target eq 'tex' |
my $repetition=&Apache::response::repetition(); |
&& $Apache::lonhomework::type eq 'exam') { |
$result.='\begin{enumerate}'; |
$result .= &Apache::inputtags::exam_score_line($target); |
for (my $i=0;$i<$repetition;$i++) { |
|
$result.='\item[\textbf{'.($Apache::lonxml::counter+$i). |
} elsif ($target eq 'answer') { |
'}.]\textit{Leave blank on scoring form}\vskip 0 mm'; |
$result.=&Apache::response::answer_header($$tagstack[-1]); |
} |
my $answer = &mt('Answer for essay will be hand graded.'); |
$result.= '\end{enumerate}'; |
$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' || |
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || |
$target eq 'tex' || $target eq 'analyze') { |
$target eq 'tex' || $target eq 'analyze') { |
&Apache::lonxml::increment_counter($increment); |
&Apache::lonxml::increment_counter($increment); |
} |
} |
&Apache::response::end_response; |
&Apache::response::end_response; |
|
|
return $result; |
return $result; |
} |
} |
|
|
|
sub file_submission { |
|
my ($part,$id,$which,$award,$uploadedflag)=@_; |
|
my $files; |
|
my $jspart=$part; |
|
$jspart=~s/\./_/g; |
|
if ($which eq 'portfiles') { $files= $env{'form.HWPORT'.$jspart.'_'.$id}; } |
|
if ($which eq 'filename') { |
|
$files = $env{'form.HWFILE'.$jspart.'_'.$id.'.filename'}; |
|
} |
|
|
|
if ($files =~ /[^\s]/) { |
|
$files =~s/,$//; |
|
$Apache::lonhomework::results{"resource.$part.$id.$which"}=$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) { |
|
$$award='INVALID_FILETYPE'; |
|
} |
|
} |
|
} |
|
if ($$award ne 'INVALID_FILETYPE' && ref($uploadedflag)) { |
|
$$uploadedflag=1; |
|
} |
|
if ($$award ne 'INVALID_FILETYPE' && $which eq 'portfiles') { |
|
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'.$jspart.'_'.$id,undef, |
|
'essayresponse'); |
|
} |
|
} elsif ($which eq 'portfiles' && |
|
$Apache::lonhomework::history{"resource.$part.$id.$which"}) { |
|
my ($symb,$crsid,$domain,$name)=&Apache::lonnet::whichuser(); |
|
&Apache::lonnet::unmark_as_readonly($domain,$name,[$symb,$crsid]); |
|
$Apache::lonhomework::results{"resource.$part.$id.$which"}=""; |
|
} |
|
} |
|
|
sub check_collaborators { |
sub check_collaborators { |
my ($ncol,$coll) = @_; |
my ($ncol,$coll) = @_; |
my %classlist=&Apache::lonnet::dump('classlist', |
my %classlist=&Apache::lonnet::dump('classlist', |
$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, |
$env{'course.'.$env{'request.course.id'}.'.domain'}, |
$ENV{'course.'.$ENV{'request.course.id'}.'.num'}); |
$env{'course.'.$env{'request.course.id'}.'.num'}); |
my (@badcollaborators,$result); |
my (@badcollaborators,$result); |
my (@collaborators) = split(/\,?\s+/,$coll); |
my (@collaborators) = split(/\,?\s+/,$coll); |
foreach (@collaborators) { |
foreach (@collaborators) { |
Line 175 sub check_collaborators {
|
Line 252 sub check_collaborators {
|
if (/@/) { |
if (/@/) { |
$collaborator =~ s/@/:/; |
$collaborator =~ s/@/:/; |
} else { |
} else { |
$collaborator = $_.':'.$ENV{'user.domain'}; |
$collaborator = $_.':'.$env{'user.domain'}; |
} |
} |
push @badcollaborators, $_ if (!grep /^$collaborator/i,keys %classlist); |
push @badcollaborators, $_ if (!grep /^$collaborator/i,keys %classlist); |
} |
} |