'."\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');
} elsif ($context eq 'course') {
@@ -711,21 +746,22 @@ sub print_upload_manager_footer {
$Str .= '
'.&mt('Default role and/or section')." \n".
&mt('Role and/or section for users without one in the uploaded file.');
}
- $Str .= '
';
- my ($options,$cb_script,$coursepick) = &default_role_selector($context,'defaultrole',1);
- if ($context eq 'domain') {
- $Str .= ''.&mt('Domain Level').' '.$options.'
');
$r->rflush();
if ($context eq 'course') {
my $classlist = &Apache::loncoursedata::get_classlist();
my $secidx = &Apache::loncoursedata::CL_SECTION();
+ my $viewablesec = &viewable_section($permission);
foreach my $student (keys(%{$classlist})) {
- if (exists($permission->{'view_section'})) {
- if ($classlist->{$student}[$secidx] ne $permission->{'view_section'}) {
+ my $section = $classlist->{$student}[$secidx];
+ if ($viewablesec ne '') {
+ if ($section ne $viewablesec) {
next;
} else {
$userlist{$student} = $classlist->{$student};
@@ -1256,61 +1329,61 @@ sub print_userlist {
$userlist{$student} = $classlist->{$student};
}
}
- my $cid =$env{'request.course.id'};
- my $cdom=$env{'course.'.$cid.'.domain'};
- my $cnum=$env{'course.'.$cid.'.num'};
+ my $cid = $env{'request.course.id'};
+ my ($cnum,$cdom) = &get_course_identity($cid);
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);
+ \@statuses,$showroles,undef,$withsec);
&gather_userinfo($context,$format,\%userlist,$indexhash,\%userinfo,
- \%advrolehash);
+ \%advrolehash,$permission);
} else {
my (%cstr_roles,%dom_roles);
- if ($context eq 'construction_space') {
+ if ($context eq 'author') {
# List co-authors and assistant co-authors
- my @possroles = ('ca','aa');
+ 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);
+ \%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});
+ \%userinfo,$dom_roles{$key},$permission);
}
}
- } elsif ($env{'form.roletype'} eq 'construction_space') {
+ } 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});
+ \%userinfo,$dom_roles{$key},$permission);
} else {
my @possroles;
if ($env{'form.showrole'} eq 'Any') {
- @possroles = ('ca','aa');
+ @possroles = &roles_by_context('author');
} else {
@possroles = ($env{'form.showrole'});
}
foreach my $author (sort(keys(%{$dom_roles{$key}}))) {
- my ($role,$authorname,$authordom) = split(/:/,$author);
+ 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);
+ $indexhash,\%userinfo,\%coauthors,$permission);
}
}
}
@@ -1319,16 +1392,13 @@ sub print_userlist {
my %courses = &process_coursepick();
my %allusers;
foreach my $cid (keys(%courses)) {
- my %coursehash =
- &Apache::lonnet::coursedescription($cid,{'one_time' => 1});
- my $cdom = $coursehash{'domain'};
- my $cnum = $coursehash{'num'};
- my $cdesc = $coursehash{'description'};
+ 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);
- unshift(@roles,'cr');
+ @roles = &course_roles($context,undef,$custom);
} else {
@roles = ($env{'form.showrole'});
}
@@ -1355,20 +1425,22 @@ sub print_userlist {
}
}
&gather_userinfo($context,$format,\%userlist,$indexhash,
- \%userinfo,\%allusers);
+ \%userinfo,\%allusers,$permission);
} else {
+ $r->print('');
return;
}
}
}
}
if (keys(%userlist) == 0) {
- if ($context eq 'construction_space') {
+ 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 'construction_space') {
+ } 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");
@@ -1380,41 +1452,50 @@ sub print_userlist {
# Print out the available choices
my $usercount;
if ($env{'form.action'} eq 'modifystudent') {
- ($usercount) = &show_users_list($r,$context,'view','modify',
+ ($usercount) = &show_users_list($r,$context,'view',$permission,
$env{'form.Status'},\%userlist,$keylist);
} else {
($usercount) = &show_users_list($r,$context,$env{'form.output'},
- 'aboutme',$env{'form.Status'},\%userlist,$keylist);
+ $permission,$env{'form.Status'},\%userlist,$keylist);
}
if (!$usercount) {
$r->print(' '.&mt('There are no users matching the search criteria.'));
}
}
- $r->print('');
+ $r->print('');
}
sub list_submit_button {
my ($text) = @_;
- return '';
+ return '';
}
sub gather_userinfo {
- my ($context,$format,$userlist,$indexhash,$userinfo,$rolehash) = @_;
+ my ($context,$format,$userlist,$indexhash,$userinfo,$rolehash,$permission) = @_;
foreach my $item (keys(%{$rolehash})) {
- @{$userlist->{$item}} = ();
my %userdata;
- if ($context eq 'construction_space' || $context eq 'course') {
+ if ($context eq 'author') {
($userdata{'username'},$userdata{'domain'},$userdata{'role'}) =
split(/:/,$item);
($userdata{'start'},$userdata{'end'})=split(/:/,$rolehash->{$item});
&build_user_record(\%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(\%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(\%userdata,$userinfo,$indexhash,$item,$userlist);
- } elsif ($env{'form.roletype'} eq 'construction_space') {
+ } elsif ($env{'form.roletype'} eq 'author') {
if (ref($rolehash->{$item}) eq 'HASH') {
$userdata{'extent'} = $item;
foreach my $key (keys(%{$rolehash->{$item}})) {
@@ -1429,6 +1510,7 @@ sub gather_userinfo {
($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 = '';
@@ -1436,6 +1518,14 @@ sub gather_userinfo {
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 = ', ';
}
@@ -1458,6 +1548,7 @@ sub gather_userinfo {
sub build_user_record {
my ($userdata,$userinfo,$indexhash,$record_key,$userlist) = @_;
+ next if ($userdata->{'start'} eq '-1' && $userdata->{'end'} eq '-1');
&process_date_info($userdata);
my $username = $userdata->{'username'};
my $domain = $userdata->{'domain'};
@@ -1492,7 +1583,8 @@ sub courses_selector {
my $format_reply;
my $jscript = '';
- my $totcodes =
+ my $totcodes = 0;
+ $totcodes =
&Apache::courseclassifier::retrieve_instcodes(\%coursecodes,
$cdom,$totcodes);
if ($totcodes > 0) {
@@ -1694,7 +1786,7 @@ sub process_date_info {
}
sub show_users_list {
- my ($r,$context,$mode,$linkto,$statusmode,$userlist,$keylist)=@_;
+ my ($r,$context,$mode,$permission,$statusmode,$userlist,$keylist)=@_;
#
# Variables for excel output
my ($excel_workbook, $excel_sheet, $excel_filename,$row,$format);
@@ -1712,23 +1804,26 @@ sub show_users_list {
if (!grep(/^\Q$sortby\E$/,@sortable)) {
$sortby = 'username';
}
+ my $setting = $env{'form.roletype'};
my ($cid,$cdom,$cnum,$classgroups,$displayphotos,$displayclickers);
if ($context eq 'course') {
- $cid=$env{'request.course.id'};
- $cdom = $env{'course.'.$cid.'.domain'};
- $cnum = $env{'course.'.$cid.'.num'};
+ $cid = $env{'request.course.id'};
+ ($cnum,$cdom) = &get_course_identity($cid);
($classgroups) = &Apache::loncoursedata::get_group_memberships(
$userlist,$keylist,$cdom,$cnum);
- if (! exists($env{'form.displayphotos'})) {
- $env{'form.displayphotos'} = 'off';
- }
- $displayphotos = $env{'form.displayphotos'};
- if (! exists($env{'form.displayclickers'})) {
- $env{'form.displayclickers'} = 'off';
- }
- $displayclickers = $env{'form.displayclickers'};
- if ($env{'course.'.$cid.'.internal.showphoto'}) {
- $r->print('
+ if ($mode eq 'autoenroll') {
+ $env{'form.showrole'} = 'st';
+ } else {
+ if (! exists($env{'form.displayphotos'})) {
+ $env{'form.displayphotos'} = 'off';
+ }
+ $displayphotos = $env{'form.displayphotos'};
+ if (! exists($env{'form.displayclickers'})) {
+ $env{'form.displayclickers'} = 'off';
+ }
+ $displayclickers = $env{'form.displayclickers'};
+ if ($env{'course.'.$cid.'.internal.showphoto'}) {
+ $r->print('
- ');
- }
- $r->print(<print(<
END
+ }
}
- unless ($mode eq 'autoenroll') {
+ if ($mode ne 'autoenroll') {
+ my $check_uncheck_js = &Apache::loncommon::check_uncheck_jscript();
+ my $alert = &mt("You must select at least one user by checking a user's 'Select' checkbox");
+ my $singconfirm = &mt(' for a single user');
+ my $multconfirm = &mt(' for multiple users');
+ my $date_sec_selector = &date_section_javascript($context,$setting,$statusmode);
$r->print(<
+$check_uncheck_js
+
+function verify_action (field) {
+ var numchecked = 0;
+ var singconf = '$singconfirm';
+ var multconf = '$multconfirm';
+ if (field.length > 0) {
+ for (i = 0; i < field.length; i++) {
+ if (field[i].checked == true) {
+ numchecked ++;
+ }
+ }
+ } else {
+ if (field.checked == true) {
+ numchecked ++;
+ }
+ }
+ if (numchecked == 0) {
+ alert("$alert");
+ }
+ else {
+ var message = document.studentform.bulkaction[document.studentform.bulkaction.selectedIndex].text;
+ if (numchecked == 1) {
+ message += singconf;
+ }
+ else {
+ message += multconf;
+ }
+ if (confirm(message)) {
+ document.studentform.phase.value = 'bulkchange';
+ document.studentform.submit();
+ }
+ }
+}
+
+function username_display_launch(username,domain) {
+ var target;
+ for (var i=0; i
+$date_sec_selector
END
}
@@ -1770,10 +1928,17 @@ END
'clicker' => "clicker id",
'photo' => "photo",
'extent' => "extent",
+ 'pr' => "Proceed",
+ 'ca' => "check all",
+ 'ua' => "uncheck all",
+ 'ac' => "Action to take for selected users",
+ 'link' => "Behavior of username links",
+ 'aboutme' => "Display a user's personal page",
+ 'modify' => "Modify a user's information",
);
if ($context eq 'domain' && $env{'form.roletype'} eq 'course') {
$lt{'extent'} = &mt('Course(s): description, section(s), status');
- } elsif ($context eq 'construction_space') {
+ } elsif ($context eq 'author') {
$lt{'extent'} = &mt('Author');
}
my @cols = ('username','domain','id','fullname');
@@ -1786,7 +1951,7 @@ END
if ($env{'form.showrole'} eq 'Any' || $env{'form.showrole'} eq 'cr') {
push(@cols,'role');
}
- if ($context eq 'domain' && ($env{'form.roletype'} eq 'construction_space' ||
+ if ($context eq 'domain' && ($env{'form.roletype'} eq 'author' ||
$env{'form.roletype'} eq 'course')) {
push (@cols,'extent');
}
@@ -1805,19 +1970,52 @@ END
} elsif ($env{'form.showrole'} ne 'Any') {
$rolefilter = &Apache::lonnet::plaintext($env{'form.showrole'});
}
- my $results_description = &results_header_row($rolefilter,$statusmode,
- $context);
- $r->print(''.$results_description.' ');
- my $output;
- if ($mode eq 'html' || $mode eq 'view') {
- $r->print(<
-
+ my $results_description;
+ if ($mode ne 'autoenroll') {
+ $results_description = &results_header_row($rolefilter,$statusmode,
+ $context,$permission);
+ $r->print(''.$results_description.' ');
+ }
+ my ($output,$actionselect);
+ 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(<
+
+
+
+
+END
+ $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
- if ($linkto eq 'aboutme') {
- $output = &mt("Select a user name to view the user's personal page.");
- } elsif ($linkto eq 'modify') {
- $output = &mt("Select a user name to modify the user's information");
+ }
}
$output .= "\n
\n".
&Apache::loncommon::start_data_table().
@@ -1827,15 +2025,16 @@ END
'.&mt("$result_text{'ok'}{$choice} role(s) for [quant,_1,user,users,users].",$count).'
');
+ if ($count > 0) {
+ if ($choice eq 'revoke' || $choice eq 'drop') {
+ $r->print('
'.&mt('Re-enabling will re-activate data for the role.
'));
+ }
+ # Flush the course logs so reverse user roles immediately updated
+ &Apache::lonnet::flushcourselogs();
+ }
+ if ($env{'form.makedatesdefault'}) {
+ if ($choice eq 'chgdates' || $choice eq 'reenable' || $choice eq 'activate') {
+ $r->print(&make_dates_default($startdate,$enddate));
}
}
- $r->print('
'.&mt('Dropped [_1] user(s).',$count).'
');
- $r->print('
'.&mt('Re-enrollment will re-activate data.')) if ($count);
}
-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,$action) = @_;
+ my ($cdom,$cnum) = ($scope=~m{^/($match_domain)/($match_courseid)});
+ my $cid=$cdom.'_'.$cnum;
+ my $user = $uname.':'.$udom;
+ if ($action eq 'drop') {
+ if (!&active_student_roles($cnum,$cdom,$uname,$udom)) {
+ my $result =
+ &Apache::lonnet::cput('classlist',
+ { $user => $now },
+ $env{'course.'.$cid.'.domain'},
+ $env{'course.'.$cid.'.num'});
+ 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.");
@@ -2927,5 +3708,491 @@ sub set_login {
return $response;
}
+sub course_sections {
+ my ($sections_count,$role) = @_;
+ my $output = '';
+ my @sections = (sort {$a <=> $b} keys %{$sections_count});
+ if (scalar(@sections) == 1) {
+ $output = '