--- loncom/interface/Attic/londropadd.pm 2002/09/17 15:52:44 1.50
+++ loncom/interface/Attic/londropadd.pm 2003/07/25 18:51:18 1.78
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to drop and add students in courses
#
-# $Id: londropadd.pm,v 1.50 2002/09/17 15:52:44 matthew Exp $
+# $Id: londropadd.pm,v 1.78 2003/07/25 18:51:18 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -41,6 +41,7 @@ use Apache::lonnet();
use Apache::loncommon();
use Apache::lonhtmlcommon();
use Apache::Constants qw(:common :http REDIRECT);
+use Spreadsheet::WriteExcel;
###############################################################
###############################################################
@@ -78,13 +79,16 @@ sub modifystudent {
# We are in this course
my $section=$1;
$section='' if ($course eq $courseid.'_st');
- if ( ((!$section) && (!$csec)) || ($section ne $csec) ) {
+ if ($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 (!($start && ($now<$start)) || !($end && ($now>$end))) {
my $reply=&Apache::lonnet::modifystudent
- ($udom,$unam,'','','','','','','',
+ # dom name id mode pass f m l g
+ ($udom,$unam,'', '', '',undef,undef,undef,undef,
$section,time,undef,undef,$desiredhost);
$result .= $reply.':';
}
@@ -92,7 +96,7 @@ sub modifystudent {
}
}
if ($result eq '') {
- $result eq 'Unable to find section for this student';
+ $result = 'Unable to find section for this student';
} else {
$result =~ s/(ok:)+/ok/g;
}
@@ -150,7 +154,7 @@ sub print_main_menu {
</font>
</p><p>
<font size="+1">
- <a href="/adm/dropadd?action=classlist">View Classlist</a>
+ <a href="/adm/dropadd?action=classlist">View Class List</a>
</font>
</p><p>
<font size="+1">
@@ -212,14 +216,16 @@ sub javascript_validations {
my %param = ( formname => 'studentform',
kerb_def_dom => $krbdefdom );
my $authheader = &Apache::loncommon::authform_header(%param);
+ my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
return (<<ENDPICK);
-function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec) {
+function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail) {
var foundatype=0;
var message='';
if (founduname==0) {
alert('You need to specify the username field');
return;
}
+ // alert('current.radiovalue = '+current.radiovalue);
if (current.radiovalue == null || current.radiovalue == 'nochange') {
// They did not check any of the login radiobuttons.
alert('You must choose an authentication type');
@@ -248,64 +254,53 @@ function verify_message (vf,founduname,f
}
}
- if (foundname==0) { message='No name fields specified. '; }
- if (foundid==0) { message+='No ID or student number field specified. '; }
- if (foundsec==0) { message+='No section or group field specified. '; }
- if (vf.startdate.value=='') {
- message+='No starting date set. ';
- }
- if (vf.enddate.value=='') {
- message+='No ending date set. ';
- }
- if ((vf.enddate.value!='') && (vf.startdate.value!='')) {
- if (Math.round(vf.enddate.value)<Math.round(vf.startdate.value)) {
- alert('Ending date is before starting date');
- return;
- }
- }
+ if (foundname==0) { message='name fields'; }
+ if (foundid==0) { if (message!='') { message+=', '; } message+='student number field'; }
+ if (foundsec==0) { if (message!='') { message+=', '; } message+='section or group field'; }
+ if (foundemail==0) { if (message!='') { message+=', '; } message+='email address field'; }
if (message!='') {
- message+='Continue enrollment?';
+ message='Not specified (optional): '+message+'. Continue enrollment?';
if (confirm(message)) {
- pclose();
vf.state.value='enrolling';
vf.submit();
}
} else {
- pclose();
vf.state.value='enrolling';
vf.submit();
}
}
+$authheader
+ENDPICK
- function pclose() {
- parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
- "height=350,width=350,scrollbars=no,menubar=no");
- parmwin.close();
- }
-
- function pjump(type,dis,value,marker,ret,call) {
- parmwin=window.open("/adm/rat/parameter.html?type="+escape(type)
- +"&value="+escape(value)+"&marker="+escape(marker)
- +"&return="+escape(ret)
- +"&call="+escape(call)+"&name="+escape(dis),"LONCAPAparms",
- "height=350,width=350,scrollbars=no,menubar=no");
+}
+sub javascript_validations_without_auth {
+ my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
+ return (<<ENDPICK);
+function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail) {
+ var foundatype=0;
+ var message='';
+ if (founduname==0) {
+ alert('You need to specify the username field');
+ return;
}
-
- function dateset() {
- if (document.studentform.pres_marker.value=='end') {
- document.studentform.enddate.value=
- document.studentform.pres_value.value;
- }
- if (document.studentform.pres_marker.value=='start') {
- document.studentform.startdate.value=
- document.studentform.pres_value.value;
- }
- pclose();
+ if (foundname==0) { message='name fields'; }
+ if (foundid==0) { if (message!='') { message+=', '; } message+='student number field'; }
+ if (foundsec==0) { if (message!='') { message+=', '; } message+='section or group field'; }
+ if (foundemail==0) { if (message!='') { message+=', '; } message+='email address field'; }
+ if (message!='') {
+ message='Not specified (optional): '+message+'. Continue enrollment?';
+ if (confirm(message)) {
+ vf.state.value='enrolling';
+ vf.submit();
+ }
+ } else {
+ vf.state.value='enrolling';
+ vf.submit();
}
+}
-$authheader
ENDPICK
}
@@ -320,6 +315,7 @@ function verify(vf) {
var foundname=0;
var foundid=0;
var foundsec=0;
+ var foundemail=0;
var tw;
for (i=0;i<=vf.nfields.value;i++) {
tw=eval('vf.f'+i+'.selectedIndex');
@@ -328,8 +324,9 @@ function verify(vf) {
if (tw==7) { foundid=1; }
if (tw==8) { foundsec=1; }
if (tw==9) { foundpwd=1; }
+ if (tw==10) { foundemail=1; }
}
- verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec);
+ verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail);
}
//
@@ -348,7 +345,8 @@ function verify(vf) {
// 7 = id
// 8 = section
// 9 = ipwd (password)
-//
+// 10 = email address
+
function flip(vf,tf) {
var nw=eval('vf.f'+tf+'.selectedIndex');
var i;
@@ -459,11 +457,18 @@ ENDPICK
###############################################################
sub print_upload_manager_footer {
my ($r,$i,$keyfields,$defdom,$today,$halfyear)=@_;
- my %param = ( formname => 'document.studentform');
+
+ my ($krbdef,$krbdefdom) =
+ &Apache::loncommon::get_kerberos_defaults($defdom);
+ my %param = ( formname => 'document.studentform',
+ kerb_def_dom => $krbdefdom,
+ kerb_def_auth => $krbdef
+ );
my $krbform = &Apache::loncommon::authform_kerberos(%param);
my $intform = &Apache::loncommon::authform_internal(%param);
my $locform = &Apache::loncommon::authform_local(%param);
my $domform = &domain_form($defdom);
+ my $date_table = &date_setting_table();
$r->print(<<ENDPICK);
</table>
<input type=hidden name=nfields value=$i>
@@ -482,18 +487,9 @@ $locform
<h3>LON-CAPA Domain for Students</h3>
LON-CAPA domain: $domform <p>
<h3>Starting and Ending Dates</h3>
-<input type="hidden" value='' name="pres_value" >
-<input type="hidden" value='' name="pres_type" >
-<input type="hidden" value='' name="pres_marker" >
-<input type="hidden" value='$today' name="startdate" >
-<input type="hidden" value='$halfyear' name="enddate" >
-<a
- href="javascript:pjump('date_start','Enrollment Starting Date',document.studentform.startdate.value,'start','studentform.pres','dateset');"
->Set Starting Date</a><p>
-
-<a
- href="javascript:pjump('date_end','Enrollment Ending Date',document.studentform.enddate.value,'end','studentform.pres','dateset');"
->Set Ending Date</a><p>
+<p>
+$date_table
+</p>
<h3>Full Update</h3>
<input type=checkbox name=fullup value=yes> Full update
(also print list of users not enrolled anymore)<p>
@@ -520,12 +516,11 @@ sub print_upload_manager_form {
my @records=&Apache::loncommon::upfile_record_sep();
my $total=$#records;
my $distotal=$total+1;
- $ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/;
- my $krbdefdom=$1;
- $krbdefdom=~tr/a-z/A-Z/;
my $today=time;
my $halfyear=$today+15552000;
my $defdom=$r->dir_config('lonDefDomain');
+ my ($krbdef,$krbdefdom) =
+ &Apache::loncommon::get_kerberos_defaults($defdom);
&print_upload_manager_header($r,$datatoken,$distotal,$krbdefdom);
my $i;
my $keyfields;
@@ -538,7 +533,8 @@ sub print_upload_manager_form {
['gen','Generation'],
['id','ID/Student Number'],
['sec','Group/Section'],
- ['ipwd','Initial Password']);
+ ['ipwd','Initial Password'],
+ ['email','EMail Address']);
if ($ENV{'form.upfile_associate'} eq 'reverse') {
&Apache::loncommon::csv_print_samples($r,\@records);
$i=&Apache::loncommon::csv_print_select_table($r,\@records,\@d);
@@ -557,8 +553,20 @@ sub print_upload_manager_form {
# ======================================================= Enroll single student
sub enroll_single_student {
my $r=shift;
+ # Remove whitespace from section
+ $ENV{'form.csec'}=~s/(\s|:)//g;
+ #
+ # We do the dates first because the action of making them the defaul
+ # in the course is entirely seperate 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();
+ if ($ENV{'form.makedatesdefault'}) {
+ $r->print(&make_dates_default($startdate,$enddate));
+ }
+
$r->print('<h3>Enrolling Student</h3>');
- $r->print('<p>Enrolling '.$ENV{'form.cuname'}." in domain ".
+ $r->print('<p>Enrolling '.$ENV{'form.cuname'}." \@ ".
$ENV{'form.lcdomain'}.'</p>');
if (($ENV{'form.cuname'})&&($ENV{'form.cuname'}!~/\W/)&&
($ENV{'form.lcdomain'})&&($ENV{'form.lcdomain'}!~/\W/)) {
@@ -594,17 +602,25 @@ sub enroll_single_student {
my $home = &Apache::lonnet::homeserver($ENV{'form.cuname'},
$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'},
$ENV{'request.course.id'},$ENV{'form.csec'},
$desiredhost);
- $r->print(&Apache::lonnet::modifystudent(
- $ENV{'form.lcdomain'},$ENV{'form.cuname'},
- $ENV{'form.cstid'},$amode,$genpwd,
- $ENV{'form.cfirst'},$ENV{'form.cmiddle'},
- $ENV{'form.clast'},$ENV{'form.cgen'},
- $ENV{'form.csec'},$ENV{'form.enddate'},
- $ENV{'form.startdate'},$ENV{'form.forceid'},
- $desiredhost));
+ my $login_result = &Apache::lonnet::modifystudent
+ ($ENV{'form.lcdomain'},$ENV{'form.cuname'},
+ $ENV{'form.cstid'},$amode,$genpwd,
+ $ENV{'form.cfirst'},$ENV{'form.cmiddle'},
+ $ENV{'form.clast'},$ENV{'form.cgen'},
+ $ENV{'form.csec'},$enddate,
+ $startdate,$ENV{'form.forceid'},
+ $desiredhost);
+ if ($login_result =~ /^ok/) {
+ $r->print($login_result);
+ $r->print("<p> If active, the new role will be available ".
+ "when the student next logs in to LON-CAPA.</p>");
+ } else {
+ $r->print("unable to enroll: ".$login_result);
+ }
} else {
$r->print('<p><font color="#ff0000">ERROR</font> '.
'Invalid login mode or password. '.
@@ -615,28 +631,211 @@ sub enroll_single_student {
}
}
-# ======================================================= Menu Phase Two Enroll
+sub setup_date_selectors {
+ my ($starttime,$endtime) = @_;
+ if (! defined($starttime)) {
+ $starttime = time;
+ if (exists($ENV{'course.'.$ENV{'request.course.id'}.
+ '.default_enrollment_start_date'})) {
+ $starttime = $ENV{'course.'.$ENV{'request.course.id'}.
+ '.default_enrollment_start_date'};
+ }
+ }
+ if (! defined($endtime)) {
+ $endtime = time+(6*30*24*60*60); # 6 months from now, approx
+ if (exists($ENV{'course.'.$ENV{'request.course.id'}.
+ '.default_enrollment_end_date'})) {
+ $endtime = $ENV{'course.'.$ENV{'request.course.id'}.
+ '.default_enrollment_end_date'};
+ }
+ }
+ my $startdateform = &Apache::lonhtmlcommon::date_setter('studentform',
+ 'startdate',
+ $starttime);
+ my $enddateform = &Apache::lonhtmlcommon::date_setter('studentform',
+ 'enddate',
+ $endtime);
+ return ($startdateform,$enddateform);
+}
+
+sub get_dates_from_form {
+ my $startdate = &Apache::lonhtmlcommon::get_date_from_form('startdate');
+ my $enddate = &Apache::lonhtmlcommon::get_date_from_form('enddate');
+ if ($ENV{'form.no_end_date'}) {
+ $enddate = 0;
+ }
+ return ($startdate,$enddate);
+}
+
+sub date_setting_table {
+ my ($starttime,$endtime) = @_;
+ my ($startform,$endform)=&setup_date_selectors($starttime,$endtime);
+ my $dateDefault = '<nobr>'.
+ '<input type="checkbox" name="makedatesdefault" />'.
+ ' make these dates the default for future enrollment';
+ my $perpetual = '<nobr><input type="checkbox" name="no_end_date"';
+ if (defined($endtime) && $endtime == 0) {
+ $perpetual .= ' checked';
+ }
+ $perpetual.= ' />'.' no ending date</nobr>';
+ my $result = '';
+ $result .= "<table>\n";
+ $result .= '<tr><td align="right">Starting Date</td>'.
+ '<td>'.$startform.'</td>'.
+ '<td>'.$dateDefault.'</td>'."</tr>\n";
+ $result .= '<tr><td align="right">Ending Date</td>'.
+ '<td>'.$endform.'</td>'.
+ '<td>'.$perpetual.'</td>'."</tr>\n";
+ $result .= "</table>\n";
+ return $result;
+}
+
+sub make_dates_default {
+ my ($startdate,$enddate) = @_;
+ my $result = '';
+ my $dom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+ my $crs = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+ my $put_result = &Apache::lonnet::put('environment',
+ {'default_enrollment_start_date'=>$startdate,
+ 'default_enrollment_end_date' =>$enddate},$dom,$crs);
+ if ($put_result eq 'ok') {
+ $result .= "Set default start and end dates for course<br />";
+ #
+ # Refresh the course environment
+ &Apache::lonnet::coursedescription($ENV{'request.course.id'});
+ } else {
+ $result .= "Unable to set default dates for course:".$put_result.
+ '<br />';
+ }
+ return $result;
+}
+
+##
+## Single student enrollment routines (some of them)
+##
+sub get_student_username_domain_form {
+ my $r = shift;
+ my $domform = &Apache::loncommon::select_dom_form
+ ($r->dir_config('lonDefDomain'),'cudomain',0);
+ $r->print(<<END);
+<input type="hidden" name="action" value="enrollstudent" />
+<input type="hidden" name="state" value="gotusername" />
+<h3>Enroll One Student</h3>
+<table>
+<tr><th>Username:</th>
+ <td><input type="text" name="cuname" size="15" /></td></tr>
+<tr><th>Domain:</th>
+ <td>$domform</td></tr>
+<tr><th> </th>
+ <td>
+ <input type="submit" name="Begin Enrollment" value="Begin Enrollment" />
+ </td></tr>
+</table>
+END
+ return;
+}
+
sub print_enroll_single_student_form {
my $r=shift;
$r->print("<h3>Enroll One Student</h3>");
- my ($krbdefdom) = $ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/;
- $krbdefdom=~tr/a-z/A-Z/;
- my $today = time;
- my $halfyear = $today+15552000;
- my $defdom=$r->dir_config('lonDefDomain');
- my $javascript_validations=&javascript_validations($krbdefdom);
- # Set up authentication forms
- my %param = ( formname => 'document.studentform');
- my $krbform = &Apache::loncommon::authform_kerberos(%param);
- my $intform = &Apache::loncommon::authform_internal(%param);
- my $locform = &Apache::loncommon::authform_local(%param);
- # Set up domain selection form
- my $domform = &domain_form($defdom);
- # Print it all out
+ #
+ my $username = $ENV{'form.cuname'};
+ my $domain = $ENV{'form.cudomain'};
+ my $home = &Apache::lonnet::homeserver($username,$domain);
+ # $new_user flags whether we are creating a new user or using an old one
+ my $new_user = 1;
+ if ($home ne 'no_host') {
+ $new_user = 0;
+ }
+ &Apache::lonnet::logthis('home = '.$home);
+ #
+ my $user_data_html = '';
+ my $javascript_validations = '';
+ if ($new_user) {
+ my $defdom=$r->dir_config('lonDefDomain');
+ # Set up authentication forms
+ my ($krbdef,$krbdefdom) =
+ &Apache::loncommon::get_kerberos_defaults($domain);
+ $javascript_validations=&javascript_validations($krbdefdom);
+ my %param = ( formname => 'document.studentform',
+ kerb_def_dom => $krbdefdom,
+ kerb_def_auth => $krbdef
+ );
+ my $krbform = &Apache::loncommon::authform_kerberos(%param);
+ my $intform = &Apache::loncommon::authform_internal(%param);
+ my $locform = &Apache::loncommon::authform_local(%param);
+ #
+ # Set up domain selection form
+ my $homeserver_form = '';
+ my %servers = &Apache::loncommon::get_library_servers($domain);
+ $homeserver_form = '<select name="lcserver" size="1">'."\n".
+ '<option value="default" selected>default</option>'."\n";
+ while (my ($servername,$serverdescription) = each (%servers)) {
+ $homeserver_form .= '<option value="'.$servername.'">'.
+ $serverdescription."</option>\n";
+ }
+ $homeserver_form .= "</select>\n";
+ #
+ #
+ $user_data_html = <<END;
+<h3>User Data for $username\@$domain</h3>
+<table>
+<tr><th>First Name:</th>
+ <td><input type="text" name="cfirst" size="15"></td></tr>
+<tr><th>Middle Name:</th>
+ <td><input type="text" name="cmiddle" size="15"></td></tr>
+<tr><th>Last Name:</th>
+ <td><input type="text" name="clast" size="15"></td></tr>
+<tr><th>Generation:</th>
+ <td><input type="text" name="cgen" size="5"> </td></tr>
+<tr><th>Home Server:</th>
+ <td>$homeserver_form</td></tr>
+</table>
+<h3>Password</h3>
+Please select an authentication mechanism
+<table>
+<p>
+$krbform
+<br />
+$intform
+<br />
+$locform
+</p>
+END
+ } else {
+ # User already exists. Do not worry about authentication
+ my %uenv = &Apache::lonnet::dump('environment',$domain,$username);
+ $javascript_validations = &javascript_validations_without_auth();
+ $user_data_html = <<END;
+<h3>User Data for $username\@$domain</h3>
+<input type="hidden" name="lcserver" value="default" />
+<table>
+<tr><th>First Name:</th>
+ <td>
+ <input type="text" name="cfirst" value="$uenv{'firstname'}" size="15" />
+ </td></tr>
+<tr><th>Middle Name:</th>
+ <td>
+ <input type="text" name="cmiddle" value="$uenv{'middlename'}" size="15" />
+ </td></tr>
+<tr><th>Last Name:</th>
+ <td>
+ <input type="text" name="clast"value="$uenv{'lastname'}" size="15" />
+ </td></tr>
+<tr><th>Generation:</th>
+ <td>
+ <input type="text" name="cgen" value="$uenv{'generation'}" size="5" />
+ </td></tr>
+</table>
+END
+ }
+ my $date_table = &date_setting_table();
+ # Print it all out
$r->print(<<END);
-<input type="hidden" name="action" value="enrollstudent">
-<input type="hidden" name="state" value="done">
-
+<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" />
<script type="text/javascript" language="Javascript">
function verify(vf) {
var founduname=0;
@@ -673,44 +872,14 @@ function clearpwd(vf) {
}
</script>
-<h3>Personal Data</h3>
-<table>
-<tr><td>First Name:</td><td> <input type="text" name="cfirst" size="15"></td></tr>
-<tr><td>Middle Name:</td><td> <input type="text" name="cmiddle" size="15"></td></tr>
-<tr><td>Last Name: </td><td><input type="text" name="clast" size="15"></td></tr>
-<tr><td>Generation: </td><td><input type="text" name="cgen" size="5"> </td></tr>
-</table>
-<h3>Login Data</h3>
-<p>Username: <input type="text" name="cuname" size="15"></p>
-<p>Domain: $domform</p>
-<p>Note: login settings below will not take effect if the user already exists
-</p><p>
-$krbform
-</p><p>
-$intform
-</p><p>
-$locform
-</p><p>
+$user_data_html
<h3>Course Data</h3>
<p>Group/Section: <input type="text" name="csec" size="5" />
<p>
-<!-- Date setting form elements -->
-<input type="hidden" name="pres_value" value='' />
-<input type="hidden" name="pres_type" value='' />
-<input type="hidden" name="pres_marker" value='' />
-<input type="hidden" name="startdate" value='$today' />
-<input type="hidden" name="enddate" value='$halfyear' />
-</p><p>
-<a
- href="javascript:pjump('date_start','Enrollment Starting Date',document.studentform.startdate.value,'start','studentform.pres','dateset');"
->Set Starting Date</a>
-</p><p>
-<a
- href="javascript:pjump('date_end','Enrollment Ending Date',document.studentform.enddate.value,'end','studentform.pres','dateset');"
->Set Ending Date</a>
+$date_table
</p>
<h3>ID/Student Number</h3>
<p>
@@ -726,179 +895,223 @@ END
return;
}
-# =================================================== get the current classlist
-sub get_current_classlist {
- my ($domain,$identifier) = @_;
- # domain is the domain the class is being run in
- # identifier is the internal, unique identifier for the class.
- my %currentlist=();
- my $now=time;
- my %results=&Apache::lonnet::dump('classlist',$domain,$identifier);
- my ($tmp) = keys(%results);
- if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
- foreach my $student (keys(%results)) {
- # Extract the start and end dates
- my ($end,$start)=split(/\:/,$results{$student});
- # If the class isn't over, put it in the list
- unless (($end) && ($now>$end)) {
- $currentlist{$student}=1;
- }
- }
- return (undef,%currentlist);
- } else {
- $tmp =~ s/^error://;
- return ($tmp,undef);
- }
-}
-
# ========================================================= Menu Phase Two Drop
-sub menu_phase_two_drop {
+sub print_drop_menu {
my $r=shift;
$r->print("<h3>Drop Students</h3>");
my $cid=$ENV{'request.course.id'};
- my ($error,%currentlist)=&get_current_classlist
- ($ENV{'course.'.$cid.'.domain'},$ENV{'course.'.$cid.'.num'});
- if (defined($error)) {
- if ($error =~ /^No such file or directory/) {
- $r->print("There are no students currently enrolled.\n");
- } else {
- $r->print("<pre>ERROR:$error</pre>");
- }
- } elsif (!defined(%currentlist)) {
+ my ($classlist,$keylist) = &Apache::loncoursedata::get_classlist();
+ if (! defined($classlist)) {
$r->print("There are no students currently enrolled.\n");
- } else {
- # Print out the available choices
- &show_drop_list($r,%currentlist);
+ return;
}
+ # Print out the available choices
+ &show_drop_list($r,$classlist,$keylist);
+ return;
}
# ============================================== view classlist
sub print_html_classlist {
my $r=shift;
+ if (! exists($ENV{'form.sortby'})) {
+ $ENV{'form.sortby'} = 'username';
+ }
+ if ($ENV{'form.Status'} !~ /^(Any|Expired|Active)$/) {
+ $ENV{'form.Status'} = 'Active';
+ }
+ my $status_select = &Apache::lonhtmlcommon::StatusOptions
+ ($ENV{'form.Status'},'studentform');
$r->print(<<END);
+<input type="hidden" name="action" value="$ENV{'form.action'}" />
+<input type="hidden" name="state" value="" />
<p>
-<font size="+1">Current Classlist</font>
-<font size="+1"><a href="/adm/dropadd?action=classlist&state=csv">CSV format</a></font>
-</p>
+<font size="+1">Current Class List</font>
+
+END
+ if ($ENV{'form.action'} ne 'modifystudent') {
+ $r->print(<<END);
+<font size="+1">
+<a href="javascript:document.studentform.state.value='csv';document.studentform.submit();">CSV format</a>
+
+<a href="javascript:document.studentform.state.value='excel';document.studentform.submit();">Excel format</a>
+</font>
+
+Student Status:
END
+ }
+ $r->print($status_select."</p>\n");
my $cid=$ENV{'request.course.id'};
- my ($error,%currentlist)=&get_current_classlist
- ($ENV{'course.'.$cid.'.domain'},$ENV{'course.'.$cid.'.num'});
- if (defined($error)) {
- if ($error =~ /^No such file or directory/) {
- $r->print("There are no students currently enrolled.\n");
- } else {
- $r->print("<pre>ERROR:$error</pre>");
- }
- } elsif (!defined(%currentlist)) {
+ my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist();
+ if (! defined($classlist)) {
$r->print("There are no students currently enrolled.\n");
} else {
# Print out the available choices
if ($ENV{'form.action'} eq 'modifystudent') {
- &show_class_list($r,'view','modify',%currentlist);
+ &show_class_list($r,'view','modify','modifystudent',
+ $ENV{'form.Status'},$classlist,$keylist);
} else {
- &show_class_list($r,'view','aboutme',%currentlist);
+ &show_class_list($r,'view','aboutme','classlist',
+ $ENV{'form.Status'},$classlist,$keylist);
}
}
}
# ============================================== view classlist
-sub print_csv_classlist {
+sub print_formatted_classlist {
my $r=shift;
+ my $mode = shift;
my $cid=$ENV{'request.course.id'};
- my ($error,%currentlist)=&get_current_classlist
- ($ENV{'course.'.$cid.'.domain'},$ENV{'course.'.$cid.'.num'});
- if (defined($error)) {
- if ($error =~ /^No such file or directory/) {
- $r->print("There are no students currently enrolled.\n");
- } else {
- $r->print("<pre>ERROR:$error</pre>");
- }
- } elsif (!defined(%currentlist)) {
+ my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist();
+ if (! defined($classlist)) {
$r->print("There are no students currently enrolled.\n");
} else {
- &show_class_list($r,'csv','nolink',%currentlist);
+ &show_class_list($r,$mode,'nolink','csv',
+ $ENV{'form.Status'},$classlist,$keylist);
}
}
# =================================================== Show student list to drop
sub show_class_list {
- my ($r,$mode,$linkto,%currentlist)=@_;
+ my ($r,$mode,$linkto,$action,$statusmode,$classlist,$keylist)=@_;
my $cid=$ENV{'request.course.id'};
+ #
+ # Variables for excel output
+ my ($excel_workbook, $excel_sheet, $excel_filename,$row);
+ #
+ my $sortby = $ENV{'form.sortby'};
+ if ($sortby !~ /^(username|domain|section|fullname|id)$/) {
+ $sortby = 'username';
+ }
# Print out header
if ($mode eq 'view') {
if ($linkto eq 'aboutme') {
- $r->print('Select a user name to view the users page.');
+ $r->print('Select a user name to view the users personal page.');
} elsif ($linkto eq 'modify') {
$r->print('Select a user name to modify the students information');
}
$r->print(<<END);
+
+<input type="hidden" name="sortby" value="$sortby" />
+<input type="hidden" name="sname" value="" />
+<input type="hidden" name="sdom" value="" />
<p>
<table border=2>
-<tr><th>username</th><th>domain</th><th>ID</th>
- <th>student name</th><th>generation</th><th>section</th></tr>
+<tr><th>
+ <a href="javascript:document.studentform.sortby.value='username';document.studentform.submit();">username</a>
+ </th><th>
+ <a href="javascript:document.studentform.sortby.value='domain';document.studentform.submit();">domain</a>
+ </th><th>
+ <a href="javascript:document.studentform.sortby.value='id';document.studentform.submit();">ID</a>
+ </th><th>
+ <a href="javascript:document.studentform.sortby.value='fullname';document.studentform.submit();">student name</a>
+ </th><th>
+ <a href="javascript:document.studentform.sortby.value='section';document.studentform.submit();">section</a>
+ </th>
+</tr>
END
} elsif ($mode eq 'csv') {
- $r->print('"'.join('","',("username","domain","ID","last name",
- "first name","middle name","generation",
- "section")).'"'."\n");
- }
- foreach (sort keys %currentlist) {
- my ($sname,$sdom)=split(/\:/,$_);
- my %reply=&Apache::lonnet::idrget($sdom,$sname);
- my $ssec=&Apache::lonnet::usection($sdom,$sname,$cid);
- my %info=&Apache::lonnet::get('environment',
- ['firstname','middlename',
- 'lastname','generation'],
- $sdom, $sname);
- my ($tmp) = keys(%info);
- if ($tmp =~ /^(con_lost|error|no_such_host)/i) {
- if ($mode eq 'view') {
- $r->print('<tr><td colspan="6"><font color="red">'.
- 'Internal error: unable to get environment '.
- 'for '.$sname.' in domain '.$sdom.'</font></td></tr>');
- } else {
- $r->print('"Internal error: unable to get environment for '.
- $sname.' in domain '.$sdom.'"');
- }
+ if($statusmode eq 'Expired') {
+ $r->print('"Students with expired roles"');
+ }
+ if ($statusmode eq 'Any') {
+ $r->print('"'.join('","',("username","domain","ID","student name",
+ "section","status")).'"'."\n");
} else {
- if ($mode eq 'view') {
- $r->print("<tr>\n <td>\n ");
- if ($linkto eq 'nothing') {
- $r->print($sname);
- } elsif ($linkto eq 'aboutme') {
- $r->print(&Apache::loncommon::aboutmewrapper($sname,$sname,
- $sdom));
- } elsif ($linkto eq 'modify') {
- $r->print('<a href="/adm/dropadd?action=modifystudent'.
- '&state=selected'.'&sname='.$sname.
- '&sdom='.$sdom.'">'.$sname."</a>\n");
- }
- $r->print(<<"END");
+ $r->print('"'.join('","',("username","domain","ID","student name",
+ "section")).'"'."\n");
+ }
+ } elsif ($mode eq 'excel') {
+ # Create the excel spreadsheet
+ $excel_filename = '/prtspool/'.
+ $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
+ time.'_'.rand(1000000000).'.xls';
+ $excel_workbook = Spreadsheet::WriteExcel->new('/home/httpd'.
+ $excel_filename);
+ $excel_workbook->set_tempdir('/home/httpd/perl/tmp');
+ $excel_sheet = $excel_workbook->addworksheet('classlist');
+ #
+ my $description = 'Class List for '.
+ $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+ $excel_sheet->write($row++,0,$description);
+ #
+ $excel_sheet->write($row++,0,["username","domain","ID",
+ "student name","section","status"]);
+ }
+ #
+ # Sort the students
+ my %index;
+ my $i;
+ foreach (@$keylist) {
+ $index{$_} = $i++;
+ }
+ my $index = $index{$sortby};
+ my $second = $index{'username'};
+ my $third = $index{'domain'};
+ my @Sorted_Students = sort {
+ lc($classlist->{$a}->[$index]) cmp lc($classlist->{$b}->[$index])
+ ||
+ lc($classlist->{$a}->[$second]) cmp lc($classlist->{$b}->[$second])
+ ||
+ lc($classlist->{$a}->[$third]) cmp lc($classlist->{$b}->[$third])
+ } (keys(%$classlist));
+ foreach my $student (@Sorted_Students) {
+ my $username = $classlist->{$student}->[$index{'username'}];
+ my $domain = $classlist->{$student}->[$index{'domain'}];
+ my $section = $classlist->{$student}->[$index{'section'}];
+ my $name = $classlist->{$student}->[$index{'fullname'}];
+ my $id = $classlist->{$student}->[$index{'id'}];
+ my $status = $classlist->{$student}->[$index{'status'}];
+ next if (($statusmode ne 'Any') && ($status ne $statusmode));
+ if ($mode eq 'view') {
+ $r->print("<tr>\n <td>\n ");
+ if ($linkto eq 'nothing') {
+ $r->print($username);
+ } elsif ($linkto eq 'aboutme') {
+ $r->print(&Apache::loncommon::aboutmewrapper($username,
+ $username,
+ $domain));
+ } elsif ($linkto eq 'modify') {
+ $r->print('<a href="'.
+ "javascript:document.studentform.sname.value='".
+ $username.
+ "';document.studentform.sdom.value='".$domain.
+ "';document.studentform.state.value='selected".
+ "';document.studentform.submit();".'">'.
+ $username."</a>\n");
+ }
+ $r->print(<<"END");
</td>
- <td>$sdom</td>
- <td>$reply{$sname}</td>
- <td>$info{'lastname'}, $info{'firstname'} $info{'middlename'}</td>
- <td>$info{'generation'}</td>
- <td>$ssec</td>
+ <td>$domain</td>
+ <td>$id</td>
+ <td>$name</td>
+ <td>$section</td>
</tr>
END
- } elsif ($mode eq 'csv') {
- # no need to bother with $linkto
- my @line = ();
- foreach ($sname,$sdom,$reply{$sname},
- $info{'lastname'},$info{'firstname'},
- $info{'middlename'},$info{'generation'},$ssec) {
- push @line,&Apache::loncommon::csv_translate($_);
- }
- my $tmp = $";
- $" = '","';
- $r->print("\"@line\"\n");
- $" = $tmp;
+ } elsif ($mode eq 'csv') {
+ # no need to bother with $linkto
+ my @line = ();
+ foreach ($username,$domain,$id,$name,$section) {
+ push @line,&Apache::loncommon::csv_translate($_);
+ }
+ if ($statusmode eq 'Any') {
+ push @line,&Apache::loncommon::csv_translate($status);
}
+ my $tmp = $";
+ $" = '","';
+ $r->print("\"@line\"\n");
+ $" = $tmp;
+ } elsif ($mode eq 'excel') {
+ $excel_sheet->write($row++,0,[$username,$domain,$id,
+ $name,$section,$status]);
}
}
- $r->print('</table><br>') if ($mode eq 'view');
+ if ($mode eq 'view') {
+ $r->print('</table><br>');
+ } elsif ($mode eq 'excel') {
+ $excel_workbook->close();
+ $r->print('<p><a href="'.$excel_filename.'">'.
+ 'Your Excel spreadsheet</a> is ready for download.</p>'."\n");
+ }
}
@@ -908,14 +1121,14 @@ END
sub print_modify_student_form {
my $r = shift();
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['sdom','sname']);
-
- my $sname = $ENV{'form.sname'};
- my $sdom = $ENV{'form.sdom'};
+ ['sdom','sname']);
+ my $sname = $ENV{'form.sname'};
+ my $sdom = $ENV{'form.sdom'};
+ my $sortby = $ENV{'form.sortby'};
# determine the students name information
my %info=&Apache::lonnet::get('environment',
['firstname','middlename',
- 'lastname','generation'],
+ 'lastname','generation','id'],
$sdom, $sname);
my ($tmp) = keys(%info);
if ($tmp =~ /^(con_lost|error|no_such_host)/i) {
@@ -930,18 +1143,26 @@ sub print_modify_student_form {
# determine the students starting and ending times and section
my ($starttime,$endtime,$section) = &get_enrollment_data($sname,$sdom);
# Deal with date forms
- my $startdateform = &Apache::lonhtmlcommon::date_setter('studentform',
- 'startdate',
- $starttime);
- my $enddateform = &Apache::lonhtmlcommon::date_setter('studentform',
- 'enddate',
- $endtime);
+ my $date_table = &date_setting_table($starttime,$endtime);
+ #
+ if (! exists($ENV{'form.Status'}) ||
+ $ENV{'form.Status'} !~ /^(Any|Expired|Active)$/) {
+ $ENV{'form.Status'} = 'crap';
+ }
# Make sure student is enrolled in course
$r->print(<<END);
+<p>
+<font size="+1">
+Only domain coordinators can change a users password.
+</font>
+</p>
<input type="hidden" name="slogin" value="$sname" />
<input type="hidden" name="sdomain" value="$sdom" />
<input type="hidden" name="action" value="modifystudent" />
-<input type="hidden" name="state" value="done" />
+<input type="hidden" name="state" value="done" />
+<input type="hidden" name="sortby" value="$sortby" />
+<input type="hidden" name="Status" value="$ENV{'form.Status'}" />
+
<h2>Modify Enrollment for $info{'firstname'} $info{'middlename'}
$info{'lastname'} $info{'generation'}, $sname\@$sdom</h2>
<p>
@@ -955,13 +1176,15 @@ $info{'lastname'} $info{'generation'}, $
<input type="text" name="generation" value="$info{'generation'}" /></td></tr>
</table>
</p><p>
-<b>Section</b>: <input type="text" name="section" value="$section" size="4"/>
+<b>Student ID</b>: <input type="text" name="id" value="$info{'id'}" size="12"/>
</p><p>
-<table>
-<tr><td align="right"><b>Starting Date:</b></td><td>$startdateform</td></tr>
-<tr><td align="right"><b>Ending Date:</b></td><td>$enddateform</td></tr>
-</table>
+<input type="checkbox" name="forceid" >
+Disable ID/Student Number Safeguard and Force Change of Conflicting IDs
+(only do if you know what you are doing)
+</p><p>
+<b>Section</b>: <input type="text" name="section" value="$section" size="4"/>
</p>
+<p>$date_table</p>
<input type="submit" value="Submit Modifications" />
</body></html>
END
@@ -973,56 +1196,139 @@ END
#
sub modify_single_student {
my $r = shift;
- # make sure user can modify student data?
+ #
+ # Remove whitespace from the section
+ $ENV{'form.section'} =~ s/(\s|:)//g;
+ #
+ # Do the date defaults first
+ my ($starttime,$endtime) = &get_dates_from_form();
+ if ($ENV{'form.makedatesdefault'}) {
+ $r->print(&make_dates_default($starttime,$endtime));
+ }
+ # Get the 'sortby' and 'Status' variables so the user goes back to their
+ # previous screen
+ my $sortby = $ENV{'form.sortby'};
+ my $status = $ENV{'form.Status'};
+ #
+ # We always need this information
+ my $slogin = $ENV{'form.slogin'};
+ my $sdom = $ENV{'form.sdomain'};
+ #
+ # Get the old data
+ my %old=&Apache::lonnet::get('environment',
+ ['firstname','middlename',
+ 'lastname','generation','id'],
+ $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("There was an error determining the environment values ".
+ " for $slogin \@ $sdom.");
+ return;
+ }
+ undef $tmp;
+ #
+ # Get the new data
my $firstname = $ENV{'form.firstname'};
my $middlename = $ENV{'form.middlename'};
my $lastname = $ENV{'form.lastname'};
my $generation = $ENV{'form.generation'};
my $section = $ENV{'form.section'};
my $courseid = $ENV{'request.course.id'};
- my $sname = $ENV{'form.slogin'};
- my $sdom = $ENV{'form.sdomain'};
- my $starttime = &Apache::lonhtmlcommon::get_date_from_form('startdate',
- time);
- my $endtime = &Apache::lonhtmlcommon::get_date_from_form('enddate',
- time);
+ my $sid = $ENV{'form.id'};
my $displayable_starttime = localtime($starttime);
my $displayable_endtime = localtime($endtime);
+ #
+ # check for forceid override
+ if ((defined($old{'id'})) && ($old{'id'} ne '') &&
+ ($sid ne $old{'id'}) && (! exists($ENV{'form.forceid'}))) {
+ $r->print("<font color=\"ff0000\">You changed the students id ".
+ " but did not disable the ID change safeguard.".
+ " The students id will not be changed.</font>");
+ $sid = $old{'id'};
+ }
+ #
# talk to the user about what we are going to do
$r->print(<<END);
-Modifying data for user: $sname \@ $sdom <br />
+ <h2>Modifying data for user $slogin \@ $sdom </h2>
<h3>Student Information</h3>
-<table>
-<tr><td>First name </td><td> $firstname </td></tr>
-<tr><td>Middle name </td><td> $middlename </td></tr>
-<tr><td>Last name </td><td> $lastname </td></tr>
-<tr><td>Generation </td><td> $generation </td></tr>
+<table rules="rows" border="1" cellpadding="3" >
+<tr>
+ <th> Field </th>
+ <th> Old Value </th>
+ <th> New Value </th>
+</tr>
+<tr>
+ <td> <b>First name</b> </td>
+ <td> $old{'firstname'} </td>
+ <td> $firstname </td>
+</tr><tr>
+ <td> <b>Middle name</b> </td>
+ <td> $old{'middlename'} </td>
+ <td> $middlename </td>
+</tr><tr>
+ <td> <b>Last name</b> </td>
+ <td> $old{'lastname'} </td>
+ <td> $lastname </td>
+</tr><tr>
+ <td> <b>Generation</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>Section</b> </td>
+ <td> $old{'section'} </td>
+ <td> $section</td>
+</tr>
</table>
<h3>Role Information</h3>
<table>
-<tr><td>Section </td><td> $section </td></tr>
-<tr><td>Start Time </td><td> $displayable_starttime </td></tr>
-<tr><td>End Time </td><td> $displayable_endtime </td></tr>
+<tr><td align="right"><b>Start Time:</b></td><td> $displayable_starttime </td></tr>
+<tr><td align="right"><b>End Time:</b></td><td> $displayable_endtime </td></tr>
</table>
+<p>
END
- # send request(s) to modify data
- my $roleresults = 'refused';
- #my $roleresults = &Apache::lonnet::assignrole($sdom,$sname,
- # $courseid.'/'.$section,
- # 'st',
- # $endtime,$starttime);
- if ($roleresults =~/refused/) {
+ #
+ # 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);
+ if ($modify_section_results !~ /^ok/) {
+ $r->print("An error occured 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'});
+ if ($roleresults eq 'refused' ) {
$r->print("Your request to change the role information for this ".
- "student was refused.");
+ "student was refused. You do not appear to have ".
+ "sufficient authority to change student information.");
} elsif ($roleresults !~ /ok/) {
$r->print("An error occurred during the attempt to change the role".
- " information for this student. The error reported was ".
+ " information for this student. <br />".
+ "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'}.
+ ":".$roleresults);
} else { # everything is okay!
- $r->print("Student role updated successfully.");
+ $r->print("Student information updated successfully. <br />".
+ "The student must log out and log in again to see ".
+ "these changes.");
}
- #
$r->print(<<END);
+</p><p>
+<input type="hidden" name="action" value="modifystudent" />
+<input type="hidden" name="sortby" value="$sortby" />
+<input type="hidden" name="Status" value="$status" />
+<a href="javascript:document.studentform.submit();">Modify another students data</a>
</body></html>
END
return;
@@ -1041,7 +1347,6 @@ sub get_enrollment_data {
my $section = '';
my $count = scalar(keys(%roles));
while (my ($course,$role) = each(%roles)) {
- &Apache::lonnet::logthis('course = '.$course.' role = '.$role);
if ($course=~ /^\/$courseid\/*\s*(\w+)*_st$/ ) {
#
# Get active role
@@ -1061,59 +1366,133 @@ sub get_enrollment_data {
return ($start,$end,$section);
}
-# =================================================== Show student list to drop
+#################################################
+#################################################
+
+=pod
+
+=item show_drop_list
+
+Display a list of students to drop
+Inputs:
+
+=over 4
+
+=item $r, Apache request
+
+=item $classlist, hash pointer returned from loncoursedata::get_classlist();
+
+=item $keylist, array pointer returned from loncoursedata::get_classlist()
+which describes the order elements are stored in the %$classlist values.
+
+=item $nosort, if true, sorting links are omitted.
+
+=back
+
+=cut
+
+#################################################
+#################################################
sub show_drop_list {
- my ($r,%currentlist)=@_;
+ my ($r,$classlist,$keylist,$nosort)=@_;
my $cid=$ENV{'request.course.id'};
- $r->print(<<'END');
-<input type="hidden" name="action" value="drop" />
+ if (! exists($ENV{'form.sortby'})) {
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['sortby']);
+ }
+ my $sortby = $ENV{'form.sortby'};
+ if ($sortby !~ /^(username|domain|section|fullname|id)$/) {
+ $sortby = 'username';
+ }
+ #
+ my $action = "drop";
+ $r->print(<<END);
+<input type="hidden" name="sortby" value="$sortby" />
+<input type="hidden" name="action" value="$action" />
<input type="hidden" name="state" value="done" />
<script>
-function checkAll(field)
-{
+function checkAll(field) {
for (i = 0; i < field.length; i++)
field[i].checked = true ;
}
-function uncheckAll(field)
-{
+function uncheckAll(field) {
for (i = 0; i < field.length; i++)
field[i].checked = false ;
}
</script>
<p>
<input type="hidden" name="phase" value="four">
+END
+
+ if ($nosort) {
+ $r->print(<<END);
<table border=2>
-<tr><th> </th><th>username</th><th>domain</th>
-<th>ID</th><th>student name</th><th>generation</th>
-<th>section</th></tr>
+<tr>
+ <th> </th>
+ <th>username</th>
+ <th>domain</th>
+ <th>ID</th>
+ <th>student name</th>
+ <th>section</th>
+</tr>
END
- foreach (sort keys %currentlist) {
- my ($sname,$sdom)=split(/\:/,$_);
- my %reply=&Apache::lonnet::idrget($sdom,$sname);
- my $ssec=&Apache::lonnet::usection($sdom,$sname,$cid);
- my %info=&Apache::lonnet::get('environment',
- ['firstname','middlename',
- 'lastname','generation'],
- $sdom, $sname);
- my ($tmp) = keys(%info);
- if ($tmp =~ /^(con_lost|error|no_such_host)/i) {
- $r->print('<tr><td colspan="7"><font color="red">'.
- 'Internal error: unable to get environment '.
- 'for '.$sname.' in domain '.$sdom.'</font></td></tr>');
- } else {
- $r->print(<<"END");
+
+ } else {
+ $r->print(<<END);
+<table border=2>
+<tr><th> </th>
+ <th>
+ <a href="/adm/dropadd?action=$action&sortby=username">username</a>
+ </th><th>
+ <a href="/adm/dropadd?action=$action&sortby=domain">domain</a>
+ </th><th>
+ <a href="/adm/dropadd?action=$action&sortby=id">ID</a>
+ </th><th>
+ <a href="/adm/dropadd?action=$action&sortby=fullname">student name</a>
+ </th><th>
+ <a href="/adm/dropadd?action=$action&sortby=section">section</a>
+ </th>
+</tr>
+END
+ }
+ #
+ # Sort the students
+ my %index;
+ my $i;
+ foreach (@$keylist) {
+ $index{$_} = $i++;
+ }
+ my $index = $index{$sortby};
+ my $second = $index{'username'};
+ my $third = $index{'domain'};
+ my @Sorted_Students = sort {
+ lc($classlist->{$a}->[$index]) cmp lc($classlist->{$b}->[$index])
+ ||
+ lc($classlist->{$a}->[$second]) cmp lc($classlist->{$b}->[$second])
+ ||
+ lc($classlist->{$a}->[$third]) cmp lc($classlist->{$b}->[$third])
+ } (keys(%$classlist));
+ foreach my $student (@Sorted_Students) {
+ my $error;
+ my $username = $classlist->{$student}->[$index{'username'}];
+ my $domain = $classlist->{$student}->[$index{'domain'}];
+ my $section = $classlist->{$student}->[$index{'section'}];
+ my $name = $classlist->{$student}->[$index{'fullname'}];
+ my $id = $classlist->{$student}->[$index{'id'}];
+ my $status = $classlist->{$student}->[$index{'status'}];
+ next if ($status ne 'Active');
+ #
+ $r->print(<<"END");
<tr>
- <td><input type="checkbox" name="droplist" value="$_"></td>
- <td>$sname</td>
- <td>$sdom</td>
- <td>$reply{$sname}</td>
- <td>$info{'lastname'}, $info{'firstname'} $info{'middlename'}</td>
- <td>$info{'generation'}</td>
- <td>$ssec</td>
+ <td><input type="checkbox" name="droplist" value="$student"></td>
+ <td>$username</td>
+ <td>$domain</td>
+ <td>$id</td>
+ <td>$name</td>
+ <td>$section</td>
</tr>
END
- }
}
$r->print('</table><br>');
$r->print(<<"END");
@@ -1122,6 +1501,7 @@ END
<input type="button" value="uncheck all" onclick="javascript:uncheckAll(document.studentform.droplist)">
<p><input type=submit value="Drop Students"></p>
END
+ return;
}
#
@@ -1170,10 +1550,10 @@ sub upfile_drop_add {
}
}
#
- my $startdate = $ENV{'form.startdate'};
- my $enddate = $ENV{'form.enddate'};
- if ($startdate=~/\D/) { $startdate=''; }
- if ($enddate=~/\D/) { $enddate=''; }
+ my ($startdate,$enddate) = &get_dates_from_form();
+ if ($ENV{'form.makedatesdefault'}) {
+ $r->print(&make_dates_default($startdate,$enddate));
+ }
# Determine domain and desired host (home server)
my $domain=$ENV{'form.lcdomain'};
my $desiredhost = $ENV{'form.lcserver'};
@@ -1209,7 +1589,7 @@ sub upfile_drop_add {
#######################################
## Enroll Students ##
#######################################
- $r->print('<h3>Enrolling Students</h3>');
+ $r->print('<h3>Enrolling Students</h3>'."\n".'<p>');
my $count=0;
my $flushc=0;
my %student=();
@@ -1238,9 +1618,9 @@ sub upfile_drop_add {
}
}
if ($entries{$fields{'username'}}=~/\W/) {
- $r->print('<p><b>Unacceptable username: '.
+ $r->print('<br /><b>Unacceptable username: '.
$entries{$fields{'username'}}.' for user '.
- $fname.' '.$mname.' '.$lname.' '.$gen.'</b><p>');
+ $fname.' '.$mname.' '.$lname.' '.$gen.'</b>');
} else {
# determine section number
my $sec='';
@@ -1250,6 +1630,8 @@ sub upfile_drop_add {
$sec=$entries{$fields{'sec'}};
}
}
+ # remove whitespace from section
+ $sec =~ s/(\s|:)//g;
# determine student id number
my $id='';
if (defined($fields{'id'})) {
@@ -1258,6 +1640,14 @@ sub upfile_drop_add {
}
$id=~tr/A-Z/a-z/;
}
+ # determine email address
+ my $email='';
+ if (defined($fields{'email'})) {
+ if (defined($entries{$fields{'email'}})) {
+ $email=$entries{$fields{'email'}};
+ unless ($email=~/^[^\@]+\@[^\@]+$/) { $email=''; }
+ }
+ }
# determine student password
my $password='';
if ($genpwd) {
@@ -1269,17 +1659,23 @@ sub upfile_drop_add {
}
}
}
+ # Clean up whitespace
+ foreach (\$domain,\$username,\$id,\$fname,\$mname,
+ \$lname,\$gen,\$sec) {
+ $$_ =~ s/(\s+$|^\s+)//g;
+ }
if ($password) {
&modifystudent($domain,$username,$cid,$sec,
$desiredhost);
my $reply=&Apache::lonnet::modifystudent
($domain,$username,$id,$amode,$password,
$fname,$mname,$lname,$gen,$sec,$enddate,
- $startdate,$ENV{'form.forceid'},$desiredhost);
+ $startdate,$ENV{'form.forceid'},$desiredhost,
+ $email);
if ($reply ne 'ok') {
- $r->print('<p><b>'.
- 'Error enrolling '.$username.': '.
- $reply.'</b></p>');
+ $reply =~ s/^error://;
+ $r->print('<br /><b>'.$username.'</b>:'.
+ ' Unable to enroll: '.$reply);
} else {
$count++; $flushc++;
$student{$username}=1;
@@ -1290,80 +1686,41 @@ sub upfile_drop_add {
}
}
} else {
- $r->print("<p><b>No password for $username</b><p>");
+ $r->print('<br /><b>'.$username.'</b>:'.
+ ' Unable to enroll: No password specified.');
}
}
}
} # end of foreach (@studentdata)
- $r->print('<p>Processed Students: '.$count);
+ $r->print('</p><p>Processed Students: '.$count.'</p>');
+ $r->print("<p>If active, the new role will be available when the ".
+ "students next log in to LON-CAPA.</p>");
#####################################
# Drop students #
#####################################
if ($ENV{'form.fullup'} eq 'yes') {
$r->print('<h3>Dropping Students</h3>');
# Get current classlist
- my ($error,%currentlist)=&get_current_classlist
- ($ENV{'course.'.$cid.'.domain'},
- $ENV{'course.'.$cid.'.num'});
- if (defined($error)) {
- $r->print('<pre>ERROR:$error</pre>');
- }
- if (defined(%currentlist)) {
- # Drop the students
+ my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist();
+ if (! defined($classlist)) {
+ $r->print("There are no students currently enrolled.\n");
+ } else {
+ # Remove the students we just added from the list of students.
foreach (@studentdata) {
my %entries=&Apache::loncommon::record_sep($_);
unless (($entries{$fields{'username'}} eq '') ||
(!defined($entries{$fields{'username'}}))) {
- delete($currentlist{$entries{$fields{'username'}}.
+ delete($classlist->{$entries{$fields{'username'}}.
':'.$domain});
}
}
- # Print out list of dropped students
- &show_drop_list($r,%currentlist);
- } else {
- $r->print("There are no students currently enrolled.\n");
+ # Print out list of dropped students.
+ &show_drop_list($r,$classlist,$keylist,'nosort');
}
}
} # end of unless
}
-###################################################################
-###################################################################
-
-=pod
-
-=item &drop_students
-
-Inputs: \@droplist, a pointer to an array of students to drop.
-Students should be in format of studentname:studentdomain
-
-Returns: $errors, a string describing any errors encountered.
-$successes, a string describing the successful dropping of students.
-
-=cut
-
-###################################################################
-###################################################################
-sub drop_students {
- my @droplist = @{shift()};
- my $courseid = $ENV{'request.course.id'};
- my $successes = '';
- my $errors = '';
- foreach (@droplist) {
- my ($sname,$sdom)=split(/:/,$_);
- my $result = &drop_student($sname,$sdom,$courseid);
- if ($result !~ /ok/) {
- $errors .= "Error dropping $sname\@$sdom: $result\n";
- } else {
- $successes .= "Dropped $sname\@$sdom\n";
- }
- }
- return ($errors,$successes);
-}
-###################################################################
-###################################################################
-
-
# ================================================================== Phase four
sub drop_student_list {
my $r=shift;
@@ -1376,17 +1733,18 @@ sub drop_student_list {
}
foreach (@droplist) {
my ($uname,$udom)=split(/\:/,$_);
+ # drop student
my $result = &modifystudent($udom,$uname,$ENV{'request.course.id'});
if ($result eq 'ok' || $result eq 'ok:') {
- $r->print('Dropped '.$uname.' at '.$udom.'<br>');
+ $r->print('Dropped '.$uname.' @ '.$udom.'<br>');
+ $count++;
} else {
- $r->print('Error dropping '.$uname.' at '.$udom.': '.$result.
+ $r->print('Error dropping '.$uname.' @ '.$udom.': '.$result.
'<br />');
}
- $count++;
}
$r->print('<p><b>Dropped '.$count.' student(s).</b>');
- $r->print('<p>Re-enrollment will re-activate data.');
+ $r->print('<p>Re-enrollment will re-activate data.') if ($count);
}
###################################################################
@@ -1410,7 +1768,8 @@ The response to the request is governed
upload enrolling enroll students based on upload
drop undefined print the classlist ready to drop
drop done drop the selected students
- enrollstudent undefined print single student enroll menu
+ enrollstudent undefined print student username domain form
+ enrollstudent gotusername print single student enroll menu
enrollstudent enrolling enroll student
classlist undefined print html classlist
classlist csv print csv classlist
@@ -1470,25 +1829,29 @@ sub handler {
}
} elsif ($ENV{'form.action'} eq 'drop') {
if (! exists($ENV{'form.state'})) {
- &menu_phase_two_drop($r);
+ &print_drop_menu($r);
} elsif ($ENV{'form.state'} eq 'done') {
&drop_student_list($r);
} else {
- &menu_phase_two_drop($r);
+ &print_drop_menu($r);
}
} elsif ($ENV{'form.action'} eq 'enrollstudent') {
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.state'} eq 'enrolling') {
&enroll_single_student($r);
} else {
- &print_enroll_single_student_form($r);
+ &get_student_username_domain_form($r);
}
} elsif ($ENV{'form.action'} eq 'classlist') {
if (! exists($ENV{'form.state'})) {
&print_html_classlist($r);
} elsif ($ENV{'form.state'} eq 'csv') {
- &print_csv_classlist($r);
+ &print_formatted_classlist($r,'csv');
+ } elsif ($ENV{'form.state'} eq 'excel') {
+ &print_formatted_classlist($r,'excel');
} else {
&print_html_classlist($r);
}