';
$Str .= &hidden_input('nfields',$i);
$Str .= &hidden_input('keyfields',$keyfields);
@@ -605,35 +736,36 @@ sub print_upload_manager_footer {
$Str .= '
'; } - if ($context eq 'construction_space') { + if ($context eq 'author') { $Str .= '
'.&mt('Default role and/or section')."
\n". - &mt('Role and/or section for users without one in the uploaded file.'); + $Str .= '
'.&mt('Default role and/or section(s)')."
\n". + &mt('Role and/or section(s) for users without values specified in the uploaded file.'); } - $Str .= '
'; - my ($options,$cb_script,$coursepick) = &default_role_selector($context); - if ($context eq 'domain') { - $Str .= ''.&mt('Domain Level').'
'.$options.'
'.&mt('Course Level').'
'.$cb_script.$coursepick; + $Str .= '
'; + if (($context eq 'domain') || ($context eq 'author')) { + my ($options,$cb_script,$coursepick) = &default_role_selector($context,1); + if ($context eq 'domain') { + $Str .= ''.&mt('Domain Level').'
'.$options.'
'.&mt('Course Level').'
'.$cb_script.$coursepick; + } elsif ($context eq 'author') { + $Str .= $options; + } } else { - $Str .= $options; + my ($cnum,$cdom) = &get_course_identity(); + my $rowtitle = &mt('section'); + my $secbox = §ion_picker($cdom,$cnum,'Any',$rowtitle, + $permission,$context,'upload'); + $Str .= $secbox."
');
&print_upload_manager_footer($r,$i,$keyfields,$defdom,$today,$halfyear,
- $context);
+ $context,$permission);
}
sub setup_date_selectors {
- my ($starttime,$endtime,$mode) = @_;
+ my ($starttime,$endtime,$mode,$nolink,$formname) = @_;
+ if ($formname eq '') {
+ $formname = 'studentform';
+ }
if (! defined($starttime)) {
$starttime = time;
unless ($mode eq 'create_enrolldates' || $mode eq 'create_defaultdates') {
@@ -752,12 +906,15 @@ sub setup_date_selectors {
}
}
}
- my $startdateform = &Apache::lonhtmlcommon::date_setter('studentform',
- 'startdate',
- $starttime);
- my $enddateform = &Apache::lonhtmlcommon::date_setter('studentform',
- 'enddate',
- $endtime);
+
+ my $startdateform =
+ &Apache::lonhtmlcommon::date_setter($formname,'startdate',$starttime,
+ undef,undef,undef,undef,undef,undef,undef,$nolink);
+
+ my $enddateform =
+ &Apache::lonhtmlcommon::date_setter($formname,'enddate',$endtime,
+ undef,undef,undef,undef,undef,undef,undef,$nolink);
+
if ($mode eq 'create_enrolldates') {
$startdateform = &Apache::lonhtmlcommon::date_setter('ccrs',
'startenroll',
@@ -788,35 +945,47 @@ sub get_dates_from_form {
}
sub date_setting_table {
- my ($starttime,$endtime,$mode) = @_;
- my ($startform,$endform)=&setup_date_selectors($starttime,$endtime,$mode);
+ my ($starttime,$endtime,$mode,$bulkaction,$formname,$permission) = @_;
+ my $nolink;
+ if ($bulkaction) {
+ $nolink = 1;
+ }
+ my ($startform,$endform) =
+ &setup_date_selectors($starttime,$endtime,$mode,$nolink,$formname);
my $dateDefault;
if ($mode eq 'create_enrolldates' || $mode eq 'create_defaultdates') {
$dateDefault = ' ';
- } elsif ($mode ne 'construction_space' && $mode ne 'domain') {
- $dateDefault = ''.&mt('Settings for assigning roles:').'
'."\n". &mt('Pick the action to take on roles for these users:').''; } - if ($context eq 'construction_space') { + if ($context eq 'author') { $Str .= '
'.&mt('Default role')."
\n". - &mt('Choose the role to assign to users without one specified in the uploaded file'); + &mt('Choose the role to assign to users without a value specified in the uploaded file'); } elsif ($context eq 'course') { $Str .= ''.&mt('Default role and section')."
\n". - &mt('Choose the role and/or section to assign to users without one specified in the uploaded file'); + &mt('Choose the role and/or section(s) to assign to users without values specified in the uploaded file'); } else { - $Str .= ''.&mt('Default role and/or section')."
\n". - &mt('Role and/or section for users without one in the uploaded file.'); + $Str .= '
'.&mt('Default role and/or section(s)')."
\n". + &mt('Role and/or section(s) for users without values specified in the uploaded file.'); } - $Str .= '
'; - my ($options,$cb_script,$coursepick) = &default_role_selector($context); - if ($context eq 'domain') { - $Str .= ''.&mt('Domain Level').'
'.$options.'
'.&mt('Course Level').'
'.$cb_script.$coursepick; + $Str .= '
'; + if (($context eq 'domain') || ($context eq 'author')) { + my ($options,$cb_script,$coursepick) = &default_role_selector($context,1); + if ($context eq 'domain') { + $Str .= ''.&mt('Domain Level').'
'.$options.'
'.&mt('Course Level').'
'.$cb_script.$coursepick; + } elsif ($context eq 'author') { + $Str .= $options; + } } else { - $Str .= $options; + my ($cnum,$cdom) = &get_course_identity(); + my $rowtitle = &mt('section'); + my $secbox = §ion_picker($cdom,$cnum,'Any',$rowtitle, + $permission,$context,'upload'); + $Str .= $secbox."
".&mt('Full Update')."
\n". + '
'.&mt('Students selected from this list can be dropped.').'
".&mt('Full Update')."
\n". - '\n"; - } - $Str .= "".&mt('ID/Student Number')."
\n"; - $Str .= "\n".'
'."\n".
- &mt('(only do if you know what you are doing.)')."
\n"; $Str .= '
'; + my $result = &Apache::lonhtmlcommon::start_pick_box()."\n"; + $result .= &Apache::lonhtmlcommon::row_title(&mt('Starting Date'), + 'LC_oddrow_value')."\n". + $startform."\n". + &Apache::lonhtmlcommon::row_closure(1). + &Apache::lonhtmlcommon::row_title(&mt('Ending Date'), + 'LC_oddrow_value')."\n". + $endform.' '.$perpetual. + &Apache::lonhtmlcommon::row_closure(1). + &Apache::lonhtmlcommon::end_pick_box(); if ($dateDefault) { $result .= $dateDefault.'
'."\n"; } @@ -827,19 +996,19 @@ sub make_dates_default { my ($startdate,$enddate,$context) = @_; my $result = ''; if ($context eq 'course') { - my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'}; - my $crs = $env{'course.'.$env{'request.course.id'}.'.num'}; + my ($cnum,$cdom) = &get_course_identity(); my $put_result = &Apache::lonnet::put('environment', {'default_enrollment_start_date'=>$startdate, - 'default_enrollment_end_date' =>$enddate},$dom,$crs); + 'default_enrollment_end_date' =>$enddate},$cdom,$cnum); if ($put_result eq 'ok') { - $result .= "Set default start and end dates for course
"; + $result .= &mt('Set default start and end access dates for course.'). + '
'."\n"; # # Refresh the course environment &Apache::lonnet::coursedescription($env{'request.course.id'}, {'freshen_cache' => 1}); } else { - $result .= &mt('Unable to set default dates for course').":".$put_result. + $result .= &mt('Unable to set default access dates for course.').":".$put_result. '
'; } } @@ -847,10 +1016,10 @@ sub make_dates_default { } sub default_role_selector { - my ($context) = @_; + my ($context,$checkpriv) = @_; my %customroles; my ($options,$coursepick,$cb_jscript); - if ($context ne 'construction_space') { + if ($context ne 'author') { %customroles = &my_custom_roles(); } @@ -863,112 +1032,134 @@ sub default_role_selector { $options = ''; return ($options,$cb_jscript,$coursepick); } sub default_course_roles { - my ($context,%customroles) = @_; + my ($context,$checkpriv,%customroles) = @_; my $output; - my @roles = &course_roles($context); + my $custom = 1; + my @roles = &course_roles($context,$checkpriv,$custom); foreach my $role (@roles) { - my $plrole=&Apache::lonnet::plaintext($role); - $output .= ' '; + if ($role ne 'cr') { + my $plrole=&Apache::lonnet::plaintext($role); + $output .= ' '; + } } if (keys(%customroles) > 0) { - foreach my $cust (sort(keys(%customroles))) { - my $custrole='cr_cr_'.$env{'user.domain'}. - '_'.$env{'user.name'}.'_'.$cust; - $output .= ' '; + if (grep(/^cr$/,@roles)) { + foreach my $cust (sort(keys(%customroles))) { + my $custrole='cr_'.$env{'user.domain'}. + '_'.$env{'user.name'}.'_'.$cust; + $output .= ' '; + } } } return $output; } sub construction_space_roles { - my @allroles = ('ca','aa'); + my ($checkpriv) = @_; + my @allroles = &roles_by_context('author'); my @roles; - foreach my $role (@allroles) { - if (&Apache::lonnet::allowed('c'.$role,$env{'user.domain'}.'/'.$env{'user.name'})) { - push(@roles,$role); + if ($checkpriv) { + foreach my $role (@allroles) { + if (&Apache::lonnet::allowed('c'.$role,$env{'user.domain'}.'/'.$env{'user.name'})) { + push(@roles,$role); + } } + return @roles; + } else { + return @allroles; } - return @roles; } sub domain_roles { - my @allroles = ('dc','li','dg','au','sc'); + my ($checkpriv) = @_; + my @allroles = &roles_by_context('domain'); my @roles; - foreach my $role (@allroles) { - if (&Apache::lonnet::allowed('c'.$role,$env{'request.role.domain'})) { - push(@roles,$role); + if ($checkpriv) { + foreach my $role (@allroles) { + if (&Apache::lonnet::allowed('c'.$role,$env{'request.role.domain'})) { + push(@roles,$role); + } } + return @roles; + } else { + return @allroles; } - return @roles; } sub course_roles { - my ($context) = @_; - my @allroles = ('st','ta','ep','in','cc'); + my ($context,$checkpriv,$custom) = @_; + my @allroles = &roles_by_context('course',$custom); my @roles; if ($context eq 'domain') { @roles = @allroles; } elsif ($context eq 'course') { if ($env{'request.course.id'}) { - foreach my $role (@allroles) { - if (&Apache::lonnet::allowed('c'.$role,$env{'request.course.id'})) { - push(@roles,$role); - } else { - if ($role ne 'cc' && $env{'request.course.section'} ne '') { - if (!&Apache::lonnet::allowed('c'.$role, - $env{'request.course.id'}.'/'. - $env{'request.course.section'})) { - push(@roles,$role); + if ($checkpriv) { + foreach my $role (@allroles) { + if (&Apache::lonnet::allowed('c'.$role,$env{'request.course.id'})) { + push(@roles,$role); + } else { + if ($role ne 'cc' && $env{'request.course.sec'} ne '') { + if (&Apache::lonnet::allowed('c'.$role, + $env{'request.course.id'}.'/'. + $env{'request.course.sec'})) { + push(@roles,$role); + } } } } + } else { + @roles = @allroles; } } } @@ -976,18 +1167,19 @@ sub course_roles { } sub curr_role_permissions { - my ($context,$setting) = @_; + my ($context,$setting,$checkpriv) = @_; + my $custom = 1; my @roles; - if ($context eq 'construction_space') { - @roles = &construction_space_roles(); + if ($context eq 'author') { + @roles = &construction_space_roles($checkpriv); } elsif ($context eq 'domain') { if ($setting eq 'course') { - @roles = &course_roles($context); + @roles = &course_roles($context,$checkpriv,$custom); } else { - @roles = &domain_roles(); + @roles = &domain_roles($checkpriv); } } elsif ($context eq 'course') { - @roles = &course_roles($context); + @roles = &course_roles($context,$checkpriv,$custom); } return @roles; } @@ -1005,49 +1197,49 @@ sub my_custom_roles { return %returnhash; } -sub print_html_classlist { - my ($r,$mode,$permission,$context) = @_; +sub print_userlist { + my ($r,$mode,$permission,$context,$formname,$totcodes,$codetitles, + $idlist,$idlist_titles) = @_; + my $format = $env{'form.output'}; if (! exists($env{'form.sortby'})) { $env{'form.sortby'} = 'username'; } - if ($env{'form.status'} !~ /^(Any|Expired|Active|Future)$/) { - $env{'form.status'} = 'Active'; + if ($env{'form.Status'} !~ /^(Any|Expired|Active|Future)$/) { + $env{'form.Status'} = 'Active'; } my $status_select = &Apache::lonhtmlcommon::StatusOptions - ($env{'form.status'}); + ($env{'form.Status'}); + if ($env{'form.showrole'} eq '') { + if ($context eq 'course') { + $env{'form.showrole'} = 'st'; + } else { + $env{'form.showrole'} = 'Any'; + } + } if (! defined($env{'form.output'}) || $env{'form.output'} !~ /^(csv|excel|html)$/ ) { $env{'form.output'} = 'html'; } - if ($context eq 'course') { - my $cid =$env{'request.course.id'}; - my $cdom=$env{'course.'.$cid.'.domain'}; - my $cnum=$env{'course.'.$cid.'.num'}; - # - # List course personnel - my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum); - # - - $r->print('
'.&Apache::loncommon::start_data_table()); - foreach my $role (sort keys %coursepersonnel) { - next if ($role =~ /^\s*$/); - $r->print(&Apache::loncommon::start_data_table_row(). - '
\n"); if ($env{'form.action'} ne 'modifystudent') { @@ -1066,71 +1258,606 @@ sub print_html_classlist { $output_selector .= ''; $r->print(''.(' 'x3)); } - $r->print('\n"); - $r->print(''. - "\n
\n"); - + $r->print(''.(' 'x3)."\n"); + my $roleselected = ''; + if ($env{'form.showrole'} eq 'Any') { + $roleselected = ' selected="selected" '; + } + my ($role_select,$cnum,$cdom); + if ($context eq 'domain') { + $role_select = &domain_roles_select(); + $r->print(''); + } else { + $role_select = ''; + $r->print(''); + if ($context eq 'course') { + ($cnum,$cdom) = &get_course_identity(); + $r->print(§ion_group_filter($cnum,$cdom)); + } + } + if (!(($context eq 'domain') && ($env{'form.roletype'} eq 'course'))) { + $r->print(' '.&list_submit_button(&mt('Update Display')). + "\n\n"); + } + my ($indexhash,$keylist) = &make_keylist_array(); + my (%userlist,%userinfo); + if ($context eq 'domain' && $env{'form.roletype'} eq 'course') { + my $courseform = + &Apache::lonhtmlcommon::course_selection($formname,$totcodes, + $codetitles,$idlist,$idlist_titles); + $r->print(''.&Apache::lonhtmlcommon::start_pick_box()."\n". + &Apache::lonhtmlcommon::start_pick_box()."\n". + &Apache::lonhtmlcommon::row_title(&mt('Select Course(s)'), + 'LC_oddrow_value')."\n". + $courseform."\n". + &Apache::lonhtmlcommon::row_closure(1). + &Apache::lonhtmlcommon::end_pick_box().'
'. + ''.&list_submit_button(&mt('Update Display')). + "\n".'
'.&mt('Warning: data retrieval for multiple courses can take considerable time, as this operation is not currently optimized.').''."\n"); + if ($env{'form.coursepick'}) { + $r->print(''.&mt('Searching').' ...
'); + } + } else { + $r->print('
'.&mt('Searching').' ...
'); + } + $r->rflush(); if ($context eq 'course') { - # - # Print the classlist - $r->print('
'.&mt('Current Class List').'
'); - my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist(); + my $classlist = &Apache::loncoursedata::get_classlist(); + my $secidx = &Apache::loncoursedata::CL_SECTION(); + my $viewablesec = &viewable_section($permission); + foreach my $student (keys(%{$classlist})) { + my $section = $classlist->{$student}[$secidx]; + if ($viewablesec ne '') { + if ($section ne $viewablesec) { + next; + } else { + $userlist{$student} = $classlist->{$student}; + } + } else { + $userlist{$student} = $classlist->{$student}; + } + } + my $showroles; + if ($env{'form.showrole'} ne 'Any') { + $showroles = [$env{'form.showrole'}]; + } else { + $showroles = undef; + } + my $withsec = 1; + my %advrolehash = &Apache::lonnet::get_my_roles($cnum,$cdom,undef, + \@statuses,$showroles,undef,$withsec); + &gather_userinfo($context,$format,\%userlist,$indexhash,\%userinfo, + \%advrolehash,$permission); + } else { + my (%cstr_roles,%dom_roles); + if ($context eq 'author') { + # List co-authors and assistant co-authors + my @possroles = &roles_by_context($context); + %cstr_roles = &Apache::lonnet::get_my_roles(undef,undef,undef, + \@statuses,\@possroles); + &gather_userinfo($context,$format,\%userlist,$indexhash,\%userinfo, + \%cstr_roles,$permission); + } elsif ($context eq 'domain') { + if ($env{'form.roletype'} eq 'domain') { + %dom_roles = &Apache::lonnet::get_domain_roles($env{'request.role.domain'}); + foreach my $key (keys(%dom_roles)) { + if (ref($dom_roles{$key}) eq 'HASH') { + &gather_userinfo($context,$format,\%userlist,$indexhash, + \%userinfo,$dom_roles{$key},$permission); + } + } + } elsif ($env{'form.roletype'} eq 'author') { + my %dom_roles = &Apache::lonnet::get_domain_roles($env{'request.role.domain'},['au']); + my %coauthors; + foreach my $key (keys(%dom_roles)) { + if (ref($dom_roles{$key}) eq 'HASH') { + if ($env{'form.showrole'} eq 'au') { + &gather_userinfo($context,$format,\%userlist,$indexhash, + \%userinfo,$dom_roles{$key},$permission); + } else { + my @possroles; + if ($env{'form.showrole'} eq 'Any') { + @possroles = &roles_by_context('author'); + } else { + @possroles = ($env{'form.showrole'}); + } + foreach my $author (sort(keys(%{$dom_roles{$key}}))) { + my ($role,$authorname,$authordom) = split(/:/,$author,-1); + my $extent = '/'.$authordom.'/'.$authorname; + %{$coauthors{$extent}} = + &Apache::lonnet::get_my_roles($authorname, + $authordom,undef,\@statuses,\@possroles); + } + &gather_userinfo($context,$format,\%userlist, + $indexhash,\%userinfo,\%coauthors,$permission); + } + } + } + } elsif ($env{'form.roletype'} eq 'course') { + if ($env{'form.coursepick'}) { + my %courses = &process_coursepick(); + my %allusers; + foreach my $cid (keys(%courses)) { + my ($cnum,$cdom,$cdesc) = &get_course_identity($cid); + next if ($cnum eq '' || $cdom eq ''); + my $custom = 1; + my (@roles,@sections,%access,%users,%userdata, + %statushash); + if ($env{'form.showrole'} eq 'Any') { + @roles = &course_roles($context,undef,$custom); + } else { + @roles = ($env{'form.showrole'}); + } + foreach my $role (@roles) { + %{$users{$role}} = (); + } + foreach my $type (@statuses) { + $access{$type} = $type; + } + &Apache::loncommon::get_course_users($cdom,$cnum,\%access,\@roles,\@sections,\%users,\%userdata,\%statushash); + foreach my $user (keys(%userdata)) { + next if (ref($userinfo{$user}) eq 'HASH'); + foreach my $item ('fullname','id') { + $userinfo{$user}{$item} = $userdata{$user}[$indexhash->{$item}]; + } + } + foreach my $role (keys(%users)) { + foreach my $user (keys(%{$users{$role}})) { + my $uniqid = $user.':'.$role; + $allusers{$uniqid}{$cid} = { desc => $cdesc, + secs => $statushash{$user}{$role}, + }; + } + } + } + &gather_userinfo($context,$format,\%userlist,$indexhash, + \%userinfo,\%allusers,$permission); + } else { + $r->print(''); + return; + } + } + } + } + if (keys(%userlist) == 0) { + if ($context eq 'author') { + $r->print(&mt('There are no co-authors to display.')."\n"); + } elsif ($context eq 'domain') { + if ($env{'form.roletype'} eq 'domain') { + $r->print(&mt('There are no users with domain roles to display.')."\n"); + } elsif ($env{'form.roletype'} eq 'author') { + $r->print(&mt('There are no authors or co-authors to display.')."\n"); + } elsif ($env{'form.roletype'} eq 'course') { + $r->print(&mt('There are no course users to display')."\n"); + } + } elsif ($context eq 'course') { + $r->print(&mt('There are no course users to display.')."\n"); + } + } else { + # Print out the available choices + my $usercount; + if ($env{'form.action'} eq 'modifystudent') { + ($usercount) = &show_users_list($r,$context,'view',$permission, + $env{'form.Status'},\%userlist,$keylist); + } else { + ($usercount) = &show_users_list($r,$context,$env{'form.output'}, + $permission,$env{'form.Status'},\%userlist,$keylist); + } + if (!$usercount) { + $r->print(''.&mt('There are no users matching the search criteria.')); + } + } + $r->print(''); +} + +sub section_group_filter { + my ($cnum,$cdom) = @_; + my @filters; + if ($env{'request.course.sec'} eq '') { + @filters = ('sec'); + } + push(@filters,'grp'); + my %name = ( + sec => 'secfilter', + grp => 'grpfilter', + ); + my %title = &Apache::lonlocal::texthash ( + sec => 'Section(s)', + grp => 'Group(s)', + all => 'all', + none => 'none', + ); + my ($output,@options); + foreach my $item (@filters) { + my $markup; + if ($env{'form.'.$name{$item}} eq '') { + $env{'form.'.$name{$item}} = 'all'; + } + if ($item eq 'sec') { + if ($env{'form.showrole'} eq 'cc') { + $env{'form.'.$name{$item}} = 'none'; + } + my %sections_count = &Apache::loncommon::get_sections($cdom,$cnum); + @options = sort(keys(%sections_count)); + } elsif ($item eq 'grp') { + my %curr_groups = &Apache::longroup::coursegroups(); + @options = sort(keys(%curr_groups)); + } + if (@options > 0) { + my $currsel; + $markup = ''."\n"; + foreach my $option ('all','none',@options) { + $currsel = ''; + if ($env{'form.'.$name{$item}} eq $option) { + $currsel = ' selected="selected" '; + } + $markup .= ' '."\n"; + } + $markup .= ''."\n"; + $output .= (' 'x3).''; + } + } + return $output; +} - if (exists($permission->{'view_section'})) { - my $sec = &Apache::loncoursedata::CL_SECTION(); - foreach my $student (keys(%{$classlist})) { - if ($classlist->{$student}[$sec] ne $permission->{'view_section'}) { - delete($classlist->{$student}); +sub list_submit_button { + my ($text) = @_; + return ''; +} + +sub gather_userinfo { + my ($context,$format,$userlist,$indexhash,$userinfo,$rolehash,$permission) = @_; + foreach my $item (keys(%{$rolehash})) { + my %userdata; + if ($context eq 'author') { + ($userdata{'username'},$userdata{'domain'},$userdata{'role'}) = + split(/:/,$item); + ($userdata{'start'},$userdata{'end'})=split(/:/,$rolehash->{$item}); + &build_user_record($context,\%userdata,$userinfo,$indexhash, + $item,$userlist); + } elsif ($context eq 'course') { + my $viewablesec = &viewable_section($permission); + ($userdata{'username'},$userdata{'domain'},$userdata{'role'}, + $userdata{'section'}) = split(/:/,$item,-1); + ($userdata{'start'},$userdata{'end'})=split(/:/,$rolehash->{$item}); + if (($viewablesec ne '') && ($userdata{'section'} ne '')) { + next if ($viewablesec ne $userdata{'section'}); + } + &build_user_record($context,\%userdata,$userinfo,$indexhash, + $item,$userlist); + } elsif ($context eq 'domain') { + if ($env{'form.roletype'} eq 'domain') { + ($userdata{'role'},$userdata{'username'},$userdata{'domain'}) = + split(/:/,$item); + ($userdata{'end'},$userdata{'start'})=split(/:/,$rolehash->{$item}); + &build_user_record($context,\%userdata,$userinfo,$indexhash, + $item,$userlist); + } elsif ($env{'form.roletype'} eq 'author') { + if (ref($rolehash->{$item}) eq 'HASH') { + $userdata{'extent'} = $item; + foreach my $key (keys(%{$rolehash->{$item}})) { + ($userdata{'username'},$userdata{'domain'},$userdata{'role'}) = split(/:/,$key); + ($userdata{'start'},$userdata{'end'}) = + split(/:/,$rolehash->{$item}{$key}); + my $uniqid = $key.':'.$item; + &build_user_record($context,\%userdata,$userinfo, + $indexhash,$uniqid,$userlist); + } + } + } elsif ($env{'form.roletype'} eq 'course') { + ($userdata{'username'},$userdata{'domain'},$userdata{'role'}) = + split(/:/,$item); + if (ref($rolehash->{$item}) eq 'HASH') { + my $numcids = keys(%{$rolehash->{$item}}); + foreach my $cid (sort(keys(%{$rolehash->{$item}}))) { + if (ref($rolehash->{$item}{$cid}) eq 'HASH') { + my $spanstart = ''; + my $spanend = '; '; + my $space = ', '; + if ($format eq 'html' || $format eq 'view') { + $spanstart = ''; + # FIXME: actions on courses disabled for now +# if ($permission->{'cusr'}) { +# if ($numcids > 1) { +# $spanstart .= ' '; +# } else { +# $spanstart .= ' '; +# } +# } + $spanend = '
'; + $space = ', '; + } + $userdata{'extent'} .= $spanstart. + $rolehash->{$item}{$cid}{'desc'}.$space; + if (ref($rolehash->{$item}{$cid}{'secs'}) eq 'HASH') { + foreach my $sec (sort(keys(%{$rolehash->{$item}{$cid}{'secs'}}))) { + if (($env{'form.Status'} eq 'Any') || + ($env{'form.Status'} eq $rolehash->{$item}{$cid}{'secs'}{$sec})) { + $userdata{'extent'} .= $sec.$space.$rolehash->{$item}{$cid}{'secs'}{$sec}.$spanend; + $userdata{'status'} = $rolehash->{$item}{$cid}{'secs'}{$sec}; + } + } + } + } + } + } + if ($userdata{'status'} ne '') { + &build_user_record($context,\%userdata,$userinfo, + $indexhash,$item,$userlist); } } } + } + return; +} - if (! defined($classlist)) { - $r->print(&mt('There are no students currently enrolled.')."\n"); - } else { - # Print out the available choices - if ($env{'form.action'} eq 'modifystudent') { - &show_users_list($r,$context,'view','modify', - $env{'form.Status'},$classlist,$keylist); - } else { - &show_users_list($r,$context,$env{'form.output'},'aboutme', - $env{'form.Status'},$classlist,$keylist); - } - } - } elsif ($context eq 'construction_space') { - # List co-authors and assistant co-authors - my @statuses; - if ($env{'form.status'} eq 'Any') { - @statuses = ('previous','active','future'); - } elsif ($env{'form.status'} eq 'Expired') { - @statuses = ('previous'); - } elsif ($env{'form.status'} eq 'Active') { - @statuses = ('active'); - } elsif ($env{'form.status'} eq 'Future') { - @statuses = ('future'); - } - my @possroles = ('ca','aa'); - my %cstr_roles = &Apache::lonnet::get_my_roles(undef,undef,undef, - \@statuses,\@possroles); - if (keys(%cstr_roles) == 0) { - $r->print(&mt('There are no authors or co-authors.')."\n"); - } else { - # Print out the available choices - if ($env{'form.action'} eq 'modifystudent') { - &show_users_list($r,$context,'view','modify', - $env{'form.Status'},\%cstr_roles); - } else { - &show_users_list($r,$context,$env{'form.output'},'aboutme', - $env{'form.Status'},\%cstr_roles); +sub build_user_record { + my ($context,$userdata,$userinfo,$indexhash,$record_key,$userlist) = @_; + next if ($userdata->{'start'} eq '-1' && $userdata->{'end'} eq '-1'); + if (!(($context eq 'domain') && ($env{'form.roletype'} eq 'course'))) { + &process_date_info($userdata); + } + my $username = $userdata->{'username'}; + my $domain = $userdata->{'domain'}; + if (ref($userinfo->{$username.':'.$domain}) eq 'HASH') { + $userdata->{'fullname'} = $userinfo->{$username.':'.$domain}{'fullname'}; + $userdata->{'id'} = $userinfo->{$username.':'.$domain}{'id'}; + } else { + &aggregate_user_info($domain,$username,$userinfo); + $userdata->{'fullname'} = $userinfo->{$username.':'.$domain}{'fullname'}; + $userdata->{'id'} = $userinfo->{$username.':'.$domain}{'id'}; + } + foreach my $key (keys(%{$indexhash})) { + if (defined($userdata->{$key})) { + $userlist->{$record_key}[$indexhash->{$key}] = $userdata->{$key}; + } + } + return; +} + +sub courses_selector { + my ($cdom,$formname) = @_; + my %coursecodes = (); + my %codes = (); + my @codetitles = (); + my %cat_titles = (); + my %cat_order = (); + my %idlist = (); + my %idnums = (); + my %idlist_titles = (); + my $caller = 'global'; + my $format_reply; + my $jscript = ''; + + my $totcodes = 0; + $totcodes = + &Apache::courseclassifier::retrieve_instcodes(\%coursecodes, + $cdom,$totcodes); + if ($totcodes > 0) { + $format_reply = + &Apache::lonnet::auto_instcode_format($caller,$cdom,\%coursecodes, + \%codes,\@codetitles,\%cat_titles,\%cat_order); + if ($format_reply eq 'ok') { + my $numtypes = @codetitles; + &Apache::courseclassifier::build_code_selections(\%codes,\@codetitles,\%cat_titles,\%cat_order,\%idlist,\%idnums,\%idlist_titles); + my ($scripttext,$longtitles) = &Apache::courseclassifier::javascript_definitions(\@codetitles,\%idlist,\%idlist_titles,\%idnums,\%cat_titles); + my $longtitles_str = join('","',@{$longtitles}); + my $allidlist = $idlist{$codetitles[0]}; + $jscript .= &Apache::courseclassifier::courseset_js_start($formname,$longtitles_str,$allidlist); + $jscript .= $scripttext; + $jscript .= &Apache::courseclassifier::javascript_code_selections($formname,@codetitles); + } + } + my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($cdom); + + my %elements = ( + Year => 'selectbox', + coursepick => 'radio', + coursetotal => 'text', + courselist => 'text', + ); + $jscript .= &Apache::lonhtmlcommon::set_form_elements(\%elements); + if ($env{'form.coursepick'} eq 'category') { + $jscript .= qq| +function setCourseCat(formname) { + if (formname.Year.options[formname.Year.selectedIndex].value == -1) { + return; + } + courseSet('Year'); + for (var j=0; j
'.&Apache::loncommon::start_data_table(); + foreach my $role (sort(keys(%coursepersonnel))) { + next if ($role =~ /^\s*$/); + $output .= &Apache::loncommon::start_data_table_row(). + '
'); + } + my ($output,$actionselect,%canchange,%canchangesec); + if ($mode eq 'html' || $mode eq 'view' || $mode eq 'autoenroll') { + if ($mode ne 'autoenroll') { + if ($permission->{'cusr'}) { + $actionselect = &select_actions($context,$setting,$statusmode); + } + $r->print(<
\n". + $output = '
';
+ my @linkdests = ('aboutme');
+ if ($permission->{'cusr'}) {
+ push (@linkdests,'modify');
+ $output .= ''.$lt{'link'}.': ';
+ my $usernamelink = $env{'form.usernamelink'};
+ if ($usernamelink eq '') {
+ $usernamelink = 'aboutme';
+ }
+ foreach my $item (@linkdests) {
+ my $checkedstr = '';
+ if ($item eq $usernamelink) {
+ $checkedstr = ' checked="checked" ';
+ }
+ $output .= ' ';
+ }
+ $output .= '
';
+ } else {
+ $output .= &mt("Click on a username to view the user's personal page.").'
';
+ }
+ if ($actionselect) {
+ $output .= <<"END";
+$lt{'ac'}: $actionselect
+ +END + my @allroles; + if ($env{'form.showrole'} eq 'Any') { + my $custom = 1; + if ($context eq 'domain') { + @allroles = &roles_by_context($setting,$custom); + } else { + @allroles = &roles_by_context($context,$custom); + } + } else { + @allroles = ($env{'form.showrole'}); + } + foreach my $role (@allroles) { + if ($context eq 'domain') { + if ($setting eq 'domain') { + if (&Apache::lonnet::allowed('c'.$role, + $env{'request.role.domain'})) { + $canchange{$role} = 1; + } + } elsif ($setting eq 'author') { + if (&Apache::lonnet::allowed('c'.$role, + $env{'request.role.domain'})) { + $canchange{$role} = 1; + } + } + } elsif ($context eq 'author') { + if (&Apache::lonnet::allowed('c'.$role, + $env{'user.domain'}.'/'.$env{'user.name'})) { + $canchange{$role} = 1; + } + } elsif ($context eq 'course') { + if (&Apache::lonnet::allowed('c'.$role,$env{'request.course.id'})) { + $canchange{$role} = 1; + } elsif ($env{'request.course.sec'} ne '') { + if (&Apache::lonnet::allowed('c'.$role,$env{'request.course.id'}.'/'.$env{'request.course.sec'})) { + $canchangesec{$role} = $env{'request.course.sec'}; + } + } + } + } + } + } + $output .= "\n
\n". &Apache::loncommon::start_data_table(). - &Apache::loncommon::start_data_table_header_row()); + &Apache::loncommon::start_data_table_header_row(); if ($mode eq 'autoenroll') { - $r->print(" + $output .= "
| '.&mt('manual').' | |
'); - %lt=&Apache::lonlocal::texthash( - 'dp' => "Expire User Roles", - 'ca' => "check all", - 'ua' => "uncheck all", - ); - $r->print(<<"END"); -
- - -
+ if ($mode eq 'view' || $mode eq 'html' || $mode eq 'autoenroll') { + $r->print(&Apache::loncommon::end_data_table().''); + } elsif ($mode eq 'excel') { + $excel_workbook->close(); + $r->print('
'. + &mt('Your Excel spreadsheet').' '.&mt('is ready for download').'.
'."\n"); + } elsif ($mode eq 'csv') { + close($CSVfile); + $r->print(''. + &mt('Your CSV file').' is ready for download.'. + "\n"); + $r->rflush(); + } + if ($mode eq 'autoenroll') { + return ($usercount,$autocount,$manualcount,$lockcount,$unlockcount); + } else { + return ($usercount); + } +} + +sub print_username_link { + my ($mode,$permission,$in) = @_; + my $output; + if ($mode eq 'autoenroll') { + $output = $in->{'username'}; + } elsif (!$permission->{'cusr'}) { + $output = &Apache::loncommon::aboutmewrapper($in->{'username'}, + $in->{'username'}, + $in->{'domain'}); + } else { + $output = '{'username'}','$in->{'domain'}'".')" />'. + $in->{'username'}.''; + } + return $output; +} + +sub role_type_names { + my %lt = &Apache::lonlocal::texthash ( + 'domain' => 'Domain Roles', + 'author' => 'Co-Author Roles', + 'course' => 'Course Roles', + ); + return %lt; +} + +sub select_actions { + my ($context,$setting,$statusmode) = @_; + my %lt = &Apache::lonlocal::texthash( + revoke => "Revoke user roles", + delete => "Delete user roles", + reenable => "Re-enable expired user roles", + activate => "Make future user roles active now", + chgdates => "Change starting/ending dates", + chgsec => "Change section associated with user roles", + ); + my ($output,$options,%choices); + # FIXME Disable actions for now for roletype=course in domain context + if ($context eq 'domain' && $setting eq 'course') { + return; + } + if ($context eq 'course') { + if ($env{'form.showrole'} ne 'Any') { + if (!&Apache::lonnet::allowed('c'.$env{'form.showrole'}, + $env{'request.course.id'})) { + if ($env{'request.course.sec'} eq '') { + return; + } else { + if (!&Apache::lonnet::allowed('c'.$env{'form.showrole'},$env{'request.course.id'}.'/'.$env{'request.course.sec'})) { + return; + } + } + } + } + } + if ($statusmode eq 'Any') { + $options .= ' +'; + $choices{'dates'} = 1; + } else { + if ($statusmode eq 'Future') { + $options .= ' +'; + $choices{'dates'} = 1; + } elsif ($statusmode eq 'Expired') { + $options .= ' +'; + $choices{'dates'} = 1; + } + if ($statusmode eq 'Active' || $statusmode eq 'Future') { + $options .= ' + +'; + $choices{'dates'} = 1; + } + } + if ($context eq 'domain') { + $options .= ' +'; + } + if (($context eq 'course') || ($context eq 'domain' && $setting eq 'course')) { + if (($statusmode ne 'Expired') && ($env{'request.course.sec'} eq '')) { + $options .= ' +'; + $choices{'sections'} = 1; + } + } + if ($options) { + $output = ''."\n". + ''."\n".$options."\n".''; + if ($choices{'dates'}) { + $output .= + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n"; + if ($context eq 'course') { + $output .= ''."\n"; + } + } + if ($choices{'sections'}) { + $output .= ''."\n". + ''."\n"; + } + } + return $output; +} + +sub date_section_javascript { + my ($context,$setting) = @_; + my $title; + if (($context eq 'course') || ($context eq 'domain' && $setting eq 'course')) { + $title = &mt('Date and Section selector'); + } else { + $title = &mt('Date selector'); + } + my $output = ' + +ENDTWO + return $output; +} + +sub date_section_selector { + my ($context,$permission) = @_; + my $callingform = $env{'form.callingform'}; + my $formname = 'dateselect'; + my $groupslist = &get_groupslist(); + my $sec_js = &setsections_javascript($formname,$groupslist); + my $output = <<"END"; + +'; + my %lt = &Apache::lonlocal::texthash ( + chac => 'Access dates to apply for selected users', + chse => 'Changes in section affiliation to apply to selected users', + fors => 'For student roles changing the section, will result in a section switch as students may only be in one section of a course at a time.', + forn => 'For a role in a course that is not a student role, a user may have roles in more than one section of a course at a time.', + reta => "Retain each user's current section affiliations?", + dnap => '(Does not apply to student roles).', + ); + my ($date_items,$headertext); + if ($env{'form.bulkaction'} eq 'chgsec') { + $headertext = $lt{'chse'}; + } else { + $headertext = $lt{'chac'}; + my $starttime; + if (($env{'form.bulkaction'} eq 'activate') || + ($env{'form.bulkaction'} eq 'reenable')) { + $starttime = time; + } + $date_items = &date_setting_table($starttime,undef,$context, + $env{'form.bulkaction'},$formname, + $permission); + } + $output .= ''.$headertext.'
'. + ''; + return $output; } +sub section_picker { + my ($cdom,$cnum,$role,$rowtitle,$permission,$context,$mode) = @_; + my %sections_count = &Apache::loncommon::get_sections($cdom,$cnum); + my $sections_select .= &course_sections(\%sections_count,$role); + my $secbox = ''.&Apache::lonhtmlcommon::start_pick_box()."\n"; + if ($mode eq 'upload') { + my ($options,$cb_script,$coursepick) = + &default_role_selector($context,1); + $secbox .= &Apache::lonhtmlcommon::row_title('role','LC_oddrow_value'). + $options. &Apache::lonhtmlcommon::row_closure(1)."\n"; + } + $secbox .= &Apache::lonhtmlcommon::row_title($rowtitle,'LC_oddrow_value')."\n"; + if ($env{'request.course.sec'} eq '') { + $secbox .= '
| '.&mt('Existing sections')."\n".
+ ' '.$sections_select.' | '.
+ &mt('New section').' '."\n". + ''."\n". + ''."\n". + ' |
END
-
-my %lt=&Apache::lonlocal::texthash('usrn' => "username",
- 'dom' => "domain",
- 'sn' => "student name",
- 'sec' => "section",
- 'start' => "start date",
- 'end' => "end date",
- 'groups' => "active groups",
- );
+ my ($indexhash,$keylist) = &make_keylist_array();
+ my $studentcount = 0;
+ if (ref($classlist) eq 'HASH') {
+ foreach my $student (keys(%{$classlist})) {
+ my $sdata = $classlist->{$student};
+ my $status = $sdata->[$indexhash->{'status'}];
+ my $section = $sdata->[$indexhash->{'section'}];
+ if ($status ne 'Active') {
+ delete($classlist->{$student});
+ next;
+ }
+ if ($env{'request.course.sec'} ne '') {
+ if ($section ne $env{'request.course.sec'}) {
+ delete($classlist->{$student});
+ next;
+ }
+ }
+ $studentcount ++;
+ }
+ }
+ if (!$studentcount) {
+ $r->print(&mt('There are no students to drop.'));
+ return;
+ }
+ my ($classgroups) = &Apache::loncoursedata::get_group_memberships(
+ $classlist,$keylist,$cdom,$cnum);
+ my %lt=&Apache::lonlocal::texthash('usrn' => "username",
+ 'dom' => "domain",
+ 'sn' => "student name",
+ 'sec' => "section",
+ 'start' => "start date",
+ 'end' => "end date",
+ 'groups' => "active groups",
+ );
if ($nosort) {
- $r->print(&Apache::loncommon::start_data_table());
+ $r->print(&Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row());
$r->print(< \n";
$str .= ''."\n";
+ &mt('Upload file of users').'">'."\n";
$str .= '
$lt{'usrn'}
$lt{'dom'}
@@ -1459,61 +3046,55 @@ my %lt=&Apache::lonlocal::texthash('usrn
$lt{'start'}
$lt{'end'}
$lt{'groups'}
-
END
-
+ $r->print(&Apache::loncommon::end_data_table_header_row());
} else {
- $r->print(&Apache::loncommon::start_data_table());
+ $r->print(&Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row());
$r->print(<
+
- $lt{'usrn'}
+ $lt{'usrn'}
- $lt{'dom'}
+ $lt{'dom'}
- ID
+ ID
- $lt{'sn'}
+ $lt{'sn'}
- $lt{'sec'}
+ $lt{'sec'}
- $lt{'start'}
+ $lt{'start'}
- $lt{'end'}
+ $lt{'end'}
- $lt{'groups'}
+ $lt{'groups'}
-
END
+ $r->print(&Apache::loncommon::end_data_table_header_row());
}
#
# Sort the students
- my %index;
- my $i;
- foreach (@$keylist) {
- $index{$_} = $i++;
- }
- $index{'groups'} = scalar(@$keylist);
- my $index = $index{$sortby};
- my $second = $index{'username'};
- my $third = $index{'domain'};
+ my $index = $indexhash->{$sortby};
+ my $second = $indexhash->{'username'};
+ my $third = $indexhash->{'domain'};
my @Sorted_Students = sort {
lc($classlist->{$a}->[$index]) cmp lc($classlist->{$b}->[$index])
||
lc($classlist->{$a}->[$second]) cmp lc($classlist->{$b}->[$second])
||
lc($classlist->{$a}->[$third]) cmp lc($classlist->{$b}->[$third])
- } (keys(%$classlist));
+ } (keys(%{$classlist}));
foreach my $student (@Sorted_Students) {
my $error;
my $sdata = $classlist->{$student};
- my $username = $sdata->[$index{'username'}];
- my $domain = $sdata->[$index{'domain'}];
- my $section = $sdata->[$index{'section'}];
- my $name = $sdata->[$index{'fullname'}];
- my $id = $sdata->[$index{'id'}];
- my $start = $sdata->[$index{'start'}];
- my $end = $sdata->[$index{'end'}];
+ my $username = $sdata->[$indexhash->{'username'}];
+ my $domain = $sdata->[$indexhash->{'domain'}];
+ my $section = $sdata->[$indexhash->{'section'}];
+ my $name = $sdata->[$indexhash->{'fullname'}];
+ my $id = $sdata->[$indexhash->{'id'}];
+ my $start = $sdata->[$indexhash->{'start'}];
+ my $end = $sdata->[$indexhash->{'end'}];
my $groups = $classgroups->{$student};
my $active_groups;
if (ref($groups->{active}) eq 'HASH') {
@@ -1529,18 +3110,18 @@ END
} else {
$end = &Apache::lonlocal::locallocaltime($end);
}
- my $status = $sdata->[$index{'status'}];
- next if ($status ne 'Active');
+ my $studentkey = $student.':'.$section;
+ my $startitem = '';
#
$r->print(&Apache::loncommon::start_data_table_row());
$r->print(<<"END");
-
+
$username
$domain
$id
$name
$section
- $start
+ $start $startitem
$end
$active_groups
END
@@ -1548,7 +3129,7 @@ END
}
$r->print(&Apache::loncommon::end_data_table().'
');
%lt=&Apache::lonlocal::texthash(
- 'dp' => "Expire Users' Roles",
+ 'dp' => "Drop Students",
'ca' => "check all",
'ua' => "uncheck all",
);
@@ -1561,8 +3142,6 @@ END
return;
}
-
-
#
# Print out the initial form to get the file containing a list of users
#
@@ -1572,11 +3151,11 @@ sub print_first_users_upload_form {
$str = '';
$str .= '';
$str .= '';
- $str .= "".&mt('Upload a list of users')."
\n";
+ $str .= "".&mt('Upload a file containing information about users')."
\n";
$str .= &Apache::loncommon::upfile_select_html();
$str .= "
'.&mt('No roles added').'
'); } if ($counts{'auth'} > 0) { $r->print("\n". &mt('Authentication changed for [_1] existing users.', $counts{'auth'})."
\n"); } - $r->print(''); + $r->print(&print_namespacing_alerts($domain,\%alerts,\%curr_rules)); ##################################### - # Drop students # + # Display list of students to drop # ##################################### if ($env{'form.fullup'} eq 'yes') { - $r->print(''.&mt('Dropping Students')."
\n"); + $r->print(''.&mt('Students to Drop')."
\n"); # Get current classlist - my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist(); + my $classlist = &Apache::loncoursedata::get_classlist(); if (! defined($classlist)) { - $r->print(&mt('There are no students currently enrolled.'). - "\n"); + $r->print(''. + ''. + &mt('There are no students with current/future access to the course.'). + ''."\n"); } else { # Remove the students we just added from the list of students. - foreach (@userdata) { - my %entries=&Apache::loncommon::record_sep($_); + foreach my $line (@userdata) { + my %entries=&Apache::loncommon::record_sep($line); unless (($entries{$fields{'username'}} eq '') || (!defined($entries{$fields{'username'}}))) { delete($classlist->{$entries{$fields{'username'}}. @@ -1906,15 +3695,58 @@ sub upfile_drop_add { } } # Print out list of dropped students. - &show_drop_list($r,$classlist,$keylist,'nosort'); + &show_drop_list($r,$classlist,'nosort',$permission); } } } # end of unless + if ($env{'form.fullup'} ne 'yes') { + $r->print(''); + } +} + +sub print_namespacing_alerts { + my ($domain,$alerts,$curr_rules) = @_; + my $output; + if (ref($alerts) eq 'HASH') { + if (keys(%{$alerts}) > 0) { + if (ref($alerts->{'username'}) eq 'HASH') { + foreach my $dom (sort(keys(%{$alerts->{'username'}}))) { + my $count; + if (ref($alerts->{'username'}{$dom}) eq 'HASH') { + $count = keys(%{$alerts->{'username'}{$dom}}); + } + my $domdesc = &Apache::lonnet::domain($domain,'description'); + if (ref($curr_rules->{$dom}) eq 'HASH') { + $output .= &Apache::loncommon::instrule_disallow_msg( + 'username',$domdesc,$count,'upload'); + } + $output .= &Apache::loncommon::user_rule_formats($dom, + $domdesc,$curr_rules->{$dom}{'username'}, + 'username'); + } + } + if (ref($alerts->{'id'}) eq 'HASH') { + foreach my $dom (sort(keys(%{$alerts->{'id'}}))) { + my $count; + if (ref($alerts->{'id'}{$dom}) eq 'HASH') { + $count = keys(%{$alerts->{'id'}{$dom}}); + } + my $domdesc = &Apache::lonnet::domain($domain,'description'); + if (ref($curr_rules->{$dom}) eq 'HASH') { + $output .= &Apache::loncommon::instrule_disallow_msg( + 'id',$domdesc,$count,'upload'); + } + $output .= &Apache::loncommon::user_rule_formats($dom, + $domdesc,$curr_rules->{$dom}{'id'},'id'); + } + } + } + } } sub user_change_result { - my ($r,$userresult,$authresult,$roleresult,$counts,$flushc,$username, - $userchg) = @_; + my ($r,$userresult,$authresult,$roleresult,$idresult,$counts,$flushc, + $username,$userchg) = @_; my $okresult = 0; if ($userresult ne 'ok') { if ($userresult =~ /^error:(.+)$/) { @@ -1955,57 +3787,298 @@ sub user_change_result { $flushc=0; } } + if ($idresult) { + $r->print($idresult); + } return $flushc; } # ========================================================= Menu Phase Two Drop -sub print_expire_menu { - my ($r,$context) = @_; - $r->print("".&mt("Expire Users' Roles")."
"); - my $cid=$env{'request.course.id'}; - my ($classlist,$keylist) = &Apache::loncoursedata::get_classlist(); +sub print_drop_menu { + my ($r,$context,$permission) = @_; + $r->print(''.&mt("Drop Students").'
'."\n". + ''. &Apache::loncommon::end_page()); return; } - # ================================================================== Phase four -sub expire_user_list { - my ($r,$context) = @_; +sub update_user_list { + my ($r,$context,$setting,$choice) = @_; + my $now = time; my $count=0; - my @droplist = &Apache::loncommon::get_env_multiple('form.droplist'); - foreach (@droplist) { - my ($uname,$udom)=split(/\:/,$_); - # drop student - my $result = &modifystudent($udom,$uname,$env{'request.course.id'}); + my @changelist; + if ($choice eq 'drop') { + @changelist = &Apache::loncommon::get_env_multiple('form.droplist'); + } else { + @changelist = &Apache::loncommon::get_env_multiple('form.actionlist'); + } + my %result_text = ( ok => { 'revoke' => 'Revoked', + 'delete' => 'Deleted', + 'reenable' => 'Re-enabled', + 'activate' => 'Activated', + 'chgdates' => 'Changed Access Dates for', + 'chgsec' => 'Changed section for', + 'drop' => 'Dropped', + }, + error => {'revoke' => 'revoking', + 'delete' => 'deleting', + 'reenable' => 're-enabling', + 'activate' => 'activating', + 'chgdates' => 'changing access dates for', + 'chgsec' => 'changing section for', + 'drop' => 'dropping', + }, + ); + my ($startdate,$enddate); + if ($choice eq 'chgdates' || $choice eq 'reenable' || $choice eq 'activate') { + ($startdate,$enddate) = &get_dates_from_form(); + } + foreach my $item (@changelist) { + my ($role,$uname,$udom,$cid,$sec,$scope,$result,$type,$locktype,@sections, + $scopestem); + if ($choice eq 'drop') { + ($uname,$udom,$sec) = split(/:/,$item,-1); + $role = 'st'; + $cid = $env{'request.course.id'}; + $scopestem = '/'.$cid; + $scopestem =~s/\_/\//g; + if ($sec eq '') { + $scope = $scopestem; + } else { + $scope = $scopestem.'/'.$sec; + } + } elsif ($context eq 'course') { + ($uname,$udom,$role,$sec,$type,$locktype) = split(/\:/,$item,-1); + $cid = $env{'request.course.id'}; + $scopestem = '/'.$cid; + $scopestem =~s/\_/\//g; + if ($sec eq '') { + $scope = $scopestem; + } else { + $scope = $scopestem.'/'.$sec; + } + } elsif ($context eq 'author') { + ($uname,$udom,$role) = split(/\:/,$item,-1); + $scope = '/'.$env{'user.domain'}.'/'.$env{'user.name'}; + } elsif ($context eq 'domain') { + if ($setting eq 'domain') { + ($role,$uname,$udom) = split(/\:/,$item,-1); + $scope = '/'.$env{'request.role.domain'}.'/'; + } elsif ($setting eq 'author') { + ($uname,$udom,$role,$scope) = split(/\:/,$item); + } elsif ($setting eq 'course') { + ($uname,$udom,$role,$cid,$sec,$type,$locktype) = + split(/\:/,$item); + $scope = '/'.$cid; + $scope =~s/\_/\//g; + if ($sec ne '') { + $scope .= '/'.$sec; + } + } + } + my $plrole = &Apache::lonnet::plaintext($role); + my $start = $env{'form.'.$item.'_start'}; + my $end = $env{'form.'.$item.'_end'}; + if ($choice eq 'drop') { + # drop students + $end = $now; + $type = 'manual'; + $result = + &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid); + } elsif ($choice eq 'revoke') { + # revoke or delete user role + $end = $now; + if ($role eq 'st') { + $result = + &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid); + } else { + $result = + &Apache::lonnet::revokerole($udom,$uname,$scope,$role); + } + } elsif ($choice eq 'delete') { + if ($role eq 'st') { + &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$now,$start,$type,$locktype,$cid); + } + $result = + &Apache::lonnet::assignrole($udom,$uname,$scope,$role,$now, + $start,1); + } else { + #reenable, activate, change access dates or change section + if ($choice ne 'chgsec') { + $start = $startdate; + $end = $enddate; + } + if ($choice eq 'reenable') { + if ($role eq 'st') { + $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid); + } else { + $result = + &Apache::lonnet::assignrole($udom,$uname,$scope,$role,$end, + $now); + } + } elsif ($choice eq 'activate') { + if ($role eq 'st') { + $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid); + } else { + $result = &Apache::lonnet::assignrole($udom,$uname,$scope,$role,$end, + $now); + } + } elsif ($choice eq 'chgdates') { + if ($role eq 'st') { + $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid); + } else { + $result = &Apache::lonnet::assignrole($udom,$uname,$scope,$role,$end, + $start); + } + } elsif ($choice eq 'chgsec') { + my (@newsecs,$revresult,$nochg,@retained); + if ($role ne 'cc') { + @newsecs = split(/,/,$env{'form.newsecs'}); + } + # remove existing section if not to be retained. + if (!$env{'form.retainsec'}) { + if ($sec eq '') { + if (@newsecs == 0) { + $result = &mt('No change in section assignment (none)'); + $nochg = 1; + } + } else { + if (@newsecs > 0) { + if (grep(/^\Q$sec\E$/,@newsecs)) { + push(@retained,$sec); + } else { + $revresult = + &Apache::lonnet::revokerole($udom,$uname, + $scope,$role); + } + } else { + $revresult = + &Apache::lonnet::revokerole($udom,$uname, + $scope,$role); + } + } + } else { + if ($sec eq '') { + $nochg = 1; + } else { + push(@retained,$sec); + } + } + # add new sections + if (@newsecs == 0) { + if (!$nochg) { + if ($role eq 'st') { + $result = + &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,undef,$end,$start,$type,$locktype,$cid); + } else { + my $newscope = $scopestem; + $result = &Apache::lonnet::assignrole($udom,$uname,$newscope,$role,$end,$start); + } + } + } else { + foreach my $newsec (@newsecs) { + if (!grep(/^\Q$newsec\E$/,@retained)) { + if ($role eq 'st') { + $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$newsec,$end,$start,$type,$locktype,$cid); + } else { + my $newscope = $scopestem; + if ($newsec ne '') { + $newscope .= '/'.$newsec; + } + $result = &Apache::lonnet::assignrole($udom,$uname, + $newscope,$role,$end,$start); + } + } + } + } + } + } + my $extent = $scope; + if ($choice eq 'drop' || $context eq 'course') { + my ($cnum,$cdom,$cdesc) = &get_course_identity($cid); + if ($cdesc) { + $extent = $cdesc; + } + } if ($result eq 'ok' || $result eq 'ok:') { - $r->print(&mt('Dropped [_1]',$uname.'@'.$udom).''); + $r->print(&mt("$result_text{'ok'}{$choice} role of '[_1]' in [_2] for [_3]", + $plrole,$extent,$uname.':'.$udom).'
'); $count++; } else { $r->print( - &mt('Error dropping [_1]:[_2]',$uname.'@'.$udom,$result). - '
'); + &mt("Error $result_text{'error'}{$choice} [_1] in [_2] for [_3]: [_4].", + $plrole,$extent,$uname.':'.$udom,$result).'
'); } } - $r->print('
'.&mt('Dropped [_1] user(s).',$count).'
'); - $r->print(''.&mt('Re-enrollment will re-activate data.')) if ($count); + $r->print('
'."\n"); } -sub section_check_js { - my $groupslist; - my %curr_groups = &Apache::longroup::coursegroups(); - if (%curr_groups) { - $groupslist = join('","',sort(keys(%curr_groups))); +sub classlist_drop { + my ($scope,$uname,$udom,$now) = @_; + my ($cdom,$cnum) = ($scope=~m{^/($match_domain)/($match_courseid)}); + if (&Apache::lonnet::is_course($cdom,$cnum)) { + my $user = $uname.':'.$udom; + if (!&active_student_roles($cnum,$cdom,$uname,$udom)) { + my $result = + &Apache::lonnet::cput('classlist', + { $user => $now },$cdom,$cnum); + return &mt('Drop from classlist: [_1]', + ''.$result.'').''; + } } +} + +sub active_student_roles { + my ($cnum,$cdom,$uname,$udom) = @_; + my %roles = + &Apache::lonnet::get_my_roles($uname,$udom,'userroles', + ['future','active'],['st']); + return exists($roles{"$cnum:$cdom:st"}); +} + +sub section_check_js { + my $groupslist= &get_groupslist(); return <<"END"; function validate(caller) { - var groups = new Array("$groupslist"); + var groups = new Array($groupslist); var secname = caller.value; if ((secname == 'all') || (secname == 'none')) { alert("'"+secname+"' may not be used as the name for a section, as it is a reserved word.\\nPlease choose a different section name."); @@ -2052,5 +4125,535 @@ sub set_login { return $response; } +sub course_sections { + my ($sections_count,$role) = @_; + my $output = ''; + my @sections = (sort {$a <=> $b} keys %{$sections_count}); + my $numsec = scalar(@sections); + if ($numsec <= 1) { + $output = '