--- loncom/interface/Attic/londropadd.pm 2002/04/26 19:10:54 1.32
+++ loncom/interface/Attic/londropadd.pm 2002/09/13 15:33:39 1.49
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to drop and add students in courses
#
-# $Id: londropadd.pm,v 1.32 2002/04/26 19:10:54 matthew Exp $
+# $Id: londropadd.pm,v 1.49 2002/09/13 15:33:39 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -59,23 +59,21 @@ use Apache::Constants qw(:common :http R
# ================================================================ Print header
sub header {
+ my $bodytag=&Apache::loncommon::bodytag('Enrollment Manager');
return(<<ENDHEAD);
<html>
<head>
-<title>LON-CAPA Student Drop/Add</title>
+<title>LON-CAPA Enrollment Manager</title>
</head>
-<body bgcolor="#FFFFFF">
-<img align=right src=/adm/lonIcons/lonlogos.gif>
-<h1>Drop/Add Students</h1>
-<form method="post" enctype="multipart/form-data"
-action="/adm/dropadd" name="studentform">
-<h2>Course: $ENV{'course.'.$ENV{'request.course.id'}.'.description'}</h2>
+$bodytag
+<form method="post" enctype="multipart/form-data"
+ action="/adm/dropadd" name="studentform">
ENDHEAD
}
# =========== Drop student from all sections of a course, except optional $csec
sub modifystudent {
- my ($udom,$unam,$courseid,$csec)=@_;
+ 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
@@ -84,24 +82,32 @@ sub modifystudent {
my %roles = &Apache::lonnet::dump('roles',$udom,$unam);
my ($tmp) = keys(%roles);
# Bail out if we were unable to get the students roles
- return if ($tmp =~ /^(con_lost|error|no_such_host)/i);
+ return "$1" if ($tmp =~ /^(con_lost|error|no_such_host)/i);
# Go through the roles looking for enrollment in this course
+ my $result = '';
foreach my $course (keys(%roles)) {
- my $value = $roles{$course};
- if ($course=~/^$courseid(?:\/)*(\w+)*\_st$/) {
+ if ($course=~/^$courseid(?:\/)*(?:\s+)*(\w+)*\_st$/) {
# We are in this course
my $section=$1;
$section='' if ($course eq $courseid.'_st');
- if (((!$section) && (!$csec)) || ($section ne $csec)) {
+ if ( ((!$section) && (!$csec)) || ($section ne $csec) ) {
my (undef,$end,$start)=split(/\_/,$roles{$course});
my $now=time;
if (!($start && ($now<$start)) || !($end && ($now>$end))) {
my $reply=&Apache::lonnet::modifystudent
- ($udom,$unam,'','','','','','','',$section,time);
+ ($udom,$unam,'','','','','','','',
+ $section,time,undef,undef,$desiredhost);
+ $result .= $reply.':';
}
}
}
}
+ if ($result eq '') {
+ $result eq 'Unable to find section for this student';
+ } else {
+ $result =~ s/(ok:)+/ok/g;
+ }
+ return $result;
}
# ============ build a domain and server selection form
@@ -121,7 +127,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_home_servers($dom);
+ my %servers = &Apache::loncommon::get_library_servers($dom);
foreach my $server (keys(%servers)) {
$select_menus{$dom}->{'select2'}->{$server}
= "$server $servers{$server}";
@@ -136,20 +142,17 @@ sub domain_form {
# ============================================================== Menu Phase One
sub menu_phase_one {
my $r=shift;
- my $upfile_select=&Apache::loncommon::upfile_select_html();
- $r->print(<<ENDUPFORM);
-<input type=hidden name=phase value=two>
-<hr>
-<h3>Upload a courselist</h3>
-$upfile_select
-<p><input type=submit name=fileupload value="Upload Courselist">
-<hr>
-<h3>Enroll a single student</h3>
-<p><input type=submit name=enroll value="Enroll Student">
-<hr>
-<h3>Drop students</h3>
-<p><input type=submit name=drop value="Selection List">
-ENDUPFORM
+ $r->print(<<END);
+<p>
+<font size="+1"><a href="/adm/dropadd?phase=two&uplist=yes">Upload a course list</a></font>
+</p><p>
+<font size="+1"><a href="/adm/dropadd?phase=two&enroll=yes">Enroll a single student</a></font>
+</p><p>
+<font size="+1"><a href="/adm/dropadd?phase=two&view=yes">View Classlist</a></font>
+</p><p>
+<font size="+1"><a href="/adm/dropadd?phase=two&drop=yes">Drop Students</a></font>
+</p>
+END
}
sub phase_two_header {
@@ -162,12 +165,14 @@ sub phase_two_header {
}
my $javascript_validations=&javascript_validations($krbdefdom);
$r->print(<<ENDPICK);
+<h3>Uploading Class List</h3>
<hr>
<h3>Identify fields</h3>
Total number of records found in file: $distotal <hr />
Enter as many fields as you can. The system will inform you and bring you back
to this page if the data selected is insufficient to run your class.<hr />
-<input type="submit" name="associate" value="Reverse Association" />
+<input type="button" value="Reverse Association" onClick="javascript:this.form.associate.value='Reverse Association';submit(this.form);" />
+<input type="hidden" name="associate" value="" />
<input type="hidden" name="phase" value="three" />
<input type="hidden" name="datatoken" value="$datatoken" />
<input type="hidden" name="fileupload" value="$ENV{'form.fileupload'}" />
@@ -303,19 +308,34 @@ function verify(vf) {
verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec);
}
+//
+// vf = this.form
+// tf = column number
+//
+// values of nw
+//
+// 0 = none
+// 1 = username
+// 2 = names (lastname, firstnames)
+// 3 = fname (firstname)
+// 4 = mname (middlename)
+// 5 = lname (lastname)
+// 6 = gen (generation)
+// 7 = id
+// 8 = section
+// 9 = ipwd (password)
+//
function flip(vf,tf) {
var nw=eval('vf.f'+tf+'.selectedIndex');
var i;
+ // make sure no other columns are labeled the same as this one
for (i=0;i<=vf.nfields.value;i++) {
if ((i!=tf) && (eval('vf.f'+i+'.selectedIndex')==nw)) {
eval('vf.f'+i+'.selectedIndex=0;')
}
}
- if (tf==1 && nw!=0) {
- for (i=2;i<=5;i++) {
- eval('vf.f'+i+'.selectedIndex=0;')
- }
- }
+ // If we set this to 'lastname, firstnames', clear out all the ones
+ // set to 'fname','mname','lname','gen' (3,4,5,6) currently.
if (nw==2) {
for (i=0;i<=vf.nfields.value;i++) {
if ((eval('vf.f'+i+'.selectedIndex')>=3) &&
@@ -324,6 +344,8 @@ function flip(vf,tf) {
}
}
}
+ // If we set this to one of 'fname','mname','lname','gen' (3,4,5,6),
+ // clear out any that are set to 'lastname, firstnames' (2)
if ((nw>=3) && (nw<=6)) {
for (i=0;i<=vf.nfields.value;i++) {
if (eval('vf.f'+i+'.selectedIndex')==2) {
@@ -331,6 +353,8 @@ function flip(vf,tf) {
}
}
}
+ // If we set the password, make the password form below correspond to
+ // the new value.
if (nw==9) {
changed_radio('int',document.studentform);
set_auth_radio_buttons('int',document.studentform);
@@ -449,7 +473,7 @@ LON-CAPA domain: $domform <p>
<input type=checkbox name=forceid value=yes>
Disable ID/Student Number Safeguard and Force Change of Conflicting IDs
(only do if you know what you are doing)<p>
-<input type="button" onClick="verify(this.form)" value="Update Courselist"><br>
+<input type="button" onClick="javascript:verify(this.form)" value="Update Courselist" /><br />
Note: for large courses, this operation might be time consuming.
ENDPICK
}
@@ -502,7 +526,8 @@ sub menu_phase_two_upload {
sub enroll_single_student {
my $r=shift;
$r->print('<h3>Enrolling Student</h3>');
- $r->print($ENV{'form.cuname'}." in domain ".$ENV{'form.lcdomain'});
+ $r->print('<p>Enrolling '.$ENV{'form.cuname'}." in domain ".
+ $ENV{'form.lcdomain'}.'</p>');
if (($ENV{'form.cuname'})&&($ENV{'form.cuname'}!~/\W/)&&
($ENV{'form.lcdomain'})&&($ENV{'form.lcdomain'}!~/\W/)) {
# Deal with home server selection
@@ -511,19 +536,20 @@ sub enroll_single_student {
if (lc($desiredhost) eq 'default') {
$desiredhost = undef;
} else {
- my %home_servers = &Apache::loncommon::get_home_servers($domain);
+ my %home_servers =&Apache::loncommon::get_library_servers($domain);
if (! exists($home_servers{$desiredhost})) {
$r->print('<font color="#ff0000">Error:</font>'.
'Invalid home server specified');
return;
}
}
- $r->print(" with server $desiredhost :");
+ $r->print(" with server $desiredhost :") if (defined($desiredhost));
# End of home server selection logic
my $amode='';
my $genpwd='';
if ($ENV{'form.login'} eq 'krb') {
- $amode='krb4';
+ $amode='krb';
+ $amode.=$ENV{'form.krbver'};
$genpwd=$ENV{'form.krbarg'};
} elsif ($ENV{'form.login'} eq 'int') {
$amode='internal';
@@ -533,7 +559,12 @@ sub enroll_single_student {
$genpwd=$ENV{'form.locarg'};
if (!$genpwd) { $genpwd=" "; }
}
- if (($amode) && ($genpwd)) {
+ my $home = &Apache::lonnet::homeserver($ENV{'form.cuname'},
+ $ENV{'form.lcdomain'});
+ if ((($amode) && ($genpwd)) || ($home ne 'no_host')) {
+ &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,
@@ -542,10 +573,10 @@ sub enroll_single_student {
$ENV{'form.csec'},$ENV{'form.enddate'},
$ENV{'form.startdate'},$ENV{'form.forceid'},
$desiredhost));
- &modifystudent($ENV{'form.lcdomain'},$ENV{'form.cuname'},
- $ENV{'request.course.id'},$ENV{'form.csec'});
} else {
- $r->print('Invalid login mode or password');
+ $r->print('<p><font color="#ff0000">ERROR</font> '.
+ 'Invalid login mode or password. '.
+ 'Unable to enroll '.$ENV{'form.cuname'}.'.</p>');
}
} else {
$r->print('Invalid username or domain');
@@ -555,6 +586,7 @@ sub enroll_single_student {
# ======================================================= Menu Phase Two Enroll
sub menu_phase_two_enroll {
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;
@@ -672,6 +704,7 @@ sub get_current_classlist {
}
return (undef,%currentlist);
} else {
+ $tmp =~ s/^error://;
return ($tmp,undef);
}
}
@@ -679,13 +712,17 @@ sub get_current_classlist {
# ========================================================= Menu Phase Two Drop
sub menu_phase_two_drop {
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'});
+ 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)) {
+ 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)) {
$r->print("There are no students currently enrolled.\n");
} else {
# Print out the available choices
@@ -693,6 +730,110 @@ sub menu_phase_two_drop {
}
}
+# ============================================== view classlist
+sub menu_phase_two_view {
+ my $r=shift;
+ $r->print(<<END);
+<font size="+1">Current Classlist</font>
+<font size="+1"><a href="/adm/dropadd?phase=two&viewcsv=yes">CSV format</a></font><br />
+END
+ 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)) {
+ $r->print("There are no students currently enrolled.\n");
+ } else {
+ # Print out the available choices
+ &show_class_list($r,'view',%currentlist);
+ }
+}
+
+# ============================================== view classlist
+sub menu_phase_two_viewcsv {
+ my $r=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)) {
+ $r->print("There are no students currently enrolled.\n");
+ } else {
+ &show_class_list($r,'csv',%currentlist);
+ }
+}
+
+# =================================================== Show student list to drop
+sub show_class_list {
+ my ($r,$mode,%currentlist)=@_;
+ my $cid=$ENV{'request.course.id'};
+ # Print out header
+ if ($mode eq 'view') {
+ $r->print(<<END);
+<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>
+END
+ } elsif ($mode eq 'csv') {
+ $r->print(<<END);
+username,domain,ID,last name,first name,middle name,generation,section
+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( ($mode eq 'view' ?
+ '<tr><td colspan="6"><font color="red">' :'').
+ 'Internal error: unable to get environment '.
+ 'for '.$sname.' in domain '.$sdom.
+ ( $mode eq 'view' ?'</font></td></tr>' :''));
+ } else {
+ if ($mode eq 'view') {
+ $r->print(<<"END");
+<tr>
+ <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>
+</tr>
+END
+ } elsif ($mode eq 'csv') {
+ 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;
+ }
+ }
+ }
+ $r->print('</table><br>') if ($mode eq 'view');
+}
+
# =================================================== Show student list to drop
sub show_drop_list {
my ($r,%currentlist)=@_;
@@ -754,6 +895,32 @@ END
END
}
+#
+# Print out the initial form to get the courselist file
+#
+sub print_first_courselist_upload_form {
+ my $r=shift;
+ my $upfile_select=&Apache::loncommon::upfile_select_html();
+ my $create_classlist_help =
+ &Apache::loncommon::help_open_topic("Course_Create_Class_List",
+ "How do I create a class list from a spreadsheet");
+ my $create_csv_help =
+ &Apache::loncommon::help_open_topic("Course_Convert_To_CSV",
+ "How do I create a CSV file from a spreadsheet");
+ $r->print(<<ENDUPFORM);
+<input type=hidden name=phase value=two>
+<hr>
+<h3>Upload a courselist</h3>
+$upfile_select
+<p><input type=submit name="fileupload" value="Upload Courselist">
+<br />
+$create_classlist_help <br />
+$create_csv_help
+</body></html>
+ENDUPFORM
+ return;
+}
+
# ================================================= Drop/Add from uploaded file
sub upfile_drop_add {
my $r=shift;
@@ -782,7 +949,7 @@ sub upfile_drop_add {
if (lc($desiredhost) eq 'default') {
$desiredhost = undef;
} else {
- my %home_servers = &Apache::loncommon::get_home_servers($domain);
+ my %home_servers = &Apache::loncommon::get_library_servers($domain);
if (! exists($home_servers{$desiredhost})) {
$r->print('<font color="#ff0000">Error:</font>'.
'Invalid home server specified');
@@ -793,7 +960,8 @@ sub upfile_drop_add {
my $amode = '';
my $genpwd = '';
if ($ENV{'form.login'} eq 'krb') {
- $amode='krb4';
+ $amode='krb';
+ $amode.=$ENV{'form.krbver'};
$genpwd=$ENV{'form.krbarg'};
} elsif ($ENV{'form.login'} eq 'int') {
$amode='internal';
@@ -871,11 +1039,12 @@ sub upfile_drop_add {
}
}
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);
- &modifystudent($domain,$username,$cid,$sec);
if ($reply ne 'ok') {
$r->print('<p><b>'.
'Error enrolling '.$username.': '.
@@ -931,10 +1100,21 @@ sub upfile_drop_add {
sub drop_student_list {
my $r=shift;
my $count=0;
- foreach (@{$ENV{'form.droplist'}}) {
+ my @droplist;
+ if (ref($ENV{'form.droplist'})) {
+ @droplist = @{$ENV{'form.droplist'}};
+ } else {
+ @droplist = ($ENV{'form.droplist'});
+ }
+ foreach (@droplist) {
my ($uname,$udom)=split(/\:/,$_);
- &modifystudent($udom,$uname,$ENV{'request.course.id'});
- $r->print('Dropped '.$uname.' at '.$udom.'<br>');
+ my $result = &modifystudent($udom,$uname,$ENV{'request.course.id'});
+ if ($result eq 'ok' || $result eq 'ok:') {
+ $r->print('Dropped '.$uname.' at '.$udom.'<br>');
+ } else {
+ $r->print('Error dropping '.$uname.' at '.$udom.': '.$result.
+ '<br />');
+ }
$count++;
}
$r->print('<p><b>Dropped '.$count.' student(s).</b>');
@@ -949,13 +1129,16 @@ sub handler {
$r->send_http_header;
return OK;
}
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['enroll','drop','view','phase',
+ 'viewcsv','uplist']);
# Needs to be in a course
if (($ENV{'request.course.fn'}) &&
(&Apache::lonnet::allowed('cst',$ENV{'request.course.id'}))) {
# Start page
- $r->content_type('text/html');
+ $r->content_type('text/html') if (! exists($ENV{'form.viewcsv'}));
$r->send_http_header;
- $r->print(&header());
+ $r->print(&header()) if (! exists($ENV{'form.viewcsv'}));
# Phase one, initial screen
unless ($ENV{'form.phase'}) {
&menu_phase_one($r);
@@ -970,12 +1153,18 @@ sub handler {
}
}
if ($ENV{'form.phase'} eq 'two') {
- if ($ENV{'form.fileupload'}) {
+ if ($ENV{'form.uplist'}) {
+ &print_first_courselist_upload_form($r);
+ } elsif ($ENV{'form.fileupload'}) {
&menu_phase_two_upload($r);
} elsif ($ENV{'form.enroll'}) {
&menu_phase_two_enroll($r);
} elsif ($ENV{'form.drop'}) {
&menu_phase_two_drop($r);
+ } elsif ($ENV{'form.view'}) {
+ &menu_phase_two_view($r);
+ } elsif ($ENV{'form.viewcsv'}) {
+ &menu_phase_two_viewcsv($r);
}
}
# Phase three
@@ -993,7 +1182,7 @@ sub handler {
&enroll_single_student($r);
}
# End
- $r->print('</form></body></html>');
+ $r->print('</form></body></html>') if (! exists($ENV{'form.viewcsv'}));
} else {
# Not in a course, or not allowed to modify parms
$ENV{'user.error.msg'}=