--- loncom/homework/bridgetask.pm 2005/12/21 18:08:28 1.90 +++ loncom/homework/bridgetask.pm 2006/02/08 22:26:02 1.103 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.90 2005/12/21 18:08:28 albertel Exp $ +# $Id: bridgetask.pm,v 1.103 2006/02/08 22:26:02 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -80,19 +80,25 @@ sub proctor_check_auth { } } if ($authenticated && $type eq 'Task') { + # increment version my $version= $Apache::lonhomework::history{'resource.0.version'}; $version++; - $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; + + #clean out all current results foreach my $key (keys(%Apache::lonhomework::history)) { if ($key=~/^resource\.0\./) { $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; } elsif ($authenticated && $type eq 'problem') { &Apache::lonxml::debug("authed $slot_name"); @@ -548,6 +554,8 @@ DONESCREEN $result.=&show_queue($env{'form.queue'},1); } elsif ($status_code eq 'select_user') { $result.=&select_user(); + } elsif ($status_code eq 'unable') { + $result.=''.&mt("Unable to aqcuire a user to grade.").''.$back; } else { $result.=''.&mt("No user to be graded.").''.$back; } @@ -683,6 +691,17 @@ sub get_key_todo { } 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 { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result=''; @@ -758,7 +777,7 @@ DONEBUTTON my $opt_req=&Apache::lonxml::get_param('OptionalRequired', $parstack,$safeeval); if ($opt_req !~ /\S/) { $opt_req='0'; } - $status.="\n
".&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)."
\n"; + $status.="\n".&mt('You needed to pass all of the [_1] mandatory components and [_2] of the [_3] optional components, of which you passed [_4].',$man_count,$opt_req,$opt_count,$opt_passed)."
\n"; my $internal_location=&internal_location(); $result=~s/\Q$internal_location\E/$status/; @@ -891,6 +910,7 @@ DONEBUTTON $Apache::lonhomework::results{"resource.0.solved"}= $Apache::lonhomework::results{"resource.$version.0.solved"}; } + &minimize_storage(); &Apache::structuretags::finalize_storage(); } } elsif ($target eq 'webgrade') { @@ -1081,32 +1101,30 @@ sub show_queue { if ($tmp=~/^error: 2 /) { return "\nEmpty |
"; } - $result.=" | resource | user | type | data |
---|
Status | "; } + $result.=" | user | data |
---|---|---|---|
$title | $uname | "; - $result.='lock | '.$queue{$key}.' |
$uname | "; + $result.=''.$queue{$key}.' | ||
$title | "; - $result.=' | last queue modification time | '. + $result.=" |
"; + $result.=' | '. &Apache::lonlocal::locallocaltime($queue{$key})." | ||
- | $fullname->{$student} | +$fullname->{$student} ($studentdis) | RESULT } @@ -1432,6 +1475,9 @@ RESULT if ($status{'version'}) { $result .= ' '.&mt('Version').' '.$status{'version'}; } + if ($status{'grader'}) { + $result .= ' '.&mt('(Graded by [_1])',$status{'grader'}).' '; + } $result.= ' | ';
if ($status{'reviewqueue'} eq 'enqueued') {
$result .= &mt('Awaiting Review');
@@ -1635,7 +1681,7 @@ sub get_instance {
$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});
$result.=' '.$status_display.' '; if ($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}) { - $result.=''.$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}.' '; + $result.=''.&mt('Comment: [_1]',$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}).' '; } $result.=''; } @@ -1709,7 +1755,7 @@ sub get_instance { $Apache::lonhomework::results{"resource.$version.0.$dim.status"}= 'fail'; } else { - $Apache::lonhomework::results{"resource.$version.$dim.status"}= + $Apache::lonhomework::results{"resource.$version.0.$dim.status"}= 'pass'; } } else { |