version 1.24, 2013/09/11 10:25:50
|
version 1.25, 2014/01/13 13:20:33
|
Line 173 sub start_externalresponse {
|
Line 173 sub start_externalresponse {
|
sub end_externalresponse { |
sub end_externalresponse { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result; |
my $result; |
|
my $response; |
my $part=$Apache::inputtags::part; |
my $part=$Apache::inputtags::part; |
my $id = $Apache::inputtags::response['-1']; |
my $id = $Apache::inputtags::response['-1']; |
my $increment = 1; |
my $increment = 1; |
Line 180 sub end_externalresponse {
|
Line 181 sub end_externalresponse {
|
if ( &Apache::response::submitted('scantron') ) { |
if ( &Apache::response::submitted('scantron') ) { |
my $increment=&Apache::response::scored_response($part,$id); |
my $increment=&Apache::response::scored_response($part,$id); |
} elsif ( &Apache::response::submitted() ) { |
} elsif ( &Apache::response::submitted() ) { |
my $response = $env{'form.HWVAL_'.$id}; |
$response = $env{'form.HWVAL_'.$id}; |
my $jspart=$part; |
my $jspart=$part; |
$jspart=~s/\./_/g; |
$jspart=~s/\./_/g; |
my $filename = $env{'form.HWFILE'.$jspart.'_'.$id.'.filename'} || |
my $filename = $env{'form.HWFILE'.$jspart.'_'.$id.'.filename'} || |
Line 194 sub end_externalresponse {
|
Line 195 sub end_externalresponse {
|
if ($Apache::lonhomework::history{"resource.$part.award"} eq 'DRAFT') { |
if ($Apache::lonhomework::history{"resource.$part.award"} eq 'DRAFT') { |
$was_draft = 1; |
$was_draft = 1; |
} |
} |
if (($response =~ /[^\s]/) || ($filename =~ /[^\s]/) || ($portfiles =~ /[^\s]/) || |
if (($filename =~ /[^\s]/) || ($portfiles =~ /[^\s]/) || |
(@deletions > 0) || ($was_draft && $is_submit)) { |
(@deletions > 0) || ($was_draft && $is_submit)) { |
my $award='DRAFT'; |
my $award='DRAFT'; |
if ($env{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') { |
if ($env{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') { |
Line 239 sub end_externalresponse {
|
Line 240 sub end_externalresponse {
|
} |
} |
($award eq 'DRAFT') ? ($externalgrade = 0) : ($externalgrade =1); |
($award eq 'DRAFT') ? ($externalgrade = 0) : ($externalgrade =1); |
} |
} |
if($externalgrade){ |
if (&Apache::response::getresponse() =~ /[^\s]/) { |
my $response = &Apache::response::getresponse(); |
$response = &Apache::response::getresponse(); |
|
$externalgrade = 1; |
|
} |
|
|
|
if ($externalgrade) { |
my $filesresults=0; |
my $filesresults=0; |
# Previously turned in files |
# Previously turned in files |
my %previously_turned_in=(); |
my %previously_turned_in=(); |