--- loncom/homework/bridgetask.pm 2005/10/01 03:55:06 1.60 +++ loncom/homework/bridgetask.pm 2005/10/01 04:14:51 1.63 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.60 2005/10/01 03:55:06 albertel Exp $ +# $Id: bridgetask.pm,v 1.63 2005/10/01 04:14:51 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -478,7 +478,9 @@ sub start_Task { my $bodytext=&Apache::lonxml::get_all_text("/task",$parser); } if ($target eq 'webgrade' && defined($env{'form.queue'})) { - $result.=&submission_time_stamp(); + if ($webgrade eq 'yes') { + $result.=&submission_time_stamp(); + } $result.=$form_tag_start; $result.=''; @@ -488,6 +490,14 @@ sub start_Task { $result.=''; } + if ($env{'form.chosensections'}) { + my @chosen_sections= + &Apache::loncommon::get_env_multiple('form.chosensections'); + foreach my $sec (@chosen_sections) { + $result.=''; + } + } } } else { # page_start returned a starting result, delete it if we don't need it @@ -918,6 +928,10 @@ sub show_queue { &Apache::grades::init_perm(); my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,); &Apache::grades::reset_perm(); + if (!(grep(/^all$/,@chosen_sections))) { + $result.='

Showing only sections '.join(', ',@chosen_sections). + '.

'."\n"; + } my $regexp="^$symb\0"; my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); @@ -957,6 +971,11 @@ sub show_queue { ($action,$description)=('unlock',&mt('Unlock')); } } + my $seclist; + foreach my $sec (@chosen_sections) { + $seclist.=''; + } if (time > $slot_data{'endtime'}) { $result.=(< @@ -967,6 +986,7 @@ sub show_queue { + $seclist FORM @@ -1171,13 +1191,19 @@ sub get_from_queue { sub select_user { my ($symb,$cid)=&Apache::lonxml::whichuser(); - my $result.=''; my @chosen_sections= &Apache::loncommon::get_env_multiple('form.chosensections'); &Apache::grades::init_perm(); my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,); &Apache::grades::reset_perm(); + + my $result; + if (!(grep(/^all$/,@chosen_sections))) { + $result.='

Showing only sections '.join(', ',@chosen_sections). + '.

'."\n"; + } + $result.='
'; foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) { my ($uname,$udom) = split(/:/,$student); @@ -1202,6 +1228,11 @@ sub select_user { $result.='
 '.$fullname->{$student}. ''; } else { + my $seclist; + foreach my $sec (@chosen_sections) { + $seclist.=''; + } $result.=< @@ -1210,7 +1241,8 @@ sub select_user { - + + $seclist $fullname->{$student}