version 1.96, 2008/12/22 14:55:28
|
version 1.104, 2010/04/19 04:20:25
|
Line 41 BEGIN {
|
Line 41 BEGIN {
|
sub start_essayresponse { |
sub start_essayresponse { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result; |
my $result; |
|
print STDERR "target is $target AND status is ".$Apache::inputtags::status[-1]." AND ". |
|
" type is ".$Apache::lonhomework::type."\n"; |
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'); |
Line 55 sub start_essayresponse {
|
Line 57 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 75 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 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 267 sub file_submission {
|
Line 283 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 281 sub file_submission {
|
Line 297 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 294 sub file_submission {
|
Line 312 sub file_submission {
|
} |
} |
} else { |
} else { |
my ($symb,$crsid,$udom,$uname) = &Apache::lonnet::whichuser(); |
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 310 sub file_submission {
|
Line 331 sub file_submission {
|
last; |
last; |
} |
} |
} |
} |
$dirlist{$fullpath} = \@list; |
|
} |
} |
} |
} |
if (ref($totalsize)) { |
if (ref($totalsize)) { |
Line 319 sub file_submission {
|
Line 339 sub file_submission {
|
if ($which eq 'filename') { |
if ($which eq 'filename') { |
&delete_form_items($jspart,$id); |
&delete_form_items($jspart,$id); |
} |
} |
|
last; |
} else { |
} else { |
push(@accepted_files,$file); |
push(@accepted_files,$file); |
} |
} |
Line 327 sub file_submission {
|
Line 348 sub file_submission {
|
} |
} |
} |
} |
$Apache::lonhomework::results{"resource.$part.$id.$which"}=join(',',@accepted_files); |
$Apache::lonhomework::results{"resource.$part.$id.$which"}=join(',',@accepted_files); |
if (($$award eq 'INVALID_FILETYPE') || ($award eq 'EXCESS_FILESIZE')) { |
if (($$award eq 'INVALID_FILETYPE') || ($$award eq 'EXCESS_FILESIZE')) { |
return; |
return; |
} |
} |
if (ref($uploadedflag)) { |
if (ref($uploadedflag)) { |
Line 375 sub file_submission {
|
Line 396 sub file_submission {
|
$Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}= |
$Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}= |
&Apache::lonnet::userfileupload('HWFILE'.$jspart.'_'.$id,undef, |
&Apache::lonnet::userfileupload('HWFILE'.$jspart.'_'.$id,undef, |
$subdir); |
$subdir); |
&Apache::lonnet::delenv($env{'form.HWFILE'.$jspart.'_'.$id}); |
delete($env{'form.HWFILE'.$jspart.'_'.$id}); |
} |
} |
} elsif ($which eq 'portfiles' && |
} elsif ($which eq 'portfiles' && |
$Apache::lonhomework::history{"resource.$part.$id.$which"}) { |
$Apache::lonhomework::history{"resource.$part.$id.$which"}) { |
Line 387 sub file_submission {
|
Line 408 sub file_submission {
|
|
|
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}); |
} |
} |
|
|
|
|