--- loncom/homework/bridgetask.pm 2006/01/26 07:12:38 1.98 +++ 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.98 2006/01/26 07:12:38 albertel Exp $ +# $Id: bridgetask.pm,v 1.103 2006/02/08 22:26:02 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -777,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, of which you were required to pass [_4] on the bridge task.',$man_count,$opt_passed,$opt_count,$opt_req)."
\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/; @@ -1101,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 } @@ -1474,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');
@@ -1677,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.=''; } |