--- loncom/homework/bridgetask.pm 2006/02/08 21:55:36 1.101
+++ loncom/homework/bridgetask.pm 2006/02/08 22:44:14 1.104
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.101 2006/02/08 21:55:36 albertel Exp $
+# $Id: bridgetask.pm,v 1.104 2006/02/08 22:44:14 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1101,32 +1101,30 @@ sub show_queue {
if ($tmp=~/^error: 2 /) {
return "\n
Current Queue - $queue
Empty
";
}
- $result.="\n
Current Queue - $symb $queue
";
- if ($with_selects) { $result.="
"; }
- $result.="
resource
user
type
data
";
+ my $title=&Apache::lonnet::gettitle($symb);
+ $result.="\n
Current Queue - $title $queue
";
+ if ($with_selects) { $result.="
Status
"; }
+ $result.="
user
data
";
foreach my $key (sort(keys(%queue))) {
my ($symb,$uname,$udom) = &decode_queue_key($key);
if (!defined($classlist->{$uname.':'.$udom})) { next; }
if ($key=~/locked$/ && !$with_selects) {
- my $title=&Apache::lonnet::gettitle($symb);
- $result.="
$title
$uname
";
- $result.='
lock
'.$queue{$key}.'
';
+ $result.="
$uname
";
+ $result.='
'.$queue{$key}.'
';
} elsif ($key=~/timestamp$/ && !$with_selects) {
- my ($symb,undef) = split("\0",$key);
- my $title=&Apache::lonnet::gettitle($symb);
- $result.="
";
} elsif ($key!~/(timestamp|locked)$/) {
- my $title=&Apache::lonnet::gettitle($symb);
$result.="
";
my $slot=$queue{$key}->[0];
my %slot_data=&Apache::lonnet::get_slot($slot);
if ($with_selects) {
my $ekey=&Apache::lonnet::escape($key);
- my ($action,$description)=('select',&mt('Select'));
+ my ($action,$description,$status)=('select',&mt('Select'));
if (exists($queue{"$key\0locked"})) {
my $me=$env{'user.name'}.'@'.$env{'user.domain'};
+ $status=&mt('Locked by [_1]',$queue{"$key\0locked"});
if ($me eq $queue{"$key\0locked"}) {
($action,$description)=('resume',&mt('Resume'));
} else {
@@ -1140,8 +1138,9 @@ sub show_queue {
}
if (time > $slot_data{'endtime'}) {
$result.=(<