--- loncom/homework/bridgetask.pm 2007/04/07 00:12:43 1.231 +++ loncom/homework/bridgetask.pm 2007/08/03 23:29:57 1.236 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.231 2007/04/07 00:12:43 albertel Exp $ +# $Id: bridgetask.pm,v 1.236 2007/08/03 23:29:57 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -244,7 +244,9 @@ sub add_grading_button { my $result="\n\t".''; $result.="\n\t".''; - if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) { + if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'}) + || &Apache::lonnet::allowed('mgq',$env{'request.course.id'}.'/'.$env{'request.course.sec'}) + ) { my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue'); $result.="\n\t".''."\n\t\t".''; $result.="\n\t\t\t".''. @@ -610,7 +612,8 @@ sub start_Task { if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); } $result.=$uri.'">'.&add_grading_button()."\n"; my $symb=&Apache::lonnet::symbread(); - if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) { + if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'}) + || &Apache::lonnet::allowed('mgq',$env{'request.course.id'}.'/'.$env{'request.course.sec'})) { $result.=''. ''. ''. @@ -1064,7 +1067,7 @@ sub end_Task { } if (!$previous && $status ne 'SHOW_ANSWER' && &show_task($status,$previous)) { - $result.=&Apache::inputtags::gradestatus('0'); + $result.=&Apache::inputtags::gradestatus('0',$target,1); } $result.=''; @@ -1559,19 +1562,25 @@ sub show_queue { } } + $result .= + '

'. + &mt('Return to resource').'

'. + "\n

Current Queue - $queue

"; my $regexp="^$symb\0"; my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); my ($tmp)=%queue; if ($tmp=~/^error: 2 /) { - return "\n

Current Queue - $queue

". + $result.= + &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_row(). ''. &Apache::loncommon::end_data_table_row(). &Apache::loncommon::end_data_table(); + return $result; } my $title=&Apache::lonnet::gettitle($symb); - $result.="\n

Current Queue - $title $queue

". + $result.= &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_header_row(); if ($with_selects) { $result.=""; } @@ -1579,7 +1588,8 @@ sub show_queue { &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; } + next if (!defined($classlist->{$uname.':'.$udom})); + next if (§ion_restricted($classlist->{$uname.':'.$udom})); my $section = $classlist->{$uname.':'.$udom}[&Apache::loncoursedata::CL_SECTION()]; @@ -1665,6 +1675,18 @@ FORM return $result; } +sub section_restricted { + my ($classlist_entry) = @_; + my $cid =(&Apache::lonnet::whichuser())[1]; + if (lc($env{'course.'.$cid.'.task_grading'}) eq 'section' + && $env{'request.course.sec'} + && $env{'request.course.sec'} ne + $classlist_entry->[&Apache::loncoursedata::CL_SECTION()]) { + return 1; + } + return 0; +} + sub get_queue_counts { my ($queue)=@_; my $result; @@ -1680,11 +1702,14 @@ sub get_queue_counts { if ($tmp=~/^error: 2 /) { return (0,0,0); } + my ($entries,$ready_to_grade,$locks)=(0,0,0); my %slot_cache; foreach my $key (sort(keys(%queue))) { my ($symb,$uname,$udom) = &decode_queue_key($key); - if (!defined($classlist->{$uname.':'.$udom})) { next; } + next if (!defined($classlist->{$uname.':'.$udom})); + next if (§ion_restricted($classlist->{$uname.':'.$udom})); + if ($key=~/locked$/) { $locks++; } elsif ($key=~/timestamp$/) { @@ -1761,7 +1786,8 @@ sub pick_from_queue_data { if ($key =~ /\0timestamp$/) { next; } my ($symb,$uname,$udom)=&decode_queue_key($key); - if (!defined($classlist->{$uname.':'.$udom})) { next; } + next if (!defined($classlist->{$uname.':'.$udom})); + next if (§ion_restricted($classlist->{$uname.':'.$udom})); if ($check_section) { my $section = @@ -1870,7 +1896,7 @@ sub lock_key { sub get_queue_symb_status { my ($queue,$symb,$cdom,$cnum) = @_; if (!defined($cdom) || !defined($cnum)) { - my (undef,$cid)=&Apache::lonnet::whichuser(); + my (undef,$cid) =&Apache::lonnet::whichuser(); $cnum=$env{'course.'.$cid.'.num'}; $cdom=$env{'course.'.$cid.'.domain'}; } @@ -1886,6 +1912,7 @@ sub get_queue_symb_status { next if ($key=~/timestamp$/); my ($symb,$uname,$udom) = &decode_queue_key($key); next if (!defined($classlist->{$uname.':'.$udom})); + next if (§ion_restricted($classlist->{$uname.':'.$udom})); push(@users,"$uname:$udom"); } return @users; @@ -2134,9 +2161,7 @@ sub get_dim_id { sub get_id { my ($parstack,$safeeval)=@_; - my $id=&Apache::lonxml::get_param('id',$parstack,$safeeval); - if (!$id) { $id=$Apache::lonxml::curdepth; } - return $id; + return &Apache::lonxml::get_id($parstack,$safeeval); } sub start_Setup { @@ -2224,8 +2249,8 @@ sub start_Dimension { $result.= &Apache::edit::text_arg('Id:','id',$token,10).' '. &Apache::edit::select_arg('Passing is Mandatory:','Mandatory', - [['yes', 'Yes'], - ['no','No'],], + [['Y', 'Yes'], + ['N','No'],], $token).'
'. &Apache::edit::text_arg('Required number of passed optional elements to pass the '.$token->[1].':', 'OptionalRequired',$token,4). @@ -2689,7 +2714,8 @@ sub end_Setup { sub grading_history { my ($version,$dim,$id) = @_; - if (!&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) { + if (!&Apache::lonnet::allowed('mgq',$env{'request.course.id'}) + && !&Apache::lonnet::allowed('mgq',$env{'request.course.id'}.'/'.$env{'request.course.sec'})) { return ''; } my ($result,$grader); @@ -2867,8 +2893,8 @@ sub start_Criteria { $result.= &Apache::edit::text_arg('Id:','id',$token,10).' '. &Apache::edit::select_arg('Passing is Mandatory:','Mandatory', - [['yes', 'Yes'], - ['no','No'],], + [['Y', 'Yes'], + ['N','No'],], $token) .'
'.&Apache::edit::end_row(). &Apache::edit::start_spanning_row();
Specify a section:
'.&mt('Empty').'Status