version 1.178, 2006/06/23 22:32:39
|
version 1.181, 2006/07/17 20:35:11
|
Line 152 sub create_new_version {
|
Line 152 sub create_new_version {
|
} elsif ($type eq 'problem') { |
} elsif ($type eq 'problem') { |
&Apache::lonxml::debug("authed $slot_name"); |
&Apache::lonxml::debug("authed $slot_name"); |
} |
} |
|
if (!defined($user) || !defined($domain)) { |
if (defined($user) && defined($domain)) { |
$user = $env{'user.name'}; |
$Apache::lonhomework::results{"resource.$id.checkedin"}= |
$domain = $env{'user.domain'}; |
$user.':'.$domain; |
|
} |
} |
|
|
|
$Apache::lonhomework::results{"resource.$id.checkedin"}= |
|
$user.':'.$domain; |
|
|
if (defined($slot_name)) { |
if (defined($slot_name)) { |
$Apache::lonhomework::results{"resource.$id.checkedin.slot"}= |
$Apache::lonhomework::results{"resource.$id.checkedin.slot"}= |
$slot_name; |
$slot_name; |
Line 372 sub nested_parse {
|
Line 375 sub nested_parse {
|
@Apache::scripttag::parser_env = @old_env; |
@Apache::scripttag::parser_env = @old_env; |
if ($args->{'delayed_dim_results'}) { |
if ($args->{'delayed_dim_results'}) { |
my $dim = &get_dim_id(); |
my $dim = &get_dim_id(); |
|
&Apache::lonxml::debug(" tossing out $result "); |
|
&Apache::lonxml::debug(" usining out $dim 's ". $dimension{$dim}{'result'}); |
return $dimension{$dim}{'result'}; |
return $dimension{$dim}{'result'}; |
} |
} |
return $result; |
return $result; |
Line 530 sub start_Task {
|
Line 535 sub start_Task {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
|
my ($status,$accessmsg,$slot); |
my ($status,$accessmsg,$slot); |
|
&Apache::structuretags::init_problem_globals('Task'); |
if ($target ne 'webgrade') { |
if ($target ne 'webgrade') { |
&Apache::structuretags::init_problem_globals('Task'); |
|
&Apache::structuretags::initialize_storage(); |
&Apache::structuretags::initialize_storage(); |
&Apache::lonhomework::showhash(%Apache::lonhomework::history); |
&Apache::lonhomework::showhash(%Apache::lonhomework::history); |
if ($env{'request.state'} eq 'construct') { |
if ($env{'request.state'} eq 'construct') { |
Line 1058 DONEBUTTON
|
Line 1063 DONEBUTTON
|
&Apache::loncommon::end_page({'discussion' => 1}); |
&Apache::loncommon::end_page({'discussion' => 1}); |
} |
} |
} |
} |
|
|
|
my $useslots = &Apache::lonnet::EXT("resource.0.useslots"); |
|
my %queue_data = ('type' => 'Task', |
|
'time' => time,); |
|
if (defined($Apache::inputtags::slot_name)) { |
|
$queue_data{'slot'} = $Apache::inputtags::slot_name; |
|
} elsif (defined($Apache::lonhomework::history{"resource.$version.0.checkedin.slot"})) { |
|
$queue_data{'slot'} = $Apache::lonhomework::history{"resource.$version.0.checkedin.slot"}; |
|
} |
|
|
|
|
if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) { |
if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) { |
my $award='SUBMITTED'; |
my $award='SUBMITTED'; |
&Apache::essayresponse::file_submission("$version.0",'bridgetask', |
&Apache::essayresponse::file_submission("$version.0",'bridgetask', |
Line 1080 DONEBUTTON
|
Line 1096 DONEBUTTON
|
&Apache::lonhomework::showhash(%Apache::lonhomework::results); |
&Apache::lonhomework::showhash(%Apache::lonhomework::results); |
&Apache::structuretags::finalize_storage(); |
&Apache::structuretags::finalize_storage(); |
if ($award eq 'SUBMITTED') { |
if ($award eq 'SUBMITTED') { |
my $useslots = &Apache::lonnet::EXT("resource.0.useslots"); |
&add_to_queue('gradingqueue',\%queue_data); |
if ($useslots =~ /^\s*no\s*$/i) { |
|
&add_to_queue('gradingqueue', |
|
{'type' => 'Task', |
|
'time' => time}); |
|
} elsif (defined($Apache::inputtags::slot_name)) { |
|
&add_to_queue('gradingqueue', |
|
{'type' => 'Task', |
|
'time' => time, |
|
'slot' => $Apache::inputtags::slot_name}); |
|
} |
|
} |
} |
} elsif ($Apache::lonhomework::results{'INTERNAL_store'}) { |
} elsif ($Apache::lonhomework::results{'INTERNAL_store'}) { |
&Apache::structuretags::finalize_storage(); |
&Apache::structuretags::finalize_storage(); |
Line 1138 DONEBUTTON
|
Line 1144 DONEBUTTON
|
&check_queue_unlock($env{'form.queue'}); |
&check_queue_unlock($env{'form.queue'}); |
&Apache::lonxml::debug(" still needs review not changing status."); |
&Apache::lonxml::debug(" still needs review not changing status."); |
} else { |
} else { |
&move_between_queues($env{'form.queue'},'reviewqueue'); |
if ($env{'form.queue'} ne 'none') { |
|
&move_between_queues($env{'form.queue'},'reviewqueue'); |
|
} else { |
|
&add_to_queue('reviewqueue',\%queue_data); |
|
} |
} |
} |
} elsif ($ungraded) { |
} elsif ($ungraded) { |
$Apache::lonhomework::results{"resource.$version.0.status"}='ungraded'; |
$Apache::lonhomework::results{"resource.$version.0.status"}='ungraded'; |
if ($env{'form.queue'} eq 'reviewqueue' || |
if ($env{'form.queue'} eq 'reviewqueue') { |
$env{'form.queue'} eq 'none' ) { |
|
&Apache::lonxml::debug("moving back."); |
&Apache::lonxml::debug("moving back."); |
&move_between_queues($env{'form.queue'},'gradingqueue'); |
&move_between_queues($env{'form.queue'}, |
|
'gradingqueue'); |
|
} elsif ($env{'form.queue'} eq 'none' ) { |
|
&add_to_queue('gradingqueue',\%queue_data); |
} else { |
} else { |
&check_queue_unlock($env{'form.queue'}); |
&check_queue_unlock($env{'form.queue'}); |
} |
} |
Line 1221 DONEBUTTON
|
Line 1233 DONEBUTTON
|
$result.=&Apache::response::meta_stores_write('status','string', |
$result.=&Apache::response::meta_stores_write('status','string', |
'Bridge Task Status'); |
'Bridge Task Status'); |
} |
} |
|
&Apache::structuretags::reset_problem_globals('Task'); |
undef($Apache::lonhomework::parsing_a_task); |
undef($Apache::lonhomework::parsing_a_task); |
return $result; |
return $result; |
} |
} |
Line 2220 sub get_criteria {
|
Line 2233 sub get_criteria {
|
&nested_parse(\$dimension{$dim}{$instance.'.text'},[@_]); |
&nested_parse(\$dimension{$dim}{$instance.'.text'},[@_]); |
$result.= |
$result.= |
&nested_parse(\$dimension{$dim}{'questiontext'},[@_], |
&nested_parse(\$dimension{$dim}{'questiontext'},[@_], |
{'set_dim_id' => undef, |
{'set_dim_id' => undef, |
'delay_dim_results' => 1}); |
'delayed_dim_results' => 1}); |
foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}}, |
foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}}, |
@{$dimension{$dim}{'criterias'}} ) { |
@{$dimension{$dim}{'criterias'}} ) { |
my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; |
my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; |
Line 2258 sub get_criteria {
|
Line 2271 sub get_criteria {
|
$result.=&grading_history($version,$dim,$id); |
$result.=&grading_history($version,$dim,$id); |
$last_link=$link; |
$last_link=$link; |
} |
} |
if (&delay_result()) { |
if (&nest()) { |
&Apache::lonxml::debug(" for $dim stashing results into ".$dimension{$dim}{'nested'}); |
&Apache::lonxml::debug(" for $dim stashing results into ".$dimension{$dim}{'nested'}); |
$dimension{$dimension{$dim}{'nested'}}{'result'}.=$result; |
$dimension{$dimension{$dim}{'nested'}}{'result'}.=$result; |
undef($result); |
undef($result); |