version 1.30, 2007/12/23 03:16:30
|
version 1.35, 2007/12/26 13:55:32
|
Line 304 sub print_upload_manager_header {
|
Line 304 sub print_upload_manager_header {
|
my $javascript_validations = |
my $javascript_validations = |
&javascript_validations('upload',$krbdefdom,$password_choice,undef, |
&javascript_validations('upload',$krbdefdom,$password_choice,undef, |
$env{'request.role.domain'},$context, |
$env{'request.role.domain'},$context, |
$permission,$groupslist); |
$groupslist); |
my $checked=(($env{'form.noFirstLine'})?' checked="checked" ':''); |
my $checked=(($env{'form.noFirstLine'})?' checked="checked" ':''); |
$r->print(&mt('Total number of records found in file: <b>[_1]</b>.',$distotal). |
$r->print(&mt('Total number of records found in file: <b>[_1]</b>.',$distotal). |
"<br />\n"); |
"<br />\n"); |
Line 332 sub print_upload_manager_header {
|
Line 332 sub print_upload_manager_header {
|
############################################################### |
############################################################### |
sub javascript_validations { |
sub javascript_validations { |
my ($mode,$krbdefdom,$curr_authtype,$curr_authfield,$domain, |
my ($mode,$krbdefdom,$curr_authtype,$curr_authfield,$domain, |
$context,$permission,$groupslist)=@_; |
$context,$groupslist)=@_; |
|
|
my %param = ( |
my %param = ( |
kerb_def_dom => $krbdefdom, |
kerb_def_dom => $krbdefdom, |
Line 1264 sub print_userlist {
|
Line 1264 sub print_userlist {
|
if ($env{'form.showrole'} eq 'Any') { |
if ($env{'form.showrole'} eq 'Any') { |
$roleselected = ' selected="selected" '; |
$roleselected = ' selected="selected" '; |
} |
} |
my $role_select; |
my ($role_select,$cnum,$cdom); |
if ($context eq 'domain') { |
if ($context eq 'domain') { |
$role_select = &domain_roles_select(); |
$role_select = &domain_roles_select(); |
$r->print('<label>'.&mt('Role Type: [_1]',$role_select).'</label>'); |
$r->print('<label>'.&mt('Role Type: [_1]',$role_select).'</label>'); |
Line 1288 sub print_userlist {
|
Line 1288 sub print_userlist {
|
} |
} |
$role_select .= '</select>'; |
$role_select .= '</select>'; |
$r->print('<label>'.&mt('Role: [_1]',$role_select).'</label>'); |
$r->print('<label>'.&mt('Role: [_1]',$role_select).'</label>'); |
|
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'))) { |
if (!(($context eq 'domain') && ($env{'form.roletype'} eq 'course'))) { |
$r->print(' '.&list_submit_button(&mt('Update Display')). |
$r->print(' '.&list_submit_button(&mt('Update Display')). |
Line 1307 sub print_userlist {
|
Line 1311 sub print_userlist {
|
&Apache::lonhtmlcommon::row_closure(1). |
&Apache::lonhtmlcommon::row_closure(1). |
&Apache::lonhtmlcommon::end_pick_box().'</p>'. |
&Apache::lonhtmlcommon::end_pick_box().'</p>'. |
'<p>'.&list_submit_button(&mt('Update Display')). |
'<p>'.&list_submit_button(&mt('Update Display')). |
"\n</p>\n"); |
"\n".'</p><span class="LC_warning">'.&mt('Warning: data retrieval for multiple courses can take considerable time, as this operation is not currently optimized.').'</span>'."\n"); |
if ($env{'form.coursepick'}) { |
if ($env{'form.coursepick'}) { |
$r->print('<hr />'.&mt('Searching').' ...<br /> <br />'); |
$r->print('<hr />'.&mt('Searching').' ...<br /> <br />'); |
} |
} |
Line 1331 sub print_userlist {
|
Line 1335 sub print_userlist {
|
$userlist{$student} = $classlist->{$student}; |
$userlist{$student} = $classlist->{$student}; |
} |
} |
} |
} |
my $cid = $env{'request.course.id'}; |
|
my ($cnum,$cdom) = &get_course_identity($cid); |
|
my $showroles; |
my $showroles; |
if ($env{'form.showrole'} ne 'Any') { |
if ($env{'form.showrole'} ne 'Any') { |
$showroles = [$env{'form.showrole'}]; |
$showroles = [$env{'form.showrole'}]; |
Line 1468 sub print_userlist {
|
Line 1470 sub print_userlist {
|
$env{'form.phase'}.'" /></form>'); |
$env{'form.phase'}.'" /></form>'); |
} |
} |
|
|
|
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 = '<select name="'.$name{$item}.'" />'."\n"; |
|
foreach my $option ('all','none',@options) { |
|
$currsel = ''; |
|
if ($env{'form.'.$name{$item}} eq $option) { |
|
$currsel = ' selected="selected" '; |
|
} |
|
$markup .= ' <option value="'.$option.'"'.$currsel.'>'; |
|
if (($option eq 'all') || ($option eq 'none')) { |
|
$markup .= $title{$option}; |
|
} else { |
|
$markup .= $option; |
|
} |
|
$markup .= '</option>'."\n"; |
|
} |
|
$markup .= '</select>'."\n"; |
|
$output .= (' 'x3).'<label>'.$title{$item}.': '.$markup.'</label>'; |
|
} |
|
} |
|
return $output; |
|
} |
|
|
sub list_submit_button { |
sub list_submit_button { |
my ($text) = @_; |
my ($text) = @_; |
return '<input type="button" name="updatedisplay" value="'.$text.'" onclick="javascript:display_update()" />'; |
return '<input type="button" name="updatedisplay" value="'.$text.'" onclick="javascript:display_update()" />'; |
Line 2047 END
|
Line 2105 END
|
$env{'request.role.domain'})) { |
$env{'request.role.domain'})) { |
$canchange{$role} = 1; |
$canchange{$role} = 1; |
} |
} |
|
} elsif ($setting eq 'author') { |
|
if (&Apache::lonnet::allowed('c'.$role, |
|
$env{'request.role.domain'})) { |
|
$canchange{$role} = 1; |
|
} |
} |
} |
} elsif ($context eq 'author') { |
} elsif ($context eq 'author') { |
if (&Apache::lonnet::allowed('c'.$role, |
if (&Apache::lonnet::allowed('c'.$role, |
Line 2158 END
|
Line 2221 END
|
$index{$idx} = $i++; |
$index{$idx} = $i++; |
} |
} |
my $usercount = 0; |
my $usercount = 0; |
|
my ($secfilter,$grpfilter); |
|
if ($context eq 'course') { |
|
$secfilter = $env{'form.secfilter'}; |
|
$grpfilter = $env{'form.grpfilter'}; |
|
if ($secfilter eq '') { |
|
$secfilter = 'all'; |
|
} |
|
if ($grpfilter eq '') { |
|
$grpfilter = 'all'; |
|
} |
|
} |
# Get groups, role, permanent e-mail so we can sort on them if |
# Get groups, role, permanent e-mail so we can sort on them if |
# necessary. |
# necessary. |
foreach my $user (keys(%{$userlist})) { |
foreach my $user (keys(%{$userlist})) { |
Line 2195 END
|
Line 2269 END
|
delete($userlist->{$user}); |
delete($userlist->{$user}); |
next; |
next; |
} |
} |
if (ref($classgroups) eq 'HASH') { |
if ($context eq 'course') { |
$groups = $classgroups->{$user}; |
my @ac_groups; |
} |
if (ref($classgroups) eq 'HASH') { |
if (ref($groups->{active}) eq 'HASH') { |
$groups = $classgroups->{$user}; |
$userlist->{$user}->[$index{'groups'}] = join(', ',keys(%{$groups->{'active'}})); |
} |
|
if (ref($groups->{'active'}) eq 'HASH') { |
|
@ac_groups = keys(%{$groups->{'active'}}); |
|
$userlist->{$user}->[$index{'groups'}] = join(', ',@ac_groups); |
|
} |
|
if ($mode ne 'autoenroll') { |
|
my $section = $userlist->{$user}->[$index{'section'}]; |
|
if ($secfilter eq 'none') { |
|
if ($section ne '') { |
|
delete($userlist->{$user}); |
|
next; |
|
} |
|
} elsif ($secfilter ne 'all') { |
|
if ($section ne $secfilter) { |
|
delete($userlist->{$user}); |
|
next; |
|
} |
|
} |
|
if ($grpfilter eq 'none') { |
|
if (@ac_groups > 0) { |
|
delete($userlist->{$user}); |
|
next; |
|
} |
|
} elsif ($grpfilter ne 'all') { |
|
if (!grep(/^\Q$grpfilter\E$/,@ac_groups)) { |
|
delete($userlist->{$user}); |
|
next; |
|
} |
|
} |
|
} |
} |
} |
my %emails = &Apache::loncommon::getemails($uname,$udom); |
my %emails = &Apache::loncommon::getemails($uname,$udom); |
if ($emails{'permanentemail'} =~ /\S/) { |
if ($emails{'permanentemail'} =~ /\S/) { |
Line 2736 sub results_header_row {
|
Line 2839 sub results_header_row {
|
$description .= &mt('All users in course with [_1] roles',$rolefilter); |
$description .= &mt('All users in course with [_1] roles',$rolefilter); |
} |
} |
} |
} |
|
my $constraint; |
my $viewablesec = &viewable_section($permission); |
my $viewablesec = &viewable_section($permission); |
if ($viewablesec ne '') { |
if ($viewablesec ne '') { |
if ($env{'form.showrole'} eq 'st') { |
if ($env{'form.showrole'} eq 'st') { |
$description .= ' '.&mt('(section [_1] only)',$viewablesec); |
$constraint = &mt('only users in section "[_1]"',$viewablesec); |
} elsif ($env{'form.showrole'} ne 'cc') { |
} elsif ($env{'form.showrole'} ne 'cc') { |
$description .= ' '.&mt('(only users affiliated with no section or section [_1])',$viewablesec); |
$constraint = &mt('only users affiliated with no section or section "[_1]"',$viewablesec); |
|
} |
|
if (($env{'form.grpfilter'} ne 'all') && ($env{'form.grpfilter'} ne '')) { |
|
if ($env{'form.grpfilter'} eq 'none') { |
|
$constraint .= &mt(' and not in any group'); |
|
} else { |
|
$constraint .= &mt(' and members of group: "[_1]"',$env{'form.grpfilter'}); |
|
} |
|
} |
|
} else { |
|
if (($env{'form.secfilter'} ne 'all') && ($env{'form.secfilter'} ne '')) { |
|
if ($env{'form.secfilter'} eq 'none') { |
|
$constraint = &mt('only users affiliated with no section'); |
|
} else { |
|
$constraint = &mt('only users affiliated with section "[_1]"',$env{'form.secfilter'}); |
|
} |
|
} |
|
if (($env{'form.grpfilter'} ne 'all') && ($env{'form.grpfilter'} ne '')) { |
|
if ($env{'form.grpfilter'} eq 'none') { |
|
if ($constraint eq '') { |
|
$constraint = &mt('only users not in any group'); |
|
} else { |
|
$constraint .= &mt(' and also not in any group'); |
|
} |
|
} else { |
|
if ($constraint eq '') { |
|
$constraint = &mt('only members of group: "[_1]"',$env{'form.grpfilter'}); |
|
} else { |
|
$constraint .= &mt(' and also members of group: "[_1]"'.$env{'form.grpfilter'}); |
|
} |
|
} |
} |
} |
} |
} |
|
if ($constraint ne '') { |
|
$description .= ' ('.$constraint.')'; |
|
} |
} elsif ($context eq 'author') { |
} elsif ($context eq 'author') { |
$description = |
$description = |
&mt('Author space for <span class="LC_cusr_emph">[_1]</span>', |
&mt('Author space for <span class="LC_cusr_emph">[_1]</span>', |
Line 3883 sub update_user_list {
|
Line 4020 sub update_user_list {
|
$plrole,$extent,$uname.':'.$udom,$result).'<br />'); |
$plrole,$extent,$uname.':'.$udom,$result).'<br />'); |
} |
} |
} |
} |
|
$r->print('<form name="studentform" method="post" action="/adm/createuser">'."\n"); |
|
if ($choice eq 'drop') { |
|
$r->print('<input type="hidden" name="action" value="listusers" />'."\n". |
|
'<input type="hidden" name="Status" value="Active" />'."\n". |
|
'<input type="hidden" name="showrole" value="st" />'."\n"); |
|
} else { |
|
foreach my $item ('action','sortby','roletype','showrole','Status','secfilter','grpfilter') { |
|
if ($env{'form.'.$item} ne '') { |
|
$r->print('<input type="hidden" name="'.$item.'" value="'.$env{'form.'.$item}. |
|
'" />'."\n"); |
|
} |
|
} |
|
} |
$r->print('<p><b>'.&mt("$result_text{'ok'}{$choice} role(s) for [quant,_1,user,users,no users].",$count).'</b></p>'); |
$r->print('<p><b>'.&mt("$result_text{'ok'}{$choice} role(s) for [quant,_1,user,users,no users].",$count).'</b></p>'); |
if ($count > 0) { |
if ($count > 0) { |
if ($choice eq 'revoke' || $choice eq 'drop') { |
if ($choice eq 'revoke' || $choice eq 'drop') { |
Line 3896 sub update_user_list {
|
Line 4046 sub update_user_list {
|
$r->print(&make_dates_default($startdate,$enddate,$context)); |
$r->print(&make_dates_default($startdate,$enddate,$context)); |
} |
} |
} |
} |
|
my $linktext = &mt('Display User Lists'); |
|
if ($choice eq 'drop') { |
|
$linktext = &mt('Display current class roster'); |
|
} |
|
$r->print('<a href="javascript:document.studentform.submit()">'.$linktext.'</a></form>'."\n"); |
} |
} |
|
|
sub classlist_drop { |
sub classlist_drop { |