version 1.98, 2009/01/05 05:54:34
|
version 1.106, 2010/04/22 13:00:24
|
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 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)) { |
Line 403 sub check_collaborators {
|
Line 421 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 451 __END__
|
Line 469 __END__
|
|
|
=head1 NAME |
=head1 NAME |
|
|
Apache::easyresponse |
Apache::essayresponse |
|
|
=head1 SYNOPSIS |
=head1 SYNOPSIS |
|
|