--- loncom/auth/lonroles.pm 2004/11/11 23:17:13 1.107 +++ loncom/auth/lonroles.pm 2004/11/12 15:33:32 1.108 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # User Roles Screen # -# $Id: lonroles.pm,v 1.107 2004/11/11 23:17:13 raeburn Exp $ +# $Id: lonroles.pm,v 1.108 2004/11/12 15:33:32 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -82,33 +82,11 @@ sub handler { my $now=time; my $then=$ENV{'user.login.time'}; my $envkey; - my $dcselect=''; my %dcroles = (); my $numdc = &check_fordc(\%dcroles,$then); # ================================================================== Roles Init if ($ENV{'form.selectrole'}) { - if ($ENV{'form.dcselected'}) { - my $dcdom = $ENV{'form.dcselected'}; - my $dckey = 'user.role.dc./'.$dcdom.'/'; - if ($ENV{$dckey}) { - my ($dcstart,$dcend)=split(/\./,$ENV{$dckey}); - my $active_dc = 1; - if ($dcstart) { - if ($dcstart>$then) { - $active_dc = 0; - } - } - if ($dcend) { - if ($dcend < $then) { - $active_dc = 0; - } - } - if ($active_dc) { - $dcselect = $dcdom; - } - } - } if ($ENV{'request.course.id'}) { my %temp=('logout_'.$ENV{'request.course.id'} => time); &Apache::lonnet::put('email_status',\%temp); @@ -136,18 +114,6 @@ sub handler { } } - if ($ENV{'form.dccourse'}) { - my $dcdom = $ENV{'form.dcdomain'}; - my $pickedcourse = $ENV{'form.dccourse'}; - if ($dcdom && $pickedcourse) { - unless ($ENV{'user.role.cc./'.$dcdom.'/'.$pickedcourse}) { - if ($ENV{'user.role.dc./'.$dcdom.'/'}) { - &set_privileges($dcdom,$pickedcourse); - } - } - } - } - foreach $envkey (keys %ENV) { next if ($envkey!~/^user\.role\./); my ($where,$trolecode,$role,$tstatus,$tend,$tstart); @@ -290,13 +256,12 @@ ENDENTERKEY '.course.helper.not.run'}) { $furl = "/adm/helper/course.initialization.helper"; } - # Check to see if the user is a DC coming from the - # course selection page - if ($ENV{'form.dccourse'}) { + # Check to see if the user is a DC selecting a course + if (($numdc > 0) && ($role eq 'cc')) { my $formaction = '/adm/roles/'; my ($dcdom,$pickedcourse) = split/_/,$courseid; if ($ENV{'user.role.dc./'.$dcdom.'/'}) { - &Apache::lonhtmlcommon::store_recent('cc_pickby_dc_'.$dcdom, + &Apache::lonhtmlcommon::store_recent('recent_roles', $courseid,$formaction); } } @@ -324,12 +289,10 @@ ENDENTERKEY return OK; } if ($role eq 'dc') { - unless ($dcselect) { - my $redirect_url = '/adm/menu/'; - &redirect_user($r,&mt('Loading Domain Coordinator Menu'), + my $redirect_url = '/adm/menu/'; + &redirect_user($r,&mt('Loading Domain Coordinator Menu'), $redirect_url); - return OK; - } + return OK; } } } @@ -345,7 +308,6 @@ ENDENTERKEY return OK if $r->header_only; my $swinfo=&Apache::lonmenu::rawconfig(); - my $setDCchoice = &dc_script(); my $bodytag=&Apache::loncommon::bodytag('User Roles'); my $helptag='
'.&Apache::loncommon::help_open_menu('','General Intro','General_Intro','User Roles',1,undef,undef,undef,undef,,&mt("Click here for help")).'
'; $r->print(< ENDHEADER @@ -377,12 +338,6 @@ ENDHEADER my $tryagain=$ENV{'form.tryagain'}; # -------------------------------------------------------- Generate Page Output -# -------------------------------------------------------- Domain Coordinator? - if ($dcselect ne '') { - &choosecourse_display($r,$dcselect,$then,$now); - return OK; - } - # --------------------------------------------------------------- Error Header? if ($error) { $r->print("

LON-CAPA Access Control

"); @@ -670,69 +625,27 @@ ENDHEADER if ($haverole) { $doheaders++; } } if ($numdc > 0) { - $r->print(''. - ''. - ''. - ''. - &mt('Domain').''); - foreach my $dcdom (keys %dcroles) { - my $output = $roletext{$dcroles{$dcdom}}; - my $ccrole = Apache::lonnet::plaintext('cc'); - if ($ENV{'request.role'} =~ m-cc\./$dcdom/-) { - $output.=$roletext{'user.role.'.$ENV{'request.role'}}; - } - $r->print($output); - $r->print(''); - $r->print(''. - ''. - $ccrole.''.&mt('Course').''. - ''.&mt('All courses').''. - '
'.&mt('Domain').':'.$dcdom.''. - ''. - &mt('Course Coordinator access to all courses in domain'). - ': '.$dcdom.''."\n"); - } - foreach my $type ('Construction Space','Course','Domain','System') { - my $output; - foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) { - my $skiprole = 0; - foreach my $dcdom (keys %dcroles) { - if ($sortrole{$which} =~ m-(dc)\./$dcdom/-) { - $skiprole = 1; - last; + &select_recent_courses($r,\%roletext); + } + foreach my $type ('Construction Space','Course','Domain','System') { + my $output; + foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) { + if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) { + $output.=$roletext{$sortrole{$which}}; + if ($sortrole{$which} =~ m-dc\./(\w+)/-) { + if ($dcroles{$1}) { + $output .= &allcourses_row($1); } } - if (($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) && (!$skiprole)) { - $output.=$roletext{$sortrole{$which}}; - } - } - if ($output) { - if ($doheaders > 0) { - $r->print("". - "".&mt($type)." -"); - } - $r->print($output); - } - } - } else { - foreach my $type ('Construction Space','Course','Domain','System') { - my $output; - foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) { - if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) { - $output.=$roletext{$sortrole{$which}}; - } } - if ($output) { - if ($doheaders > 0) { - $r->print("". - "".&mt($type).""); - } - $r->print($output); + } + if ($output) { + if ($doheaders > 0) { + $r->print("". + "".&mt($type).""); } - } + $r->print($output); + } } my $tremark=''; my $tfont='#003300'; @@ -881,21 +794,22 @@ sub check_fordc { return $numdc; } -sub choosecourse_display { - my ($r,$dcdom,$then,$now) = @_; +sub courselink { + my ($dcdom) = @_; my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,'dom'); my $verify_script = <<"END"; END my $courseform=&Apache::loncommon::selectcourse_link - ('roles','dccourse','dcdomain','coursedesc'); - $r->print($cb_jscript.$verify_script); - my $formaction='/adm/roles'; - $formaction=~s/\/+/\//g; - my $crs; - &select_recent_courses($r,$dcdom,$then,$now); - $r->print('
'); - $r->print('

'.&mt('Choose a course from domain').': '.$dcdom.'

'.$courseform.'

'. - ''. - 'Course Title:
'. - 'Course ID: '. - ''. - ''. - ''. - '

'. - '
'); - return; + ('rolechoice','dccourse','dcdomain','coursedesc'); + my $hiddenitems = ''. + ''. + ''. + ''; + return $cb_jscript.$verify_script.$courseform.$hiddenitems; } + sub select_recent_courses { - my ($r,$dcdom,$then,$now)=@_; + my ($r,$roletext)=@_; my $advanced = $ENV{'user.adv'}; my $tryagain = $ENV{'form.tryagain'}; - my %recent=&Apache::lonnet::dump(&recent_filename('cc_pickby_dc_'.$dcdom)); + my %recent=&Apache::lonnet::dump(&recent_filename('recent_roles')); my $numrecent = 0; - my $roletext = '

'.&mt('Enter a recently visited course').'

'. - '
'. - ''. - ''."\n". - ''. + my $roledisplay = ''. ''."\n"; foreach my $courseid (sort keys %recent) { unless ($courseid =~/^error\:/) { my ($dom,$crs) = split/_/,$courseid; - if ($dom eq $dcdom) { - $numrecent ++; - my $crskey = 'user.role.cc./'.$dom.'/'.$crs; - my ($where,$trolecode,$role,$tstatus,$tend,$tstart,$tbg,$tfont,$tremark,$inrole,$tpstart,$tpend); - my $button = 1; - &role_status($crskey,$then,$now,\$role,\$where,\$trolecode,\$tstatus,\$tstart,\$tend); - if ($tstart) { - $tpstart=&Apache::lonlocal::locallocaltime($tstart); - } - if ($tend) { - $tpend=&Apache::lonlocal::locallocaltime($tend); - } - my $ttype = &mt('Course'); - my $twhere; - if ($ENV{'course.'.$courseid.'.description'}) { - $twhere=$ENV{'course.'.$courseid.'.description'}; - } - my ($tdom,$trest,$tsection)= - split(/\//,Apache::lonnet::declutter($where)); - if ($ENV{'request.role'} eq $trolecode) { - $tstatus='selected'; - } - if ($tstatus eq 'is') { - $tbg='#77FF77'; - $tfont='#003300'; - } elsif ($tstatus eq 'future') { - $tbg='#FFFF77'; - $button=0; - } elsif ($tstatus eq 'will') { - $tbg='#FFAA77'; - $tremark.=&mt('Active at next login. '); - } elsif ($tstatus eq 'expired') { - $tbg='#FF7777'; - $tfont='#330000'; - $button=0; - } elsif ($tstatus eq 'will_not') { - $tbg='#AAFF77'; - $tremark.=&mt('Expired after logout. '); - } elsif ($tstatus eq 'selected') { - $tbg='#11CC55'; - $tfont='#002200'; - $inrole=1; - $tremark.=&mt('Currently selected. '); - } - my $trole=Apache::lonnet::plaintext($role); - $roletext.=''; - if (!$button) { - $roletext.=(''); - } elsif ($tstatus eq 'is') { - $roletext.=(''); - } elsif ($tryagain) { - $roletext.= - ''; - } elsif ($advanced) { - $roletext.= - ''; - } else { - $roletext.=''; - } - $tremark.=&Apache::lonannounce::showday(time,1, - &Apache::lonannounce::readcalendar($tdom.'_'.$trest)); - - $roletext.=''."\n"; - } + $numrecent ++; + my $crskey = 'user.role.cc./'.$dom.'/'.$crs; + $roledisplay.=$$roletext{$crskey}; } } if ($numrecent > 0) { - $r->print($roletext.'
 '.&mt('User Role').''.&mt('Extent'). - ''.&mt('Start').''.&mt('End').''. - &mt('Remarks and Calendar Announcements').'
'. - &mt('Domain').' - '.&mt('Recent courses accessed in this domain'). + &mt('Recent courses accessed by DC'). '
  '.$trole. - ''.$ttype. - ''.$twhere. - ''.$tpstart. - ''.$tpend. - ''.$tremark. - ' 
'."\n"); + $r->print("$roledisplay\n"); } } +sub allcourses_row { + my ($dcdom) = @_; + my $ccrole = Apache::lonnet::plaintext('cc'); + my $selectlink = &courselink($dcdom); + my $output = ''. + ''. + ''. + ''. + $ccrole.''.&mt('Course').''. + ''.&mt('All courses').': '. + $selectlink.''. + '
'.&mt('Domain').':'.$dcdom.''. + ''. + &mt('Course Coordinator access to all courses in domain'). + ': '.$dcdom.''."\n"; + return $output; +} + sub recent_filename { my $area=shift; return 'nohist_recent_'.&Apache::lonnet::escape($area);