version 1.95, 2008/12/21 19:09:15
|
version 1.100.4.1, 2009/09/11 16:34:09
|
Line 60 sub start_essayresponse {
|
Line 60 sub start_essayresponse {
|
} |
} |
$result.='<br /><table border="1">'; |
$result.='<br /><table border="1">'; |
if ( $Apache::lonhomework::type ne 'survey' ) { |
if ( $Apache::lonhomework::type ne 'survey' ) { |
$result.= '<tr><td>'. |
if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') { |
'<label>'. |
$result .= '<input type="hidden" name="HWDRAFT'.$part.'_'.$id.'" value="yes" />'; |
'<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked="checked" /> '. |
} else { |
&mt('Submit entries below as answer to receive credit'). |
$result.= '<tr><td>'. |
'</label> <br />'. |
'<label>'. |
'<label>'. |
'<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked="checked" /> '. |
'<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no" /> '. |
&mt('Submit entries below as answer to receive credit'). |
&mt('Save entries below as a draft answer (not submitting them for credit yet)'). |
'</label> <br />'. |
'</label>'. |
'<label>'. |
'</td></tr>'; |
'<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>'.'<label>'. |
$result .='<tr><td>'.'<label>'. |
Line 203 sub end_essayresponse {
|
Line 207 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 266 sub file_submission {
|
Line 271 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 285 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 293 sub file_submission {
|
Line 300 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 309 sub file_submission {
|
Line 319 sub file_submission {
|
last; |
last; |
} |
} |
} |
} |
$dirlist{$fullpath} = \@list; |
|
} |
} |
} |
} |
if (ref($totalsize)) { |
if (ref($totalsize)) { |
Line 318 sub file_submission {
|
Line 327 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 374 sub file_submission {
|
Line 384 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 386 sub file_submission {
|
Line 396 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}); |
} |
} |
|
|
|
|