--- loncom/interface/Attic/londropadd.pm 2005/04/19 03:58:23 1.129
+++ loncom/interface/Attic/londropadd.pm 2008/11/17 15:48:46 1.175
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to drop and add students in courses
#
-# $Id: londropadd.pm,v 1.129 2005/04/19 03:58:23 matthew Exp $
+# $Id: londropadd.pm,v 1.175 2008/11/17 15:48:46 jms Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -26,8 +26,23 @@
# http://www.lon-capa.org/
#
#
-###############################################################
-##############################################################
+
+=head1 NAME
+
+Apache::londropadd
+
+=head1 SYNOPSIS
+
+drop & add students
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 SUBROUTINES
+
+=over
+
+=cut
package Apache::londropadd;
@@ -39,34 +54,39 @@ use Apache::Constants qw(:common :http R
use Spreadsheet::WriteExcel;
use Apache::lonstathelpers();
use Apache::lonlocal;
+use Apache::longroup;
+use LONCAPA();
-###############################################################
-###############################################################
sub header {
- my $html=&Apache::lonxml::xmlbegin();
- my $bodytag=&Apache::loncommon::bodytag('Enrollment Manager');
- my $title = &mt('LON-CAPA Enrollment Manager');
+ my ($jscript,$loaditems) = @_;
+ my $start_page;
+ if (ref($loaditems) eq 'HASH') {
+ $start_page=&Apache::loncommon::start_page('Enrollment Manager',$jscript,{'add_entries' => $loaditems,});
+ } else {
+ $start_page=&Apache::loncommon::start_page('Enrollment Manager',$jscript);
+ }
return(<<ENDHEAD);
-$html
-<head>
-<title>$title</title>
-</head>
-$bodytag
+$start_page
<form method="post" enctype="multipart/form-data"
action="/adm/dropadd" name="studentform">
ENDHEAD
}
-###############################################################
-###############################################################
-# Drop student from all sections of a course, except optional $csec
+=pod
+
+=item modifystudent()
+
+ Drop student from all sections of a course, except optional $csec
+
+=cut
+
sub modifystudent {
my ($udom,$unam,$courseid,$csec,$desiredhost)=@_;
# if $csec is undefined, drop the student from all the courses matching
# this one. If $csec is defined, drop them from all other sections of
# this course and add them to section $csec
- $courseid=~s/\_/\//g;
- $courseid=~s/^(\w)/\/$1/;
+ my $cdom = $env{'course.'.$courseid.'.domain'};
+ my $cnum = $env{'course.'.$courseid.'.num'};
my %roles = &Apache::lonnet::dump('roles',$udom,$unam);
my ($tmp) = keys(%roles);
# Bail out if we were unable to get the students roles
@@ -74,16 +94,16 @@ sub modifystudent {
# Go through the roles looking for enrollment in this course
my $result = '';
foreach my $course (keys(%roles)) {
- if ($course=~/^$courseid(?:\/)*(?:\s+)*(\w+)*\_st$/) {
+ if ($course=~m{^/\Q$cdom\E/\Q$cnum\E(?:\/)*(?:\s+)*(\w+)*\_st$}) {
# We are in this course
my $section=$1;
- $section='' if ($course eq $courseid.'_st');
+ $section='' if ($course eq "/$cdom/$cnum".'_st');
if (defined($csec) && $section eq $csec) {
$result .= 'ok:';
} elsif ( ((!$section) && (!$csec)) || ($section ne $csec) ) {
my (undef,$end,$start)=split(/\_/,$roles{$course});
my $now=time;
- # if this is an active role
+ # if this is an active role
if (!($start && ($now<$start)) || !($end && ($now>$end))) {
my $reply=&Apache::lonnet::modifystudent
# dom name id mode pass f m l g
@@ -102,15 +122,20 @@ sub modifystudent {
return $result;
}
-###############################################################
-###############################################################
-# build a domain and server selection form
+=pod
+
+=item domain_form()
+
+ build a domain and server selection form
+
+=cut
+
sub domain_form {
my ($defdom) = @_;
# Set up domain and server selection forms
#
# Get the domains
- my @domains = &Apache::loncommon::get_domains();
+ my @domains = &Apache::lonnet::all_domains();
# build up the menu information to be passed to
# &Apache::loncommon::linked_select_forms
my %select_menus;
@@ -121,7 +146,7 @@ sub domain_form {
$select_menus{$dom}->{'default'}= 'default';
$select_menus{$dom}->{'select2'}->{'default'} = 'default';
# Now build up the other items in the second menu
- my %servers = &Apache::loncommon::get_library_servers($dom);
+ my %servers = &Apache::lonnet::get_servers($dom,'library');
foreach my $server (keys(%servers)) {
$select_menus{$dom}->{'select2'}->{$server}
= "$server $servers{$server}";
@@ -133,44 +158,77 @@ sub domain_form {
return $result;
}
-###############################################################
-###############################################################
-# Menu Phase One
+=pod
+
+=item print_main_menu()
+
+ Menu Phase One
+
+=cut
+
sub print_main_menu {
- my ($r,$enrl_permission,$view_permission)=@_;
+ my ($r,$permission)=@_;
#
- my ($cdom,$cnum) = split/_/,$env{'request.course.id'};
+ my $cid =$env{'request.course.id'};
+ my $cdom=$env{'course.'.$cid.'.domain'};
+ my $cnum=$env{'course.'.$cid.'.num'};
my @menu =
(
{ text => 'Upload a class list',
help => 'Course_Create_Class_List',
action => 'upload',
- permission => $enrl_permission,
+ permission => $permission->{'enrl'},
},
{ text => 'Enroll a single student',
help => 'Course_Add_Student',
action => 'enrollstudent',
- permission => $enrl_permission,
+ permission => $permission->{'enrl'},
},
{ text => 'Modify student data',
help => 'Course_Modify_Student_Data',
action => 'modifystudent',
- permission => $enrl_permission,
+ permission => $permission->{'enrl'},
},
{ text => 'View Class List',
help => 'Course_View_Class_List',
action => 'classlist',
- permission => $view_permission,
+ permission => $permission->{'view'},
},
{ text => 'Drop Students',
help => 'Course_Drop_Student',
action => 'drop',
- permission => $enrl_permission,
+ permission => $permission->{'enrl'},
},
{ text => 'Automated Enrollment Manager',
- permission => &Apache::lonnet::auto_run($cnum,$cdom),
+ permission => (&Apache::lonnet::auto_run($cnum,$cdom)
+ && $permission->{'enrl'}),
url => '/adm/populate',
},
+ { text => 'Create a new group',
+ help => 'Course_Create_Group',
+ permission => $permission->{'grp_manage'},
+ url => '/adm/coursegroups?refpage=enrl&action=create',
+ },
+ { text => 'Modify an existing group',
+ help => 'Course_Modify_Group',
+ permission => $permission->{'grp_manage'},
+ url => '/adm/coursegroups?refpage=enrl&action=modify',
+ },
+ { text => 'Delete an existing group',
+ help => 'Course_Delete_Group',
+ permission => $permission->{'grp_manage'},
+ url => '/adm/coursegroups?refpage=enrl&action=delete',
+ },
+ { text => 'Re-enable a deleted group',
+ help => 'Course_Reenable_Group',
+ permission => $permission->{'grp_manage'},
+ url => '/adm/coursegroups?refpage=enrl&action=reenable',
+ },
+ { text => 'Enter an existing group',
+ help => 'Course_Display_Group',
+ permission => $permission->{'grp_view'},
+ url => '/adm/coursegroups?refpage=enrl&action=view',
+ },
);
my $menu_html = '';
foreach my $menu_item (@menu) {
@@ -194,13 +252,15 @@ sub print_main_menu {
return;
}
-###############################################################
-###############################################################
+
+
sub hidden_input {
my ($name,$value) = @_;
return '<input type="hidden" name="'.$name.'" value="'.$value.'" />'."\n";
}
+
+
sub print_upload_manager_header {
my ($r,$datatoken,$distotal,$krbdefdom)=@_;
my $javascript;
@@ -232,9 +292,10 @@ sub print_upload_manager_header {
$password_choice = 'int';
}
#
- my $javascript_validations=&javascript_validations('auth',$krbdefdom,
- $password_choice);
- my $checked=(($env{'form.noFirstLine'})?' checked="1"':'');
+ my $javascript_validations =
+ &javascript_validations('auth',$krbdefdom,$password_choice,undef,
+ $env{'request.role.domain'});
+ my $checked=(($env{'form.noFirstLine'})?' checked="checked" ':'');
$r->print('<h3>'.&mt('Uploading Class List')."</h3>\n".
"<hr>\n".
'<h3>'.&mt('Identify fields')."</h3>\n");
@@ -253,17 +314,19 @@ sub print_upload_manager_header {
$r->print('<input type="button" value="Reverse Association" '.
'name="'.&mt('Reverse Association').'" '.
'onClick="javascript:this.form.associate.value=\'Reverse Association\';submit(this.form);" />');
- $r->print('<input type="checkbox" name="noFirstLine" $checked />'.
- &mt('Ignore First Line'));
+ $r->print('<label><input type="checkbox" name="noFirstLine"'.$checked.'/>'.
+ &mt('Ignore First Line').'</label>');
$r->print("<hr />\n".
'<script type="text/javascript" language="Javascript">'."\n".
$javascript."\n".$javascript_validations.'</script>');
}
-###############################################################
-###############################################################
+
+
+
+
sub javascript_validations {
- my ($mode,$krbdefdom,$curr_authtype,$curr_authfield)=@_;
+ my ($mode,$krbdefdom,$curr_authtype,$curr_authfield,$domain)=@_;
my $authheader;
if ($mode eq 'auth') {
my %param = ( formname => 'studentform',
@@ -272,7 +335,7 @@ sub javascript_validations {
$authheader = &Apache::loncommon::authform_header(%param);
} elsif ($mode eq 'createcourse') {
my %param = ( formname => 'ccrs',
- kerb_def_dom => $krbdefdom,
+ kerb_def_dom => $krbdefdom,
curr_authtype => $curr_authtype );
$authheader = &Apache::loncommon::authform_header(%param);
} elsif ($mode eq 'modifycourse') {
@@ -292,7 +355,7 @@ sub javascript_validations {
ipass => 'You need to specify the initial password.',
name => 'The optional name field was not specified.',
snum => 'The optional student number field was not specified.',
- section => 'The optional section or group field was not specified.',
+ section => 'The optional section field was not specified.',
email => 'The optional email address field was not specified.',
continue => 'Continue enrollment?',
);
@@ -301,6 +364,7 @@ sub javascript_validations {
my $function_name =(<<END);
function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail) {
END
+ my ($authnum,%can_assign) = &Apache::loncommon::get_assignable_auth($domain);
my $auth_checks;
if ($mode eq 'createcourse') {
$auth_checks .= (<<END);
@@ -315,9 +379,13 @@ END
$auth_checks .= (<<END);
var foundatype=0;
if (founduname==0) {
- alert('$alert{'username'}');
+ alert('$alert{'username'}');
return;
}
+
+END
+ if ($authnum > 1) {
+ $auth_checks .= (<<END);
// alert('current.radiovalue = '+current.radiovalue);
if (current.radiovalue == null || current.radiovalue == '' || current.radiovalue == 'nochange') {
// They did not check any of the login radiobuttons.
@@ -325,6 +393,7 @@ END
return;
}
END
+ }
}
if ($mode eq 'createcourse') {
$auth_checks .= "
@@ -378,6 +447,7 @@ END
}
END
}
+ my $section_checks;
my $optional_checks = '';
if ( ($mode eq 'createcourse') || ($mode eq 'modifycourse') ) {
$optional_checks = (<<END);
@@ -385,6 +455,7 @@ END
}
END
} else {
+ $section_checks = &Apache::lonuserutils::section_check_js();
$optional_checks = (<<END);
var message='';
if (foundname==0) {
@@ -425,18 +496,19 @@ END
if ( ($mode eq 'auth') || ($mode eq 'createcourse') || ($mode eq 'modifycourse') ) {
$result .= $auth_checks;
}
- $result .= $optional_checks;
+ $result .= $optional_checks."\n".$section_checks;
if ( ($mode eq 'auth') || ($mode eq 'createcourse') || ($mode eq 'modifycourse') ) {
$result .= $authheader;
}
return $result;
}
-###############################################################
-###############################################################
+
+
+
sub upload_manager_javascript_forward_associate {
return(<<ENDPICK);
-function verify(vf) {
+function verify(vf,sec_caller) {
var founduname=0;
var foundpwd=0;
var foundname=0;
@@ -525,11 +597,12 @@ function clearpwd(vf) {
ENDPICK
}
-###############################################################
-###############################################################
+
+
+
sub upload_manager_javascript_reverse_associate {
return(<<ENDPICK);
-function verify(vf) {
+function verify(vf,sec_caller) {
var founduname=0;
var foundpwd=0;
var foundname=0;
@@ -580,8 +653,9 @@ function clearpwd(vf) {
ENDPICK
}
-###############################################################
-###############################################################
+
+
+
sub print_upload_manager_footer {
my ($r,$i,$keyfields,$defdom,$today,$halfyear)=@_;
@@ -607,6 +681,7 @@ sub print_upload_manager_footer {
$Str .= '<h3>'.&mt('Login Type')."</h3>\n";
$Str .= "<p>\n".
&mt('Note: this will not take effect if the user already exists').
+ &Apache::loncommon::help_open_topic('Auth_Options').
"</p><p>\n";
$Str .= $krbform."\n</p><p>\n".
$intform."\n</p><p>\n".
@@ -616,15 +691,16 @@ sub print_upload_manager_footer {
$Str .= "<h3>".&mt('Starting and Ending Dates')."</h3>\n";
$Str .= "<p>\n".$date_table."</p>\n";
$Str .= "<h3>".&mt('Full Update')."</h3>\n";
- $Str .= '<input type="checkbox" name="fullup" value="yes">'.
+ $Str .= '<label><input type="checkbox" name="fullup" value="yes">'.
' '.&mt('Full update (also print list of users not enrolled anymore)').
- "</p>\n";
+ "</label></p>\n";
$Str .= "<h3>".&mt('Student Number')."</h3>\n";
- $Str .= "<p>\n".'<input type="checkbox" name="forceid" value="yes">';
+ $Str .= "<p>\n".'<label><input type="checkbox" name="forceid" value="yes">';
$Str .= &mt('Disable ID/Student Number Safeguard and Force Change '.
'of Conflicting IDs (only do if you know what you are doing)').
- "\n</p><p>\n";
- $Str .= '<input type="button" onClick="javascript:verify(this.form)" '.
+ "</label>\n</p><p>\n";
+ $Str .= '<input type="button"'.
+ 'onClick="javascript:verify(this.form,this.form.csec)" '.
'value="Update Class List" />'."<br />\n";
$Str .= &mt('Note: for large courses, this operation may be time '.
'consuming');
@@ -632,8 +708,9 @@ sub print_upload_manager_footer {
return;
}
-###############################################################
-###############################################################
+
+
+
sub print_upload_manager_form {
my $r=shift;
@@ -685,7 +762,7 @@ sub print_upload_manager_form {
['lname',&mt('Last Name'), $env{'form.lname_choice'}],
['gen', &mt('Generation'), $env{'form.gen_choice'}],
['id', &mt('ID/Student Number'),$env{'form.id_choice'}],
- ['sec', &mt('Group/Section'), $env{'form.sec_choice'}],
+ ['sec', &mt('Section'), $env{'form.sec_choice'}],
['ipwd', &mt('Initial Password'),$env{'form.ipwd_choice'}],
['email',&mt('EMail Address'), $env{'form.email_choice'}]);
if ($env{'form.upfile_associate'} eq 'reverse') {
@@ -707,10 +784,12 @@ sub print_upload_manager_form {
&print_upload_manager_footer($r,$i,$keyfields,$defdom,$today,$halfyear);
}
-###############################################################
-###############################################################
+
+
+
+
sub enroll_single_student {
- my $r=shift;
+ my ($r,$srcharray) = @_;
# Remove non alphanumeric values from section
$env{'form.csec'}=~s/\W//g;
#
@@ -718,23 +797,28 @@ sub enroll_single_student {
# in the course is entirely separate from the action of enrolling the
# student. Also, a failure in setting the dates as default is not fatal
# to the process of enrolling / modifying a student.
- my ($startdate,$enddate) = &get_dates_from_form();
+ my ($startdate,$enddate) = &Apache::lonuserutils::get_dates_from_form();
if ($env{'form.makedatesdefault'}) {
- $r->print(&make_dates_default($startdate,$enddate));
+ $r->print(&Apache::lonuserutils::make_dates_default($startdate,
+ $enddate));
}
$r->print('<h3>'.&mt('Enrolling Student').'</h3>');
- $r->print('<p>'.&mt('Enrolling').' '.$env{'form.cuname'}." \@ ".
- $env{'form.lcdomain'}.'</p>');
- if (($env{'form.cuname'})&&($env{'form.cuname'}!~/\W/)&&
- ($env{'form.lcdomain'})&&($env{'form.lcdomain'}!~/\W/)) {
+ $r->print('<p>'.&mt('Enrolling [_1] : [_2]',$env{'form.cuname'},
+ $env{'form.lcdomain'}).'</p>');
+ if (($env{'form.cuname'})
+ && ($env{'form.cuname'}
+ eq &LONCAPA::clean_username($env{'form.cuname'}))
+ && ($env{'form.lcdomain'})
+ && ($env{'form.lcdomain'}
+ eq &LONCAPA::clean_domain($env{'form.lcdomain'}))) {
# Deal with home server selection
my $domain=$env{'form.lcdomain'};
my $desiredhost = $env{'form.lcserver'};
if (lc($desiredhost) eq 'default') {
$desiredhost = undef;
} else {
- my %home_servers =&Apache::loncommon::get_library_servers($domain);
+ my %home_servers =&Apache::lonnet::get_servers($domain,'library');
if (! exists($home_servers{$desiredhost})) {
$r->print('<font color="#ff0000">'.&mt('Error').':</font>'.
&mt('Invalid home server specified'));
@@ -761,7 +845,7 @@ sub enroll_single_student {
$env{'form.lcdomain'});
if ((($amode) && ($genpwd)) || ($home ne 'no_host')) {
# Clean out any old roles the student has in this class.
- &modifystudent($env{'form.lcdomain'},$env{'form.cuname'},
+ &Apache::lonuserutils::modifystudent($env{'form.lcdomain'},$env{'form.cuname'},
$env{'request.course.id'},$env{'form.csec'},
$desiredhost);
my $login_result = &Apache::lonnet::modifystudent
@@ -790,6 +874,22 @@ sub enroll_single_student {
} else {
$r->print(&mt('Invalid username or domain'));
}
+ $r->print("<p><a href='/adm/dropadd?action=enrollstudent'>".&mt("Enroll another student")."</a></p>");
+ if (ref($srcharray) eq 'ARRAY') {
+ foreach my $item (@{$srcharray},'ccuname','ccdomain') {
+ $r->print('<input type="hidden" name="'.$item.'" value="'.$env{'form.'.$item}.'" />'."\n");
+ }
+ }
+ foreach my $item ('sortby','seluname','seludom') {
+ if (exists($env{'form.'.$item})) {
+ $r->print('<input type="hidden" name="'.$item.'" value="'.$env{'form.'.$item}.'" />'."\n");
+ }
+ }
+ $r->print('<input type="hidden" name="phase" value="get_user_info" />'."\n".
+ '<input type="hidden" name="currstate" value="" />'."\n".
+ '<input type="hidden" name="prevphase" value="" />'."\n".
+ '<input type="hidden" name="action" value="enrollstudent" />'."\n".
+ '<input type="hidden" name="state" value="gotusername" />');
}
sub setup_date_selectors {
@@ -852,16 +952,17 @@ sub date_setting_table {
my ($starttime,$endtime,$mode) = @_;
my ($startform,$endform)=&setup_date_selectors($starttime,$endtime,$mode);
my $dateDefault = '<nobr>'.
- '<input type="checkbox" name="makedatesdefault" /> '.
- &mt('make these dates the default for future enrollment');
+ '<label><input type="checkbox" name="makedatesdefault" /> '.
+ &mt('make these dates the default for future enrollment').
+ '</label></nobr>';
if ($mode eq 'create_enrolldates' || $mode eq 'create_defaultdates') {
$dateDefault = ' ';
}
- my $perpetual = '<nobr><input type="checkbox" name="no_end_date"';
+ my $perpetual = '<nobr><label><input type="checkbox" name="no_end_date"';
if (defined($endtime) && $endtime == 0) {
$perpetual .= ' checked';
}
- $perpetual.= ' /> '.&mt('no ending date').'</nobr>';
+ $perpetual.= ' /> '.&mt('no ending date').'</label></nobr>';
if ($mode eq 'create_enrolldates') {
$perpetual = ' ';
}
@@ -889,7 +990,8 @@ sub make_dates_default {
$result .= "Set default start and end dates for course<br />";
#
# Refresh the course environment
- &Apache::lonnet::coursedescription($env{'request.course.id'});
+ &Apache::lonnet::coursedescription($env{'request.course.id'},
+ {'freshen_cache' => 1});
} else {
$result .= &mt('Unable to set default dates for course').":".$put_result.
'<br />';
@@ -897,13 +999,32 @@ sub make_dates_default {
return $result;
}
-##
-## Single student enrollment routines (some of them)
-##
+=pod
+
+=item get_student_username_domain_form()
+
+ Single student enrollment routines (some of them)
+
+=cut
+
sub get_student_username_domain_form {
- my $r = shift;
- my $domform = &Apache::loncommon::select_dom_form
- ($env{'course.'.$env{'request.course.id'}.'.domain'},'cudomain',0);
+ my ($r,$elements,$response,$srch,$forcenewuser) = @_;
+ my $loaditems = {
+ 'onload' => "javascript:setFormElements(document.studentform)",
+ };
+ $r->print(&header(undef,$loaditems));
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"javascript:backPage(document.studentform,'','')",
+ text=>"Single user search"});
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Enroll Student',
+ 'Course_Add_Student'));
+ my $defdom=$env{'request.role.domain'};
+
+ my $jscript = &Apache::loncommon::studentbrowser_javascript()."\n".
+ '<script type="text/javascript">'."\n".
+ &Apache::lonhtmlcommon::set_form_elements($elements->{'studentform'}).
+ '</script>'."\n";
+
my %lt=&Apache::lonlocal::texthash(
'eos' => "Enroll One Student",
'usr' => "Username",
@@ -911,36 +1032,49 @@ sub get_student_username_domain_form {
'been' => "Begin Enrollment",
);
$r->print(<<END);
-<input type="hidden" name="action" value="enrollstudent" />
-<input type="hidden" name="state" value="gotusername" />
+$jscript
<h3>$lt{'eos'}</h3>
-<table>
-<tr><th>$lt{'usr'}:</th>
- <td><input type="text" name="cuname" size="15" /></td></tr>
-<tr><th>$lt{'dom'}:</th>
- <td>$domform</td></tr>
-<tr><th> </th>
- <td>
- <input type="submit" name="Begin Enrollment" value="$lt{'been'}" />
- </td></tr>
-</table>
-<script type="text/javascript">
-// the if prevents the script error if the browser can not handle this
-if ( document.studentform.cuname ) { document.studentform.cuname.focus(); }
-</script>
END
+ $r->print($response);
+ $r->print(&single_user_entry_form($defdom,$srch,$forcenewuser));
return;
}
+sub single_user_entry_form {
+ my ($dom,$srch,$forcenewuser) = @_;
+ my $userpicker =
+ &Apache::loncommon::user_picker($dom,$srch,$forcenewuser,
+ 'document.studentform');
+ my $srchbutton = &mt('Search');
+ my $output = <<"ENDDOCUMENT";
+<input type="hidden" name="action" value="enrollstudent" />
+<input type="hidden" name="state" value="gotusername" />
+<input type="hidden" name="phase" value="get_user_info" />
+$userpicker
+<input name="userrole" type="button" value="$srchbutton" onclick="javascript:validateEntry(document.studentform)" />
+ENDDOCUMENT
+ return $output;
+}
+
sub print_enroll_single_student_form {
- my $r=shift;
+ my ($r,$jscript,$ccuname,$ccdomain,$srch) = @_;
+ $r->print(&header($jscript));
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"javascript:backPage(document.studentform,'','')",
+ text=>"Single user search"});
+ if ($env{'form.phase'} eq 'userpicked') {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"javascript:backPage(document.studentform,'get_user_info','select')",
+ text=>"Select user",});
+ }
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"javascript:backPage(document.studentform,'$env{'form.phase'}','modify')",
+ text=>"Set enrollment",});
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Enroll Student',
+ 'Course_Add_Student'));
$r->print("<h3>".&mt('Enroll One Student')."</h3>");
#
- my $username = $env{'form.cuname'};
- my $domain = $env{'form.cudomain'};
- $username=~s/\W//gs;
- $domain=~s/\W//gs;
- my $home = &Apache::lonnet::homeserver($username,$domain);
+ my $home = &Apache::lonnet::homeserver($ccuname,$ccdomain);
# $new_user flags whether we are creating a new user or using an old one
my $new_user = 1;
if ($home ne 'no_host') {
@@ -950,11 +1084,34 @@ sub print_enroll_single_student_form {
my $user_data_html = '';
my $javascript_validations = '';
if ($new_user) {
+ my $usertoadd;
+ my $instsrch = {
+ srchin => 'instd',
+ srchby => 'uname',
+ srchtype => 'exact',
+ srchterm => $ccuname,
+ srchdomain => $ccdomain,
+ };
+ if (($instsrch->{'srchterm'} ne '') && ($instsrch->{'srchdomain'} ne '')) {
+ $usertoadd = $instsrch->{'srchterm'}.':'.$instsrch->{'srchdomain'};
+ }
+ my (%dirsrch_results,%inst_results);
+ if ($usertoadd) {
+ if (&Apache::loncreateuser::directorysrch_check($instsrch) eq 'ok') {
+ %dirsrch_results = &Apache::lonnet::inst_directory_query($instsrch);
+ if (ref($dirsrch_results{$usertoadd}) eq 'HASH') {
+ %inst_results = %{$dirsrch_results{$usertoadd}};
+ }
+ }
+ }
+
my $defdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
# Set up authentication forms
my ($krbdef,$krbdefdom) =
- &Apache::loncommon::get_kerberos_defaults($domain);
- $javascript_validations=&javascript_validations('auth',$krbdefdom);
+ &Apache::loncommon::get_kerberos_defaults($ccdomain);
+ $javascript_validations =
+ &Apache::lonuserutils::javascript_validations('auth',$krbdefdom,
+ undef,undef,$ccdomain);
my %param = ( formname => 'document.studentform',
kerb_def_dom => $krbdefdom,
kerb_def_auth => $krbdef
@@ -965,7 +1122,7 @@ sub print_enroll_single_student_form {
#
# Set up domain selection form
my $homeserver_form = '';
- my %servers = &Apache::loncommon::get_library_servers($domain);
+ my %servers = &Apache::lonnet::get_servers($ccdomain,'library');
$homeserver_form = '<select name="lcserver" size="1">'."\n".
'<option value="default" selected>default</option>'."\n";
while (my ($servername,$serverdescription) = each (%servers)) {
@@ -976,47 +1133,51 @@ sub print_enroll_single_student_form {
#
#
my %lt=&Apache::lonlocal::texthash(
- 'udf' => "User Data for",
+ 'udf' => "Personal Data",
'fn' => "First Name",
'mn' => "Middle Name",
'ln' => "Last Name",
'gen' => "Generation",
'hs' => "Home Server",
- 'pswd' => "Password",
+ 'pswd' => "Login Data",
'psam' => "Please select an authentication mechanism",
'mail' => "Email Address"
);
+ my $authhelp=&Apache::loncommon::help_open_topic('Auth_Options');
$user_data_html = <<END;
-<h3>$lt{'udf'} $username\@$domain</h3>
+<h3>$lt{'udf'} $ccuname:$ccdomain</h3>
<table>
-<tr><th>$lt{'fn'}:</th>
- <td><input type="text" name="cfirst" size="15"></td></tr>
-<tr><th>$lt{'mn'}:</th>
- <td><input type="text" name="cmiddle" size="15"></td></tr>
-<tr><th>$lt{'ln'}:</th>
- <td><input type="text" name="clast" size="15"></td></tr>
-<tr><th>$lt{'gen'}:</th>
- <td><input type="text" name="cgen" size="5"> </td></tr>
-<tr><th>$lt{'hs'}:</th>
+<tr><td class="LC_dropadd_labeltext"><label for="cfirst">$lt{'fn'}</label>:</td>
+ <td><input type="text" name="cfirst" size="15" value="$inst_results{'firstname'}" /></td></tr>
+<tr><td class="LC_dropadd_labeltext"><label for="cmiddle">$lt{'mn'}</label>:</td>
+ <td><input type="text" name="cmiddle" size="15" value="$inst_results{'middlename'}" /></td></tr>
+<tr><td class="LC_dropadd_labeltext"><label for="clast">$lt{'ln'}</label>:</td>
+ <td><input type="text" name="clast" size="15" value="$inst_results{'lastname'}" /></td></tr>
+<tr><td class="LC_dropadd_labeltext"><label for="cgen">$lt{'gen'}</label>:</td>
+ <td><input type="text" name="cgen" size="5" value="$inst_results{'generation'}" /> </td></tr>
+<tr><td class="LC_dropadd_labeltext"><label for="lcserver">$lt{'hs'}</label>:</td>
<td>$homeserver_form</td></tr>
-<tr><th>$lt{'mail'}:</th>
- <td><input type="text" name="emailaddress" size="20" /></td></tr>
+<tr><td class="LC_dropadd_labeltext"><label for="emailaddress">$lt{'mail'}</label>:</td>
+ <td><input type="text" name="emailaddress" size="20" value="$inst_results{'permanentemail'}" /></td></tr>
</table>
<h3>$lt{'pswd'}</h3>
-$lt{'psam'}
-<table>
+$lt{'psam'}$authhelp
<p>
-$krbform
-<br />
-$intform
-<br />
-$locform
-</p>
END
+ if ($krbform ne '') {
+ $user_data_html .= $krbform.'<br />';
+ }
+ if ($intform ne '') {
+ $user_data_html .= $intform.'<br />';
+ }
+ if ($locform ne '') {
+ $user_data_html .= $locform.'<br />';
+ }
+ $user_data_html .= "\n</p>\n"
} else {
# User already exists. Do not worry about authentication
- my %uenv = &Apache::lonnet::dump('environment',$domain,$username);
- $javascript_validations = &javascript_validations('noauth');
+ my %uenv = &Apache::lonnet::dump('environment',$ccdomain,$ccuname);
+ $javascript_validations = &Apache::lonuserutils::javascript_validations('noauth');
my %lt=&Apache::lonlocal::texthash(
'udf' => "User Data for",
'fn' => "First Name",
@@ -1026,48 +1187,38 @@ END
'mail' => "Email Address",
);
$user_data_html = <<END;
-<h3>$lt{'udf'} $username\@$domain</h3>
+<h3>$lt{'udf'} $ccuname:$ccdomain</h3>
<input type="hidden" name="lcserver" value="default" />
<table>
-<tr><th>$lt{'fn'}:</th>
- <td>
- <input type="text" name="cfirst" value="$uenv{'firstname'}" size="15" />
- </td></tr>
-<tr><th>$lt{'mn'}:</th>
- <td>
- <input type="text" name="cmiddle" value="$uenv{'middlename'}" size="15" />
- </td></tr>
-<tr><th>$lt{'ln'}:</th>
- <td>
- <input type="text" name="clast"value="$uenv{'lastname'}" size="15" />
- </td></tr>
-<tr><th>$lt{'gen'}:</th>
- <td>
- <input type="text" name="cgen" value="$uenv{'generation'}" size="5" />
- </td></tr>
-<tr><th>$lt{'mail'}:</th>
- <td>
- <input type="text" name="emailaddress" value="$uenv{'permanentemail'}" size="20" />
- </td></tr>
+<tr><td class="LC_dropadd_labeltext"><label for="cfirst">$lt{'fn'}</label>:</td>
+ <td><input type="text" name="cfirst" value="$uenv{'firstname'}" size="15" /></td></tr>
+<tr><td class="LC_dropadd_labeltext"><label for="cmiddle">$lt{'mn'}</label>:</td>
+ <td><input type="text" name="cmiddle" value="$uenv{'middlename'}" size="15" /></td></tr>
+<tr><td class="LC_dropadd_labeltext"><label for="clast">$lt{'ln'}</label>:</td>
+ <td><input type="text" name="clast" value="$uenv{'lastname'}" size="15" /></td></tr>
+<tr><td class="LC_dropadd_labeltext"><label for="cgen">$lt{'gen'}</label>:</td>
+ <td><input type="text" name="cgen" value="$uenv{'generation'}" size="5" /> </td></tr>
+<tr><td class="LC_dropadd_labeltext"><label for="emailaddress">$lt{'mail'}</label>:</td>
+ <td><input type="text" name="emailaddress" value="$uenv{'permanentemail'}" size="20" /></td></tr>
</table>
END
}
- my $date_table = &date_setting_table();
+ my $date_table = &Apache::lonuserutils::date_setting_table();
# Print it all out
my %lt=&Apache::lonlocal::texthash(
'cd' => "Course Data",
- 'gs' => "Group/Section",
+ 'gs' => "Section",
'idsn' => "ID/Student Number",
'disn' => "Disable ID/Student Number Safeguard and Force Change of Conflicting IDs (only do if you know what you are doing)",
'eas' => "Enroll as student",
);
$r->print(<<END);
<input type="hidden" name="action" value="enrollstudent" />
-<input type="hidden" name="state" value="done" />
-<input type="hidden" name="cuname" value="$username" />
-<input type="hidden" name="lcdomain" value="$domain" />
+<input type="hidden" name="state" value="gotusername" />
+<input type="hidden" name="cuname" value="$ccuname" />
+<input type="hidden" name="lcdomain" value="$ccdomain" />
<script type="text/javascript" language="Javascript">
-function verify(vf) {
+function verify(vf,sec_caller) {
var founduname=0;
var foundpwd=0;
var foundname=0;
@@ -1084,6 +1235,9 @@ function verify(vf) {
}
if ((typeof(vf.csec.value)!="undefined") && (vf.csec.value!='')) {
foundsec=1;
+ if (validate(sec_caller) == "error") {
+ return;
+ }
}
if ((typeof(vf.cstid.value)!="undefined") && (vf.cstid.value!='')) {
foundid=1;
@@ -1107,24 +1261,45 @@ $user_data_html
<h3>$lt{'cd'}</h3>
-<p>$lt{'gs'}: <input type="text" name="csec" size="5" />
-<p>
-$date_table
+<p><label for="csec">$lt{'gs'}</label>: <input type="text" name="csec" size="5" />
</p>
+$date_table
<h3>$lt{'idsn'}</h3>
<p>
-$lt{'idsn'}: <input type="text" name="cstid" size="10">
+<label for="cstid">$lt{'idsn'}</label>: <input type="text" name="cstid" size="10" />
</p><p>
-<input type="checkbox" name="forceid" value="yes">
+<label>
+<input type="checkbox" name="forceid" value="yes" />
$lt{'disn'}
+</label>
</p><p>
-<input type="button" onClick="verify(this.form)" value="$lt{'eas'}">
+<input type="button" onClick="verify(this.form,this.form.csec)" value="$lt{'eas'}" />
</p>
END
+ $r->print('<input type="hidden" name="currstate" value="" />'."\n".
+ '<input type="hidden" name="phase" value="" />'."\n".
+ '<input type="hidden" name="prevphase" value="'.$env{'form.phase'}.'" />'."\n");
+ if (ref($srch) eq 'HASH') {
+ foreach my $item (sort(keys(%{$srch}))) {
+ $r->print('<input type="hidden" name="'.$item.'" value="'.$srch->{$item}.'" />'."\n");
+ }
+ }
+ foreach my $item ('sortby','seluname','seludom') {
+ if (exists($env{'form.'.$item})) {
+ $r->print('<input type="hidden" name="'.$item.'" value="'.$env{'form.'.$item}.'" />'."\n");
+ }
+ }
return;
}
-# ========================================================= Menu Phase Two Drop
+=pod
+
+=item print_drop_menu()
+
+ Menu Phase Two Drop
+
+=cut
+
sub print_drop_menu {
my $r=shift;
$r->print("<h3>".&mt('Drop Students')."</h3>");
@@ -1139,18 +1314,26 @@ sub print_drop_menu {
return;
}
-# ============================================== view classlist
+
+=pod
+
+=item print_html_classlist()
+
+ view classlist
+
+=cut
+
sub print_html_classlist {
- my ($r,$mode) = @_;
+ my ($r,$mode,$permission) = @_;
if (! exists($env{'form.sortby'})) {
$env{'form.sortby'} = 'username';
}
- if ($env{'form.Status'} !~ /^(Any|Expired|Active)$/) {
+ if ($env{'form.Status'} !~ /^(Any|Expired|Active|Future)$/) {
$env{'form.Status'} = 'Active';
}
my $status_select = &Apache::lonhtmlcommon::StatusOptions
($env{'form.Status'});
- my $cid=$env{'request.course.id'};
+ my $cid =$env{'request.course.id'};
my $cdom=$env{'course.'.$cid.'.domain'};
my $cnum=$env{'course.'.$cid.'.num'};
#
@@ -1162,10 +1345,11 @@ sub print_html_classlist {
$env{'form.output'} = 'html';
}
#
- $r->print('<br /><table border="2">');
+ $r->print('<br />'.&Apache::loncommon::start_data_table());
foreach my $role (sort keys %coursepersonnel) {
next if ($role =~ /^\s*$/);
- $r->print('<tr><td>'.$role.'</td><td>');
+ $r->print(&Apache::loncommon::start_data_table_row().
+ '<td>'.$role.'</td><td>');
foreach my $user (split(',',$coursepersonnel{$role})) {
my ($puname,$pudom)=split(':',$user);
$r->print(' '.&Apache::loncommon::aboutmewrapper(
@@ -1173,9 +1357,9 @@ sub print_html_classlist {
$pudom),
$puname,$pudom));
}
- $r->print('</td></tr>');
+ $r->print('</td>'.&Apache::loncommon::end_data_table_row());
}
- $r->print('</table>');
+ $r->print(&Apache::loncommon::end_data_table());
#
# Interface output
$r->print('<input type="hidden" name="action" value="'.
@@ -1195,15 +1379,25 @@ sub print_html_classlist {
$output_selector .= "\n".$option;
}
$output_selector .= '</select>';
- $r->print(&mt('Output Format: [_1]',$output_selector).(' 'x3));
+ $r->print('<label>'.&mt('Output Format: [_1]',$output_selector).'</label>'.(' 'x3));
}
- $r->print(&mt('Student Status: [_1]',$status_select)."\n");
+ $r->print('<label>'.&mt('Student Status: [_1]',$status_select)."</label>\n");
$r->print('<input type="submit" value="'.&mt('Update Display').'" />'.
"\n</p>\n");
#
# Print the classlist
$r->print('<h2>'.&mt('Current Class List').'</h2>');
my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist();
+
+ if (exists($permission->{'view_section'})) {
+ my $sec = &Apache::loncoursedata::CL_SECTION();
+ foreach my $student (keys(%{$classlist})) {
+ if ($classlist->{$student}[$sec] ne $permission->{'view_section'}) {
+ delete($classlist->{$student});
+ }
+ }
+ }
+
if (! defined($classlist)) {
$r->print(&mt('There are no students currently enrolled.')."\n");
} else {
@@ -1218,10 +1412,22 @@ sub print_html_classlist {
}
}
-# =================================================== Show student list to drop
+
+=pod
+
+=item show_class_list()
+
+ Show student list to drop
+
+=cut
+
sub show_class_list {
my ($r,$mode,$linkto,$statusmode,$classlist,$keylist)=@_;
my $cid=$env{'request.course.id'};
+ my $cdom = $env{'course.'.$cid.'.domain'};
+ my $cnum = $env{'course.'.$cid.'.num'};
+ my ($classgroups) = &Apache::loncoursedata::get_group_memberships(
+ $classlist,$keylist,$cdom,$cnum);
#
# Variables for excel output
my ($excel_workbook, $excel_sheet, $excel_filename,$row,$format);
@@ -1230,9 +1436,19 @@ sub show_class_list {
my ($CSVfile,$CSVfilename);
#
my $sortby = $env{'form.sortby'};
- if ($sortby !~ /^(username|domain|section|fullname|id|start|end|type)$/) {
+ if ($sortby !~ /^(username|domain|section|groups|fullname|id|start|end|type)$/) {
$sortby = 'username';
}
+ if (! exists($env{'form.displayphotos'})) {
+ $env{'form.displayphotos'} = 'off';
+ }
+ my $displayphotos = $env{'form.displayphotos'};
+
+ if (! exists($env{'form.displayclickers'})) {
+ $env{'form.displayclickers'} = 'off';
+ }
+ my $displayclickers = $env{'form.displayclickers'};
+
# Print out header
unless ($mode eq 'autoenroll') {
$r->print(<<END);
@@ -1241,21 +1457,27 @@ END
}
$r->print(<<END);
<input type="hidden" name="sortby" value="$sortby" />
+<input type="hidden" name="displayphotos" value="$displayphotos" />
+<input type="hidden" name="displayclickers" value="$displayclickers" />
END
if ($mode eq 'html' || $mode eq 'view' || $mode eq 'autoenroll') {
if ($linkto eq 'aboutme') {
- $r->print(&mt('Select a user name to view the users personal page.'));
+ $r->print(&mt("Select a user name to view the user's personal page."));
} elsif ($linkto eq 'modify') {
- $r->print(&mt('Select a user name to modify the students information'));
+ $r->print(&mt("Select a user name to modify the student's information"));
}
my %lt=&Apache::lonlocal::texthash(
'usrn' => "username",
'dom' => "domain",
'sn' => "student name",
'sec' => "section",
+ 'grp' => "active groups",
'start' => "start date",
'end' => "end date",
- 'type' => "enroll type/action"
+ 'type' => "enroll type/action",
+ 'email' => "email address",
+ 'clicker'=> "clicker id",
+ 'photo' => "photo",
);
unless ($mode eq 'autoenroll') {
$r->print(<<END);
@@ -1263,9 +1485,22 @@ END
<input type="hidden" name="sdom" value="" />
END
}
+ if ($env{'course.'.$env{'request.course.id'}.'.internal.showphoto'}) {
+ $r->print('
+<script type="text/javascript">
+function photowindow(photolink) {
+ var title = "Photo_Viewer";
+ var options = "scrollbars=1,resizable=1,menubar=0";
+ options += ",width=240,height=240";
+ stdeditbrowser = open(photolink,title,options,"1");
+ stdeditbrowser.focus();
+}
+</script>
+ ');
+ }
$r->print("
<p>
-<table border=2>
+".&Apache::loncommon::start_data_table()."
<tr>
");
if ($mode eq 'autoenroll') {
@@ -1292,9 +1527,49 @@ END
<a href="javascript:document.studentform.sortby.value='start';document.studentform.submit();">$lt{'start'}</a>
</th><th>
<a href="javascript:document.studentform.sortby.value='end';document.studentform.submit();">$lt{'end'}</a>
+ </th><th>
+ <a href="javascript:document.studentform.sortby.value='groups';document.studentform.submit();">$lt{'grp'}</a>
+ </th><th>
+ <a href="javascript:document.studentform.sortby.value='email';document.studentform.submit();">$lt{'email'}</a>
</th>
- </tr>
END
+
+# Clicker display on or off?
+
+ my %clicker_options = &Apache::lonlocal::texthash(
+ 'on' => 'Show',
+ 'off' => 'Hide',
+ );
+ my $clickerchg = 'on';
+ if ($displayclickers eq 'on') {
+ $clickerchg = 'off';
+ }
+ $r->print(' <th>'."\n".' '.
+ '<a href="javascript:document.studentform.displayclickers.value='.
+ "'".$clickerchg."'".';document.studentform.submit();">'.
+ $clicker_options{$clickerchg}.'</a> '.$lt{'clicker'}."\n".
+ ' </th>'."\n");
+
+# Photo display on or off?
+ if ($env{'course.'.$env{'request.course.id'}.'.internal.showphoto'}) {
+ my %photo_options = &Apache::lonlocal::texthash(
+ 'on' => 'Show',
+ 'off' => 'Hide',
+ );
+ my $photochg = 'on';
+ if ($displayphotos eq 'on') {
+ $photochg = 'off';
+ }
+ $r->print(' <th>'."\n".' '.
+ '<a href="javascript:document.studentform.displayphotos.value='.
+ "'".$photochg."'".';document.studentform.submit();">'.
+ $photo_options{$photochg}.'</a> '.$lt{'photo'}."\n".
+ ' </th>'."\n");
+ }
+ $r->print(" </tr>\n");
+
+# Done with the HTML header line
+
} elsif ($mode eq 'csv') {
#
# Open a file
@@ -1303,9 +1578,9 @@ END
time.'_'.rand(1000000000).'.csv';
unless ($CSVfile = Apache::File->new('>/home/httpd'.$CSVfilename)) {
$r->log_error("Couldn't open $CSVfilename for output $!");
- $r->print("Problems occured in writing the csv file. ".
- "This error has been logged. ".
- "Please alert your LON-CAPA administrator.");
+ $r->print(&mt('Problems occurred in writing the csv file. '
+ .'This error has been logged. '
+ .'Please alert your LON-CAPA administrator.'));
$CSVfile = undef;
}
#
@@ -1313,16 +1588,22 @@ END
if($statusmode eq 'Expired') {
print $CSVfile '"'.&mt('Students with expired roles').'"'."\n";
}
+ if($statusmode eq 'Future') {
+ print $CSVfile '"'.&mt('Students with future roles').'"'."\n";
+ }
if ($statusmode eq 'Any') {
print $CSVfile '"'.join('","',map {
&Apache::loncommon::csv_translate(&mt($_))
} ("username","domain","ID","student name",
- "section","start date","end date","status")).'"'."\n";
+ "section","start date","end date","status",
+ "active groups","email address"))
+ .'"'."\n";
} else {
print $CSVfile '"'.join('","',map {
&Apache::loncommon::csv_translate(&mt($_))
} ("username","domain","ID","student name",
- "section","start date","end date")).'"'."\n";
+ "section","start date","end date",
+ "active groups","email address")).'"'."\n";
}
} elsif ($mode eq 'excel') {
# Create the excel spreadsheet
@@ -1337,9 +1618,13 @@ END
#
$excel_sheet->write($row++,0,["username","domain","ID",
"student name","section",
- "start date","end date","status"],
+ "start date","end date","status",
+ "active groups","email address"],
$format->{'bold'});
}
+
+# Done with header lines in all formats
+
#
# Sort the students
my %index;
@@ -1347,6 +1632,7 @@ END
foreach (@$keylist) {
$index{$_} = $i++;
}
+ $index{'groups'} = scalar(@{$keylist});
my $index = $index{$sortby};
my $second = $index{'username'};
my $third = $index{'domain'};
@@ -1364,16 +1650,28 @@ END
my $lockcount = 0;
foreach my $student (@Sorted_Students) {
my $sdata = $classlist->{$student};
+ my $groups = $classgroups->{$student};
my $username = $sdata->[$index{'username'}];
my $domain = $sdata->[$index{'domain'}];
my $section = $sdata->[$index{'section'}];
+ my $active_groups;
+ if (ref($groups->{active}) eq 'HASH') {
+ $active_groups = join(', ',keys(%{$groups->{'active'}}));
+ }
my $name = $sdata->[$index{'fullname'}];
my $id = $sdata->[$index{'id'}];
my $status = $sdata->[$index{'status'}];
+ next if (($statusmode ne 'Any') && ($status ne $statusmode));
my $start = $sdata->[$index{'start'}];
my $end = $sdata->[$index{'end'}];
my $type = $sdata->[$index{'type'}];
- next if (($statusmode ne 'Any') && ($status ne $statusmode));
+
+ my %emails = &Apache::loncommon::getemails($username,$domain);
+ my $email;
+ if ($emails{'permanentemail'} =~ /\S/) {
+ $email = $emails{'permanentemail'};
+ }
+
if ($mode eq 'view' || $mode eq 'html' || $mode eq 'autoenroll') {
if (! defined($start) || $start == 0) {
$start = &mt('none');
@@ -1385,22 +1683,22 @@ END
} else {
$end = &Apache::lonlocal::locallocaltime($end);
}
- $r->print("<tr>\n ");
+ $r->print(&Apache::loncommon::start_data_table_row());
if ($mode eq 'autoenroll') {
my $lockedtype = $sdata->[$index{'lockedtype'}];
$studentcount++;
my $cellentry;
if ($type eq 'auto') {
- $cellentry = '<b>'.&mt('auto').'</b> <input type="checkbox" name="chgauto" value="'.$username.':'.$domain.'" /> Change';
+ $cellentry = '<b>'.&mt('auto').'</b> <label><input type="checkbox" name="chgauto" value="'.$username.':'.$domain.'" /> Change</label>';
$autocount ++;
} else {
- $cellentry = '<table border="0" cellspacing="0"><tr><td rowspan="2"><b>'.&mt('manual').'</b></td><td><nobr><input type="checkbox" name="chgmanual" value="'.$username.':'.$domain.'" /> Change</nobr></td></tr><tr><td><nobr>';
+ $cellentry = '<table border="0" cellspacing="0"><tr><td rowspan="2"><b>'.&mt('manual').'</b></td><td><nobr><label><input type="checkbox" name="chgmanual" value="'.$username.':'.$domain.'" /> Change</label></nobr></td></tr><tr><td><nobr>';
$manualcount ++;
if ($lockedtype) {
- $cellentry .= '<input type="checkbox" name="unlockchg" value="'.$username.':'.$domain.'" /> '.&mt('Unlock');
+ $cellentry .= '<label><input type="checkbox" name="unlockchg" value="'.$username.':'.$domain.'" /> '.&mt('Unlock').'</label>';
$unlockcount ++;
} else {
- $cellentry .= '<input type="checkbox" name="lockchg" value="'.$username.':'.$domain.'" /> '.&mt('Lock');
+ $cellentry .= '<label><input type="checkbox" name="lockchg" value="'.$username.':'.$domain.'" /> '.&mt('Lock').'</label>';
$lockcount ++;
}
$cellentry .= '</nobr></td></tr></table>';
@@ -1432,8 +1730,36 @@ END
<td>$section</td>
<td>$start</td>
<td>$end</td>
- </tr>
+ <td>$active_groups</td>
+ <td>$email</td>
END
+
+# Clickers
+ if ($displayclickers eq 'on') {
+ my $clickers =
+ (&Apache::lonnet::userenvironment($domain,$username,'clickers'))[1];
+ if ($clickers!~/\w/) { $clickers='-'; }
+ $r->print('<td>'.$clickers.'</td>');
+ } else {
+ $r->print(' <td> </td> ');
+ }
+
+# Photos
+
+ if ($env{'course.'.$env{'request.course.id'}.
+ '.internal.showphoto'}) {
+ if ($displayphotos eq 'on') {
+ my $imgurl =
+ &Apache::lonnet::retrievestudentphoto($domain,
+ $username,'gif',
+ 'thumbnail');
+
+ $r->print(' <td align="right"><a href="javascript:photowindow('."'".&Apache::lonnet::studentphoto($domain,$username,'jpg')."'".')"><img src="'.$imgurl.'" border="1"></a></td>');
+ } else {
+ $r->print(' <td> </td> ');
+ }
+ }
+ $r->print(&Apache::loncommon::end_data_table_row());
} elsif ($mode eq 'csv') {
next if (! defined($CSVfile));
# no need to bother with $linkto
@@ -1454,6 +1780,8 @@ END
if ($statusmode eq 'Any') {
push @line,&Apache::loncommon::csv_translate($status);
}
+ push @line,&Apache::loncommon::csv_translate($active_groups);
+ push @line,&Apache::loncommon::csv_translate($email);
print $CSVfile '"'.join('","',@line).'"'."\n";
} elsif ($mode eq 'excel') {
$excel_sheet->write($row,0,[$username,$domain,$id,
@@ -1469,11 +1797,13 @@ END
}
}
$excel_sheet->write($row,$col++,$status);
+ $excel_sheet->write($row,$col++,$active_groups);
+ $excel_sheet->write($row,$col++,$email);
$row++;
}
}
if ($mode eq 'view' || $mode eq 'html' || $mode eq 'autoenroll') {
- $r->print('</table><br>');
+ $r->print(&Apache::loncommon::end_data_table().'<br />');
} elsif ($mode eq 'excel') {
$excel_workbook->close();
$r->print('<p><a href="'.$excel_filename.'">'.
@@ -1492,9 +1822,14 @@ END
}
-#
-# print out form for modification of a single students data
-#
+=pod
+
+=item print_modify_student_form()
+
+ print out form for modification of a single students data
+
+=cut
+
sub print_modify_student_form {
my $r = shift();
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
@@ -1505,15 +1840,15 @@ sub print_modify_student_form {
# determine the students name information
my %info=&Apache::lonnet::get('environment',
['firstname','middlename',
- 'lastname','generation','id'],
- $sdom, $sname);
+ 'lastname','generation','id',
+ 'permanentemail'], $sdom, $sname);
my ($tmp) = keys(%info);
if ($tmp =~ /^(con_lost|error|no_such_host)/i) {
$r->print('<font color="#ff0000" size="+2">'.&mt('Error').'</font>'.
'<p>'.
&mt('Unable to retrieve environment data for').' '.$sname.
&mt('in domain').' '.$sdom.'</p><p>'.
- &mt('Please contact your LON-CAPA administrator regarding this situation.').'</p></body></html>');
+ &mt('Please contact your LON-CAPA administrator regarding this situation.').'</p>'.&Apache::loncommon::end_page());
return;
}
# determine the students starting and ending times and section
@@ -1545,10 +1880,11 @@ sub print_modify_student_form {
&Apache::lonlocal::locallocaltime($endtime)).'<br />';
}
- my $date_table = &date_setting_table($starttime,$endtime);
+ my $date_table =
+ &Apache::lonuserutils::date_setting_table($starttime,$endtime);
#
if (! exists($env{'form.Status'}) ||
- $env{'form.Status'} !~ /^(Any|Expired|Active)$/) {
+ $env{'form.Status'} !~ /^(Any|Expired|Active|Future)$/) {
$env{'form.Status'} = 'crap';
}
# Make sure student is enrolled in course
@@ -1560,12 +1896,25 @@ sub print_modify_student_form {
'mn' => "Middle",
'ln' => "Last",
'gen' => "Generation",
+ 'email' => "E-mail address",
'sid' => "Student ID",
'disn' => "Disable ID/Student Number Safeguard and Force Change of Conflicting IDs (only do if you know what you are doing)",
'sec' => "Section",
'sm' => "Submit Modifications",
);
- $r->print(<<END);
+# Check if section name is valid
+ my $section_check = &Apache::lonuserutils::section_check_js();
+ $r->print(<<"END");
+<script type="text/javascript">
+$section_check
+function secverify(formname,caller) {
+ if (validate(caller) == "error") {
+ return;
+ } else {
+ formname.submit();
+ }
+}
+</script>
<p>
<font size="+1">
$lt{'odcc'}
@@ -1577,8 +1926,8 @@ $lt{'odcc'}
<input type="hidden" name="state" value="done" />
<input type="hidden" name="sortby" value="$sortby" />
<input type="hidden" name="Status" value="$env{'form.Status'}" />
-<h2>$lt{'mef'} $info{'firstname'} $info{'middlename'}
-$info{'lastname'} $info{'generation'}, $sname\@$sdom</h2>
+<h3>$lt{'mef'} $info{'firstname'} $info{'middlename'}
+$info{'lastname'} $info{'generation'}, $sname:$sdom</h3>
<p>
<b>$lt{'sn'}</b>
<table>
@@ -1590,34 +1939,45 @@ $info{'lastname'} $info{'generation'}, $
<input type="text" name="generation" value="$info{'generation'}" /></td></tr>
</table>
</p><p>
-<b>$lt{'sid'}</b>: <input type="text" name="id" value="$info{'id'}" size="12"/>
+<b>$lt{'email'}</b>: <input type="text" name="permanentemail" value="$info{'permanentemail'}" size="30" />
+</p><p>
+<b>$lt{'sid'}</b>: <input type="text" name="id" value="$info{'id'}" size="12" />
</p><p>
-<input type="checkbox" name="forceid" >
+<label>
+<input type="checkbox" name="forceid" />
$lt{'disn'}
+</label>
</p><p>
-<b>$lt{'sec'}</b>: <input type="text" name="section" value="$section" size="14"/>
+<b>$lt{'sec'}</b>: <input type="text" name="section" value="$section" size="14" />
</p>
<p>$current_date_description</p>
<p>$date_table</p>
-<input type="submit" value="$lt{'sm'}" />
-</body></html>
+<input type="button" value="$lt{'sm'}" onClick="secverify(this.form,this.form.section)" />
END
+ $r->print(&Apache::loncommon::end_page());
return;
}
-#
-# modify a single students section
-#
+
+=pod
+
+=item modify_single_student()
+
+ modify a single students section
+
+=cut
+
sub modify_single_student {
- my $r = shift;
+ my ($r) = @_;
#
# Remove non alphanumeric values from the section
$env{'form.section'} =~ s/\W//g;
#
# Do the date defaults first
- my ($starttime,$endtime) = &get_dates_from_form();
+ my ($starttime,$endtime) = &Apache::lonuserutils::get_dates_from_form();
if ($env{'form.makedatesdefault'}) {
- $r->print(&make_dates_default($starttime,$endtime));
+ $r->print(&Apache::lonuserutils::make_dates_default($starttime,
+ $endtime));
}
# Get the 'sortby' and 'Status' variables so the user goes back to their
# previous screen
@@ -1631,13 +1991,13 @@ sub modify_single_student {
# Get the old data
my %old=&Apache::lonnet::get('environment',
['firstname','middlename',
- 'lastname','generation','id'],
- $sdom, $slogin);
+ 'lastname','generation','id',
+ 'permanentemail'],$sdom, $slogin);
$old{'section'} = &Apache::lonnet::getsection($sdom,$slogin,
$env{'request.course.id'});
my ($tmp) = keys(%old);
if ($tmp =~ /^(con_lost|error|no_such_host)/i) {
- $r->print(&mt('There was an error determining the environment values for')." $slogin \@ $sdom.");
+ $r->print(&mt('There was an error determining the environment values for')." $slogin : $sdom.");
return;
}
undef $tmp;
@@ -1647,6 +2007,7 @@ sub modify_single_student {
my $middlename = $env{'form.middlename'};
my $lastname = $env{'form.lastname'};
my $generation = $env{'form.generation'};
+ my $permanentemail = $env{'form.permanentemail'};
my $section = $env{'form.section'};
my $courseid = $env{'request.course.id'};
my $sid = $env{'form.id'};
@@ -1671,65 +2032,111 @@ sub modify_single_student {
'mn' => "Middle name",
'ln' => "Last name",
'gen' => "Generation",
+ 'em' => "E-mail address",
'sec' => "Section",
'ri' => "Role Information",
'st' => "Start Time",
'et' => "End Time",
);
$r->print(<<END);
- <h2>$lt{'mdu'} $slogin \@ $sdom </h2>
-<h3>$lt{'si'}</h3>
-<table rules="rows" border="1" cellpadding="3" >
-<tr>
- <th> $lt{'fd'} </th>
- <th> $lt{'ov'} </th>
- <th> $lt{'nv'} </th>
-</tr>
-<tr>
- <td> <b>$lt{'fn'}</b> </td>
- <td> $old{'firstname'} </td>
- <td> $firstname </td>
-</tr><tr>
- <td> <b>$lt{'mn'}</b> </td>
- <td> $old{'middlename'} </td>
- <td> $middlename </td>
-</tr><tr>
- <td> <b>$lt{'ln'}</b> </td>
- <td> $old{'lastname'} </td>
- <td> $lastname </td>
-</tr><tr>
- <td> <b>$lt{'gen'}</b> </td>
- <td> $old{'generation'} </td>
- <td> $generation </td>
-</tr><tr>
- <td> <b>ID</b> </td>
- <td> $old{'id'} </td>
- <td> $sid </td>
-</tr><tr>
- <td> <b>$lt{'sec'}</b> </td>
- <td> $old{'section'} </td>
- <td> $section</td>
-</tr>
-</table>
-<h3>$lt{'ri'}</h3>
+ <h3>$lt{'mdu'} $slogin:$sdom </h3>
+END
+ $r->print(<<END);
<table>
-<tr><td align="right"><b>$lt{'st'}:</b></td><td> $displayable_starttime </td></tr>
-<tr><td align="right"><b>$lt{'et'}:</b></td><td> $displayable_endtime </td></tr>
+ <tr>
+ <td>
+ <table class="LC_nested_outer">
+ <tr>
+ <th>$lt{si}</th>
+ </tr>
+ <tr>
+ <td>
+ <table class="LC_nested">
+ <tr class="LC_info_row">
+ <td class="LC_left_item"> $lt{'fd'} </td>
+ <td class="LC_left_item"> $lt{'ov'} </td>
+ <td class="LC_left_item"> $lt{'nv'} </td>
+ </tr>
+ <tr class="LC_odd_row">
+ <td class="LC_left_item"> <b>$lt{'fn'}</b> </td>
+ <td class="LC_left_item"> $old{'firstname'} </td>
+ <td class="LC_left_item"> $firstname </td>
+ </tr>
+ <tr>
+ <td class="LC_left_item"> <b>$lt{'mn'}</b> </td>
+ <td class="LC_left_item"> $old{'middlename'} </td>
+ <td class="LC_left_item"> $middlename </td>
+ </tr>
+ <tr class="LC_odd_row">
+ <td class="LC_left_item"> <b>$lt{'ln'}</b> </td>
+ <td class="LC_left_item"> $old{'lastname'} </td>
+ <td class="LC_left_item"> $lastname </td>
+ </tr>
+ <tr>
+ <td class="LC_left_item"> <b>$lt{'gen'}</b> </td>
+ <td class="LC_left_item"> $old{'generation'} </td>
+ <td class="LC_left_item"> $generation </td>
+ </tr>
+ <tr class="LC_odd_row">
+ <td class="LC_left_item"> <b>ID</b> </td>
+ <td class="LC_left_item"> $old{'id'} </td>
+ <td class="LC_left_item"> $sid </td>
+ </tr>
+ <tr>
+ <td class="LC_left_item"> <b>$lt{'em'}</b> </td>
+ <td class="LC_left_item"> $old{'permanentemail'} </td>
+ <td class="LC_left_item"> $permanentemail </td>
+ <tr class="LC_odd_row">
+ <td> <b>$lt{'sec'}</b> </td>
+ <td> $old{'section'} </td>
+ <td> $section</td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ <br />
+ <table class="LC_nested_outer">
+ <tr>
+ <th>$lt{'ri'}</th>
+ </tr>
+ <tr>
+ <td>
+ <table class="LC_nested">
+ <tr class="LC_odd_row">
+ <td class="LC_left_item"><b>$lt{'st'}:</b></td>
+ <td class="LC_right_item"> $displayable_starttime </td>
+ </tr>
+ <tr>
+ <td class="LC_left_item"><b>$lt{'et'}:</b></td>
+ <td class="LC_right_item"> $displayable_endtime </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
</table>
<p>
END
#
# Send request(s) to modify data (final undef is for 'desiredhost',
# which is a moot point because the student already has an account.
- my $modify_section_results = &modifystudent($sdom,$slogin,
- $env{'request.course.id'},
- $section,undef);
+ my $modify_section_results =
+ &Apache::lonuserutils::modifystudent($sdom,$slogin,
+ $env{'request.course.id'},
+ $section,undef);
if ($modify_section_results !~ /^ok/) {
- $r->print(&mt('An error occured during the attempt to change the section for this student.')."<br />");
+ $r->print(&mt('An error occurred during the attempt to change the section for this student.')."<br />");
}
my $roleresults = &Apache::lonnet::modifystudent
($sdom,$slogin,$sid,undef,undef,$firstname,$middlename,$lastname,
- $generation,$section,$endtime,$starttime,$env{'form.forceid'});
+ $generation,$section,$endtime,$starttime,$env{'form.forceid'},
+ undef,$permanentemail);
+ if ($old{'permanentemail'} ne $permanentemail) {
+ &Apache::loncommon::flush_email_cache($slogin,$sdom);
+ }
if ($roleresults eq 'refused' ) {
$r->print(&mt('Your request to change the role information for this student was refused. You do not appear to have sufficient authority to change student information.'));
} elsif ($roleresults !~ /ok/) {
@@ -1737,8 +2144,8 @@ END
&mt('The error reported was')." ".
$roleresults);
&Apache::lonnet::logthis("londropadd:failed attempt to modify student".
- " data for ".$slogin." \@ ".$sdom." by ".
- $env{'user.name'}." \@ ".$env{'user.domain'}.
+ " data for ".$slogin." : ".$sdom." by ".
+ $env{'user.name'}." : ".$env{'user.domain'}.
":".$roleresults);
} else { # everything is okay!
$r->print(&mt('Student information updated successfully.')." <br />".
@@ -1751,15 +2158,16 @@ END
<input type="hidden" name="sortby" value="$sortby" />
<input type="hidden" name="Status" value="$status" />
<a href="javascript:document.studentform.submit();">$Masd</a>
-</body></html>
END
+ $r->print(&Apache::loncommon::end_page());
return;
}
sub get_enrollment_data {
my ($sname,$sdomain) = @_;
my $courseid = $env{'request.course.id'};
- $courseid =~ s:_:/:g;
+ my $cdom = $env{'course.'.$courseid.'.domain'};
+ my $cnum = $env{'course.'.$courseid.'.num'};
my %roles = &Apache::lonnet::dump('roles',$sdomain,$sname);
my ($tmp) = keys(%roles);
# Bail out if we were unable to get the students roles
@@ -1769,7 +2177,7 @@ sub get_enrollment_data {
my $section = '';
my $count = scalar(keys(%roles));
while (my ($course,$role) = each(%roles)) {
- if ($course=~ /^\/$courseid\/*\s*(\w+)*_st$/ ) {
+ if ($course=~m{^/\Q$cdom\E/\Q$cnum\E/*\s*(\w+)*_st$} ) {
#
# Get active role
$section=$1;
@@ -1788,12 +2196,10 @@ sub get_enrollment_data {
return ($start,$end,$section);
}
-#################################################
-#################################################
=pod
-=item show_drop_list
+=item show_drop_list()
Display a list of students to drop
Inputs:
@@ -1813,8 +2219,6 @@ which describes the order elements are s
=cut
-#################################################
-#################################################
sub show_drop_list {
my ($r,$classlist,$keylist,$nosort)=@_;
my $cid=$env{'request.course.id'};
@@ -1823,9 +2227,13 @@ sub show_drop_list {
['sortby']);
}
my $sortby = $env{'form.sortby'};
- if ($sortby !~ /^(username|domain|section|fullname|id|start|end)$/) {
+ if ($sortby !~ /^(username|domain|section|groups|fullname|id|start|end)$/) {
$sortby = 'username';
}
+ my $cdom = $env{'course.'.$cid.'.domain'};
+ my $cnum = $env{'course.'.$cid,'.num'};
+ my ($classgroups) = &Apache::loncoursedata::get_group_memberships(
+ $classlist,$keylist,$cdom,$cnum);
#
my $action = "drop";
$r->print(<<END);
@@ -1853,10 +2261,11 @@ my %lt=&Apache::lonlocal::texthash('usrn
'sec' => "section",
'start' => "start date",
'end' => "end date",
+ 'groups' => "active groups",
);
if ($nosort) {
+ $r->print(&Apache::loncommon::start_data_table());
$r->print(<<END);
-<table border=2>
<tr>
<th> </th>
<th>$lt{'usrn'}</th>
@@ -1866,12 +2275,13 @@ my %lt=&Apache::lonlocal::texthash('usrn
<th>$lt{'sec'}</th>
<th>$lt{'start'}</th>
<th>$lt{'end'}</th>
+ <th>$lt{'groups'}</th>
</tr>
END
} else {
+ $r->print(&Apache::loncommon::start_data_table());
$r->print(<<END);
-<table border=2>
<tr><th> </th>
<th>
<a href="/adm/dropadd?action=$action&sortby=username">$lt{'usrn'}</a>
@@ -1887,6 +2297,8 @@ END
<a href="/adm/dropadd?action=$action&sortby=start">$lt{'start'}</a>
</th><th>
<a href="/adm/dropadd?action=$action&sortby=end">$lt{'end'}</a>
+ </th><th>
+ <a href="/adm/dropadd?action=$action&sortby=groups">$lt{'groups'}</a>
</th>
</tr>
END
@@ -1898,6 +2310,7 @@ END
foreach (@$keylist) {
$index{$_} = $i++;
}
+ $index{'groups'} = scalar(@$keylist);
my $index = $index{$sortby};
my $second = $index{'username'};
my $third = $index{'domain'};
@@ -1918,6 +2331,11 @@ END
my $id = $sdata->[$index{'id'}];
my $start = $sdata->[$index{'start'}];
my $end = $sdata->[$index{'end'}];
+ my $groups = $classgroups->{$student};
+ my $active_groups;
+ if (ref($groups->{active}) eq 'HASH') {
+ $active_groups = join(', ',keys(%{$groups->{'active'}}));
+ }
if (! defined($start) || $start == 0) {
$start = &mt('none');
} else {
@@ -1931,8 +2349,8 @@ END
my $status = $sdata->[$index{'status'}];
next if ($status ne 'Active');
#
+ $r->print(&Apache::loncommon::start_data_table_row());
$r->print(<<"END");
-<tr>
<td><input type="checkbox" name="droplist" value="$student"></td>
<td>$username</td>
<td>$domain</td>
@@ -1941,10 +2359,11 @@ END
<td>$section</td>
<td>$start</td>
<td>$end</td>
-</tr>
+ <td>$active_groups</td>
END
+ $r->print(&Apache::loncommon::end_data_table_row());
}
- $r->print('</table><br>');
+ $r->print(&Apache::loncommon::end_data_table().'<br />');
%lt=&Apache::lonlocal::texthash(
'dp' => "Drop Students",
'ca' => "check all",
@@ -1959,9 +2378,15 @@ END
return;
}
-#
-# Print out the initial form to get the courselist file
-#
+
+=pod
+
+=item print_first_courselist_upload_form()
+
+ Print out the initial form to get the courselist file
+
+=cut
+
sub print_first_courselist_upload_form {
my $r=shift;
my $str;
@@ -1973,20 +2398,28 @@ sub print_first_courselist_upload_form {
$str .= "<p>\n";
$str .= '<input type="submit" name="fileupload" value="'.
&mt('Upload class list').'">'."\n";
- $str .= '<input type="checkbox" name="noFirstLine" /> '.
- &mt('Ignore First Line')."</p>\n";
+ $str .= '<label><input type="checkbox" name="noFirstLine" /> '.
+ &mt('Ignore First Line')."</label></p>\n";
$str .= &Apache::loncommon::help_open_topic("Course_Create_Class_List",
&mt("How do I create a class list from a spreadsheet")).
"<br />\n";
$str .= &Apache::loncommon::help_open_topic("Course_Convert_To_CSV",
&mt("How do I create a CSV file from a spreadsheet")).
"<br />\n";
- $str .= "</body>\n</html>\n";
+ $str .= &Apache::loncommon::end_page();
$r->print($str);
return;
}
-# ================================================= Drop/Add from uploaded file
+
+=pod
+
+=item upfile_drop_add()
+
+ Drop/Add from uploaded file
+
+=cut
+
sub upfile_drop_add {
my $r=shift;
&Apache::loncommon::load_tmp_file($r);
@@ -2033,11 +2466,11 @@ sub upfile_drop_add {
if (lc($desiredhost) eq 'default') {
$desiredhost = undef;
} else {
- my %home_servers = &Apache::loncommon::get_library_servers($domain);
+ my %home_servers = &Apache::lonnet::get_servers($domain,'library');
if (! exists($home_servers{$desiredhost})) {
$r->print('<font color="#ff0000">'.&mt('Error').'</font>'.
&mt('Invalid home server specified'));
- $r->print("</body>\n</html>\n");
+ $r->print(&Apache::loncommon::end_page());
return;
}
}
@@ -2067,7 +2500,8 @@ sub upfile_drop_add {
$amode = ''; # This causes the loop below to be skipped
}
}
- unless (($domain=~/\W/) || ($amode eq '')) {
+ if ( $domain eq &LONCAPA::clean_domain($domain)
+ && ($amode ne '')) {
#######################################
## Enroll Students ##
#######################################
@@ -2075,6 +2509,8 @@ sub upfile_drop_add {
my $count=0;
my $flushc=0;
my %student=();
+ # Get information about course groups
+ my %curr_groups = &Apache::longroup::coursegroups();
# Get new classlist
foreach (@studentdata) {
my %entries=&Apache::loncommon::record_sep($_);
@@ -2099,7 +2535,8 @@ sub upfile_drop_add {
$gen=$entries{$fields{'gen'}};
}
}
- if ($entries{$fields{'username'}}=~/\W/) {
+ if ($entries{$fields{'username'}}
+ ne &LONCAPA::clean_username($entries{$fields{'username'}})) {
$r->print('<br />'.
&mt('<b>[_1]</b>: Unacceptable username for user [_2] [_3] [_4] [_5]',
$entries{$fields{'username'}},$fname,$mname,$lname,$gen).
@@ -2115,6 +2552,17 @@ sub upfile_drop_add {
}
# remove non alphanumeric values from section
$sec =~ s/\W//g;
+ if ($sec eq "none" || $sec eq 'all') {
+ $r->print('<br />'.
+ &mt('<b>[_1]</b>: Unable to enroll: section name "[_2]" for user [_3] [_4] [_5] [_6] is a reserved word.',
+ $username,$sec,$fname,$mname,$lname,$gen));
+ next;
+ } elsif (($sec ne '') && (exists($curr_groups{$sec}))) {
+ $r->print('<br />'.
+ &mt('<b>[_1]</b>: Unable to enroll: section name "[_2]" for user [_3] [_4] [_5] [_6] is a course group. Section names and group names must be distinct.',
+ $username,$sec,$fname,$mname,$lname,$gen));
+ next;
+ }
# determine student id number
my $id='';
if (defined($fields{'id'})) {
@@ -2148,8 +2596,9 @@ sub upfile_drop_add {
$$_ =~ s/(\s+$|^\s+)//g;
}
if ($password || $env{'form.login'} eq 'loc') {
- &modifystudent($domain,$username,$cid,$sec,
- $desiredhost);
+ &Apache::lonuserutils::modifystudent($domain,
+ $username,$cid,
+ $sec,$desiredhost);
my $reply=&Apache::lonnet::modifystudent
($domain,$username,$id,$amode,$password,
$fname,$mname,$lname,$gen,$sec,$enddate,
@@ -2216,7 +2665,8 @@ sub drop_student_list {
foreach (@droplist) {
my ($uname,$udom)=split(/\:/,$_);
# drop student
- my $result = &modifystudent($udom,$uname,$env{'request.course.id'});
+ my $result = &Apache::lonuserutils::modifystudent($udom,$uname,
+ $env{'request.course.id'});
if ($result eq 'ok' || $result eq 'ok:') {
$r->print(&mt('Dropped [_1]',$uname.'@'.$udom).'<br>');
$count++;
@@ -2230,12 +2680,62 @@ sub drop_student_list {
$r->print('<p>'.&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)));
+ }
+ return <<"END";
+function validate(caller) {
+ 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.");
+ return 'error';
+ }
+ if (secname != '') {
+ for (var k=0; k<groups.length; k++) {
+ if (secname == groups[k]) {
+ alert("'"+secname+"' may not be used as the name for a section, as it is the name of a course group.\\nSection names and group names must be distinct. Please choose a different section name.");
+ return 'error';
+ }
+ }
+ }
+ return 'ok';
+}
+END
+}
+
+sub get_permission {
+ my %permission;
+ $permission{'view'} =
+ &Apache::lonnet::allowed('vcl',$env{'request.course.id'});
+ if (!$permission{'view'}) {
+ my $scope = $env{'request.course.id'}.'/'.$env{'request.course.sec'};
+ $permission{'view'} = &Apache::lonnet::allowed('vcl',$scope);
+ if ($permission{'view'}) {
+ $permission{'view_section'} = $env{'request.course.sec'};
+ }
+ }
+
+ $permission{'enrl'} =
+ &Apache::lonnet::allowed('cst',$env{'request.course.id'});
+
+ $permission{'grp_view'} =
+ &Apache::lonnet::allowed('vcg',$env{'request.course.id'});
+ $permission{'grp_manage'} =
+ &Apache::lonnet::allowed('mdg',$env{'request.course.id'});
+ my $allowed = 0;
+ foreach my $perm (values(%permission)) {
+ if ($perm) { $allowed=1; last; }
+ }
+ return (\%permission,$allowed);
+}
=pod
-=item &handler
+=item &handler()
The typical handler you see in all these modules. Takes $r, the
http request, as an argument.
@@ -2262,8 +2762,6 @@ The response to the request is governed
=cut
-###################################################################
-###################################################################
sub handler {
my $r=shift;
if ($r->header_only) {
@@ -2283,38 +2781,40 @@ sub handler {
if (! ($env{'request.course.fn'})) {
# Not in a course
$env{'user.error.msg'}=
- "/adm/dropadd:cst:0:0:Cannot drop or add students";
+ "/adm/dropadd:cst:0:0:Cannot manage or view course groups, ".
+ "or drop or add students";
return HTTP_NOT_ACCEPTABLE;
}
#
- my $view_permission =
- &Apache::lonnet::allowed('vcl',$env{'request.course.id'});
- my $enrl_permission =
- &Apache::lonnet::allowed('cst',$env{'request.course.id'});
- if (! $view_permission && ! $enrl_permission) {
+
+ my ($permission,$allowed) = &get_permission();
+
+ if (!$allowed) {
$env{'user.error.msg'}=
- "/adm/dropadd:cst:0:0:Cannot drop or add students";
- return HTTP_NOT_ACCEPTABLE;
+ "/adm/dropadd:cst:0:0:Cannot manage or view course groups, ".
+ "or drop or add students";
+ return HTTP_NOT_ACCEPTABLE;
}
+
#
# Only output the header information if they did not request csv format
#
# Start page
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
- $r->print(&header());
#
# Main switch on form.action and form.state, as appropriate
if (! exists($env{'form.action'})) {
- $r->print(&Apache::lonhtmlcommon::breadcrumbs
- (undef,'Enrollment Manager'));
- &print_main_menu($r,$enrl_permission,$view_permission);
- } elsif ($env{'form.action'} eq 'upload' && $enrl_permission) {
+ $r->print(&header());
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Enrollment Manager'));
+ my $action = &print_main_menu($r,$permission);
+ } elsif ($env{'form.action'} eq 'upload' && $permission->{'enrl'}) {
+ $r->print(&header());
&Apache::lonhtmlcommon::add_breadcrumb
({href=>'/adm/dropadd?action=upload&state=',
text=>"Upload Classlist"});
- $r->print(&Apache::lonhtmlcommon::breadcrumbs
- (undef,'Upload Classlist','Course_Create_Class_List'));
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Upload Classlist',
+ 'Course_Create_Class_List'));
if (! exists($env{'form.state'})) {
&print_first_courselist_upload_form($r);
} elsif ($env{'form.state'} eq 'got_file') {
@@ -2328,12 +2828,13 @@ sub handler {
} else {
&print_first_courselist_upload_form($r);
}
- } elsif ($env{'form.action'} eq 'drop' && $enrl_permission) {
+ } elsif ($env{'form.action'} eq 'drop' && $permission->{'enrl'}) {
+ $r->print(&header());
&Apache::lonhtmlcommon::add_breadcrumb
({href=>'/adm/dropadd?action=drop',
text=>"Drop Students"});
- $r->print(&Apache::lonhtmlcommon::breadcrumbs
- (undef,'Drop Students','Course_Drop_Student'));
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Drop Students',
+ 'Course_Drop_Student'));
if (! exists($env{'form.state'})) {
&print_drop_menu($r);
} elsif ($env{'form.state'} eq 'done') {
@@ -2341,70 +2842,142 @@ sub handler {
} else {
&print_drop_menu($r);
}
- } elsif ($env{'form.action'} eq 'enrollstudent' && $enrl_permission) {
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>'/adm/dropadd?action=enrollstudent',
- text=>"Enroll Student"});
- $r->print(&Apache::lonhtmlcommon::breadcrumbs
- (undef,'Enroll Student','Course_Add_Student'));
- if (! exists($env{'form.state'})) {
- &get_student_username_domain_form($r);
- } elsif ($env{'form.state'} eq 'gotusername') {
- &print_enroll_single_student_form($r);
+ } elsif ($env{'form.action'} eq 'enrollstudent' && $permission->{'enrl'}) {
+ my @search = ('srchterm','srchby','srchin','srchtype','srchdomain');
+ my ($jsback,$elements) = &Apache::loncreateuser::crumb_utilities();
+ my $jscript = '<script type="text/javascript">'.$jsback.'</script>';
+ &Apache::loncreateuser::restore_prev_selections();
+ my $srch;
+ foreach my $item (@search) {
+ $srch->{$item} = $env{'form.'.$item};
+ }
+
+ if ($env{'form.state'} eq 'gotusername') {
+ if ($env{'form.phase'} eq 'get_user_info') {
+ my ($currstate,$response,$forcenewuser,$results) =
+ &Apache::loncreateuser::user_search_result($srch);
+ if ($env{'form.currstate'} eq 'modify') {
+ $currstate = $env{'form.currstate'};
+ }
+ if ($currstate eq 'select') {
+ $r->print(&header());
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"javascript:backPage(document.usersrchform,'','')",
+ text=>"Single user search"},
+ {href=>"javascript:backPage(document.usersrchform,'get_user_info','select')",
+ text=>"Select User",});
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Enroll Student',
+ 'Course_Add_Student'));
+ &Apache::loncreateuser::print_user_selection_page($r,
+ $response,$srch,$results,'enrollstudent',\@search);
+ } elsif ($currstate eq 'modify') {
+ my ($ccuname,$ccdomain);
+ if (($srch->{'srchby'} eq 'uname') &&
+ ($srch->{'srchtype'} eq 'exact')) {
+ $ccuname = $srch->{'srchterm'};
+ $ccdomain= $srch->{'srchdomain'};
+ } else {
+ my @matchedunames = keys(%{$results});
+ ($ccuname,$ccdomain) = split(/:/,$matchedunames[0]);
+ }
+ $ccuname =&LONCAPA::clean_username($ccuname);
+ $ccdomain=&LONCAPA::clean_domain($ccdomain);
+ &print_enroll_single_student_form($r,$jscript,$ccuname,
+ $ccdomain,$srch,$response);
+ } elsif ($currstate eq 'query') {
+ $r->print(&header($jscript));
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"javascript:backPage(document.studentform,'','')",
+ text=>"Single user search"});
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Enroll Student',
+ 'Course_Add_Student'));
+ &Apache::loncreateuser::print_user_query_page($r,'enrollstudent');
+ } else {
+ &get_student_username_domain_form($r,$elements,$response,
+ $srch,$forcenewuser);
+ }
+ } elsif ($env{'form.phase'} eq 'userpicked') {
+ my $ccuname = &LONCAPA::clean_username($env{'form.seluname'});
+ my $ccdomain = &LONCAPA::clean_domain($env{'form.seludom'});
+ &print_enroll_single_student_form($r,$jscript,$ccuname,
+ $ccdomain,$srch);
+ } else {
+ &get_student_username_domain_form($r,$elements,undef,$srch);
+ }
} elsif ($env{'form.state'} eq 'enrolling') {
- &enroll_single_student($r);
+ $r->print(&header($jscript));
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"javascript:backPage(document.studentform,'','')",
+ text=>"Single user search"});
+ if ($env{'form.prevphase'} eq 'userpicked') {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"javascript:backPage(document.studentform,'get_user_info','select')",
+ text=>"Select user",});
+ }
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"javascript:backPage(document.studentform,'$env{'form.prevphase'}','modify')",
+ text=>"Set enrollment",},
+ {href=>"javascript:backPage(document.studentform,$env{'form.phase'},'')",
+ text=>"Result",});
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Enroll Student',
+ 'Course_Add_Student'));
+ &enroll_single_student($r,\@search);
} else {
- &get_student_username_domain_form($r);
+ &get_student_username_domain_form($r,$elements,undef,$srch);
}
- } elsif ($env{'form.action'} eq 'classlist' && $view_permission) {
+ } elsif ($env{'form.action'} eq 'classlist' && $permission->{'view'}) {
+ $r->print(&header());
&Apache::lonhtmlcommon::add_breadcrumb
({href=>'/adm/dropadd?action=classlist',
text=>"View Classlist"});
- $r->print(&Apache::lonhtmlcommon::breadcrumbs
- (undef,'View Classlist','Course_View_Class_List'));
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('View Classlist',
+ 'Course_View_Class_List'));
if (! exists($env{'form.state'})) {
- &print_html_classlist($r,undef);
+ &print_html_classlist($r,undef,$permission);
} elsif ($env{'form.state'} eq 'csv') {
- &print_html_classlist($r,'csv');
+ &print_html_classlist($r,'csv',$permission);
} elsif ($env{'form.state'} eq 'excel') {
- &print_html_classlist($r,'excel');
+ &print_html_classlist($r,'excel',$permission);
} else {
- &print_html_classlist($r,undef);
+ &print_html_classlist($r,undef,$permission);
}
- } elsif ($env{'form.action'} eq 'modifystudent' && $enrl_permission) {
+ } elsif ($env{'form.action'} eq 'modifystudent' && $permission->{'enrl'}) {
+ $r->print(&header());
&Apache::lonhtmlcommon::add_breadcrumb
({href=>'/adm/dropadd?action=modifystudent',
text=>"Modify Student Data"});
- $r->print(&Apache::lonhtmlcommon::breadcrumbs
- (undef,'Modify Student Data','Course_Modify_Student_Data'));
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Modify Student Data',
+ 'Course_Modify_Student_Data'));
if (! exists($env{'form.state'})) {
- &print_html_classlist($r);
+ &print_html_classlist($r,undef,$permission);
} elsif ($env{'form.state'} eq 'selected') {
&print_modify_student_form($r);
} elsif ($env{'form.state'} eq 'done') {
&modify_single_student($r);
} else {
- &print_html_classlist($r);
+ &print_html_classlist($r,undef,$permission);
}
} else {
# We should not end up here, but I guess it is possible
&Apache::lonnet::logthis("Undetermined state in londropadd.pm. ".
"form.action = ".$env{'form.action'}.
"Someone should fix this.");
- $r->print(&Apache::lonhtmlcommon::breadcrumbs
- (undef,'Enrollment Manager'));
- &print_main_menu($r,$enrl_permission,$view_permission);
+ $r->print(&header());
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Enrollment Manager'));
+ &print_main_menu($r,$permission);
}
#
# Finish up
- $r->print('</form></body></html>');
+ $r->print('</form>'.&Apache::loncommon::end_page());
return OK;
}
-###################################################################
-###################################################################
1;
__END__
+=pod
+
+=back
+=cut