version 1.109.2.6, 2010/11/08 21:08:27
|
version 1.128, 2010/11/01 18:01:26
|
Line 36 use Apache::loncommon();
|
Line 36 use Apache::loncommon();
|
use Apache::lonhtmlcommon; |
use Apache::lonhtmlcommon; |
use Apache::lonlocal; |
use Apache::lonlocal; |
use Apache::longroup; |
use Apache::longroup; |
use Apache::lonnavmaps; |
|
use LONCAPA qw(:DEFAULT :match); |
use LONCAPA qw(:DEFAULT :match); |
|
|
############################################################### |
############################################################### |
Line 48 sub modifystudent {
|
Line 47 sub modifystudent {
|
# this one. If $csec is defined, drop them from all other sections of |
# this one. If $csec is defined, drop them from all other sections of |
# this course and add them to section $csec |
# this course and add them to section $csec |
my ($cnum,$cdom) = &get_course_identity($courseid); |
my ($cnum,$cdom) = &get_course_identity($courseid); |
my %roles = &Apache::lonnet::dump('roles',$udom,$unam); |
my $extra = &Apache::lonnet::freeze_escape({'skipcheck' => 1}); |
|
my %roles = &Apache::lonnet::dump('roles',$udom,$unam,'.',undef,$extra); |
my ($tmp) = keys(%roles); |
my ($tmp) = keys(%roles); |
# Bail out if we were unable to get the students roles |
# Bail out if we were unable to get the students roles |
return "$1" if ($tmp =~ /^(con_lost|error|no_such_host)/i); |
return "$1" if ($tmp =~ /^(con_lost|error|no_such_host)/i); |
Line 296 sub hidden_input {
|
Line 296 sub hidden_input {
|
} |
} |
|
|
sub print_upload_manager_header { |
sub print_upload_manager_header { |
my ($r,$datatoken,$distotal,$krbdefdom,$context,$permission,$crstype,$formname, |
my ($r,$datatoken,$distotal,$krbdefdom,$context,$permission,$crstype, |
$can_assign)=@_; |
$can_assign)=@_; |
my $javascript; |
my $javascript; |
# |
# |
Line 327 sub print_upload_manager_header {
|
Line 327 sub print_upload_manager_header {
|
$password_choice = 'int'; |
$password_choice = 'int'; |
} |
} |
# |
# |
my ($sectionjs,$groupslist); |
my $groupslist; |
if ($context eq 'course') { |
if ($context eq 'course') { |
$groupslist = &get_groupslist(); |
$groupslist = &get_groupslist(); |
if ($env{'form.caller'} eq 'requestcrs') { |
|
$sectionjs = <<"ENDJS"; |
|
|
|
function toggleSectionsDefault() { |
|
var usingsecs; |
|
if (document.$formname.usesection.length > 1) { |
|
for (var i=0; i<document.$formname.usesection.length; i++) { |
|
if (document.$formname.usesection[i].checked) { |
|
usingsecs = document.$formname.usesection[i].value; |
|
} |
|
} |
|
} |
|
if (usingsecs == 1) { |
|
document.getElementById('defaultsec').style.display="block"; |
|
} else { |
|
document.getElementById('defaultsec').style.display="none"; |
|
document.$formname.newsec.value = ""; |
|
document.$formname.sections.value = ""; |
|
} |
|
return; |
|
} |
|
ENDJS |
|
} |
|
} |
} |
my $javascript_validations = |
my $javascript_validations = |
&javascript_validations('upload',$krbdefdom,$password_choice,undef, |
&javascript_validations('upload',$krbdefdom,$password_choice,undef, |
Line 365 ENDJS
|
Line 342 ENDJS
|
."</p>\n"); |
."</p>\n"); |
$r->print('<div class="LC_left_float"><h3>'. |
$r->print('<div class="LC_left_float"><h3>'. |
&mt('Identify fields in uploaded list')."</h3>\n"); |
&mt('Identify fields in uploaded list')."</h3>\n"); |
$r->print(&mt('Enter as many fields as you can.').'<br />'. |
$r->print(&mt('Enter as many fields as you can.<br /> The system will inform you and bring you back to this page, <br /> if the data selected are insufficient to add users.')."<br />\n"); |
&mt('The system will inform you and bring you back to this page,'). |
|
'<br />'.&mt('if the data selected are insufficient to add users.')."<br />\n"); |
|
$r->print(&hidden_input('action','upload'). |
$r->print(&hidden_input('action','upload'). |
&hidden_input('state','got_file'). |
&hidden_input('state','got_file'). |
&hidden_input('associate',''). |
&hidden_input('associate',''). |
&hidden_input('datatoken',$datatoken). |
&hidden_input('datatoken',$datatoken). |
&hidden_input('fileupload',$env{'form.fileupload'}). |
&hidden_input('fileupload',$env{'form.fileupload'}). |
&hidden_input('upfiletype',$env{'form.upfiletype'}). |
&hidden_input('upfiletype',$env{'form.upfiletype'}). |
&hidden_input('upfile_associate',$env{'form.upfile_associate'}). |
&hidden_input('upfile_associate',$env{'form.upfile_associate'})); |
&hidden_input('caller',$env{'form.caller'})); |
|
$r->print('<br /><label><input type="checkbox" name="noFirstLine"'.$checked.' />'. |
$r->print('<br /><label><input type="checkbox" name="noFirstLine"'.$checked.' />'. |
&mt('Ignore First Line').'</label><br />'); |
&mt('Ignore First Line').'</label><br />'); |
$r->print('<br /><input type="button" value="'.&mt('Reverse Association').'" '. |
$r->print('<br /><input type="button" value="'.&mt('Reverse Association').'" '. |
Line 384 ENDJS
|
Line 358 ENDJS
|
$r->print("<br /><br />\n". |
$r->print("<br /><br />\n". |
'<script type="text/javascript" language="Javascript">'."\n". |
'<script type="text/javascript" language="Javascript">'."\n". |
'// <![CDATA['."\n". |
'// <![CDATA['."\n". |
$javascript."\n".$javascript_validations."\n".$sectionjs."\n". |
$javascript."\n".$javascript_validations."\n". |
'// ]]>'."\n". |
'// ]]>'."\n". |
'</script>'); |
'</script>'); |
} |
} |
Line 415 sub javascript_validations {
|
Line 389 sub javascript_validations {
|
if ($context eq 'course') { |
if ($context eq 'course') { |
if ($env{'request.course.sec'} eq '') { |
if ($env{'request.course.sec'} eq '') { |
$setsection_call = 'setSections(document.'.$param{'formname'}.",'$crstype'".');'; |
$setsection_call = 'setSections(document.'.$param{'formname'}.",'$crstype'".');'; |
if ($env{'form.caller'} eq 'requestcrs') { |
$setsections_js = |
$setsections_js = &newsections_javascript($param{'formname'}); |
&setsections_javascript($param{'formname'},$groupslist, |
} else { |
$mode,'',$crstype); |
$setsections_js = |
|
&setsections_javascript($param{'formname'},$groupslist, |
|
$mode,'',$crstype); |
|
} |
|
} else { |
} else { |
$setsection_call = "'ok'"; |
$setsection_call = "'ok'"; |
} |
} |
Line 549 END
|
Line 519 END
|
END |
END |
} else { |
} else { |
$section_checks = §ion_check_js(); |
$section_checks = §ion_check_js(); |
|
$optional_checks = (<<END); |
unless ($env{'form.caller'} eq 'requestcrs') { |
|
$optional_checks = (<<END); |
|
var message=''; |
var message=''; |
if (foundname==0) { |
if (foundname==0) { |
message='$alert{'name'}'; |
message='$alert{'name'}'; |
Line 586 END
|
Line 554 END
|
message+='$alert{'domain'}'; |
message+='$alert{'domain'}'; |
} |
} |
END |
END |
} |
|
if (($mode eq 'upload') && ($context eq 'domain')) { |
if (($mode eq 'upload') && ($context eq 'domain')) { |
$optional_checks .= (<<END); |
$optional_checks .= (<<END); |
|
|
Line 598 END
|
Line 565 END
|
} |
} |
END |
END |
} |
} |
if ($env{'form.caller'} eq 'requestcrs') { |
$optional_checks .= (<<END); |
$optional_checks .= (<<END); |
|
vf.state.value='enrolling'; |
|
$finish |
|
} |
|
END |
|
} else { |
|
$optional_checks .= (<<END); |
|
|
|
if (message!='') { |
if (message!='') { |
message+= '\\n$alert{'continue'}'; |
message+= '\\n$alert{'continue'}'; |
Line 619 END
|
Line 579 END
|
} |
} |
} |
} |
END |
END |
} |
|
} |
} |
my $result = $function_name.$auth_checks.$optional_checks."\n". |
my $result = $function_name.$auth_checks.$optional_checks."\n". |
$section_checks.$authheader; |
$section_checks.$authheader; |
Line 640 sub upload_manager_javascript_forward_as
|
Line 599 sub upload_manager_javascript_forward_as
|
set_auth_radio_buttons('int',document.studentform); |
set_auth_radio_buttons('int',document.studentform); |
END |
END |
} |
} |
if ($can_assign->{'krb'}) { |
if ($can_assign->{'krb4'} || $can_assign->{'krb5'}) { |
$auth_update .= " vf.krbarg.value='';\n"; |
$auth_update .= " vf.krbarg.value='';\n"; |
} |
} |
if ($can_assign->{'int'}) { |
if ($can_assign->{'int'}) { |
$auth_update .= " vf.intarg.value='';\n"; |
$auth_update .= " vf.intarg.value='';\n"; |
} |
} |
if ($can_assign->{'loc'}) { |
if ($can_assign->{'loc'}) { |
$auth_update .= " vf.locarg.value='';\n"; |
$auth_update .= " vf.locarg.value='';\n"; |
} |
} |
$auth_update .= " |
$auth_update .= " |
}\n"; |
}\n"; |
Line 748 ENDPICK
|
Line 707 ENDPICK
|
############################################################### |
############################################################### |
sub upload_manager_javascript_reverse_associate { |
sub upload_manager_javascript_reverse_associate { |
my ($can_assign) = @_; |
my ($can_assign) = @_; |
my $auth_update; |
my $auth_update; |
if (ref($can_assign) eq 'HASH') { |
if (ref($can_assign) eq 'HASH') { |
if (keys(%{$can_assign}) > 1) { |
if (keys(%{$can_assign}) > 1) { |
$auth_update = <<"END"; |
$auth_update = <<"END"; |
// initial password specified, pick internal authentication |
// initial password specified, pick internal authentication |
if (tf==8 && nw!=0) { |
if (tf==8 && nw!=0) { |
changed_radio('int',document.studentform); |
changed_radio('int',document.studentform); |
set_auth_radio_buttons('int',document.studentform); |
set_auth_radio_buttons('int',document.studentform); |
END |
END |
} |
} |
if ($can_assign->{'krb'}) { |
if ($can_assign->{'krb'}) { |
$auth_update .= " vf.krbarg.value='';\n"; |
$auth_update .= " vf.krbarg.value='';\n"; |
} |
} |
if ($can_assign->{'int'}) { |
if ($can_assign->{'int'}) { |
$auth_update .= " vf.intarg.value='';\n"; |
$auth_update .= " vf.intarg.value='';\n"; |
} |
} |
if ($can_assign->{'loc'}) { |
if ($can_assign->{'loc'}) { |
$auth_update .= " vf.locarg.value='';\n"; |
$auth_update .= " vf.locarg.value='';\n"; |
} |
} |
$auth_update .= " |
$auth_update .= " |
}\n"; |
}\n"; |
} |
} |
return(<<ENDPICK); |
return(<<ENDPICK); |
function verify(vf,sec_caller) { |
function verify(vf,sec_caller) { |
Line 838 sub print_upload_manager_footer {
|
Line 797 sub print_upload_manager_footer {
|
$env{'form.ipwd_choice'} ne '') { |
$env{'form.ipwd_choice'} ne '') { |
$param{'curr_authtype'} = 'int'; |
$param{'curr_authtype'} = 'int'; |
} |
} |
if ($env{'form.caller'} eq 'requestcrs') { |
|
$param{'caller'} = $env{'form.caller'}; |
|
} |
|
my $krbform = &Apache::loncommon::authform_kerberos(%param); |
my $krbform = &Apache::loncommon::authform_kerberos(%param); |
my $intform = &Apache::loncommon::authform_internal(%param); |
my $intform = &Apache::loncommon::authform_internal(%param); |
my $locform = &Apache::loncommon::authform_local(%param); |
my $locform = &Apache::loncommon::authform_local(%param); |
Line 853 sub print_upload_manager_footer {
|
Line 809 sub print_upload_manager_footer {
|
|
|
$Str .= '<h3>'.&mt('Options').'</h3>' |
$Str .= '<h3>'.&mt('Options').'</h3>' |
.&Apache::lonhtmlcommon::start_pick_box(); |
.&Apache::lonhtmlcommon::start_pick_box(); |
if ($env{'form.caller'} eq 'requestcrs') { |
|
$Str .= &Apache::lonhtmlcommon::row_title(&mt('Default password')); |
$Str .= &Apache::lonhtmlcommon::row_title(&mt('Login Type')); |
} else { |
|
$Str .= &Apache::lonhtmlcommon::row_title(&mt('Login Type')); |
|
} |
|
if ($context eq 'domain') { |
if ($context eq 'domain') { |
$Str .= '<p>' |
$Str .= '<p>' |
.&mt('Change authentication for existing users in domain "[_1]" to these settings?' |
.&mt('Change authentication for existing users in domain "[_1]" to these settings?' |
Line 871 sub print_upload_manager_footer {
|
Line 824 sub print_upload_manager_footer {
|
.'</span></p>'; |
.'</span></p>'; |
} else { |
} else { |
$Str .= '<p class="LC_info">'."\n". |
$Str .= '<p class="LC_info">'."\n". |
&mt('This will not take effect if the user already exists.'); |
&mt('This will not take effect if the user already exists.'). |
my ($authnum,%can_assign) = &Apache::loncommon::get_assignable_auth($defdom); |
&Apache::loncommon::help_open_topic('Auth_Options'). |
if ($authnum > 1) { |
"</p>\n"; |
$Str .= &Apache::loncommon::help_open_topic('Auth_Options'); |
|
} |
|
$Str .= "</p>\n"; |
|
} |
} |
$Str .= &set_login($defdom,$krbform,$intform,$locform); |
$Str .= &set_login($defdom,$krbform,$intform,$locform); |
if ($env{'form.caller'} eq 'requestcrs') { |
|
$Str .= '<input type="hidden" name="defaultdomain" value="gcitest" />'; |
|
} |
|
my ($home_server_pick,$numlib) = |
my ($home_server_pick,$numlib) = |
&Apache::loncommon::home_server_form_item($defdom,'lcserver', |
&Apache::loncommon::home_server_form_item($defdom,'lcserver', |
'default','hide'); |
'default','hide'); |
Line 897 sub print_upload_manager_footer {
|
Line 845 sub print_upload_manager_footer {
|
&Apache::lonhtmlcommon::row_closure(); |
&Apache::lonhtmlcommon::row_closure(); |
} |
} |
|
|
unless ($env{'form.caller'} eq 'requestcrs') { |
$Str .= &Apache::lonhtmlcommon::row_title(&mt('Default domain')) |
$Str .= &Apache::lonhtmlcommon::row_title(&mt('Default domain')) |
.&Apache::loncommon::select_dom_form($defdom,'defaultdomain',undef,1) |
.&Apache::loncommon::select_dom_form($defdom,'defaultdomain',undef,1) |
.&Apache::lonhtmlcommon::row_closure(); |
.&Apache::lonhtmlcommon::row_closure() |
|
.&Apache::lonhtmlcommon::row_title(&mt('Starting and Ending Dates')) |
$Str .= &Apache::lonhtmlcommon::row_title(&mt('Starting and Ending Dates')) |
."<p>\n".$date_table."</p>\n" |
."<p>\n".$date_table."</p>\n" |
.&Apache::lonhtmlcommon::row_closure(); |
.&Apache::lonhtmlcommon::row_closure(); |
} |
|
if ($context eq 'domain') { |
if ($context eq 'domain') { |
$Str .= &Apache::lonhtmlcommon::row_title( |
$Str .= &Apache::lonhtmlcommon::row_title( |
&mt('Settings for assigning roles')) |
&mt('Settings for assigning roles')) |
Line 924 sub print_upload_manager_footer {
|
Line 872 sub print_upload_manager_footer {
|
&mt('Default role')) |
&mt('Default role')) |
.&mt('Choose the role to assign to users without a value 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') { |
} elsif ($context eq 'course') { |
if ($env{'form.caller'} eq 'requestcrs') { |
$Str .= &Apache::lonhtmlcommon::row_title( |
$Str .= &Apache::lonhtmlcommon::row_title(&mt('Default section')). |
|
&mt('Students can be assigned to different sections.').'<br />'. |
|
&mt('Will you be using sections?').' '. |
|
'<input type="radio" name="usesection" value="1" '. |
|
'onclick="javascript:toggleSectionsDefault()" />'. |
|
' '.&mt('Yes').'</label>'. |
|
' <label>'. |
|
'<input type="radio" name="usesection" value="0" checked="checked" '. |
|
'onclick="javascript:toggleSectionsDefault()" />'. |
|
' '.&mt('No').'</label>'; |
|
} else { |
|
$Str .= &Apache::lonhtmlcommon::row_title( |
|
&mt('Default role and section')) |
&mt('Default role and section')) |
.&mt('Choose the role and/or section(s) to assign to users without values 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 { |
} else { |
$Str .= &Apache::lonhtmlcommon::row_title( |
$Str .= &Apache::lonhtmlcommon::row_title( |
&mt('Default role and/or section(s)')) |
&mt('Default role and/or section(s)')) |
Line 963 sub print_upload_manager_footer {
|
Line 898 sub print_upload_manager_footer {
|
} |
} |
} else { |
} else { |
my ($cnum,$cdom) = &get_course_identity(); |
my ($cnum,$cdom) = &get_course_identity(); |
my ($rowtitle,$closure); |
my $rowtitle = &mt('section'); |
if ($env{'form.caller'} eq 'requestcrs') { |
|
$closure = 1; |
|
$rowtitle = &mt('default section name (letters/numbers only)'); |
|
} else { |
|
$rowtitle = &mt('section'); |
|
} |
|
my $secbox = §ion_picker($cdom,$cnum,'Any',$rowtitle, |
my $secbox = §ion_picker($cdom,$cnum,'Any',$rowtitle, |
$permission,$context,'upload',$crstype, |
$permission,$context,'upload',$crstype); |
$env{'form.caller'}). |
$Str .= $secbox |
&Apache::lonhtmlcommon::row_closure($closure); |
.&Apache::lonhtmlcommon::row_closure(); |
if ($env{'form.caller'} eq 'requestcrs') { |
|
$Str .= '<div id ="defaultsec" style="display: none" />'.$secbox.'</div>'; |
|
} else { |
|
$Str .= $secbox; |
|
} |
|
my %lt; |
my %lt; |
if ($crstype eq 'Community') { |
if ($crstype eq 'Community') { |
%lt = &Apache::lonlocal::texthash ( |
%lt = &Apache::lonlocal::texthash ( |
Line 991 sub print_upload_manager_footer {
|
Line 915 sub print_upload_manager_footer {
|
stus => 'Students selected from this list can be dropped.' |
stus => 'Students selected from this list can be dropped.' |
); |
); |
} |
} |
unless ($env{'form.caller'} eq 'requestcrs') { |
$Str .= &Apache::lonhtmlcommon::row_title(&mt('Full Update')) |
$Str .= &Apache::lonhtmlcommon::row_title(&mt('Full Update')) |
.'<label><input type="checkbox" name="fullup" value="yes" />' |
.'<label><input type="checkbox" name="fullup" value="yes" />' |
.' '.$lt{'disp'} |
.' '.$lt{'disp'} |
.'</label><br />' |
.'</label><br />' |
.$lt{'stus'} |
.$lt{'stus'} |
.&Apache::lonhtmlcommon::row_closure(); |
.&Apache::lonhtmlcommon::row_closure(); |
|
} |
|
} |
} |
if ($context eq 'course' || $context eq 'domain') { |
if ($context eq 'course' || $context eq 'domain') { |
unless ($env{'form.caller'} eq 'requestcrs') { |
$Str .= &forceid_change($context); |
$Str .= &forceid_change($context); |
|
} |
|
} |
} |
|
|
$Str .= &Apache::lonhtmlcommon::end_pick_box(); |
$Str .= &Apache::lonhtmlcommon::end_pick_box(); |
Line 1047 sub forceid_change {
|
Line 967 sub forceid_change {
|
############################################################### |
############################################################### |
############################################################### |
############################################################### |
sub print_upload_manager_form { |
sub print_upload_manager_form { |
my ($r,$context,$permission,$crstype,$formname) = @_; |
my ($r,$context,$permission,$crstype) = @_; |
my $firstLine; |
my $firstLine; |
my $datatoken; |
my $datatoken; |
if (!$env{'form.datatoken'}) { |
if (!$env{'form.datatoken'}) { |
Line 1095 sub print_upload_manager_form {
|
Line 1015 sub print_upload_manager_form {
|
# |
# |
my ($authnum,%can_assign) = &Apache::loncommon::get_assignable_auth($defdom); |
my ($authnum,%can_assign) = &Apache::loncommon::get_assignable_auth($defdom); |
&print_upload_manager_header($r,$datatoken,$distotal,$krbdefdom,$context, |
&print_upload_manager_header($r,$datatoken,$distotal,$krbdefdom,$context, |
$permission,$crstype,$formname,\%can_assign); |
$permission,$crstype,\%can_assign); |
my $i; |
my $i; |
my $keyfields; |
my $keyfields; |
if ($total>=0) { |
if ($total>=0) { |
my @field= |
my @field= |
(['username',&mt('Username'), $env{'form.username_choice'}], |
(['username',&mt('Username'), $env{'form.username_choice'}], |
['ipwd', &mt('Initial Password'),$env{'form.ipwd_choice'}], |
|
['names',&mt('Last Name, First Names'),$env{'form.names_choice'}], |
['names',&mt('Last Name, First Names'),$env{'form.names_choice'}], |
['fname',&mt('First Name'), $env{'form.fname_choice'}], |
['fname',&mt('First Name'), $env{'form.fname_choice'}], |
['mname',&mt('Middle Names/Initials'),$env{'form.mname_choice'}], |
['mname',&mt('Middle Names/Initials'),$env{'form.mname_choice'}], |
Line 1109 sub print_upload_manager_form {
|
Line 1028 sub print_upload_manager_form {
|
['gen', &mt('Generation'), $env{'form.gen_choice'}], |
['gen', &mt('Generation'), $env{'form.gen_choice'}], |
['id', &mt('Student/Employee ID'),$env{'form.id_choice'}], |
['id', &mt('Student/Employee ID'),$env{'form.id_choice'}], |
['sec', &mt('Section'), $env{'form.sec_choice'}], |
['sec', &mt('Section'), $env{'form.sec_choice'}], |
|
['ipwd', &mt('Initial Password'),$env{'form.ipwd_choice'}], |
['email',&mt('E-mail Address'), $env{'form.email_choice'}], |
['email',&mt('E-mail Address'), $env{'form.email_choice'}], |
['role',&mt('Role'), $env{'form.role_choice'}], |
['role',&mt('Role'), $env{'form.role_choice'}], |
['domain',&mt('Domain'), $env{'form.domain_choice'}], |
['domain',&mt('Domain'), $env{'form.domain_choice'}], |
Line 1301 sub default_role_selector {
|
Line 1221 sub default_role_selector {
|
'exs' => "Existing sections", |
'exs' => "Existing sections", |
'new' => "New section", |
'new' => "New section", |
); |
); |
$options = '<select name="defaultrole">'."\n"; |
$options = '<select name="defaultrole">'."\n". |
unless (($context eq 'course') && (&Apache::loncommon::needs_gci_custom())) { |
' <option value="">'.&mt('Please select').'</option>'."\n"; |
$options .= ' <option value="">'.&mt('Please select').'</option>'."\n"; |
|
} |
|
if ($context eq 'course') { |
if ($context eq 'course') { |
$options .= &default_course_roles($context,$checkpriv,$crstype,%customroles); |
$options .= &default_course_roles($context,$checkpriv,$crstype,%customroles); |
} elsif ($context eq 'author') { |
} elsif ($context eq 'author') { |
Line 1566 sub print_userlist {
|
Line 1484 sub print_userlist {
|
} |
} |
if (!(($context eq 'domain') && |
if (!(($context eq 'domain') && |
(($env{'form.roletype'} eq 'course') || ($env{'form.roletype'} eq 'community')))) { |
(($env{'form.roletype'} eq 'course') || ($env{'form.roletype'} eq 'community')))) { |
$r->print(' '.&list_submit_button(&mt('Update Display')). |
$r->print( |
"\n</p>\n"); |
"\n</p>\n" |
|
.'<p>' |
|
.&list_submit_button(&mt('Update Display')) |
|
."</p>\n" |
|
); |
} |
} |
my ($indexhash,$keylist) = &make_keylist_array(); |
my ($indexhash,$keylist) = &make_keylist_array(); |
my (%userlist,%userinfo,$clearcoursepick); |
my (%userlist,%userinfo,$clearcoursepick); |
Line 1586 sub print_userlist {
|
Line 1508 sub print_userlist {
|
$title = &mt('Select Communities'); |
$title = &mt('Select Communities'); |
$warning = &mt('Warning: data retrieval for multiple communities can take considerable time, as this operation is not currently optimized.'); |
$warning = &mt('Warning: data retrieval for multiple communities can take considerable time, as this operation is not currently optimized.'); |
} |
} |
|
my @standardnames = &Apache::loncommon::get_standard_codeitems(); |
my $courseform = |
my $courseform = |
&Apache::lonhtmlcommon::course_selection($formname,$numcodes, |
&Apache::lonhtmlcommon::course_selection($formname,$numcodes, |
$codetitles,$idlist,$idlist_titles,$crstype); |
$codetitles,$idlist,$idlist_titles,$crstype, |
|
\@standardnames); |
$r->print('<p>'.&Apache::lonhtmlcommon::start_pick_box()."\n". |
$r->print('<p>'.&Apache::lonhtmlcommon::start_pick_box()."\n". |
&Apache::lonhtmlcommon::start_pick_box()."\n". |
&Apache::lonhtmlcommon::start_pick_box()."\n". |
&Apache::lonhtmlcommon::row_title($title,'LC_oddrow_value')."\n". |
&Apache::lonhtmlcommon::row_title($title,'LC_oddrow_value')."\n". |
Line 1806 sub role_filter {
|
Line 1730 sub role_filter {
|
$role_select .= '</select>'; |
$role_select .= '</select>'; |
$output = '<label><span class="LC_nobreak">' |
$output = '<label><span class="LC_nobreak">' |
.&mt('Role: [_1]',$role_select) |
.&mt('Role: [_1]',$role_select) |
.'</span></label>'; |
.'</span></label> '; |
} |
} |
return $output; |
return $output; |
} |
} |
Line 1846 sub section_group_filter {
|
Line 1770 sub section_group_filter {
|
} |
} |
if (@options > 0) { |
if (@options > 0) { |
my $currsel; |
my $currsel; |
$markup = '<select name="'.$name{$item}.'" />'."\n"; |
$markup = '<select name="'.$name{$item}.'">'."\n"; |
foreach my $option ('all','none',@options) { |
foreach my $option ('all','none',@options) { |
$currsel = ''; |
$currsel = ''; |
if ($env{'form.'.$name{$item}} eq $option) { |
if ($env{'form.'.$name{$item}} eq $option) { |
Line 1861 sub section_group_filter {
|
Line 1785 sub section_group_filter {
|
$markup .= '</option>'."\n"; |
$markup .= '</option>'."\n"; |
} |
} |
$markup .= '</select>'."\n"; |
$markup .= '</select>'."\n"; |
$output .= (' 'x3).'<label>'.$title{$item}.': '.$markup.'</label>'; |
$output .= (' 'x3).'<span class="LC_nobreak">' |
|
.'<label>'.$title{$item}.': '.$markup.'</label>' |
|
.'</span> '; |
} |
} |
} |
} |
return $output; |
return $output; |
Line 2035 function setCourseCat(formname) {
|
Line 1961 function setCourseCat(formname) {
|
if (formname.Year.options[formname.Year.selectedIndex].value == -1) { |
if (formname.Year.options[formname.Year.selectedIndex].value == -1) { |
return; |
return; |
} |
} |
courseSet('Year'); |
courseSet('$codetitles[0]'); |
for (var j=0; j<formname.Semester.length; j++) { |
for (var j=0; j<formname.Semester.length; j++) { |
if (formname.Semester.options[j].value == "$env{'form.Semester'}") { |
if (formname.Semester.options[j].value == "$env{'form.Semester'}") { |
formname.Semester.options[j].selected = true; |
formname.Semester.options[j].selected = true; |
Line 2044 function setCourseCat(formname) {
|
Line 1970 function setCourseCat(formname) {
|
if (formname.Semester.options[formname.Semester.selectedIndex].value == -1) { |
if (formname.Semester.options[formname.Semester.selectedIndex].value == -1) { |
return; |
return; |
} |
} |
courseSet('Semester'); |
courseSet('$codetitles[1]'); |
for (var j=0; j<formname.Department.length; j++) { |
for (var j=0; j<formname.Department.length; j++) { |
if (formname.Department.options[j].value == "$env{'form.Department'}") { formname.Department.options[j].selected = true; |
if (formname.Department.options[j].value == "$env{'form.Department'}") { formname.Department.options[j].selected = true; |
} |
} |
Line 2052 function setCourseCat(formname) {
|
Line 1978 function setCourseCat(formname) {
|
if (formname.Department.options[formname.Department.selectedIndex].value == -1) { |
if (formname.Department.options[formname.Department.selectedIndex].value == -1) { |
return; |
return; |
} |
} |
courseSet('Department'); |
courseSet('$codetitles[2]'); |
for (var j=0; j<formname.Number.length; j++) { |
for (var j=0; j<formname.Number.length; j++) { |
if (formname.Number.options[j].value == "$env{'form.Number'}") { |
if (formname.Number.options[j].value == "$env{'form.Number'}") { |
formname.Number.options[j].selected = true; |
formname.Number.options[j].selected = true; |
Line 2211 sub process_date_info {
|
Line 2137 sub process_date_info {
|
|
|
sub show_users_list { |
sub show_users_list { |
my ($r,$context,$mode,$permission,$statusmode,$userlist,$keylist,$formname)=@_; |
my ($r,$context,$mode,$permission,$statusmode,$userlist,$keylist,$formname)=@_; |
my $custommenu; |
|
if ($formname eq '') { |
if ($formname eq '') { |
$formname = 'studentform'; |
$formname = 'studentform'; |
} |
} |
Line 2236 sub show_users_list {
|
Line 2161 sub show_users_list {
|
$sortby = 'username'; |
$sortby = 'username'; |
} |
} |
my $setting = $env{'form.roletype'}; |
my $setting = $env{'form.roletype'}; |
my ($cid,$cdom,$cnum,$classgroups,$displayphotos,$displayclickers,$crstype, |
my ($cid,$cdom,$cnum,$classgroups,$displayphotos,$displayclickers,$crstype); |
$clickersupport,$displaygroups); |
|
if ($context eq 'course') { |
if ($context eq 'course') { |
$cid = $env{'request.course.id'}; |
$cid = $env{'request.course.id'}; |
$crstype = &Apache::loncommon::course_type(); |
$crstype = &Apache::loncommon::course_type(); |
($cnum,$cdom) = &get_course_identity($cid); |
($cnum,$cdom) = &get_course_identity($cid); |
$custommenu = &Apache::loncommon::needs_gci_custom(); |
|
unless ($custommenu) { |
|
$clickersupport = 1; |
|
$displaygroups = 1; |
|
} |
|
($classgroups) = &Apache::loncoursedata::get_group_memberships( |
($classgroups) = &Apache::loncoursedata::get_group_memberships( |
$userlist,$keylist,$cdom,$cnum); |
$userlist,$keylist,$cdom,$cnum); |
if ($mode eq 'autoenroll') { |
if ($mode eq 'autoenroll') { |
Line 2367 END
|
Line 2286 END
|
'role' => "role", |
'role' => "role", |
'type' => "enroll type/action", |
'type' => "enroll type/action", |
'email' => "e-mail address", |
'email' => "e-mail address", |
'lastlogin' => "last login", |
|
'submissions' => "test status", |
|
'photo' => "photo", |
'photo' => "photo", |
'extent' => "extent", |
'extent' => "extent", |
'pr' => "Proceed", |
'pr' => "Proceed", |
Line 2415 END
|
Line 2332 END
|
push(@cols,'status'); |
push(@cols,'status'); |
} |
} |
if ($context eq 'course') { |
if ($context eq 'course') { |
if ($displaygroups) { |
push(@cols,'groups'); |
push(@cols,'groups'); |
|
} |
|
} |
} |
push(@cols,'email'); |
push(@cols,'email'); |
if ($context eq 'course') { |
|
if ($custommenu) { |
|
push(@cols,'lastlogin'); |
|
if (($env{'form.showrole'} eq 'Any') || ($env{'form.showrole'} eq 'st')) { |
|
push(@cols,'submissions'); |
|
} |
|
} |
|
} |
|
} |
} |
|
|
my $rolefilter = $env{'form.showrole'}; |
my $rolefilter = $env{'form.showrole'}; |
Line 2534 END
|
Line 2441 END
|
if ($env{'form.userwin'}) { |
if ($env{'form.userwin'}) { |
$checkwin = ' checked="checked"'; |
$checkwin = ' checked="checked"'; |
} |
} |
$output .= '</td><td valign="top"><span class="LC_nobreak"><input type="checkbox" name="userwin" value="1"'.$checkwin.' />'.$lt{'owin'}.'</span></td></tr></table></fieldset></div>'; |
$output .= '</td><td valign="top" style="border-left: 1px solid;"><span class="LC_nobreak"><input type="checkbox" name="userwin" value="1"'.$checkwin.' />'.$lt{'owin'}.'</span></td></tr></table></fieldset></div>'; |
} |
} |
$output .= "\n".'<div class="LC_clear_float_footer"> </div>'."\n". |
$output .= "\n".'<div class="LC_clear_float_footer"> </div>'."\n". |
&Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table(). |
Line 2550 END
|
Line 2457 END
|
} |
} |
} |
} |
foreach my $item (@cols) { |
foreach my $item (@cols) { |
if (grep(/^\Q$item\E$/,@sortable)) { |
$output .= "<th><a href=\"javascript:document.$formname.sortby.value='$item';document.$formname.submit();\">$lt{$item}</a></th>\n"; |
$output .= "<th><a href=\"javascript:document.$formname.sortby.value='$item';document.$formname.submit();\">$lt{$item}</a></th>\n"; |
|
} else { |
|
$output .= "<th>$lt{$item}</th>\n"; |
|
} |
|
} |
} |
my %role_types = &role_type_names(); |
my %role_types = &role_type_names(); |
if ($context eq 'course' && $mode ne 'autoenroll') { |
if ($context eq 'course' && $mode ne 'autoenroll') { |
if ($env{'form.showrole'} eq 'st' || $env{'form.showrole'} eq 'Any') { |
if ($env{'form.showrole'} eq 'st' || $env{'form.showrole'} eq 'Any') { |
# Clicker display on or off? |
# Clicker display on or off? |
if ($clickersupport) { |
my %clicker_options = ( |
my %clicker_options = ( |
'on' => 'Show', |
'on' => 'Show', |
'off' => 'Hide', |
'off' => 'Hide', |
); |
); |
my $clickerchg = 'on'; |
my $clickerchg = 'on'; |
if ($displayclickers eq 'on') { |
if ($displayclickers eq 'on') { |
$clickerchg = 'off'; |
$clickerchg = 'off'; |
} |
} |
$output .= ' <th>'."\n".' ' |
$output .= ' <th>'."\n".' ' |
.&mt('[_1]'.$clicker_options{$clickerchg}.'[_2] clicker id' |
.&mt('[_1]'.$clicker_options{$clickerchg}.'[_2] clicker id' |
|
,'<a href="javascript:document.'.$formname.'.displayclickers.value=' |
,'<a href="javascript:document.'.$formname.'.displayclickers.value=' |
."'".$clickerchg."'".';document.'.$formname.'.submit();">' |
."'".$clickerchg."'".';document.'.$formname.'.submit();">' |
,'</a>') |
,'</a>') |
."\n".' </th>'."\n"; |
."\n".' </th>'."\n"; |
} |
|
# Photo display on or off? |
# Photo display on or off? |
if ($env{'course.'.$env{'request.course.id'}.'.internal.showphoto'}) { |
if ($env{'course.'.$env{'request.course.id'}.'.internal.showphoto'}) { |
my %photo_options = &Apache::lonlocal::texthash( |
my %photo_options = &Apache::lonlocal::texthash( |
Line 2614 END
|
Line 2516 END
|
$CSVfile = undef; |
$CSVfile = undef; |
} |
} |
# |
# |
if ($clickersupport) { |
push @cols,'clicker'; |
push @cols,'clicker'; |
|
} |
|
# Write headers and data to file |
# Write headers and data to file |
print $CSVfile '"'.$results_description.'"'."\n"; |
print $CSVfile '"'.$results_description.'"'."\n"; |
print $CSVfile '"'.join('","',map { |
print $CSVfile '"'.join('","',map { |
&Apache::loncommon::csv_translate($lt{$_}) |
&Apache::loncommon::csv_translate($lt{$_}) |
} (@cols))."\"\n"; |
} (@cols))."\"\n"; |
} elsif ($mode eq 'excel') { |
} elsif ($mode eq 'excel') { |
if ($clickersupport) { |
push @cols,'clicker'; |
push @cols,'clicker'; |
|
} |
|
# Create the excel spreadsheet |
# Create the excel spreadsheet |
($excel_workbook,$excel_filename,$format) = |
($excel_workbook,$excel_filename,$format) = |
&Apache::loncommon::create_workbook($r); |
&Apache::loncommon::create_workbook($r); |
Line 2661 END
|
Line 2559 END
|
Future => 'Future', |
Future => 'Future', |
Expired => 'Expired', |
Expired => 'Expired', |
); |
); |
# If this is for a single course get last course "log-in" and submissions. |
|
my (%crslogins,%stusubmissions,%elapsed,$numparts,%nummultipart,$multipart); |
|
my $now = time; |
|
if ($context eq 'course') { |
|
if ($custommenu) { |
|
%crslogins=&Apache::lonnet::dump('nohist_crslastlogin',$cdom,$cnum); |
|
%stusubmissions=&Apache::lonnet::dump('nohist_submissiontracker',$cdom,$cnum); |
|
%elapsed = &Apache::lonlocal::texthash( |
|
-1 => 'more than a month ago', |
|
2592000 => 'within last 30 days', |
|
604800 => 'within last 7 days', |
|
86400 => 'within last 24 hours', |
|
); |
|
my $navmap = Apache::lonnavmaps::navmap->new(); |
|
if (defined($navmap)) { |
|
my @allres=$navmap->retrieveResources('/uploaded/'.$cdom.'/'.$cnum.'/default_1261144274.sequence',sub { $_[0]->is_problem() },0); |
|
foreach my $resource (@allres) { |
|
my @parts = $resource->parts(); |
|
my $count = scalar(@parts); |
|
if ($count > 1) { |
|
$nummultipart{$count} ++; |
|
} |
|
$numparts += $count; |
|
} |
|
if (keys(%nummultipart) > 0) { |
|
$multipart = '<br />'.'contains'; |
|
foreach my $key (sort {$a <=> $b} keys(%nummultipart)) { |
|
$multipart .= " nummultipart{$key} multipart questions (with $key parts)"; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
|
|
# 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 2841 END
|
Line 2705 END
|
} else { |
} else { |
$in{'end'} = &Apache::lonlocal::locallocaltime($in{'end'}); |
$in{'end'} = &Apache::lonlocal::locallocaltime($in{'end'}); |
} |
} |
if ($context eq 'course') { |
|
if ($custommenu) { |
|
my $lastlogin = $crslogins{$in{'username'}.':'.$in{'domain'}.':'.$in{'section'}.':'.$role}; |
|
if ($lastlogin ne '') { |
|
my $sincelogin = $now - $lastlogin; |
|
if ($sincelogin < 86400) { |
|
$in{'lastlogin'} = $elapsed{'86400'}; |
|
} elsif ($sincelogin < 604800) { |
|
$in{'lastlogin'} = $elapsed{'604800'}; |
|
} elsif ($sincelogin < 2592000 ) { |
|
$in{'lastlogin'} = $elapsed{'2592000'}; |
|
} else { |
|
$in{'lastlogin'} = $elapsed{'-1'}; |
|
} |
|
} |
|
} |
|
if ($role eq 'st') { |
|
my $numsub = $stusubmissions{$in{'username'}.':'.$in{'domain'}."\0attempts"} + |
|
$stusubmissions{$in{'username'}.':'.$in{'domain'}."\0surveysubs"}; |
|
if (!$numsub) { |
|
$in{'submissions'} = 'not attempted'; |
|
} elsif ($numsub < $numparts) { |
|
$in{'submissions'} = 'incomplete ('.$numsub.'/'.$numparts.')'; |
|
} else { |
|
$in{'submissions'} = 'completed'; |
|
} |
|
} |
|
} |
|
if ($mode eq 'view' || $mode eq 'html' || $mode eq 'autoenroll' || $mode eq 'pickauthor') { |
if ($mode eq 'view' || $mode eq 'html' || $mode eq 'autoenroll' || $mode eq 'pickauthor') { |
$r->print(&Apache::loncommon::start_data_table_row()); |
$r->print(&Apache::loncommon::start_data_table_row()); |
my $checkval; |
my $checkval; |
Line 2942 END
|
Line 2778 END
|
$showitem = $ltstatus{$in{$item}}; |
$showitem = $ltstatus{$in{$item}}; |
} |
} |
$r->print('<td>'.$showitem.'</td>'."\n"); |
$r->print('<td>'.$showitem.'</td>'."\n"); |
} elsif ($item eq 'submissions') { |
|
if ($in{$item} =~ /^incomplete/) { |
|
$r->print('<td>'.$in{$item}.$multipart.'</td>'); |
|
} else { |
|
$r->print('<td>'.$in{$item}.'</td>'."\n"); |
|
} |
|
} else { |
} else { |
$r->print('<td>'.$in{$item}.'</td>'."\n"); |
$r->print('<td>'.$in{$item}.'</td>'."\n"); |
} |
} |
} |
} |
if (($context eq 'course') && ($mode ne 'autoenroll')) { |
if (($context eq 'course') && ($mode ne 'autoenroll')) { |
if ($env{'form.showrole'} eq 'st' || $env{'form.showrole'} eq 'Any') { |
if ($env{'form.showrole'} eq 'st' || $env{'form.showrole'} eq 'Any') { |
if ($clickersupport) { |
if ($displayclickers eq 'on') { |
if ($displayclickers eq 'on') { |
my $clickers = |
my $clickers = |
|
(&Apache::lonnet::userenvironment($in{'domain'},$in{'username'},'clickers'))[1]; |
(&Apache::lonnet::userenvironment($in{'domain'},$in{'username'},'clickers'))[1]; |
if ($clickers!~/\w/) { $clickers='-'; } |
if ($clickers!~/\w/) { $clickers='-'; } |
$r->print('<td>'.$clickers.'</td>'); |
$r->print('<td>'.$clickers.'</td>'); |
} else { |
} else { |
$r->print(' <td> </td> '); |
$r->print(' <td> </td> '); |
} |
|
} |
} |
if ($env{'course.'.$env{'request.course.id'}.'.internal.showphoto'}) { |
if ($env{'course.'.$env{'request.course.id'}.'.internal.showphoto'}) { |
if ($displayphotos eq 'on' && $role eq 'st' && $in{'photo'} ne '') { |
if ($displayphotos eq 'on' && $role eq 'st' && $in{'photo'} ne '') { |
Line 3153 sub print_username_link {
|
Line 2981 sub print_username_link {
|
$output = $in->{'username'}; |
$output = $in->{'username'}; |
} else { |
} else { |
$output = '<a href="javascript:username_display_launch('. |
$output = '<a href="javascript:username_display_launch('. |
"'$in->{'username'}','$in->{'domain'}'".')" />'. |
"'$in->{'username'}','$in->{'domain'}'".')">'. |
$in->{'username'}.'</a>'; |
$in->{'username'}.'</a>'; |
} |
} |
return $output; |
return $output; |
Line 3383 ENDJS
|
Line 3211 ENDJS
|
my %lt = &Apache::lonlocal::texthash ( |
my %lt = &Apache::lonlocal::texthash ( |
chac => 'Access dates to apply for selected users', |
chac => 'Access dates to apply for selected users', |
chse => 'Changes in section affiliation to apply to 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.', |
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.', |
forn => 'For a course role that is not "student", users may have roles in more than one section at a time.', |
reta => "Retain each user's current section affiliations?", |
reta => "Retain each user's current section affiliations?", |
dnap => '(Does not apply to student roles).', |
dnap => '(Does not apply to student roles).', |
); |
); |
my ($date_items,$headertext); |
my ($date_items,$headertext); |
Line 3403 ENDJS
|
Line 3231 ENDJS
|
$permission,$crstype); |
$permission,$crstype); |
} |
} |
$output .= '<h3>'.$headertext.'</h3>'. |
$output .= '<h3>'.$headertext.'</h3>'. |
'<form name="'.$formname.'" method="post">'."\n". |
'<form name="'.$formname.'" method="post" action="">'."\n". |
$date_items; |
$date_items; |
if ($context eq 'course' && $env{'form.bulkaction'} eq 'chgsec') { |
if ($context eq 'course' && $env{'form.bulkaction'} eq 'chgsec') { |
my ($cnum,$cdom) = &get_course_identity(); |
my ($cnum,$cdom) = &get_course_identity(); |
my $crstype = &Apache::loncommon::course_type(); |
|
if ($crstype eq 'Community') { |
if ($crstype eq 'Community') { |
$lt{'fors'} = &mt('For member roles changing the section, will result in a section switch as members may only be in one section of a community at a time.'); |
$lt{'fors'} = &mt('For member roles, changing the section will result in a section switch, as members may only be in one section of a community at a time.'); |
$lt{'forn'} = &mt('For a role in a community that is not a member role, a user may have roles in more than one section of a community at a time.'); |
$lt{'forn'} = &mt('For a community role that is not "member", users may have roles in more than one section at a time.'); |
$lt{'dnap'} = &mt('(Does not apply to member roles).'); |
$lt{'dnap'} = &mt('(Does not apply to member roles).'); |
} |
} |
my $info; |
my $info; |
Line 3448 ENDJS
|
Line 3275 ENDJS
|
} |
} |
|
|
sub section_picker { |
sub section_picker { |
my ($cdom,$cnum,$role,$rowtitle,$permission,$context,$mode,$crstype,$caller) = @_; |
my ($cdom,$cnum,$role,$rowtitle,$permission,$context,$mode,$crstype) = @_; |
my %sections_count = &Apache::loncommon::get_sections($cdom,$cnum); |
my %sections_count = &Apache::loncommon::get_sections($cdom,$cnum); |
my $sections_select .= &course_sections(\%sections_count,$role); |
my $sections_select .= &course_sections(\%sections_count,$role); |
my $secbox = '<p>'.&Apache::lonhtmlcommon::start_pick_box()."\n"; |
my $secbox = '<div>'.&Apache::lonhtmlcommon::start_pick_box()."\n"; |
if ($mode eq 'upload' && $caller ne 'requestcrs') { |
if ($mode eq 'upload') { |
my ($options,$cb_script,$coursepick) = |
my ($options,$cb_script,$coursepick) = |
&default_role_selector($context,1,$crstype); |
&default_role_selector($context,1,$crstype); |
$secbox .= &Apache::lonhtmlcommon::row_title(&mt('role'),'LC_oddrow_value'). |
$secbox .= &Apache::lonhtmlcommon::row_title(&mt('role'),'LC_oddrow_value'). |
$options. &Apache::lonhtmlcommon::row_closure(1)."\n"; |
$options. &Apache::lonhtmlcommon::row_closure(1)."\n"; |
} |
} |
$secbox .= &Apache::lonhtmlcommon::row_title($rowtitle,'LC_oddrow_value')."\n"; |
$secbox .= &Apache::lonhtmlcommon::row_title($rowtitle,'LC_oddrow_value')."\n"; |
if ($caller eq 'requestcrs') { |
if ($env{'request.course.sec'} eq '') { |
$secbox .= '<input type="hidden" name="defaultrole" value="st" />'."\n". |
|
'<input type="text" name="newsec" size="15" />'."\n". |
|
'<input type="hidden" name="sections" value="" />'."\n"; |
|
} elsif ($env{'request.course.sec'} eq '') { |
|
$secbox .= '<table class="LC_createuser"><tr class="LC_section_row">'."\n". |
$secbox .= '<table class="LC_createuser"><tr class="LC_section_row">'."\n". |
'<td align="center">'.&mt('Existing sections')."\n". |
'<td align="center">'.&mt('Existing sections')."\n". |
'<br />'.$sections_select.'</td><td align="center">'. |
'<br />'.$sections_select.'</td><td align="center">'. |
&mt('New section').'<br />'."\n". |
&mt('New section').'<br />'."\n". |
'<input type="text" name="newsec" size="15" />'."\n". |
'<input type="text" name="newsec" size="15" value="" />'."\n". |
'<input type="hidden" name="sections" value="" />'."\n". |
'<input type="hidden" name="sections" value="" />'."\n". |
'</td></tr></table>'."\n"; |
'</td></tr></table>'."\n"; |
} else { |
} else { |
Line 3477 sub section_picker {
|
Line 3300 sub section_picker {
|
$env{'request.course.sec'}; |
$env{'request.course.sec'}; |
} |
} |
$secbox .= &Apache::lonhtmlcommon::row_closure(1)."\n". |
$secbox .= &Apache::lonhtmlcommon::row_closure(1)."\n". |
&Apache::lonhtmlcommon::end_pick_box().'</p>'; |
&Apache::lonhtmlcommon::end_pick_box().'</div>'; |
return $secbox; |
return $secbox; |
} |
} |
|
|
Line 3618 sub results_header_row {
|
Line 3441 sub results_header_row {
|
if ($rolefilter eq 'Any') { |
if ($rolefilter eq 'Any') { |
$description .= &mt('All users with co-author roles in domain',$showfilter); |
$description .= &mt('All users with co-author roles in domain',$showfilter); |
} else { |
} else { |
$description .= &mt('All co-authors in domain with [_1] roles',$rolefilter); |
$description .= &mt('All co-authors in domain with [_1] roles',$rolefilter); |
} |
} |
} |
} |
} elsif (($env{'form.roletype'} eq 'course') || |
} elsif (($env{'form.roletype'} eq 'course') || |
Line 3682 sub show_drop_list {
|
Line 3505 sub show_drop_list {
|
my ($r,$classlist,$nosort,$permission,$crstype) = @_; |
my ($r,$classlist,$nosort,$permission,$crstype) = @_; |
my $cid = $env{'request.course.id'}; |
my $cid = $env{'request.course.id'}; |
my ($cnum,$cdom) = &get_course_identity($cid); |
my ($cnum,$cdom) = &get_course_identity($cid); |
my $displaygroups; |
|
unless (&Apache::loncommon::needs_gci_custom()) { |
|
$displaygroups = 1; |
|
} |
|
if (! exists($env{'form.sortby'})) { |
if (! exists($env{'form.sortby'})) { |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
['sortby']); |
['sortby']); |
Line 3763 END
|
Line 3582 END
|
<th>$lt{'sec'}</th> |
<th>$lt{'sec'}</th> |
<th>$lt{'start'}</th> |
<th>$lt{'start'}</th> |
<th>$lt{'end'}</th> |
<th>$lt{'end'}</th> |
|
<th>$lt{'groups'}</th> |
END |
END |
if ($displaygroups) { |
|
$r->print(" <th>$lt{'groups'}</th>\n"); |
|
} |
|
$r->print(&Apache::loncommon::end_data_table_header_row()); |
$r->print(&Apache::loncommon::end_data_table_header_row()); |
} else { |
} else { |
$r->print(&Apache::loncommon::start_data_table(). |
$r->print(&Apache::loncommon::start_data_table(). |
Line 3787 END
|
Line 3604 END
|
<a href="/adm/createuser?action=$action&sortby=start">$lt{'start'}</a> |
<a href="/adm/createuser?action=$action&sortby=start">$lt{'start'}</a> |
</th><th> |
</th><th> |
<a href="/adm/createuser?action=$action&sortby=end">$lt{'end'}</a> |
<a href="/adm/createuser?action=$action&sortby=end">$lt{'end'}</a> |
|
</th><th> |
|
<a href="/adm/createuser?action=$action&sortby=groups">$lt{'groups'}</a> |
</th> |
</th> |
END |
END |
if ($displaygroups) { |
|
$r->print("<th> |
|
<a href=\"/adm/createuser?action=$action&sortby=groups\">$lt{'groups'}</a> |
|
</th>\n"); |
|
} |
|
$r->print(&Apache::loncommon::end_data_table_header_row()); |
$r->print(&Apache::loncommon::end_data_table_header_row()); |
} |
} |
# |
# |
Line 3846 END
|
Line 3660 END
|
<td>$section</td> |
<td>$section</td> |
<td>$start $startitem</td> |
<td>$start $startitem</td> |
<td>$end</td> |
<td>$end</td> |
|
<td>$active_groups</td> |
END |
END |
if ($displaygroups) { |
|
$r->print(" <td>$active_groups</td>\n"); |
|
} |
|
$r->print(&Apache::loncommon::end_data_table_row()); |
$r->print(&Apache::loncommon::end_data_table_row()); |
} |
} |
$r->print(&Apache::loncommon::end_data_table().'<br />'); |
$r->print(&Apache::loncommon::end_data_table().'<br />'); |
Line 3880 END
|
Line 3692 END
|
# Print out the initial form to get the file containing a list of users |
# Print out the initial form to get the file containing a list of users |
# |
# |
sub print_first_users_upload_form { |
sub print_first_users_upload_form { |
my ($r,$context,$noheader,$caller) = @_; |
my ($r,$context) = @_; |
my $str; |
my $str; |
$str = '<input type="hidden" name="phase" value="two" />'; |
$str = '<input type="hidden" name="phase" value="two" />'; |
$str .= '<input type="hidden" name="action" value="upload" />'; |
$str .= '<input type="hidden" name="action" value="upload" />'; |
$str .= '<input type="hidden" name="state" value="got_file" />'; |
$str .= '<input type="hidden" name="state" value="got_file" />'; |
|
|
unless ($noheader) { |
$str .= '<h2>'.&mt('Upload a file containing information about users').'</h2>'."\n"; |
$str .= '<h3>'.&mt('Upload a file containing information about users').'</h3>'."\n"; |
|
} |
|
|
|
# Excel and CSV Help |
# Excel and CSV Help |
$str .= '<div class="LC_left_float">' |
$str .= '<div class="LC_left_float">' |
Line 3899 sub print_first_users_upload_form {
|
Line 3709 sub print_first_users_upload_form {
|
&mt("How do I create a CSV file from a spreadsheet")) |
&mt("How do I create a CSV file from a spreadsheet")) |
.'</div><br clear="all" />'."\n"; |
.'</div><br clear="all" />'."\n"; |
$str .= &Apache::lonhtmlcommon::start_pick_box() |
$str .= &Apache::lonhtmlcommon::start_pick_box() |
.&Apache::lonhtmlcommon::row_title(&mt('File')) |
.&Apache::lonhtmlcommon::row_title(&mt('File')); |
.&Apache::loncommon::upfile_select_html() |
if (&Apache::lonlocal::current_language() ne 'en') { |
|
if ($context eq 'course') { |
|
$str .= '<p class="LC_info">'."\n" |
|
.&mt('Please upload an UTF8 encoded file to ensure a correct character encoding in your classlist.')."\n" |
|
.'</p>'."\n"; |
|
} |
|
} |
|
$str .= &Apache::loncommon::upfile_select_html() |
.&Apache::lonhtmlcommon::row_closure() |
.&Apache::lonhtmlcommon::row_closure() |
.&Apache::lonhtmlcommon::row_title(&mt('Ignore First Line, e.g., contains column titles')) |
.&Apache::lonhtmlcommon::row_title( |
.'<label><input type="radio" name="noFirstLine" id="noFirstLine" value="1" /> '.&mt('Yes').'</label>' |
'<label for="noFirstLine">' |
.' ' |
.&mt('Ignore First Line') |
.'<label><input type="radio" name="noFirstLine" id="FirstLineOK" value="0" checked="checked" /> '.&mt('No').'</label>' |
.'</label>') |
|
.'<input type="checkbox" name="noFirstLine" id="noFirstLine" />' |
.&Apache::lonhtmlcommon::row_closure(1) |
.&Apache::lonhtmlcommon::row_closure(1) |
.&Apache::lonhtmlcommon::end_pick_box(); |
.&Apache::lonhtmlcommon::end_pick_box(); |
|
|
$str .= '<p>' |
$str .= '<p>' |
.'<input type="hidden" name=caller" value="'.$caller.'" />' |
|
.'<input type="submit" name="fileupload" value="'.&mt('Next').'" />' |
.'<input type="submit" name="fileupload" value="'.&mt('Next').'" />' |
.'</p>'; |
.'</p>'; |
|
|
Line 3973 sub upfile_drop_add {
|
Line 3790 sub upfile_drop_add {
|
$crstype = &Apache::loncommon::course_type($cid); |
$crstype = &Apache::loncommon::course_type($cid); |
} |
} |
} |
} |
my ($startdate,$enddate); |
my ($startdate,$enddate) = &get_dates_from_form(); |
if ($env{'form.caller'} eq 'requestcrs') { |
if ($env{'form.makedatesdefault'}) { |
$startdate = $env{'course.'.$env{'request.course.id'}.'.default_enrollment_start_date'}; |
$r->print(&make_dates_default($startdate,$enddate,$context,$crstype)); |
$enddate = $env{'course.'.$env{'request.course.id'}.'.default_enrollment_end_date'}; |
|
} else { |
|
($startdate,$enddate) = &get_dates_from_form(); |
|
if ($env{'form.makedatesdefault'}) { |
|
$r->print(&make_dates_default($startdate,$enddate,$context,$crstype)); |
|
} |
|
} |
} |
# Determine domain and desired host (home server) |
# Determine domain and desired host (home server) |
my $defdom=$env{'request.role.domain'}; |
my $defdom=$env{'request.role.domain'}; |
Line 4161 sub upfile_drop_add {
|
Line 3972 sub upfile_drop_add {
|
my @secs; |
my @secs; |
my %entries=&Apache::loncommon::record_sep($line); |
my %entries=&Apache::loncommon::record_sep($line); |
# Determine user name |
# Determine user name |
|
$entries{$fields{'username'}} =~ s/^\s+|\s+$//g; |
unless (($entries{$fields{'username'}} eq '') || |
unless (($entries{$fields{'username'}} eq '') || |
(!defined($entries{$fields{'username'}}))) { |
(!defined($entries{$fields{'username'}}))) { |
my ($fname, $mname, $lname,$gen) = ('','','',''); |
my ($fname, $mname, $lname,$gen) = ('','','',''); |
Line 4181 sub upfile_drop_add {
|
Line 3993 sub upfile_drop_add {
|
$gen=$entries{$fields{'gen'}}; |
$gen=$entries{$fields{'gen'}}; |
} |
} |
} |
} |
|
|
if ($entries{$fields{'username'}} |
if ($entries{$fields{'username'}} |
ne &LONCAPA::clean_username($entries{$fields{'username'}})) { |
ne &LONCAPA::clean_username($entries{$fields{'username'}})) { |
|
my $nowhitespace; |
|
if ($entries{$fields{'username'}} =~ /\s/) { |
|
$nowhitespace = ' - '.&mt('usernames may not contain spaces.'); |
|
} |
$r->print('<br />'. |
$r->print('<br />'. |
&mt('[_1]: Unacceptable username for user [_2] [_3] [_4] [_5]', |
&mt('[_1]: Unacceptable username for user [_2] [_3] [_4] [_5]', |
'<b>'.$entries{$fields{'username'}}.'</b>',$fname,$mname,$lname,$gen)); |
'<b>'.$entries{$fields{'username'}}.'</b>',$fname,$mname,$lname,$gen). |
|
$nowhitespace); |
next; |
next; |
} else { |
} else { |
if ($entries{$fields{'domain'}} |
if ($entries{$fields{'domain'}} |
Line 4303 sub upfile_drop_add {
|
Line 4121 sub upfile_drop_add {
|
if ($uhome eq 'no_host') { |
if ($uhome eq 'no_host') { |
if ($userdomain ne $domain) { |
if ($userdomain ne $domain) { |
$r->print('<br />'. |
$r->print('<br />'. |
&mt('[_1]: The domain specified ([_2]) is different to that of the course.', |
&mt('[_1]: The domain specified ([_2]) is different to that of the course.', |
'<b>'.$username.'</b>',$userdomain).'<br />'. |
'<b>'.$username.'</b>',$userdomain).'<br />'. |
&mt('The user does not already exist, and you may not create a new user in a different domain.')); |
&mt('The user does not already exist, and you may not create a new user in a different domain.')); |
next; |
next; |
} |
} |
$checkid = 1; |
$checkid = 1; |
$newuser = 1; |
$newuser = 1; |
my $user = $username.':'.$domain; |
my $user = $username.':'.$domain; |
if ($username =~/^[^\@]+\@[^\@]+$/) { |
|
if ($email eq '') { |
|
$email = $username; |
|
} |
|
if (&Apache::loncommon::needs_gci_custom()) { |
|
my $lc_email; |
|
if ($username eq $email) { |
|
$lc_email = lc($email); |
|
} |
|
my $lc_username = lc($username); |
|
if ($lc_username ne $username) { |
|
if ($username eq $email) { |
|
$email = $lc_username; |
|
} |
|
$username = $lc_username; |
|
$uhome=&Apache::lonnet::homeserver($username,$userdomain); |
|
if ($uhome ne 'no_host') { |
|
$newuser = 0; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
if ($newuser) { |
|
my $checkhash; |
my $checkhash; |
my $checks = { 'username' => 1 }; |
my $checks = { 'username' => 1 }; |
$checkhash->{$user} = { 'newuser' => 1, }; |
$checkhash->{$username.':'.$domain} = { 'newuser' => 1, }; |
&Apache::loncommon::user_rule_check($checkhash,$checks, |
&Apache::loncommon::user_rule_check($checkhash,$checks, |
\%alerts,\%rulematch,\%inst_results,\%curr_rules, |
\%alerts,\%rulematch,\%inst_results,\%curr_rules, |
\%got_rules); |
\%got_rules); |
Line 4357 sub upfile_drop_add {
|
Line 4151 sub upfile_drop_add {
|
$usertype = 'official'; |
$usertype = 'official'; |
} |
} |
} |
} |
if (!$cancreate{$usertype}) { |
unless ($cancreate{$usertype}) { |
|
my $showtype = $longtypes{$usertype}; |
$r->print('<br />'. |
$r->print('<br />'. |
&mt("[_1]: The user does not exist, and you are not permitted to create users of type: $longtypes{$usertype}.",'<b>'.$username.'</b>')); |
&mt("[_1]: The user does not exist, and you are not permitted to create users of type: $showtype.",'<b>'.$username.'</b>')); |
next; |
next; |
} |
} |
} else { |
} else { |
Line 4512 sub upfile_drop_add {
|
Line 4307 sub upfile_drop_add {
|
} |
} |
} # end of foreach (@userdata) |
} # end of foreach (@userdata) |
# Flush the course logs so reverse user roles immediately updated |
# Flush the course logs so reverse user roles immediately updated |
&Apache::lonnet::flushcourselogs(); |
$r->register_cleanup(\&Apache::lonnet::flushcourselogs); |
$r->print("</p>\n<p>\n".&mt('Processed [quant,_1,user].',$counts{'user'}). |
$r->print("</p>\n<p>\n".&mt('Processed [quant,_1,user].',$counts{'user'}). |
"</p>\n"); |
"</p>\n"); |
if ($counts{'role'} > 0) { |
if ($counts{'role'} > 0) { |
if (&Apache::loncommon::needs_gci_custom()) { |
$r->print("<p>\n". |
$r->print("<p>\n". |
&mt('Roles added for [quant,_1,user].',$counts{'role'}).' '.&mt('If a user is currently logged-in to LON-CAPA, any new roles which are active will be available when the user next logs in.')."</p>\n"); |
&mt('[quant,_1,student] enrolled in Concept Test.',$counts{'role'}). |
|
"</p>\n"); |
|
} else { |
|
$r->print("<p>\n". |
|
&mt('Roles added for [quant,_1,user].',$counts{'role'}).' '.&mt('If a user is currently logged-in to LON-CAPA, any new roles which are active will be available when the user next logs in.')."</p>\n"); |
|
} |
|
} else { |
} else { |
if (&Apache::loncommon::needs_gci_custom()) { |
$r->print('<p>'.&mt('No roles added').'</p>'); |
$r->print('<p>'.&mt('No students enrolled').'</p>'); |
|
} else { |
|
$r->print('<p>'.&mt('No roles added').'</p>'); |
|
} |
|
} |
} |
if ($counts{'auth'} > 0) { |
if ($counts{'auth'} > 0) { |
$r->print("<p>\n". |
$r->print("<p>\n". |
Line 4686 sub print_drop_menu {
|
Line 4471 sub print_drop_menu {
|
# ================================================================== Phase four |
# ================================================================== Phase four |
|
|
sub update_user_list { |
sub update_user_list { |
my ($r,$context,$setting,$choice) = @_; |
my ($r,$context,$setting,$choice,$crstype) = @_; |
my $now = time; |
my $now = time; |
my $count=0; |
my $count=0; |
my $crstype; |
|
if ($context eq 'course') { |
if ($context eq 'course') { |
$crstype = &Apache::loncommon::course_type(); |
$crstype = &Apache::loncommon::course_type(); |
} |
} |
Line 4704 sub update_user_list {
|
Line 4488 sub update_user_list {
|
'reenable' => 'Re-enabled', |
'reenable' => 'Re-enabled', |
'activate' => 'Activated', |
'activate' => 'Activated', |
'chgdates' => 'Changed Access Dates for', |
'chgdates' => 'Changed Access Dates for', |
'chgsec' => 'Changed section for', |
'chgsec' => 'Changed section(s) for', |
'drop' => 'Dropped', |
'drop' => 'Dropped', |
}, |
}, |
error => {'revoke' => 'revoking', |
error => {'revoke' => 'revoking', |
Line 4721 sub update_user_list {
|
Line 4505 sub update_user_list {
|
($startdate,$enddate) = &get_dates_from_form(); |
($startdate,$enddate) = &get_dates_from_form(); |
} |
} |
foreach my $item (@changelist) { |
foreach my $item (@changelist) { |
my ($role,$uname,$udom,$cid,$sec,$scope,$result,$type,$locktype,@sections, |
my ($role,$uname,$udom,$cid,$sec,$scope,$result,$type,$locktype, |
$scopestem); |
@sections,$scopestem,$singlesec,$showsecs,$warn_singlesec, |
|
$nothingtodo,$keepnosection); |
if ($choice eq 'drop') { |
if ($choice eq 'drop') { |
($uname,$udom,$sec) = split(/:/,$item,-1); |
($uname,$udom,$sec) = split(/:/,$item,-1); |
$role = 'st'; |
$role = 'st'; |
Line 4821 sub update_user_list {
|
Line 4606 sub update_user_list {
|
} elsif ($choice eq 'chgsec') { |
} elsif ($choice eq 'chgsec') { |
my (@newsecs,$revresult,$nochg,@retained); |
my (@newsecs,$revresult,$nochg,@retained); |
if (($role ne 'cc') && ($role ne 'co')) { |
if (($role ne 'cc') && ($role ne 'co')) { |
@newsecs = split(/,/,$env{'form.newsecs'}); |
my @secs = sort(split(/,/,$env{'form.newsecs'})); |
|
if (@secs) { |
|
my %curr_groups = &Apache::longroup::coursegroups(); |
|
foreach my $sec (@secs) { |
|
next if (($sec =~ /\W/) || ($sec eq 'none') || |
|
(exists($curr_groups{$sec}))); |
|
push(@newsecs,$sec); |
|
} |
|
} |
} |
} |
# remove existing section if not to be retained. |
# remove existing section if not to be retained. |
if (!$env{'form.retainsec'}) { |
if (!$env{'form.retainsec'} || ($role eq 'st')) { |
if ($sec eq '') { |
if ($sec eq '') { |
if (@newsecs == 0) { |
if (@newsecs == 0) { |
$result = &mt('No change in section assignment (none)'); |
$result = 'ok'; |
$nochg = 1; |
$nochg = 1; |
|
$nothingtodo = 1; |
} else { |
} else { |
$revresult = |
$revresult = |
&Apache::lonnet::revokerole($udom,$uname, |
&Apache::lonnet::revokerole($udom,$uname, |
Line 4855 sub update_user_list {
|
Line 4649 sub update_user_list {
|
} else { |
} else { |
if ($sec eq '') { |
if ($sec eq '') { |
$nochg = 1; |
$nochg = 1; |
} else { |
$keepnosection = 1; |
|
} else { |
push(@retained,$sec); |
push(@retained,$sec); |
} |
} |
} |
} |
# add new sections |
# add new sections |
|
my (@diffs,@shownew); |
|
if (@retained) { |
|
@diffs = &Apache::loncommon::compare_arrays(\@retained,\@newsecs); |
|
} else { |
|
@diffs = @newsecs; |
|
} |
if (@newsecs == 0) { |
if (@newsecs == 0) { |
if (!$nochg) { |
if ($nochg) { |
|
$result = 'ok'; |
|
$nothingtodo = 1; |
|
} else { |
if ($role eq 'st') { |
if ($role eq 'st') { |
$result = |
$result = |
&Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,undef,$end,$start,$type,$locktype,$cid,'',$context); |
&Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,undef,$end,$start,$type,$locktype,$cid,'',$context); |
Line 4870 sub update_user_list {
|
Line 4674 sub update_user_list {
|
$result = &Apache::lonnet::assignrole($udom,$uname,$newscope,$role,$end,$start,'','',$context); |
$result = &Apache::lonnet::assignrole($udom,$uname,$newscope,$role,$end,$start,'','',$context); |
} |
} |
} |
} |
|
$showsecs = &mt('No section'); |
|
} elsif (@diffs == 0) { |
|
$result = 'ok'; |
|
$nothingtodo = 1; |
} else { |
} else { |
foreach my $newsec (@newsecs) { |
foreach my $newsec (@newsecs) { |
if (!grep(/^\Q$newsec\E$/,@retained)) { |
if (!grep(/^\Q$newsec\E$/,@retained)) { |
if ($role eq 'st') { |
if ($role eq 'st') { |
$result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$newsec,$end,$start,$type,$locktype,$cid,'',$context); |
$result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$newsec,$end,$start,$type,$locktype,$cid,'',$context); |
|
if (@newsecs > 1) { |
|
my $showsingle; |
|
if ($newsec eq '') { |
|
$showsingle = &mt('No section'); |
|
} else { |
|
$showsingle = $newsec; |
|
} |
|
if ($crstype eq 'Community') { |
|
$warn_singlesec = &mt('Although more than one section was indicated, a role was only added for the first section - [_1], as each community member may only be in one section at a time.','<i>'.$showsingle.'</i>'); |
|
} else { |
|
$warn_singlesec = &mt('Although more than one section was indicated, a role was only added for the first section - [_1], as each student may only be in one section of a course at a time.','<i>'.$showsingle.'</i>'); |
|
} |
|
$showsecs = $showsingle; |
|
last; |
|
} else { |
|
if ($newsec eq '') { |
|
$showsecs = &mt('No section'); |
|
} else { |
|
$showsecs = $newsec; |
|
} |
|
} |
} else { |
} else { |
my $newscope = $scopestem; |
my $newscope = $scopestem; |
if ($newsec ne '') { |
if ($newsec ne '') { |
$newscope .= '/'.$newsec; |
$newscope .= '/'.$newsec; |
|
push(@shownew,$newsec); |
} |
} |
$result = &Apache::lonnet::assignrole($udom,$uname, |
$result = &Apache::lonnet::assignrole($udom,$uname, |
$newscope,$role,$end,$start); |
$newscope,$role,$end,$start); |
|
|
} |
} |
} |
} |
} |
} |
} |
} |
|
unless ($role eq 'st') { |
|
unless ($showsecs) { |
|
my @tolist = sort(@shownew,@retained); |
|
if ($keepnosection) { |
|
push(@tolist,&mt('No section')); |
|
} |
|
$showsecs = join(', ',@tolist); |
|
} |
|
} |
} |
} |
} |
} |
my $extent = $scope; |
my $extent = $scope; |
Line 4896 sub update_user_list {
|
Line 4736 sub update_user_list {
|
} |
} |
} |
} |
if ($result eq 'ok' || $result eq 'ok:') { |
if ($result eq 'ok' || $result eq 'ok:') { |
$r->print(&mt("$result_text{'ok'}{$choice} role of '[_1]' in [_2] for [_3]", |
my $dates; |
$plrole,$extent,$uname.':'.$udom).'<br />'); |
if (($choice eq 'chgsec') || ($choice eq 'chgdates')) { |
$count++; |
$dates = &dates_feedback($start,$end,$now); |
|
} |
|
if ($choice eq 'chgsec') { |
|
if ($nothingtodo) { |
|
$r->print(&mt("Section assignment for role of '[_1]' in [_2] for '[_3]' unchanged.",$plrole,$extent,'<i>'. |
|
&Apache::loncommon::plainname($uname,$udom). |
|
'</i>').' '); |
|
if ($sec eq '') { |
|
$r->print(&mt('[_1]No section[_2] - [_3]','<b>','</b>',$dates)); |
|
} else { |
|
$r->print(&mt('Section(s): [_1] - [_2]', |
|
'<b>'.$showsecs.'</b>',$dates)); |
|
} |
|
$r->print('<br />'); |
|
} else { |
|
$r->print(&mt("$result_text{'ok'}{$choice} role of '[_1]' in [_2] for '[_3]' to [_4] - [_5]",$plrole,$extent, |
|
'<i>'.&Apache::loncommon::plainname($uname,$udom).'</i>', |
|
'<b>'.$showsecs.'</b>',$dates).'<br />'); |
|
$count ++; |
|
} |
|
if ($warn_singlesec) { |
|
$r->print('<div class="LC_warning">'.$warn_singlesec.'</div>'); |
|
} |
|
} elsif ($choice eq 'chgdates') { |
|
$r->print(&mt("$result_text{'ok'}{$choice} role of '[_1]' in [_2] for '[_3]' - [_4]",$plrole,$extent, |
|
'<i>'.&Apache::loncommon::plainname($uname,$udom).'</i>', |
|
$dates).'<br />'); |
|
$count ++; |
|
} else { |
|
$r->print(&mt("$result_text{'ok'}{$choice} role of '[_1]' in [_2] for '[_3]'.",$plrole,$extent, |
|
'<i>'.&Apache::loncommon::plainname($uname,$udom).'</i>'). |
|
'<br />'); |
|
$count ++; |
|
} |
} else { |
} else { |
$r->print( |
$r->print( |
&mt("Error $result_text{'error'}{$choice} [_1] in [_2] for [_3]: [_4].", |
&mt("Error $result_text{'error'}{$choice} [_1] in [_2] for '[_3]': [_4].", |
$plrole,$extent,$uname.':'.$udom,$result).'<br />'); |
$plrole,$extent, |
|
'<i>'.&Apache::loncommon::plainname($uname,$udom).'</i>', |
|
$result).'<br />'); |
} |
} |
} |
} |
$r->print('<form name="studentform" method="post" action="/adm/createuser">'."\n"); |
$r->print('<form name="studentform" method="post" action="/adm/createuser">'."\n"); |
Line 4918 sub update_user_list {
|
Line 4793 sub update_user_list {
|
} |
} |
} |
} |
} |
} |
$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} for [quant,_1,user role,user roles,no user roles].",$count).'</b></p>'); |
if ($count > 0) { |
if ($count > 0) { |
if ($choice eq 'revoke' || $choice eq 'drop') { |
if ($choice eq 'revoke' || $choice eq 'drop') { |
$r->print('<p>'.&mt('Re-enabling will re-activate data for the role.').'</p>'); |
$r->print('<p>'.&mt('Re-enabling will re-activate data for the role.').'</p>'); |
} |
} |
# Flush the course logs so reverse user roles immediately updated |
# Flush the course logs so reverse user roles immediately updated |
&Apache::lonnet::flushcourselogs(); |
$r->register_cleanup(\&Apache::lonnet::flushcourselogs); |
} |
} |
if ($env{'form.makedatesdefault'}) { |
if ($env{'form.makedatesdefault'}) { |
if ($choice eq 'chgdates' || $choice eq 'reenable' || $choice eq 'activate') { |
if ($choice eq 'chgdates' || $choice eq 'reenable' || $choice eq 'activate') { |
Line 4938 sub update_user_list {
|
Line 4813 sub update_user_list {
|
$r->print('<a href="javascript:document.studentform.submit()">'.$linktext.'</a></form>'."\n"); |
$r->print('<a href="javascript:document.studentform.submit()">'.$linktext.'</a></form>'."\n"); |
} |
} |
|
|
|
sub dates_feedback { |
|
my ($start,$end,$now) = @_; |
|
my $dates; |
|
if ($start < $now) { |
|
if ($end == 0) { |
|
$dates .= &mt('role(s) active now; no end date'); |
|
} elsif ($end > $now) { |
|
$dates = &mt('role(s) active now; ends [_1].',&Apache::lonlocal::locallocaltime($end)); |
|
} else { |
|
$dates = &mt('role(s) expired: [_1].',&Apache::lonlocal::locallocaltime($end)); |
|
} |
|
} else { |
|
if ($end == 0 || $end > $now) { |
|
$dates = &mt('future role(s); starts: [_1].',&Apache::lonlocal::locallocaltime($start)); |
|
} else { |
|
$dates = &mt('role(s) expired: [_1].',&Apache::lonlocal::locallocaltime($end)); |
|
} |
|
} |
|
return $dates; |
|
} |
|
|
sub classlist_drop { |
sub classlist_drop { |
my ($scope,$uname,$udom,$now) = @_; |
my ($scope,$uname,$udom,$now) = @_; |
my ($cdom,$cnum) = ($scope=~m{^/($match_domain)/($match_courseid)}); |
my ($cdom,$cnum) = ($scope=~m{^/($match_domain)/($match_courseid)}); |
Line 5118 sub setsections_javascript {
|
Line 5014 sub setsections_javascript {
|
accr => 'A course coordinator role will be added with access to all sections.', |
accr => 'A course coordinator role will be added with access to all sections.', |
acor => 'A coordinator role will be added with access to all sections', |
acor => 'A coordinator role will be added with access to all sections', |
inea => 'In each course, each user may only have one student role at a time.', |
inea => 'In each course, each user may only have one student role at a time.', |
inec => 'In each community, each user may only have on member role at a time.', |
inco => 'In each community, each user may only have one member role at a time.', |
youh => 'You had selected ', |
youh => 'You had selected ', |
secs => 'sections.', |
secs => 'sections.', |
plmo => 'Please modify your selections so they include no more than one section.', |
plmo => 'Please modify your selections so they include no more than one section.', |
Line 5126 sub setsections_javascript {
|
Line 5022 sub setsections_javascript {
|
plch => 'Please choose a different section name.', |
plch => 'Please choose a different section name.', |
mnot => 'may not be used as a section name, as it is the name of a course group.', |
mnot => 'may not be used as a section name, as it is the name of a course group.', |
secn => 'Section names and group names must be distinct. Please choose a different section name.', |
secn => 'Section names and group names must be distinct. Please choose a different section name.', |
|
nonw => 'Section names may only contain letters or numbers.', |
); |
); |
$setsection_js .= <<"ENDSECCODE"; |
$setsection_js .= <<"ENDSECCODE"; |
|
|
function setSections(formname,crstype) { |
function setSections(formname,crstype) { |
var re1 = /^currsec_/; |
var re1 = /^currsec_/; |
|
var re2 =/\\W/; |
|
var trimleading = /^\\s+/; |
|
var trimtrailing = /\\s+\$/; |
var groups = new Array($groupslist); |
var groups = new Array($groupslist); |
for (var i=0;i<formname.elements.length;i++) { |
for (var i=0;i<formname.elements.length;i++) { |
var str = formname.elements[i].name; |
var str = formname.elements[i].name; |
var checkcurr = str.match(re1); |
var checkcurr = str.match(re1); |
if (checkcurr != null) { |
if (checkcurr != null) { |
|
var num = i; |
if ($checkincluded) { |
if ($checkincluded) { |
$rolecode |
$rolecode |
if (role == 'cc' || role == 'co') { |
if (role == 'cc' || role == 'co') { |
Line 5147 function setSections(formname,crstype) {
|
Line 5048 function setSections(formname,crstype) {
|
} else { |
} else { |
var sections = ''; |
var sections = ''; |
var numsec = 0; |
var numsec = 0; |
var sections; |
var fromexisting = new Array(); |
for (var j=0; j<formname.elements[i].length; j++) { |
for (var j=0; j<formname.elements[num].length; j++) { |
if (formname.elements[i].options[j].selected == true ) { |
if (formname.elements[num].options[j].selected == true ) { |
if (formname.elements[i].options[j].value != "") { |
var addsec = formname.elements[num].options[j].value; |
|
if ((addsec != "") && (addsec != null)) { |
|
fromexisting.push(addsec); |
if (numsec == 0) { |
if (numsec == 0) { |
if (formname.elements[i].options[j].value != "") { |
sections = addsec; |
sections = formname.elements[i].options[j].value; |
} else { |
numsec ++; |
sections = sections + "," + addsec; |
} |
|
} |
|
else { |
|
sections = sections + "," + formname.elements[i].options[j].value |
|
numsec ++; |
|
} |
} |
|
numsec ++; |
} |
} |
} |
} |
} |
} |
if (numsec > 0) { |
var newsecs = formname.elements[num+1].value; |
if (formname.elements[i+1].value != "" && formname.elements[i+1].value != null) { |
var validsecs = new Array(); |
sections = sections + "," + formname.elements[i+1].value; |
var validsecstr = ''; |
} |
var badsecs = new Array(); |
} |
|
else { |
|
sections = formname.elements[i+1].value; |
|
} |
|
var newsecs = formname.elements[i+1].value; |
|
var numsplit; |
|
if (newsecs != null && newsecs != "") { |
if (newsecs != null && newsecs != "") { |
numsplit = newsecs.split(/,/g); |
var numsplit; |
numsec = numsec + numsplit.length; |
if (newsecs.indexOf(',') == -1) { |
|
numsplit = new Array(newsecs); |
|
} else { |
|
numsplit = newsecs.split(/,/g); |
|
} |
|
for (var m=0; m<numsplit.length; m++) { |
|
var newsec = numsplit[m]; |
|
newsec = newsec.replace(trimleading,''); |
|
newsec = newsec.replace(trimtrailing,''); |
|
if (re2.test(newsec) == true) { |
|
badsecs.push(newsec); |
|
} else { |
|
if (newsec != '') { |
|
var isnew = 1; |
|
if (fromexisting != null) { |
|
for (var n=0; n<fromexisting.length; n++) { |
|
if (newsec == fromexisting[n]) { |
|
isnew = 0; |
|
} |
|
} |
|
} |
|
if (isnew == 1) { |
|
validsecs.push(newsec); |
|
} |
|
} |
|
} |
|
} |
|
if (badsecs.length > 0) { |
|
alert("$alerts{'nonw'}\\n$alerts{'plch'}"); |
|
return; |
|
} |
|
numsec = numsec + validsecs.length; |
} |
} |
|
|
if ((role == 'st') && (numsec > 1)) { |
if ((role == 'st') && (numsec > 1)) { |
if (crstype == 'Community') { |
if (crstype == 'Community') { |
alert("$alerts{'inea'} $alerts{'youh'} "+numsec+" $alerts{'secs'}\\n$alerts{'plmo'}"); |
alert("$alerts{'inea'} $alerts{'youh'} "+numsec+" $alerts{'secs'}\\n$alerts{'plmo'}"); |
} else { |
} else { |
alert("$alerts{'inec'} $alerts{'youh'} "+numsec+" $alerts{'secs'}\\n$alerts{'plmo'}"); |
alert("$alerts{'inco'} $alerts{'youh'} "+numsec+" $alerts{'secs'}\\n$alerts{'plmo'}"); |
} |
} |
return; |
return; |
} |
} else { |
else { |
if (validsecs != null) { |
if (numsplit != null) { |
for (var j=0; j<validsecs.length; j++) { |
for (var j=0; j<numsplit.length; j++) { |
if (validsecstr == '' || validsecstr == null) { |
if ((numsplit[j] == 'all') || |
validsecstr = validsecs[j]; |
(numsplit[j] == 'none')) { |
} else { |
alert("'"+numsplit[j]+"' $alerts{'mayn'}\\n$alerts{'plch'}"); |
validsecstr += ','+validsecs[j]; |
|
} |
|
if ((validsecs[j] == 'all') || |
|
(validsecs[j] == 'none')) { |
|
alert("'"+validsecs[j]+"' $alerts{'mayn'}\\n$alerts{'plch'}"); |
return; |
return; |
} |
} |
for (var k=0; k<groups.length; k++) { |
for (var k=0; k<groups.length; k++) { |
if (numsplit[j] == groups[k]) { |
if (validsecs[j] == groups[k]) { |
alert("'"+numsplit[j]+"' $alerts{'mnot'}\\n$alerts{'secn'}"); |
alert("'"+validsecs[j]+"' $alerts{'mnot'}\\n$alerts{'secn'}"); |
return; |
return; |
} |
} |
} |
} |
} |
} |
} |
} |
formname.elements[i+2].value = sections; |
|
} |
} |
|
if ((validsecstr != '') && (validsecstr != null)) { |
|
if ((sections == '') || (sections == null)) { |
|
sections = validsecstr; |
|
} else { |
|
sections = sections + "," + validsecstr; |
|
} |
|
} |
|
formname.elements[num+2].value = sections; |
} |
} |
} |
} |
} |
} |
Line 5215 ENDSECCODE
|
Line 5149 ENDSECCODE
|
return $setsection_js; |
return $setsection_js; |
} |
} |
|
|
sub newsections_javascript { |
|
my %alerts = &Apache::lonlocal::texthash( |
|
inea => 'In each course, each user may only have one student role at a time.', |
|
youh => 'You had selected ', |
|
secs => 'sections.', |
|
plmo => 'Please modify your selections so they include no more than one section.', |
|
mayn => 'may not be used as the name for a section, as it is a reserved word.', |
|
plch => 'Please choose a different section name.', |
|
); |
|
my $setsection_js = <<"ENDSECCODE"; |
|
|
|
function setSections(formname) { |
|
var newsecs = formname.newsec.value; |
|
var numsplit = 0; |
|
var numsec = 0; |
|
if (newsecs != null && newsecs != "") { |
|
numsplit = newsecs.split(/,/g); |
|
numsec = numsplit.length; |
|
} |
|
if (numsec > 1) { |
|
alert("$alerts{'inea'} $alerts{'youh'} "+numsec+" $alerts{'secs'}\\n$alerts{'plmo'}"); |
|
} else { |
|
if (numsplit > 0) { |
|
for (var j=0; j<numsplit.length; j++) { |
|
if ((numsplit[j] == 'all') || |
|
(numsplit[j] == 'none')) { |
|
alert("'"+numsplit[j]+"' $alerts{'mayn'}\\n$alerts{'plch'}"); |
|
return; |
|
} |
|
} |
|
formname.sections.value = newsecs; |
|
} |
|
} |
|
return 'ok'; |
|
} |
|
|
|
ENDSECCODE |
|
return $setsection_js; |
|
} |
|
|
|
sub can_create_user { |
sub can_create_user { |
my ($dom,$context,$usertype) = @_; |
my ($dom,$context,$usertype) = @_; |
my %domconf = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom); |
my %domconf = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom); |
Line 5369 sub roles_by_context {
|
Line 5263 sub roles_by_context {
|
if ($env{'request.role'} =~ m{^dc\./}) { |
if ($env{'request.role'} =~ m{^dc\./}) { |
push(@allroles,'ad'); |
push(@allroles,'ad'); |
} |
} |
if (&Apache::loncommon::needs_gci_custom()) { |
push(@allroles,('ta','ep','in')); |
if ($crstype eq 'Community') { |
if ($crstype eq 'Community') { |
push(@allroles,'co'); |
push(@allroles,'co'); |
} else { |
|
push(@allroles,'cc'); |
|
} |
|
} else { |
} else { |
push(@allroles,('ta','ep','in')); |
push(@allroles,'cc'); |
if ($crstype eq 'Community') { |
} |
push(@allroles,'co'); |
if ($custom) { |
} else { |
push(@allroles,'cr'); |
push(@allroles,'cc'); |
|
} |
|
if ($custom) { |
|
push(@allroles,'cr'); |
|
} |
|
} |
} |
} elsif ($context eq 'author') { |
} elsif ($context eq 'author') { |
@allroles = ('ca','aa'); |
@allroles = ('ca','aa'); |