version 1.22, 2013/08/22 11:13:43
|
version 1.23, 2013/08/22 13:58:21
|
Line 177 sub end_externalresponse {
|
Line 177 sub end_externalresponse {
|
my $id = $Apache::inputtags::response['-1']; |
my $id = $Apache::inputtags::response['-1']; |
my $increment = 1; |
my $increment = 1; |
if ($target eq 'grade') { |
if ($target eq 'grade') { |
my $collaborators = $env{'form.HWCOL'.$part.'_'.$id}; |
|
my $previous_list= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"'); |
|
if ($collaborators ne $previous_list) { |
|
# &Apache::lonnet::logthis("New collaborators [$collaborators] [$previous_list]"); |
|
$Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators; |
|
} |
|
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() ) { |
Line 257 sub end_externalresponse {
|
Line 251 sub end_externalresponse {
|
} |
} |
# Currently turned in files |
# Currently turned in files |
my %currently_turned_in=(); |
my %currently_turned_in=(); |
foreach my $file (split(/\,/,$Apache::lonhomework::results{"resource.$part.$id.portfiles"}.','. |
foreach my $file (split(/\,/,$Apache::lonhomework::results{"resource.$part.$id.portfiles"}.','. |
$Apache::lonhomework::results{"resource.$part.$id.uploadedurl"})) { |
$Apache::lonhomework::results{"resource.$part.$id.uploadedurl"})) { |
if ($file=~/\S/) { |
if ($file=~/\S/) { |
$filesresults=1; |
$filesresults=1; |
$currently_turned_in{'/uploaded/'.$env{'user.domain'}.'/'.$env{'user.name'}.'/portfolio'.$file}=1; |
$currently_turned_in{'/uploaded/'.$env{'user.domain'}.'/'.$env{'user.name'}.'/portfolio'.$file}=1; |
} |
} |
} |
} |
my $filelinks=join(',',map{&escape($_)}(keys(%currently_turned_in))); |
my $filelinks=join(',',map{$_}(keys(%currently_turned_in))); |
&Apache::lonnet::logthis("Previously: ".join("\n",sort(keys(%previously_turned_in)))); |
&Apache::lonnet::logthis("Previously: ".join("\n",sort(keys(%previously_turned_in)))); |
&Apache::lonnet::logthis("Currently: ".join("\n",sort(keys(%currently_turned_in)))); |
&Apache::lonnet::logthis("Currently: ".join("\n",sort(keys(%currently_turned_in)))); |
&Apache::lonnet::logthis("File flag: ".$filesresults); |
&Apache::lonnet::logthis("File flag: ".$filesresults); |
Line 286 sub end_externalresponse {
|
Line 280 sub end_externalresponse {
|
my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname); |
my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname); |
my $ua = LWP::UserAgent->new; |
my $ua = LWP::UserAgent->new; |
my $res = $ua->request(POST $url, \%form); |
my $res = $ua->request(POST $url, \%form); |
my %previous = &Apache::response::check_for_previous($response, |
|
$part,$id); |
|
%Apache::loncapagrade::results=(); |
%Apache::loncapagrade::results=(); |
$Apache::lonhomework::results{"resource.$part.$id.submission"}=$response; |
$Apache::lonhomework::results{"resource.$part.$id.submission"}=$response; |
if ($res->is_error()) { |
if ($res->is_error()) { |
Line 304 sub end_externalresponse {
|
Line 296 sub end_externalresponse {
|
$Apache::loncapagrade::results{$key}; |
$Apache::loncapagrade::results{$key}; |
} |
} |
$Apache::externalresponse::message=$Apache::loncapagrade::results{'message'}; |
$Apache::externalresponse::message=$Apache::loncapagrade::results{'message'}; |
&Apache::response::handle_previous(\%previous, |
|
$Apache::loncapagrade::results{'awarddetail'}); |
|
if ($Apache::loncapagrade::results{'awarddetail'} eq 'ASSIGNED_SCORE') { |
if ($Apache::loncapagrade::results{'awarddetail'} eq 'ASSIGNED_SCORE') { |
$Apache::lonhomework::results{"resource.$part.$id.awarded"}= |
$Apache::lonhomework::results{"resource.$part.$id.awarded"}= |
1.*$Apache::loncapagrade::results{"awarded"}; |
1.*$Apache::loncapagrade::results{"awarded"}; |