version 1.98, 2009/01/05 05:54:34
|
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 330 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)) { |