--- loncom/homework/bridgetask.pm 2006/05/30 12:45:36 1.158
+++ loncom/homework/bridgetask.pm 2006/06/01 19:20:56 1.159
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.158 2006/05/30 12:45:36 www Exp $
+# $Id: bridgetask.pm,v 1.159 2006/06/01 19:20:56 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1257,12 +1257,20 @@ sub show_queue {
my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
my ($tmp)=%queue;
if ($tmp=~/^error: 2 /) {
- return "\n
Current Queue - $queue
";
+ return "\nCurrent Queue - $queue
".
+ &Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_row().
+ ''.&mt('Empty').' | '.
+ &Apache::loncommon::end_data_table_row().
+ &Apache::loncommon::end_data_table();
}
my $title=&Apache::lonnet::gettitle($symb);
- $result.="\nCurrent Queue - $title $queue
";
+ $result.="\nCurrent Queue - $title $queue
".
+ &Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row();
if ($with_selects) { $result.="Status | | "; }
- $result.="user | data |
";
+ $result.="user | data | ".
+ &Apache::loncommon::end_data_table_header_row();
foreach my $key (sort(keys(%queue))) {
my ($symb,$uname,$udom) = &decode_queue_key($key);
if (!defined($classlist->{$uname.':'.$udom})) { next; }
@@ -1277,14 +1285,15 @@ sub show_queue {
}
if ($key=~/locked$/ && !$with_selects) {
- $result.="$uname | ";
+ $result.= &Apache::loncommon::start_data_table_row().
+ "$uname | ";
$result.=''.$queue{$key}.' |
';
} elsif ($key=~/timestamp$/ && !$with_selects) {
- $result.=" | ";
+ $result.=&Apache::loncommon::start_data_table_row()." | ";
$result.=''.
&Apache::lonlocal::locallocaltime($queue{$key})." |
";
} elsif ($key!~/(timestamp|locked)$/) {
- $result.="";
+ $result.= &Apache::loncommon::start_data_table_row();
my ($end_time,$slot_text);
if (my $slot=&slotted_access($queue{$key})) {
my %slot_data=&Apache::lonnet::get_slot($slot);
@@ -1336,10 +1345,10 @@ FORM
" ($uname:$udom) ";
$result.=''.$slot_text.' End time: '.
&Apache::lonlocal::locallocaltime($end_time).
- " |
";
+ "".&Apache::loncommon::end_data_table_row();
}
}
- $result.="
\n";
+ $result.= &Apache::loncommon::end_data_table()."
\n";
return $result;
}
@@ -1643,7 +1652,7 @@ sub select_user {
$result.=' Showing only sections '.join(', ',@chosen_sections).
'.
'."\n";
}
- $result.='';
+ $result.=&Apache::loncommon::start_data_table();
foreach my $student (sort {lc($classlist->{$a}[&Apache::loncoursedata::CL_FULLNAME()]) cmp lc($classlist->{$b}[&Apache::loncoursedata::CL_FULLNAME()]) } (keys(%$classlist))) {
my ($uname,$udom) = split(/:/,$student);
@@ -1668,7 +1677,8 @@ sub select_user {
my $todo =
&escape(&encode_queue_key($symb,$udom,$uname));
if ($cannot_grade) {
- $result.=' | '.$classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()].
+ $result.=&Apache::loncommon::start_data_table_row().
+ ' | | '.$classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()].
' | ';
} else {
my $seclist;
@@ -1676,8 +1686,8 @@ sub select_user {
$seclist.='';
}
+ $result.=&Apache::loncommon::start_data_table_row();
$result.=<
| |
';
+ $result.= ''.&Apache::loncommon::end_data_table_row();
}
- $result.='
';
+ $result.=&Apache::loncommon::end_data_table();
return $result;
}