version 1.89, 2005/12/20 18:09:49
|
version 1.94, 2005/12/21 19:13:05
|
Line 80 sub proctor_check_auth {
|
Line 80 sub proctor_check_auth {
|
} |
} |
} |
} |
if ($authenticated && $type eq 'Task') { |
if ($authenticated && $type eq 'Task') { |
|
# increment version |
my $version= |
my $version= |
$Apache::lonhomework::results{'resource.0.version'}= |
$Apache::lonhomework::history{'resource.0.version'}; |
++$Apache::lonhomework::history{'resource.0.version'}; |
$version++; |
$Apache::lonhomework::results{"resource.$version.0.checkedin"}= |
|
$user.'@'.$domain; |
#clean out all current results |
$Apache::lonhomework::results{"resource.$version.0.checkedin.slot"}= |
|
$slot_name; |
|
foreach my $key (keys(%Apache::lonhomework::history)) { |
foreach my $key (keys(%Apache::lonhomework::history)) { |
if ($key=~/^resource\.0\./) { |
if ($key=~/^resource\.0\./) { |
$Apache::lonhomework::results{$key}=''; |
$Apache::lonhomework::results{$key}=''; |
} |
} |
} |
} |
|
|
|
#setup new version and who did it |
|
$Apache::lonhomework::results{'resource.0.version'}=$version; |
|
$Apache::lonhomework::results{"resource.$version.0.checkedin"}= |
|
$user.'@'.$domain; |
|
$Apache::lonhomework::results{"resource.$version.0.checkedin.slot"}= |
|
$slot_name; |
|
|
return 1; |
return 1; |
} elsif ($authenticated && $type eq 'problem') { |
} elsif ($authenticated && $type eq 'problem') { |
&Apache::lonxml::debug("authed #slot_name"); |
&Apache::lonxml::debug("authed $slot_name"); |
$Apache::lonhomework::results{"resource.0.checkedin"}= |
$Apache::lonhomework::results{"resource.0.checkedin"}= |
$user.'@'.$domain; |
$user.'@'.$domain; |
$Apache::lonhomework::results{"resource.0.checkedin.slot"}= |
$Apache::lonhomework::results{"resource.0.checkedin.slot"}= |
Line 682 sub get_key_todo {
|
Line 689 sub get_key_todo {
|
} |
} |
return (undef,undef) |
return (undef,undef) |
} |
} |
|
|
|
sub minimize_storage { |
|
foreach my $key (keys(%Apache::lonhomework::results)) { |
|
if ($key =~ /regrader$/) { next; } |
|
if ($Apache::lonhomework::results{$key} eq |
|
$Apache::lonhomework::history{$key}) { |
|
delete($Apache::lonhomework::results{$key}); |
|
} |
|
} |
|
} |
|
|
sub end_Task { |
sub end_Task { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $result=''; |
my $result=''; |
Line 757 DONEBUTTON
|
Line 775 DONEBUTTON
|
my $opt_req=&Apache::lonxml::get_param('OptionalRequired', |
my $opt_req=&Apache::lonxml::get_param('OptionalRequired', |
$parstack,$safeeval); |
$parstack,$safeeval); |
if ($opt_req !~ /\S/) { $opt_req='0'; } |
if ($opt_req !~ /\S/) { $opt_req='0'; } |
$status.="\n<p>".&mt('You needed to pass all of the [_1] mandatory components and [_2] of the [_3] optional components on the bridge task.',$man_count,$opt_req,$opt_count)."</p></div>\n"; |
$status.="\n<p>".&mt('You needed to pass all of the [_1] mandatory components and [_2] of the [_3] optional components, of which you were required to pass [_4] on the bridge task.',$man_count,$opt_passed,$opt_count,$opt_req)."</p></div>\n"; |
|
|
my $internal_location=&internal_location(); |
my $internal_location=&internal_location(); |
$result=~s/\Q$internal_location\E/$status/; |
$result=~s/\Q$internal_location\E/$status/; |
Line 890 DONEBUTTON
|
Line 908 DONEBUTTON
|
$Apache::lonhomework::results{"resource.0.solved"}= |
$Apache::lonhomework::results{"resource.0.solved"}= |
$Apache::lonhomework::results{"resource.$version.0.solved"}; |
$Apache::lonhomework::results{"resource.$version.0.solved"}; |
} |
} |
|
&minimize_storage(); |
&Apache::structuretags::finalize_storage(); |
&Apache::structuretags::finalize_storage(); |
} |
} |
} elsif ($target eq 'webgrade') { |
} elsif ($target eq 'webgrade') { |
Line 1708 sub get_instance {
|
Line 1727 sub get_instance {
|
$Apache::lonhomework::results{"resource.$version.0.$dim.status"}= |
$Apache::lonhomework::results{"resource.$version.0.$dim.status"}= |
'fail'; |
'fail'; |
} else { |
} else { |
$Apache::lonhomework::results{"resource.$version.$dim.status"}= |
$Apache::lonhomework::results{"resource.$version.0.$dim.status"}= |
'pass'; |
'pass'; |
} |
} |
} else { |
} else { |