version 1.93, 2008/12/09 00:23:22
|
version 1.107, 2010/06/17 00:13:20
|
Line 55 sub start_essayresponse {
|
Line 55 sub start_essayresponse {
|
if (!defined($maxfilesize)) { |
if (!defined($maxfilesize)) { |
$maxfilesize = 10.0; #FIXME This should become a domain configuration |
$maxfilesize = 10.0; #FIXME This should become a domain configuration |
} |
} |
if ( $Apache::lonhomework::type eq 'survey' ) { |
if (($Apache::lonhomework::type eq 'survey') || |
|
($Apache::lonhomework::type eq 'surveycred') || |
|
($Apache::lonhomework::type eq 'anonsurvey') || |
|
($Apache::lonhomework::type eq 'anonsurveycred')) { |
$result.= '<input type="hidden" name="HWDRAFT'.$part.'_'.$id.'" value="yes" /> '; |
$result.= '<input type="hidden" name="HWDRAFT'.$part.'_'.$id.'" value="yes" /> '; |
} |
} |
$result.='<br /><table border="1">'; |
$result.='<br /><table border="1">'; |
if ( $Apache::lonhomework::type ne 'survey' ) { |
if (($Apache::lonhomework::type ne 'survey') && |
|
($Apache::lonhomework::type ne 'surveycred') && |
|
($Apache::lonhomework::type ne 'anonsurvey') && |
|
($Apache::lonhomework::type ne 'anonsurveycred')) { |
$result.= '<tr><td>'. |
$result.= '<tr><td>'. |
'<label>'. |
'<label>'. |
'<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked="checked" /> '. |
'<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked="checked" /> '. |
Line 67 sub start_essayresponse {
|
Line 73 sub start_essayresponse {
|
'</label> <br />'. |
'</label> <br />'. |
'<label>'. |
'<label>'. |
'<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no" /> '. |
'<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no" /> '. |
&mt('Save entries below as a draft answer (not submitting them for credit yet)'). |
&mt('Save entries below (not submitted for credit yet)'). |
'</label>'. |
'</label>'. |
'</td></tr>'; |
'</td></tr>'; |
} |
} |
Line 99 sub start_essayresponse {
|
Line 105 sub start_essayresponse {
|
my @msgs; |
my @msgs; |
if ($Apache::lonhomework::history{"resource.$part.$id.collaborators"} =~ /\S/) { |
if ($Apache::lonhomework::history{"resource.$part.$id.collaborators"} =~ /\S/) { |
my $coll= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"'); |
my $coll= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"'); |
$result .= '<td>'.&mt('Collaborated with [_1]',$coll).'</td>'; |
$result .= '<td><i>'.&mt('Collaborated with [_1]',$coll).'</i></td>'; |
} |
} |
|
|
my $file_submission = |
my $file_submission = |
Line 130 sub end_essayresponse {
|
Line 136 sub end_essayresponse {
|
my $increment = &Apache::response::repetition(); |
my $increment = &Apache::response::repetition(); |
my $result; |
my $result; |
if ( $target eq 'grade' ) { |
if ( $target eq 'grade' ) { |
my $collaborators = $env{'form.HWCOL'.$part.'_'.$id}; |
# Deal with collaborators |
if ($collaborators =~ /[^\s]/) { |
my $collaborators = $env{'form.HWCOL'.$part.'_'.$id}; |
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) { |
if ($collaborators ne $previous_list); |
# &Apache::lonnet::logthis("New collaborators [$collaborators] [$previous_list]"); |
} |
$Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators; |
|
} |
|
# Scantron |
if ( &Apache::response::submitted('scantron') ) { |
if ( &Apache::response::submitted('scantron') ) { |
$increment=&Apache::response::scored_response($part,$id); |
$increment=&Apache::response::scored_response($part,$id); |
} elsif ( &Apache::response::submitted() ) { |
} elsif ( &Apache::response::submitted() ) { |
Line 146 sub end_essayresponse {
|
Line 154 sub end_essayresponse {
|
if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/) || ($portfiles =~ /[^\s]/)) { |
if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/) || ($portfiles =~ /[^\s]/)) { |
my $award='DRAFT'; |
my $award='DRAFT'; |
if ($env{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') { |
if ($env{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') { |
$award='SUBMITTED'; |
if ($Apache::lonhomework::type eq 'anonsurvey') { |
|
$award='ANONYMOUS'; |
|
} elsif ($Apache::lonhomework::type eq 'anonsurveycred') { |
|
$award='ANONYMOUS_CREDIT'; |
|
} elsif ($Apache::lonhomework::type eq 'surveycred') { |
|
$award='SUBMITTED_CREDIT'; |
|
} else { |
|
$award='SUBMITTED'; |
|
} |
} |
} |
my $uploadedflag=0; |
my $uploadedflag=0; |
my $totalsize=0; |
my $totalsize=0; |
Line 155 sub end_essayresponse {
|
Line 171 sub end_essayresponse {
|
$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); } |
if ($uploadedflag) { |
|
if ($award eq 'FILENAME_INUSE') { |
|
delete($Apache::lonhomework::results{"resource.$id.tries"}); |
|
} |
|
} else { |
|
&Apache::response::handle_previous(\%previous,$award); |
|
} |
# |
# |
# Store with resource author for similarity testing |
# Store with resource author for similarity testing |
# |
# |
Line 203 sub end_essayresponse {
|
Line 225 sub end_essayresponse {
|
|
|
if ($target eq 'analyze') { |
if ($target eq 'analyze') { |
$Apache::lonhomework::analyze{"$part.$id.type"} = 'essayresponse'; |
$Apache::lonhomework::analyze{"$part.$id.type"} = 'essayresponse'; |
|
push (@{ $Apache::lonhomework::analyze{"parts"} },"$part.$id"); |
&Apache::lonhomework::set_bubble_lines(); |
&Apache::lonhomework::set_bubble_lines(); |
} |
} |
} |
} |
Line 256 sub file_submission {
|
Line 279 sub file_submission {
|
$files = $env{'form.HWFILE'.$jspart.'_'.$id.'.filename'}; |
$files = $env{'form.HWFILE'.$jspart.'_'.$id.'.filename'}; |
} |
} |
} |
} |
|
my ($symb,$crsid,$udom,$uname)=&Apache::lonnet::whichuser(); |
if ($files =~ /[^\s]/) { |
if ($files =~ /[^\s]/) { |
$files =~s/,$//; |
$files =~s/,$//; |
my (@submitted_files,@acceptable_files,@accepted_files); |
my (@submitted_files,@acceptable_files,@accepted_files); |
Line 266 sub file_submission {
|
Line 290 sub file_submission {
|
} |
} |
my $uploadedfiletypes= |
my $uploadedfiletypes= |
&Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes"); |
&Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes"); |
if ($uploadedfiletypes) { |
if ($uploadedfiletypes ne '') { |
$uploadedfiletypes=~s/[^\w\,]//g; |
$uploadedfiletypes=~s/[^\w\,]//g; |
$uploadedfiletypes=','.$uploadedfiletypes.','; |
$uploadedfiletypes=','.$uploadedfiletypes.','; |
foreach my $file (@submitted_files) { |
foreach my $file (@submitted_files) { |
Line 280 sub file_submission {
|
Line 304 sub file_submission {
|
} |
} |
} |
} |
} |
} |
|
} else { |
|
@acceptable_files = @submitted_files; |
} |
} |
my $maxfilesize=&Apache::lonnet::EXT("resource.$part".'_'."$id.maxfilesize"); |
my $maxfilesize=&Apache::lonnet::EXT("resource.$part".'_'."$id.maxfilesize"); |
if (!$maxfilesize) { |
if (!$maxfilesize) { |
Line 292 sub file_submission {
|
Line 318 sub file_submission {
|
$$totalsize += $env{'form.HWFILESIZE'.$jspart.'_'.$id}; |
$$totalsize += $env{'form.HWFILESIZE'.$jspart.'_'.$id}; |
} |
} |
} else { |
} else { |
my ($symb,$crsid,$udom,$uname) = &Apache::lonnet::whichuser(); |
my ($path,$filename) = ($file =~ m{^(.*/)([^/]+)$}); |
my ($path,$filename) = ($file =~ m{^(.+)/([^/]+)$}); |
|
my $fullpath = '/userfiles/portfolio'.$path; |
my $fullpath = '/userfiles/portfolio'.$path; |
if (!exists($dirlist{$fullpath})) { |
if (!exists($dirlist{$fullpath})) { |
my @list = &Apache::lonnet::dirlist($fullpath,$udom,$uname,1); |
my @list = &Apache::lonnet::dirlist($fullpath,$udom,$uname,1); |
foreach my $dir_line (@list) { |
$dirlist{$fullpath} = \@list; |
|
} |
|
if (ref($dirlist{$fullpath}) eq 'ARRAY') { |
|
foreach my $dir_line (@{$dirlist{$fullpath}}) { |
my ($fname,$dom,undef,$testdir,undef,undef,undef,undef, |
my ($fname,$dom,undef,$testdir,undef,undef,undef,undef, |
$size,undef,$mtime,undef,undef,undef,$obs,undef) = |
$size,undef,$mtime,undef,undef,undef,$obs,undef) = |
split(/\&/,$dir_line,16); |
split(/\&/,$dir_line,16); |
Line 309 sub file_submission {
|
Line 337 sub file_submission {
|
last; |
last; |
} |
} |
} |
} |
$dirlist{$fullpath} = \@list; |
|
} |
} |
} |
} |
if (ref($totalsize)) { |
if (ref($totalsize)) { |
Line 318 sub file_submission {
|
Line 345 sub file_submission {
|
if ($which eq 'filename') { |
if ($which eq 'filename') { |
&delete_form_items($jspart,$id); |
&delete_form_items($jspart,$id); |
} |
} |
|
last; |
|
} else { |
|
push(@accepted_files,$file); |
} |
} |
} else { |
} else { |
push(@accepted_files,$file); |
push(@accepted_files,$file); |
} |
} |
} |
} |
my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes"); |
if ($which eq 'portfiles') { |
$Apache::lonhomework::results{"resource.$part.$id.$which"}=join(',',@accepted_files); |
my @to_mark; |
if (($$award eq 'INVALID_FILETYPE') || ($award eq 'EXCESS_FILESIZE')) { |
if ($Apache::lonhomework::results{"resource.$part.$id.portfiles"}) { |
|
@to_mark = ($Apache::lonhomework::results{"resource.$part.$id.portfiles"}); |
|
} |
|
if (@accepted_files) { |
|
if ($Apache::lonhomework::results{"resource.$part.$id.portfiles"}) { |
|
$Apache::lonhomework::results{"resource.$part.$id.$which"} .= ','; |
|
} |
|
$Apache::lonhomework::results{"resource.$part.$id.$which"}.=join(',',@accepted_files); |
|
push(@to_mark,@accepted_files); |
|
} |
|
&Apache::lonnet::unmark_as_readonly($udom,$uname,[$symb,$crsid]); |
|
&Apache::lonnet::mark_as_readonly($udom,$uname,\@to_mark,[$symb,$crsid]); |
|
&Apache::lonnet::clear_selected_files($uname); |
|
} |
|
if (($$award eq 'INVALID_FILETYPE') || ($$award eq 'EXCESS_FILESIZE')) { |
|
if ($which eq 'filename') { |
|
delete($env{'form.HWFILE'.$jspart.'_'.$id}); |
|
} |
return; |
return; |
} |
} |
if (ref($uploadedflag)) { |
if (ref($uploadedflag)) { |
$$uploadedflag=1; |
$$uploadedflag=1; |
} |
} |
if ($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 ($which eq 'filename') { |
if ($which eq 'filename') { |
$Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}= |
my $cleanpart = $part; |
$files; |
$cleanpart =~ s/\W/_/g; |
$Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}= |
my $cleanid = $id; |
&Apache::lonnet::userfileupload('HWFILE'.$jspart.'_'.$id,undef, |
$cleanid =~ s/\W/_/g; |
'essayresponse'); |
my ($map,$resid,$resurl)=&Apache::lonnet::decode_symb($symb); |
&Apache::lonnet::delenv($env{'form.HWFILE'.$jspart.'_'.$id}); |
my %crsdesc = &Apache::lonnet::coursedescription($crsid); |
} |
my $turnindir; |
} elsif ($which eq 'portfiles' && |
my %userhash = &Apache::lonnet::userenvironment($udom,$uname,'turnindir'); |
$Apache::lonhomework::history{"resource.$part.$id.$which"}) { |
$turnindir = $userhash{'turnindir'}; |
my ($symb,$crsid,$domain,$name)=&Apache::lonnet::whichuser(); |
if ($turnindir eq '') { |
&Apache::lonnet::unmark_as_readonly($domain,$name,[$symb,$crsid]); |
$turnindir = &mt('turned in'); |
$Apache::lonhomework::results{"resource.$part.$id.$which"}=""; |
$turnindir =~ s/\W+/_/g; |
|
my %newhash = ( |
|
'turnindir' => $turnindir, |
|
); |
|
&Apache::lonnet::put('environment',\%newhash,$udom,$uname); |
|
} |
|
my $prefix = 'portfolio'; |
|
my $path = '/'.$turnindir.'/'; |
|
my $crsname = $crsdesc{'description'}; |
|
my $restitle=&Apache::lonnet::gettitle($symb); |
|
foreach my $item ($crsname,$restitle) { |
|
$item =~ s/\W+/_/g; |
|
} |
|
if ($crsname eq '') { |
|
$crsname = $crsid; |
|
} |
|
if ($restitle eq '') { |
|
$restitle = ($resurl =~ m{/[^/]+$}); |
|
if ($restitle eq '') { |
|
$restitle = time; |
|
} |
|
} |
|
my @pathitems; |
|
my $navmap = Apache::lonnavmaps::navmap->new(); |
|
if (defined($navmap)) { |
|
my $mapres = $navmap->getResourceByUrl($map); |
|
if (ref($mapres)) { |
|
my $pcslist = $mapres->map_hierarchy(); |
|
if ($pcslist ne '') { |
|
foreach my $pc (split(/,/,$pcslist)) { |
|
my $res = $navmap->getByMapPc($pc); |
|
if (ref($res)) { |
|
my $title = $res->compTitle(); |
|
$title =~ s/\W+/_/g; |
|
if ($title ne '') { |
|
push(@pathitems,$title); |
|
} |
|
} |
|
} |
|
} |
|
my $maptitle = $mapres->compTitle(); |
|
$maptitle =~ s/\W+/_/g; |
|
if ($maptitle ne '') { |
|
push(@pathitems,$maptitle); |
|
} |
|
} else { |
|
$$award = 'INTERNAL_ERROR'; |
|
} |
|
} else { |
|
$$award = 'INTERNAL_ERROR'; |
|
} |
|
push(@pathitems,$restitle); |
|
unshift(@pathitems,$crsname); |
|
$path .= join('/',@pathitems); |
|
my $formelement = 'HWFILE'.$jspart.'_'.$id; |
|
my $fname = $env{'form.'.$formelement.'.filename'}; |
|
&Apache::lonnet::clean_filename($fname); |
|
my $url = '/uploaded/'.$udom.'/'.$uname.'/'.$prefix.$path.'/'.$fname; |
|
my @stat = &Apache::lonnet::stat_file($url); |
|
if (@stat && $stat[0] ne 'no_such_dir') { |
|
$$award = 'FILENAME_INUSE'; |
|
} else { |
|
my ($mode,%allfiles,%codebase); |
|
my $result = &Apache::lonnet::userfileupload($formelement,'', |
|
$prefix.$path,$mode,\%allfiles,\%codebase); |
|
if ($result =~ m{^/uploaded/}) { |
|
$Apache::lonhomework::results{"resource.$part.$id.portfiles"} .= $path.'/'.$fname; |
|
&Apache::lonnet::unmark_as_readonly($udom,$uname,[$symb,$crsid]); |
|
|
|
&Apache::lonnet::mark_as_readonly($udom,$uname,[$path.'/'.$fname],[$symb,$crsid]); |
|
} else { |
|
$$award = 'INTERNAL_ERROR'; |
|
} |
|
} |
|
delete($env{'form.HWFILE'.$jspart.'_'.$id}); |
|
} |
} |
} |
} |
} |
|
|
sub delete_form_items { |
sub delete_form_items { |
my ($jspart,$id) = @_; |
my ($jspart,$id) = @_; |
&Apache::lonnet::delenv($env{'form.HWFILE'.$jspart.'_'.$id.'.filename'}); |
delete($env{'form.HWFILE'.$jspart.'_'.$id.'.filename'}); |
&Apache::lonnet::delenv($env{'form.HWFILE'.$jspart.'_'.$id.'.mimetype'}); |
delete($env{'form.HWFILE'.$jspart.'_'.$id.'.mimetype'}); |
&Apache::lonnet::delenv($env{'form.HWFILE'.$jspart.'_'.$id}); |
delete($env{'form.HWFILE'.$jspart.'_'.$id}); |
} |
} |
|
|
|
|
sub check_collaborators { |
sub check_collaborators { |
my ($ncol,$coll) = @_; |
my ($ncol,$coll) = @_; |
my %classlist=&Apache::lonnet::dump('classlist', |
my %classlist=&Apache::lonnet::dump('classlist', |
Line 368 sub check_collaborators {
|
Line 483 sub check_collaborators {
|
$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 my $entry (@collaborators) { |
foreach my $entry (@collaborators) { |
my $collaborator; |
my $collaborator; |
if ($entry =~ /:/) { |
if ($entry =~ /:/) { |
Line 416 __END__
|
Line 531 __END__
|
|
|
=head1 NAME |
=head1 NAME |
|
|
Apache::easyresponse |
Apache::essayresponse |
|
|
=head1 SYNOPSIS |
=head1 SYNOPSIS |
|
|