--- loncom/interface/Attic/londropadd.pm 2002/10/16 13:00:57 1.57
+++ loncom/interface/Attic/londropadd.pm 2003/04/30 15:49:45 1.65
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to drop and add students in courses
#
-# $Id: londropadd.pm,v 1.57 2002/10/16 13:00:57 matthew Exp $
+# $Id: londropadd.pm,v 1.65 2003/04/30 15:49:45 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;
###############################################################
###############################################################
@@ -92,7 +93,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 +213,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 +222,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');
@@ -284,14 +287,7 @@ function verify_message (vf,founduname,f
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");
-
- }
+ $pjump_def
function dateset() {
if (document.studentform.pres_marker.value=='end') {
@@ -459,7 +455,13 @@ 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);
@@ -520,12 +522,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;
@@ -627,14 +628,17 @@ sub enroll_single_student {
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);
@@ -755,25 +759,30 @@ sub print_html_classlist {
if (! exists($ENV{'form.sortby'})) {
$ENV{'form.sortby'} = 'username';
}
- if (! exists($ENV{'form.Status'}) ||
- $ENV{'form.Status'} !~ /^(Any|Expired|Active)$/) {
+ 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="classlist" />
+<input type="hidden" name="action" value="$ENV{'form.action'}" />
<input type="hidden" name="state" value="" />
<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>
-$status_select
-</p>
+Student Status:
END
+ }
+ $r->print($status_select."</p>\n");
my $cid=$ENV{'request.course.id'};
my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist();
if (! defined($classlist)) {
@@ -791,14 +800,15 @@ END
}
# ============================================== view classlist
-sub print_csv_classlist {
+sub print_formatted_classlist {
my $r=shift;
+ my $mode = shift;
my $cid=$ENV{'request.course.id'};
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',
+ &show_class_list($r,$mode,'nolink','csv',
$ENV{'form.Status'},$classlist,$keylist);
}
}
@@ -807,8 +817,10 @@ sub print_csv_classlist {
sub show_class_list {
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';
@@ -821,7 +833,10 @@ sub show_class_list {
$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>
@@ -838,8 +853,32 @@ sub show_class_list {
</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
@@ -875,9 +914,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");
@@ -894,13 +936,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");
+ }
}
@@ -910,7 +964,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'};
@@ -938,6 +992,11 @@ sub print_modify_student_form {
my $enddateform = &Apache::lonhtmlcommon::date_setter('studentform',
'enddate',
$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>
@@ -950,6 +1009,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>
@@ -987,8 +1048,10 @@ END
#
sub modify_single_student {
my $r = shift;
- # Get the 'sortby' variable so the user does not need to re-sort
+ # 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'};
@@ -999,6 +1062,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 ".
@@ -1023,7 +1088,8 @@ sub modify_single_student {
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>");
@@ -1060,18 +1126,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>
</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'});
@@ -1095,7 +1172,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;
@@ -1164,8 +1244,10 @@ which describes the order elements are s
sub show_drop_list {
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';
@@ -1491,14 +1573,14 @@ sub drop_student_list {
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);
}
###################################################################
@@ -1600,7 +1682,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);
}