--- loncom/interface/Attic/londropadd.pm 2002/09/26 14:04:34 1.55
+++ loncom/interface/Attic/londropadd.pm 2003/07/02 19:52:56 1.71
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to drop and add students in courses
#
-# $Id: londropadd.pm,v 1.55 2002/09/26 14:04:34 matthew Exp $
+# $Id: londropadd.pm,v 1.71 2003/07/02 19:52:56 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;
}
@@ -212,6 +216,7 @@ 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) {
var foundatype=0;
@@ -220,6 +225,7 @@ function verify_message (vf,founduname,f
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');
@@ -251,60 +257,18 @@ 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 (message!='') {
message+='Continue enrollment?';
if (confirm(message)) {
- pclose();
vf.state.value='enrolling';
vf.submit();
}
} else {
- pclose();
vf.state.value='enrolling';
vf.submit();
}
}
-
- 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");
-
- }
-
- 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();
- }
-
$authheader
ENDPICK
@@ -459,11 +423,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 +453,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 +482,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;
@@ -557,6 +518,16 @@ sub print_upload_manager_form {
# ======================================================= Enroll single student
sub enroll_single_student {
my $r=shift;
+ #
+ # 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'}." \@ ".
$ENV{'form.lcdomain'}.'</p>');
@@ -603,8 +574,8 @@ sub enroll_single_student {
$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'},
+ $ENV{'form.csec'},$enddate,
+ $startdate,$ENV{'form.forceid'},
$desiredhost);
if ($login_result =~ /^ok/) {
$r->print($login_result);
@@ -623,23 +594,106 @@ sub enroll_single_student {
}
}
+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;
+}
+
# ======================================================= Menu Phase Two Enroll
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 ($krbdef,$krbdefdom) =
+ &Apache::loncommon::get_kerberos_defaults($defdom);
+ my $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 $domform = &domain_form($defdom);
+ my $date_table = &date_setting_table();
# Print it all out
$r->print(<<END);
<input type="hidden" name="action" value="enrollstudent">
@@ -705,20 +759,7 @@ $locform
<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>
@@ -734,81 +775,89 @@ END
return;
}
-# =================================================== get the current classlist
-sub get_current_classlist {
- my $r = shift;
- # Call DownloadClasslist
- my $cid = $ENV{'request.course.id'};
- my $c = $r->connection;
- my $classlisthash = &Apache::loncoursedata::DownloadClasslist
- ($cid,'Not downloaded',$c);
- # Call ProcessClasslist
- my %cache;
- my @students = &Apache::loncoursedata::ProcessClasslist(\%cache,
- $classlisthash,
- $cid,$c);
- return (\@students,\%cache);
-}
-
# ========================================================= Menu Phase Two Drop
sub print_drop_menu {
my $r=shift;
$r->print("<h3>Drop Students</h3>");
my $cid=$ENV{'request.course.id'};
- my ($student_array,$student_data)=&get_current_classlist($r);
- if (! scalar(@$student_array)) {
+ my ($classlist,$keylist) = &Apache::loncoursedata::get_classlist();
+ if (! defined($classlist)) {
$r->print("There are no students currently enrolled.\n");
return;
}
# Print out the available choices
- &show_drop_list($student_array,$student_data,$r);
+ &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 Classlist</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 ($student_array,$student_data)=&get_current_classlist($r);
- if (! scalar(@$student_array)) {
+ 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','modifystudent',
- 'any',$student_array,$student_data);
+ $ENV{'form.Status'},$classlist,$keylist);
} else {
&show_class_list($r,'view','aboutme','classlist',
- 'any',$student_array,$student_data);
+ $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 ($student_array,$student_data)=&get_current_classlist($r);
- if (! scalar(@$student_array)) {
+ 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','csv',
- 'any',$student_array,$student_data);
+ &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,$action,$statusmode,$students,$s_data)=@_;
+ my ($r,$mode,$linkto,$action,$statusmode,$classlist,$keylist)=@_;
my $cid=$ENV{'request.course.id'};
- &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['sortby']);
+ #
+ # 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';
@@ -816,58 +865,83 @@ sub show_class_list {
# 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>
- <a href="/adm/dropadd?action=$action&sortby=username">username</a>
+ <a href="javascript:document.studentform.sortby.value='username';document.studentform.submit();">username</a>
</th><th>
- <a href="/adm/dropadd?action=$action&sortby=domain">domain</a>
+ <a href="javascript:document.studentform.sortby.value='domain';document.studentform.submit();">domain</a>
</th><th>
- <a href="/adm/dropadd?action=$action&sortby=id">ID</a>
+ <a href="javascript:document.studentform.sortby.value='id';document.studentform.submit();">ID</a>
</th><th>
- <a href="/adm/dropadd?action=$action&sortby=fullname">student name</a>
+ <a href="javascript:document.studentform.sortby.value='fullname';document.studentform.submit();">student name</a>
</th><th>
- <a href="/adm/dropadd?action=$action&sortby=section">section</a>
+ <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","student name",
- "section")).'"'."\n");
+ 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 {
+ $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 = 'Classlist 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($s_data->{$a.':'.$sortby}) cmp lc($s_data->{$b.':'.$sortby})
- ||
- lc($s_data->{$a.':username'}) cmp lc($s_data->{$b.':username'})
- ||
- lc($s_data->{$a.':domain'}) cmp lc($s_data->{$b.':domain'})
- } @$students;
+ 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;
- if (exists($s_data->{$student.':error'})) {
- $error = $s_data->{$student.':error'};
- }
- if ($error) {
- $r->print('<tr><td colspan="6">'.
- '<font color="#FF8888">Error</font>'.
- 'Error retrieving data for '.
- join('@',split(/:/,$student)).
- ', '.$error.'</td></tr>'."\n");
- next;
- }
- my $username = $s_data->{$student.':username'};
- my $domain = $s_data->{$student.':domain'};
- my $section = $s_data->{$student.':section'};
- my $name = $s_data->{$student.':fullname'};
- my $status = $s_data->{$student.':Status'};
- my $id = $s_data->{$student.':id'};
- next if (($statusmode ne 'any') && ($status ne $statusmode));
+ 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') {
@@ -877,9 +951,12 @@ END
$username,
$domain));
} elsif ($linkto eq 'modify') {
- $r->print('<a href="/adm/dropadd?action=modifystudent'.
- '&state=selected'.'&sname='.$username.
- '&sdom='.$domain.'&sortby='.$sortby.'">'.
+ $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");
@@ -896,13 +973,25 @@ END
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");
+ }
}
@@ -912,7 +1001,7 @@ END
sub print_modify_student_form {
my $r = shift();
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['sdom','sname','sortby']);
+ ['sdom','sname']);
my $sname = $ENV{'form.sname'};
my $sdom = $ENV{'form.sdom'};
my $sortby = $ENV{'form.sortby'};
@@ -934,12 +1023,12 @@ 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>
@@ -952,6 +1041,8 @@ Only domain coordinators can change a us
<input type="hidden" name="action" value="modifystudent" />
<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>
@@ -972,12 +1063,8 @@ Disable ID/Student Number Safeguard and
(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>
-<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>
</p>
+<p>$date_table</p>
<input type="submit" value="Submit Modifications" />
</body></html>
END
@@ -989,8 +1076,16 @@ END
#
sub modify_single_student {
my $r = shift;
- # Get the 'sortby' variable so the user does not need to re-sort
+ #
+ # 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'};
@@ -1001,6 +1096,8 @@ sub modify_single_student {
['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 ".
@@ -1017,15 +1114,12 @@ sub modify_single_student {
my $section = $ENV{'form.section'};
my $courseid = $ENV{'request.course.id'};
my $sid = $ENV{'form.id'};
- my $starttime = &Apache::lonhtmlcommon::get_date_from_form('startdate',
- time);
- my $endtime = &Apache::lonhtmlcommon::get_date_from_form('enddate',
- time);
my $displayable_starttime = localtime($starttime);
my $displayable_endtime = localtime($endtime);
#
# check for forceid override
- if (($sid ne $old{'id'}) && (! exists($ENV{'form.forceid'}))) {
+ 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>");
@@ -1062,18 +1156,29 @@ sub modify_single_student {
<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
+ # 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'});
@@ -1097,7 +1202,10 @@ END
}
$r->print(<<END);
</p><p>
-<a href="/adm/dropadd?action=modifystudent&sortby=$sortby">Modify another students data</a>
+<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;
@@ -1116,7 +1224,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
@@ -1136,16 +1243,45 @@ 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 ($students,$s_data,$r)=@_;
+ my ($r,$classlist,$keylist,$nosort)=@_;
my $cid=$ENV{'request.course.id'};
- &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['sortby']);
+ 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" />
@@ -1164,6 +1300,23 @@ function uncheckAll(field) {
</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>section</th>
+</tr>
+END
+
+ } else {
+ $r->print(<<END);
<table border=2>
<tr><th> </th>
<th>
@@ -1179,32 +1332,32 @@ function uncheckAll(field) {
</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($s_data->{$a.':'.$sortby}) cmp lc($s_data->{$b.':'.$sortby})
- ||
- lc($s_data->{$a.':username'}) cmp lc($s_data->{$b.':username'})
- ||
- lc($s_data->{$a.':domain'}) cmp lc($s_data->{$b.':domain'})
- } @$students;
+ 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;
- if (exists($s_data->{$student.':error'})) {
- $error = $s_data->{$student.':error'};
- }
- if ($error) {
- $r->print('<tr><td colspan="6">'.
- '<font color="#FF8888">Error</font>'.
- 'Error retrieving data for '.
- join('@',split(/:/,$student)).
- ', '.$error.'</td></tr>'."\n");
- next;
- }
- my $username = $s_data->{$student.':username'};
- my $domain = $s_data->{$student.':domain'};
- my $section = $s_data->{$student.':section'};
- my $name = $s_data->{$student.':fullname'};
- my $status = $s_data->{$student.':Status'};
- my $id = $s_data->{$student.':id'};
+ 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");
@@ -1274,10 +1427,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'};
@@ -1373,6 +1526,11 @@ 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);
@@ -1408,66 +1566,26 @@ sub upfile_drop_add {
if ($ENV{'form.fullup'} eq 'yes') {
$r->print('<h3>Dropping Students</h3>');
# Get current classlist
- my ($error,%currentlist)=&get_current_classlist($r);
- 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;
@@ -1480,17 +1598,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.' @ '.$udom.'<br>');
+ $count++;
} else {
$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);
}
###################################################################
@@ -1592,7 +1711,9 @@ sub handler {
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);
}