--- loncom/interface/Attic/londropadd.pm 2002/11/08 20:51:48 1.60
+++ loncom/interface/Attic/londropadd.pm 2003/12/12 18:04:38 1.94
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to drop and add students in courses
#
-# $Id: londropadd.pm,v 1.60 2002/11/08 20:51:48 matthew Exp $
+# $Id: londropadd.pm,v 1.94 2003/12/12 18:04:38 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -32,7 +32,7 @@
# (TeX Content Handler
#
###############################################################
-###############################################################
+##############################################################
package Apache::londropadd;
@@ -42,15 +42,17 @@ use Apache::loncommon();
use Apache::lonhtmlcommon();
use Apache::Constants qw(:common :http REDIRECT);
use Spreadsheet::WriteExcel;
+use Apache::lonlocal;
###############################################################
###############################################################
sub header {
my $bodytag=&Apache::loncommon::bodytag('Enrollment Manager');
+ my $title = &mt('LON-CAPA Enrollment Manager');
return(<<ENDHEAD);
<html>
<head>
-<title>LON-CAPA Enrollment Manager</title>
+<title>$title</title>
</head>
$bodytag
<form method="post" enctype="multipart/form-data"
@@ -79,13 +81,16 @@ sub modifystudent {
# We are in this course
my $section=$1;
$section='' if ($course eq $courseid.'_st');
- if ( ((!$section) && (!$csec)) || ($section ne $csec) ) {
+ if (defined($csec) && $section eq $csec) {
+ $result .= 'ok:';
+ } elsif ( ((!$section) && (!$csec)) || ($section ne $csec) ) {
my (undef,$end,$start)=split(/\_/,$roles{$course});
my $now=time;
# if this is an active role
if (!($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.':';
}
@@ -93,7 +98,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;
}
@@ -136,33 +141,49 @@ sub domain_form {
# Menu Phase One
sub print_main_menu {
my $r=shift;
+ my %Text = &Apache::lonlocal::texthash
+ ('upload' => 'Upload a class list',
+ 'enrollone' => 'Enroll a single student',
+ 'modify' => 'Modify student data',
+ 'view' => 'View Class List',
+ 'drop' => 'Drop Students',
+ 'populate' => 'Automated Enrollment Manager');
+
$r->print(<<END);
<p>
<font size="+1">
- <a href="/adm/dropadd?action=upload">Upload a course list</a>
+ <a href="/adm/dropadd?action=upload">$Text{'upload'}</a>
</font>
</p><p>
<font size="+1">
- <a href="/adm/dropadd?action=enrollstudent">Enroll a single student</a>
+ <a href="/adm/dropadd?action=enrollstudent">$Text{'enrollone'}</a>
</font>
</p><p>
<font size="+1">
- <a href="/adm/dropadd?action=modifystudent">Modify student data</a>
+ <a href="/adm/dropadd?action=modifystudent">$Text{'modify'}</a>
</font>
</p><p>
<font size="+1">
- <a href="/adm/dropadd?action=classlist">View Classlist</a>
+ <a href="/adm/dropadd?action=classlist">$Text{'view'}</a>
</font>
</p><p>
<font size="+1">
- <a href="/adm/dropadd?action=drop">Drop Students</a>
+ <a href="/adm/dropadd?action=drop">$Text{'drop'}</a>
+</font>
+</p><p>
+<font size="+1">
+ <a href="/adm/populate">$Text{'populate'}</a>
</font>
-</p>
END
}
###############################################################
###############################################################
+sub hidden_input {
+ my ($name,$value) = @_;
+ return '<input type="hidden" name="'.$name.'" value="'.$value.'" />'."\n";
+}
+
sub print_upload_manager_header {
my ($r,$datatoken,$distotal,$krbdefdom)=@_;
my $javascript;
@@ -181,49 +202,80 @@ sub print_upload_manager_header {
} else {
$javascript=&upload_manager_javascript_forward_associate();
}
- 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="button" value="Reverse Association" onClick="javascript:this.form.associate.value='Reverse Association';submit(this.form);" />
-<input type="hidden" name="action" value="upload" />
-<input type="hidden" name="state" value="got_file" />
-<input type="hidden" name="associate" value="" />
-<input type="hidden" name="datatoken" value="$datatoken" />
-<input type="hidden" name="fileupload" value="$ENV{'form.fileupload'}" />
-<input type="hidden" name="upfiletype" value="$ENV{'form.upfiletype'}" />
-<input type="hidden" name="upfile_associate"
- value="$ENV{'form.upfile_associate'}" />
-<hr />
-<script type="text/javascript" language="Javascript">
-$javascript
-$javascript_validations
-</script>
-ENDPICK
+ my $javascript_validations=&javascript_validations('auth',$krbdefdom);
+ my $checked=(($ENV{'form.noFirstLine'})?' checked="1"':'');
+ $r->print('<h3>'.&mt('Uploading Class List')."</h3>\n".
+ "<hr>\n".
+ '<h3>'.&mt('Identify fields')."</h3>\n");
+ $r->print("<p>\n".
+ &mt('Total number of records found in file: [_1].',$distotal).
+ "\n".
+ "</p><hr>\n");
+ $r->print(&mt('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 enroll students in your class.')."<hr>\n");
+ $r->print(&hidden_input('action','upload').
+ &hidden_input('state','got_file').
+ &hidden_input('associate','').
+ &hidden_input('datatoken',$datatoken).
+ &hidden_input('fileupload',$ENV{'form.fileupload'}).
+ &hidden_input('upfiletype',$ENV{'form.upfiletype'}).
+ &hidden_input('upfile_associate',$ENV{'form.upfile_associate'}));
+ $r->print('<input type="button" value="Reverse Association" '.
+ 'name="'.&mt('Reverse Association').'" '.
+ 'onClick="javascript:this.form.associate.value=\'Reverse Association\';submit(this.form);" />');
+ $r->print('<input type="checkbox" name="noFirstLine" $checked />'.
+ &mt('Ignore First Line'));
+ $r->print("<hr />\n".
+ '<script type="text/javascript" language="Javascript">'."\n".
+ $javascript."\n".$javascript_validations.'</script>');
}
###############################################################
###############################################################
sub javascript_validations {
- my ($krbdefdom)=@_;
- my %param = ( formname => 'studentform',
+ my ($mode,$krbdefdom)=@_;
+ my $authheader;
+ if ($mode eq 'auth') {
+ my %param = ( formname => 'studentform',
+ kerb_def_dom => $krbdefdom );
+ $authheader = &Apache::loncommon::authform_header(%param);
+ } elsif ($mode eq 'createcourse') {
+ my %param = ( formname => 'ccrs',
kerb_def_dom => $krbdefdom );
- my $authheader = &Apache::loncommon::authform_header(%param);
- return (<<ENDPICK);
-function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec) {
+ $authheader = &Apache::loncommon::authform_header(%param);
+ }
+
+ my %alert = &Apache::lonlocal::texthash
+ (username => 'You need to specify the username field.',
+ authen => 'You must choose an authentication type.',
+ krb => 'You need to specify the Kerberos domain.',
+ ipass => 'You need to specify the initial password.',
+ name => 'The optional name field was not specified.',
+ snum => 'The optional student number field was not specified.',
+ section => 'The optional section or group field was not specified.',
+ email => 'The optional email address field was not specified.',
+ continue => 'Continue enrollment?',
+ );
+
+# my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
+ my $function_name =(<<END);
+function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail) {
+END
+ my $auth_checks = (<<END);
var foundatype=0;
- var message='';
+END
+ unless ($mode eq 'createcourse') {
+ $auth_checks .= (<<END);
if (founduname==0) {
- alert('You need to specify the username field');
+ alert('$alert{'username'}');
return;
}
+END
+ }
+ $auth_checks .= (<<END);
+ // 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');
+ alert('$alert{'authen'}');
return;
}
foundatype=1;
@@ -231,11 +283,11 @@ function verify_message (vf,founduname,f
var alertmsg = '';
switch (current.value) {
case 'krb':
- alertmsg = 'You need to specify the Kerberos domain';
+ alertmsg = '$alert{'krb'}';
break;
case 'loc':
case 'fsys':
- alertmsg = 'You need to specify the initial password';
+ alertmsg = '$alert{'ipass'}';
break;
case 'fsys':
alertmsg = '';
@@ -248,67 +300,59 @@ function verify_message (vf,founduname,f
return;
}
}
-
- 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;
- }
+END
+ my $optional_checks = '';
+ if ($mode eq 'createcourse') {
+ $optional_checks = (<<END);
+ vf.submit();
+}
+END
+ } else {
+ $optional_checks = (<<END);
+ var message='';
+ if (foundname==0) {
+ message='$alert{'name'}';
+ }
+ if (foundid==0) {
+ if (message!='') {
+ message+='\\n';
+ }
+ message+='$alert{'snum'}';
+ }
+ if (foundsec==0) {
+ if (message!='') {
+ message+='\\n';
+ }
+ message+='$alert{'section'}';
+ }
+ if (foundemail==0) {
+ if (message!='') {
+ message+='\\n';
+ }
+ message+='$alert{'email'}';
}
if (message!='') {
- message+='Continue enrollment?';
- if (confirm(message)) {
- pclose();
- vf.state.value='enrolling';
- vf.submit();
- }
+ message+= '\\n$alert{'continue'}';
+ if (confirm(message)) {
+ vf.state.value='enrolling';
+ vf.submit();
+ }
} else {
- pclose();
- vf.state.value='enrolling';
- vf.submit();
+ 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");
-
+END
}
-
- 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();
+ my $result = $function_name;
+ if ( ($mode eq 'auth') || ($mode eq 'createcourse') ) {
+ $result .= $auth_checks;
+ }
+ $result .= $optional_checks;
+ if ( ($mode eq 'auth') || ($mode eq 'createcourse') ) {
+ $result .= $authheader;
}
-
-$authheader
-ENDPICK
-
+ return $result;
}
###############################################################
@@ -321,6 +365,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');
@@ -329,8 +374,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);
}
//
@@ -349,7 +395,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;
@@ -460,94 +507,98 @@ 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);
- $r->print(<<ENDPICK);
-</table>
-<input type=hidden name=nfields value=$i>
-<input type=hidden name=keyfields value="$keyfields">
-<h3>Login Type</h3>
-<p>Note: this will not take effect if the user already exists</p>
-<p>
-$krbform
-</p>
-<p>
-$intform
-</p>
-<p>
-$locform
-</p>
-<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>
-<h3>Full Update</h3>
-<input type=checkbox name=fullup value=yes> Full update
-(also print list of users not enrolled anymore)<p>
-<h3>ID/Student Number</h3>
-<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="javascript:verify(this.form)" value="Update Courselist" /><br />
-Note: for large courses, this operation may be time consuming.
-ENDPICK
+ my $date_table = &date_setting_table();
+ my $Str = "</table>\n";
+ $Str .= &hidden_input('nfields',$i);
+ $Str .= &hidden_input('keyfields',$keyfields);
+ $Str .= '<h3>'.&mt('Login Type')."</h3>\n";
+ $Str .= "<p>\n".
+ &mt('Note: this will not take effect if the user already exists').
+ "</p><p>\n";
+ $Str .= $krbform."\n</p><p>\n".
+ $intform."\n</p><p>\n".
+ $locform."\n</p>\n";
+ $Str .= '<h3>'.&mt('LON-CAPA Domain for Students')."</h3>\n";
+ $Str .= "<p>\n".&mt('LON-CAPA domain: [_1]',$domform)."\n</p>\n";
+ $Str .= "<h3>".&mt('Starting and Ending Dates')."</h3>\n";
+ $Str .= "<p>\n".$date_table."</p>\n";
+ $Str .= "<h3>".&mt('Full Update')."</h3>\n";
+ $Str .= '<input type="checkbox" name="fullup" value="yes">'.
+ ' '.&mt('Full update (also print list of users not enrolled anymore)').
+ "</p>\n";
+ $Str .= "<h3>".&mt('Student Number')."</h3>\n";
+ $Str .= "<p>\n".'<input type="checkbox" name="forceid" value="yes">';
+ $Str .= &mt('Disable ID/Student Number Safeguard and Force Change '.
+ 'of Conflicting IDs (only do if you know what you are doing)').
+ "\n</p><p>\n";
+ $Str .= '<input type="button" onClick="javascript:verify(this.form)" '.
+ 'value="Update Courselist" />'."<br />\n";
+ $Str .= &mt('Note: for large courses, this operation may be time '.
+ 'consuming');
+ $r->print($Str);
+ return;
}
-# ======================================================= Menu Phase Two Upload
+###############################################################
+###############################################################
sub print_upload_manager_form {
my $r=shift;
-
+ my $firstLine;
my $datatoken;
if (!$ENV{'form.datatoken'}) {
- $datatoken=&Apache::loncommon::upfile_store($r);
+ $datatoken=&Apache::loncommon::upfile_store($r);
} else {
- $datatoken=$ENV{'form.datatoken'};
- &Apache::loncommon::load_tmp_file($r);
+ $datatoken=$ENV{'form.datatoken'};
+ &Apache::loncommon::load_tmp_file($r);
}
my @records=&Apache::loncommon::upfile_record_sep();
+ if($ENV{'form.noFirstLine'}){
+ $firstLine=shift(@records);
+ }
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 $defdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+ my ($krbdef,$krbdefdom) =
+ &Apache::loncommon::get_kerberos_defaults($defdom);
&print_upload_manager_header($r,$datatoken,$distotal,$krbdefdom);
my $i;
my $keyfields;
if ($total>=0) {
- my @d=(['username','Username'],
- ['names','Last Name, First Names'],
- ['fname','First Name'],
- ['mname','Middle Names/Initials'],
- ['lname','Last Name'],
- ['gen','Generation'],
- ['id','ID/Student Number'],
- ['sec','Group/Section'],
- ['ipwd','Initial Password']);
+ my @field=(['username',&mt('Username')],
+ ['names',&mt('Last Name, First Names')],
+ ['fname',&mt('First Name')],
+ ['mname',&mt('Middle Names/Initials')],
+ ['lname',&mt('Last Name')],
+ ['gen',&mt('Generation')],
+ ['id',&mt('ID/Student Number')],
+ ['sec',&mt('Group/Section')],
+ ['ipwd',&mt('Initial Password')],
+ ['email',&mt('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);
- foreach (@d) { $keyfields.=$_->[0].','; }
+ $i=&Apache::loncommon::csv_print_select_table($r,\@records,
+ \@field);
+ foreach (@field) {
+ $keyfields.=$_->[0].',';
+ }
chop($keyfields);
} else {
- unshift(@d,['none','']);
- $i=&Apache::loncommon::csv_samples_select_table($r,\@records,\@d);
+ unshift(@field,['none','']);
+ $i=&Apache::loncommon::csv_samples_select_table($r,\@records,
+ \@field);
my %sone=&Apache::loncommon::record_sep($records[0]);
$keyfields=join(',',sort(keys(%sone)));
}
@@ -555,11 +606,24 @@ sub print_upload_manager_form {
&print_upload_manager_footer($r,$i,$keyfields,$defdom,$today,$halfyear);
}
-# ======================================================= Enroll single student
+###############################################################
+###############################################################
sub enroll_single_student {
my $r=shift;
- $r->print('<h3>Enrolling Student</h3>');
- $r->print('<p>Enrolling '.$ENV{'form.cuname'}." \@ ".
+ # Remove non alphanumeric values from section
+ $ENV{'form.csec'}=~s/\W//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>'.&mt('Enrolling Student').'</h3>');
+ $r->print('<p>'.&mt('Enrolling').' '.$ENV{'form.cuname'}." \@ ".
$ENV{'form.lcdomain'}.'</p>');
if (($ENV{'form.cuname'})&&($ENV{'form.cuname'}!~/\W/)&&
($ENV{'form.lcdomain'})&&($ENV{'form.lcdomain'}!~/\W/)) {
@@ -571,12 +635,12 @@ sub enroll_single_student {
} else {
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');
+ $r->print('<font color="#ff0000">'.&mt('Error').':</font>'.
+ &mt('Invalid home server specified'));
return;
}
}
- $r->print(" with server $desiredhost :") if (defined($desiredhost));
+ $r->print(" ".&mt('with server')." $desiredhost :") if (defined($desiredhost));
# End of home server selection logic
my $amode='';
my $genpwd='';
@@ -604,48 +668,278 @@ 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);
- $r->print("<p> If active, the new role will be available ".
- "when the student next logs in to LON-CAPA.</p>");
+ $r->print("<p> ".&mt('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);
+ $r->print(&mt('unable to enroll').": ".$login_result);
}
} else {
- $r->print('<p><font color="#ff0000">ERROR</font> '.
- 'Invalid login mode or password. '.
- 'Unable to enroll '.$ENV{'form.cuname'}.'.</p>');
- }
+ $r->print('<p><font color="#ff0000">'.&mt('ERROR').'</font> ');
+ if ($amode =~ /^krb/) {
+ $r->print(&mt('Missing Kerberos domain information.').' ');
+ } else {
+ $r->print(&mt('Invalid login mode or password.').' ');
+ }
+ $r->print('<b>'.&mt('Unable to enroll').' '.$ENV{'form.cuname'}.'.</b></p>');
+ }
} else {
- $r->print('Invalid username or domain');
+ $r->print(&mt('Invalid username or domain'));
}
}
-# ======================================================= Menu Phase Two Enroll
+sub setup_date_selectors {
+ my ($starttime,$endtime,$mode) = @_;
+ if (! defined($starttime)) {
+ $starttime = time;
+ unless ($mode eq 'createcourse') {
+ 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
+ unless ($mode eq 'createcourse') {
+ 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);
+ if ($mode eq 'createcourse') {
+ $startdateform = &Apache::lonhtmlcommon::date_setter('ccrs',
+ 'startdate',
+ $starttime);
+ $enddateform = &Apache::lonhtmlcommon::date_setter('ccrs',
+ '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,$mode) = @_;
+ my ($startform,$endform)=&setup_date_selectors($starttime,$endtime,$mode);
+ my $dateDefault = '<nobr>'.
+ '<input type="checkbox" name="makedatesdefault" /> '.
+ &mt('make these dates the default for future enrollment');
+ if ($mode eq 'createcourse') {
+ $dateDefault = ' ';
+ }
+ my $perpetual = '<nobr><input type="checkbox" name="no_end_date"';
+ if (defined($endtime) && $endtime == 0) {
+ $perpetual .= ' checked';
+ }
+ $perpetual.= ' /> '.&mt('no ending date').'</nobr>';
+ my $result = '';
+ $result .= "<table>\n";
+ $result .= '<tr><td align="right">'.&mt('Starting Date').'</td>'.
+ '<td>'.$startform.'</td>'.
+ '<td>'.$dateDefault.'</td>'."</tr>\n";
+ $result .= '<tr><td align="right">'.&mt('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 .= &mt('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
+ ($ENV{'course.'.$ENV{'request.course.id'}.'.domain'},'cudomain',0);
+ my %lt=&Apache::lonlocal::texthash(
+ 'eos' => "Enroll One Student",
+ 'usr' => "Username",
+ 'dom' => "Domain",
+ 'been' => "Begin Enrollment",
+ );
+ $r->print(<<END);
+<input type="hidden" name="action" value="enrollstudent" />
+<input type="hidden" name="state" value="gotusername" />
+<h3>$lt{'eos'}</h3>
+<table>
+<tr><th>$lt{'usr'}:</th>
+ <td><input type="text" name="cuname" size="15" /></td></tr>
+<tr><th>$lt{'dom'}:</th>
+ <td>$domform</td></tr>
+<tr><th> </th>
+ <td>
+ <input type="submit" name="Begin Enrollment" value="$lt{'been'}" />
+ </td></tr>
+</table>
+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
+ $r->print("<h3>".&mt('Enroll One Student')."</h3>");
+ #
+ 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;
+ }
+ #
+ my $user_data_html = '';
+ my $javascript_validations = '';
+ if ($new_user) {
+ my $defdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+ # Set up authentication forms
+ my ($krbdef,$krbdefdom) =
+ &Apache::loncommon::get_kerberos_defaults($domain);
+ $javascript_validations=&javascript_validations('auth',$krbdefdom);
+ 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";
+ #
+ #
+ my %lt=&Apache::lonlocal::texthash(
+ 'udf' => "User Data for",
+ 'fn' => "First Name",
+ 'mn' => "Middle Name",
+ 'ln' => "Last Name",
+ 'gen' => "Generation",
+ 'hs' => "Home Server",
+ 'pswd' => "Password",
+ 'psam' => "Please select an authentication mechanism",
+ );
+ $user_data_html = <<END;
+<h3>$lt{'udf'} $username\@$domain</h3>
+<table>
+<tr><th>$lt{'fn'}:</th>
+ <td><input type="text" name="cfirst" size="15"></td></tr>
+<tr><th>$lt{'mn'}:</th>
+ <td><input type="text" name="cmiddle" size="15"></td></tr>
+<tr><th>$lt{'ln'}:</th>
+ <td><input type="text" name="clast" size="15"></td></tr>
+<tr><th>$lt{'gen'}:</th>
+ <td><input type="text" name="cgen" size="5"> </td></tr>
+<tr><th>$lt{'hs'}:</th>
+ <td>$homeserver_form</td></tr>
+</table>
+<h3>$lt{'pswd'}</h3>
+$lt{'psam'}
+<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('noauth');
+ my %lt=&Apache::lonlocal::texthash(
+ 'udf' => "User Data for",
+ 'fn' => "First Name",
+ 'mn' => "Middle Name",
+ 'ln' => "Last Name",
+ 'gen' => "Generation",
+ );
+ $user_data_html = <<END;
+<h3>$lt{'udf'} $username\@$domain</h3>
+<input type="hidden" name="lcserver" value="default" />
+<table>
+<tr><th>$lt{'fn'}:</th>
+ <td>
+ <input type="text" name="cfirst" value="$uenv{'firstname'}" size="15" />
+ </td></tr>
+<tr><th>$lt{'mn'}:</th>
+ <td>
+ <input type="text" name="cmiddle" value="$uenv{'middlename'}" size="15" />
+ </td></tr>
+<tr><th>$lt{'ln'}:</th>
+ <td>
+ <input type="text" name="clast"value="$uenv{'lastname'}" size="15" />
+ </td></tr>
+<tr><th>$lt{'gen'}:</th>
+ <td>
+ <input type="text" name="cgen" value="$uenv{'generation'}" size="5" />
+ </td></tr>
+</table>
+END
+ }
+ my $date_table = &date_setting_table();
+ # Print it all out
+ my %lt=&Apache::lonlocal::texthash(
+ 'cd' => "Course Data",
+ 'gs' => "Group/Section",
+ 'idsn' => "ID/Student Number",
+ 'disn' => "Disable ID/Student Number Safeguard and Force Change of Conflicting IDs (only do if you know what you are doing)",
+ 'eas' => "Enroll as student",
+ );
$r->print(<<END);
-<input type="hidden" name="action" value="enrollstudent">
-<input type="hidden" name="state" value="done">
-
+<input type="hidden" name="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;
@@ -682,54 +976,23 @@ 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>
+<h3>$lt{'cd'}</h3>
-<p>Group/Section: <input type="text" name="csec" size="5" />
+<p>$lt{'gs'}: <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>
+<h3>$lt{'idsn'}</h3>
<p>
-ID/Student Number: <input type="text" name="cstid" size="10">
+$lt{'idsn'}: <input type="text" name="cstid" size="10">
</p><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)
+$lt{'disn'}
</p><p>
-<input type="button" onClick="verify(this.form)" value="Enroll as student">
+<input type="button" onClick="verify(this.form)" value="$lt{'eas'}">
</p>
END
return;
@@ -738,11 +1001,11 @@ END
# ========================================================= Menu Phase Two Drop
sub print_drop_menu {
my $r=shift;
- $r->print("<h3>Drop Students</h3>");
+ $r->print("<h3>".&mt('Drop Students')."</h3>");
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");
+ $r->print(&mt('There are no students currently enrolled.')."\n");
return;
}
# Print out the available choices
@@ -761,27 +1024,34 @@ sub print_html_classlist {
}
my $status_select = &Apache::lonhtmlcommon::StatusOptions
($ENV{'form.Status'},'studentform');
+ my $CCL=&mt('Current Class List');
$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">$CCL</font>
END
if ($ENV{'form.action'} ne 'modifystudent') {
+ my %lt=&Apache::lonlocal::texthash(
+ 'ef' => "Excel format",
+ 'ss' => "Student Status",
+ );
$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>
+
+<a href="javascript:document.studentform.state.value='excel';document.studentform.submit();">$lt{'ef'}</a>
</font>
+$lt{'ss'}:
END
}
$r->print($status_select."</p>\n");
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");
+ $r->print(&mt('There are no students currently enrolled.')."\n");
} else {
# Print out the available choices
if ($ENV{'form.action'} eq 'modifystudent') {
@@ -801,7 +1071,7 @@ sub print_formatted_classlist {
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");
+ $r->print(&mt('There are no students currently enrolled.')."\n");
} else {
&show_class_list($r,$mode,'nolink','csv',
$ENV{'form.Status'},$classlist,$keylist);
@@ -823,10 +1093,16 @@ 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 personal page.');
+ $r->print(&mt('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(&mt('Select a user name to modify the students information'));
}
+ my %lt=&Apache::lonlocal::texthash(
+ 'usrn' => "username",
+ 'dom' => "domain",
+ 'sn' => "student name",
+ 'sec' => "section",
+ );
$r->print(<<END);
<input type="hidden" name="sortby" value="$sortby" />
@@ -835,28 +1111,29 @@ sub show_class_list {
<p>
<table border=2>
<tr><th>
- <a href="javascript:document.studentform.sortby.value='username';document.studentform.submit();">username</a>
+ <a href="javascript:document.studentform.sortby.value='username';document.studentform.submit();">$lt{'usrn'}</a>
</th><th>
- <a href="javascript:document.studentform.sortby.value='domain';document.studentform.submit();">domain</a>
+ <a href="javascript:document.studentform.sortby.value='domain';document.studentform.submit();">$lt{'dom'}</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>
+ <a href="javascript:document.studentform.sortby.value='fullname';document.studentform.submit();">$lt{'sn'}</a>
</th><th>
- <a href="javascript:document.studentform.sortby.value='section';document.studentform.submit();">section</a>
+ <a href="javascript:document.studentform.sortby.value='section';document.studentform.submit();">$lt{'sec'}</a>
</th>
</tr>
END
} elsif ($mode eq 'csv') {
if($statusmode eq 'Expired') {
- $r->print('"Students with expired roles"');
+ $r->print(&mt('Students with expired roles'));
}
if ($statusmode eq 'Any') {
- $r->print('"'.join('","',("username","domain","ID","student name",
- "section","status")).'"'."\n");
+ $r->print('"'.join('","',(&mt("username"),&mt("domain"),"ID",
+ &mt("student name"),&mt("section"),&mt("status"))).
+ '"'."\n");
} else {
- $r->print('"'.join('","',("username","domain","ID","student name",
- "section")).'"'."\n");
+ $r->print('"'.join('","',(&mt("username"),&mt("domain"),"ID",
+ &mt("student name"),&mt("section"))).'"'."\n");
}
} elsif ($mode eq 'excel') {
# Create the excel spreadsheet
@@ -868,7 +1145,7 @@ END
$excel_workbook->set_tempdir('/home/httpd/perl/tmp');
$excel_sheet = $excel_workbook->addworksheet('classlist');
#
- my $description = 'Classlist for '.
+ my $description = 'Class List for '.
$ENV{'course.'.$ENV{'request.course.id'}.'.description'};
$excel_sheet->write($row++,0,$description);
#
@@ -948,7 +1225,7 @@ END
} elsif ($mode eq 'excel') {
$excel_workbook->close();
$r->print('<p><a href="'.$excel_filename.'">'.
- 'Your Excel spreadsheet</a> is ready for download.</p>'."\n");
+ &mt('Your Excel spreadsheet').'</a> '.&mt('is ready for download').'.</p>'."\n");
}
}
@@ -970,33 +1247,45 @@ sub print_modify_student_form {
$sdom, $sname);
my ($tmp) = keys(%info);
if ($tmp =~ /^(con_lost|error|no_such_host)/i) {
- $r->print('<font color="#ff0000" size="+2">Error</font>'.
+ $r->print('<font color="#ff0000" size="+2">'.&mt('Error').'</font>'.
'<p>'.
- 'Unable to retrieve environment data for '.$sname.
- 'in domain '.$sdom.'</p><p>'.
- 'Please contact your LON-CAPA administrator '.
- 'regarding this situation.</p></body></html>');
+ &mt('Unable to retrieve environment data for').' '.$sname.
+ &mt('in domain').' '.$sdom.'</p><p>'.
+ &mt('Please contact your LON-CAPA administrator regarding this situation.').'</p></body></html>');
return;
}
# determine the students starting and ending times and section
my ($starttime,$endtime,$section) = &get_enrollment_data($sname,$sdom);
+ if ($starttime =~ /^error/) {
+ $r->print('<h2>'&mt('Error').'</h2>');
+ $r->print('<p>'.$starttime.'</p>');
+ return;
+ }
# 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
+ # Make sure student is enrolled in course
+ my %lt=&Apache::lonlocal::texthash(
+ 'mef' => "Modify Enrollment for",
+ 'odcc' => "Only domain coordinators can change a users password.",
+ 'sn' => "Student Name",
+ 'fn' => "First",
+ 'mn' => "Middle",
+ 'ln' => "Last",
+ 'gen' => "Generation",
+ 'sid' => "Student ID",
+ 'disn' => "Disable ID/Student Number Safeguard and Force Change of Conflicting IDs (only do if you know what you are doing)",
+ 'sec' => "Section",
+ 'sm' => "Submit Modifications",
+ );
$r->print(<<END);
<p>
<font size="+1">
-Only domain coordinators can change a users password.
+$lt{'odcc'}
</font>
</p>
<input type="hidden" name="slogin" value="$sname" />
@@ -1006,12 +1295,12 @@ Only domain coordinators can change a us
<input type="hidden" name="sortby" value="$sortby" />
<input type="hidden" name="Status" value="$ENV{'form.Status'}" />
-<h2>Modify Enrollment for $info{'firstname'} $info{'middlename'}
+<h2>$lt{'mef'} $info{'firstname'} $info{'middlename'}
$info{'lastname'} $info{'generation'}, $sname\@$sdom</h2>
<p>
-<b>Student Name</b>
+<b>$lt{'sn'}</b>
<table>
-<tr><th>First</th><th>Middle</th><th>Last</th><th>Generation</th></tr>
+<tr><th>$lt{'fn'}</th><th>$lt{'mn'}</th><th>$lt{'ln'}</th><th>$lt{'gen'}</th></tr>
<tr><td>
<input type="text" name="firstname" value="$info{'firstname'}" /></td><td>
<input type="text" name="middlename" value="$info{'middlename'}" /></td><td>
@@ -1019,20 +1308,15 @@ $info{'lastname'} $info{'generation'}, $
<input type="text" name="generation" value="$info{'generation'}" /></td></tr>
</table>
</p><p>
-<b>Student ID</b>: <input type="text" name="id" value="$info{'id'}" size="12"/>
+<b>$lt{'sid'}</b>: <input type="text" name="id" value="$info{'id'}" size="12"/>
</p><p>
<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"/>
+$lt{'disn'}
</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>
+<b>$lt{'sec'}</b>: <input type="text" name="section" value="$section" size="4"/>
</p>
-<input type="submit" value="Submit Modifications" />
+<p>$date_table</p>
+<input type="submit" value="$lt{'sm'}" />
</body></html>
END
return;
@@ -1043,6 +1327,15 @@ END
#
sub modify_single_student {
my $r = shift;
+ #
+ # Remove non alphanumeric values from the section
+ $ENV{'form.section'} =~ s/\W//g;
+ #
+ # Do the date defaults first
+ my ($starttime,$endtime) = &get_dates_from_form();
+ 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'};
@@ -1061,8 +1354,7 @@ sub modify_single_student {
$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.");
+ $r->print(&mt('There was an error determining the environment values for')." $slogin \@ $sdom.");
return;
}
undef $tmp;
@@ -1075,45 +1367,55 @@ 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'}))) {
- $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>");
+ if ((defined($old{'id'})) && ($old{'id'} ne '') &&
+ ($sid ne $old{'id'}) && (! exists($ENV{'form.forceid'}))) {
+ $r->print("<font color=\"ff0000\">".&mt('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
+ my %lt=&Apache::lonlocal::texthash(
+ 'mdu' => "Modifying data for user",
+ 'si' => "Student Information",
+ 'fd' => "Field",
+ 'ov' => "Old Value",
+ 'nv' => "New Value",
+ 'fn' => "First name",
+ 'mn' => "Middle name",
+ 'ln' => "Last name",
+ 'gen' => "Generation",
+ 'sec' => "Section",
+ 'ri' => "Role Information",
+ 'st' => "Start Time",
+ 'et' => "End Time",
+ );
$r->print(<<END);
- <h2>Modifying data for user $slogin \@ $sdom </h2>
-<h3>Student Information</h3>
+ <h2>$lt{'mdu'} $slogin \@ $sdom </h2>
+<h3>$lt{'si'}</h3>
<table rules="rows" border="1" cellpadding="3" >
<tr>
- <th> Field </th>
- <th> Old Value </th>
- <th> New Value </th>
+ <th> $lt{'fd'} </th>
+ <th> $lt{'ov'} </th>
+ <th> $lt{'nv'} </th>
</tr>
<tr>
- <td> <b>First name</b> </td>
+ <td> <b>$lt{'fn'}</b> </td>
<td> $old{'firstname'} </td>
<td> $firstname </td>
</tr><tr>
- <td> <b>Middle name</b> </td>
+ <td> <b>$lt{'mn'}</b> </td>
<td> $old{'middlename'} </td>
<td> $middlename </td>
</tr><tr>
- <td> <b>Last name</b> </td>
+ <td> <b>$lt{'ln'}</b> </td>
<td> $old{'lastname'} </td>
<td> $lastname </td>
</tr><tr>
- <td> <b>Generation</b> </td>
+ <td> <b>$lt{'gen'}</b> </td>
<td> $old{'generation'} </td>
<td> $generation </td>
</tr><tr>
@@ -1121,47 +1423,51 @@ sub modify_single_student {
<td> $old{'id'} </td>
<td> $sid </td>
</tr><tr>
- <td> <b>Section</b> </td>
+ <td> <b>$lt{'sec'}</b> </td>
<td> $old{'section'} </td>
<td> $section</td>
</tr>
</table>
-<h3>Role Information</h3>
+<h3>$lt{'ri'}</h3>
<table>
-<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>$lt{'st'}:</b></td><td> $displayable_starttime </td></tr>
+<tr><td align="right"><b>$lt{'et'}:</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(&mt('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. You do not appear to have ".
- "sufficient authority to change student information.");
+ $r->print(&mt('Your request to change the role information for this student was refused. You do not appear to have sufficient authority to change student information.'));
} elsif ($roleresults !~ /ok/) {
- $r->print("An error occurred during the attempt to change the role".
- " information for this student. <br />".
- "The error reported was ".
+ $r->print(&mt('An error occurred during the attempt to change the role information for this student.')." <br />".
+ &mt('The error reported was')." ".
$roleresults);
&Apache::lonnet::logthis("londropadd:failed attempt to modify student".
" data for ".$slogin." \@ ".$sdom." by ".
$ENV{'user.name'}." \@ ".$ENV{'user.domain'}.
":".$roleresults);
} else { # everything is okay!
- $r->print("Student information updated successfully. <br />".
- "The student must log out and log in again to see ".
- "these changes.");
+ $r->print(&mt('Student information updated successfully.')." <br />".
+ &mt('The student must log out and log in again to see these changes.'));
}
+ my $Masd=&mt('Modify another students data');
$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>
+<a href="javascript:document.studentform.submit();">$Masd</a>
</body></html>
END
return;
@@ -1174,13 +1480,12 @@ sub get_enrollment_data {
my %roles = &Apache::lonnet::dump('roles',$sdomain,$sname);
my ($tmp) = keys(%roles);
# Bail out if we were unable to get the students roles
- return "666" if ($tmp =~ /^(con_lost|error|no_such_host)/i);
+ return ('error'.$tmp) if ($tmp =~ /^(con_lost|error|no_such_host)/i);
# Go through the roles looking for enrollment in this course
my ($end,$start) = (undef,undef);
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
@@ -1260,32 +1565,44 @@ function uncheckAll(field) {
END
if ($nosort) {
+ my %lt=&Apache::lonlocal::texthash(
+ 'usrn' => "username",
+ 'dom' => "domain",
+ 'sn' => "student name",
+ 'sec' => "section",
+ );
$r->print(<<END);
<table border=2>
<tr>
<th> </th>
- <th>username</th>
- <th>domain</th>
+ <th>$lt{'usrn'}</th>
+ <th>$lt{'dom'}</th>
<th>ID</th>
- <th>student name</th>
- <th>section</th>
+ <th>$lt{'sn'}</th>
+ <th>$lt{'sec'}</th>
</tr>
END
} else {
+ my %lt=&Apache::lonlocal::texthash(
+ 'usrn' => "username",
+ 'dom' => "domain",
+ 'sn' => "student name",
+ 'sec' => "section",
+ );
$r->print(<<END);
<table border=2>
<tr><th> </th>
<th>
- <a href="/adm/dropadd?action=$action&sortby=username">username</a>
+ <a href="/adm/dropadd?action=$action&sortby=username">$lt{'usrn'}</a>
</th><th>
- <a href="/adm/dropadd?action=$action&sortby=domain">domain</a>
+ <a href="/adm/dropadd?action=$action&sortby=domain">$lt{'dom'}</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>
+ <a href="/adm/dropadd?action=$action&sortby=fullname">$lt{'sn'}</a>
</th><th>
- <a href="/adm/dropadd?action=$action&sortby=section">section</a>
+ <a href="/adm/dropadd?action=$action&sortby=section">$lt{'sec'}</a>
</th>
</tr>
END
@@ -1329,11 +1646,16 @@ END
END
}
$r->print('</table><br>');
+ my %lt=&Apache::lonlocal::texthash(
+ 'dp' => "Drop Students",
+ 'ca' => "check all",
+ 'ua' => "uncheck all",
+ );
$r->print(<<"END");
</p><p>
-<input type="button" value="check all" onclick="javascript:checkAll(document.studentform.droplist)">
-<input type="button" value="uncheck all" onclick="javascript:uncheckAll(document.studentform.droplist)">
-<p><input type=submit value="Drop Students"></p>
+<input type="button" value="$lt{'ca'}" onclick="javascript:checkAll(document.studentform.droplist)">
+<input type="button" value="$lt{'ua'}" onclick="javascript:uncheckAll(document.studentform.droplist)">
+<p><input type=submit value="$lt{'dp'}"></p>
END
return;
}
@@ -1343,26 +1665,25 @@ END
#
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>
-<h3>Upload a courselist</h3>
-$upfile_select
-<p>
-<input type=submit name="fileupload" value="Upload Courselist">
-<input type="hidden" name="action" value="upload" />
-<input type="hidden" name="state" value="got_file" />
-</p>
-$create_classlist_help <br />
-$create_csv_help
-</body></html>
-ENDUPFORM
+ my $str;
+ $str = '<input type="hidden" name="phase" value="two">';
+ $str .= '<input type="hidden" name="action" value="upload" />';
+ $str .= '<input type="hidden" name="state" value="got_file" />';
+ $str .= "<h3>".&mt('Upload a class list')."</h3>\n";
+ $str .= &Apache::loncommon::upfile_select_html();
+ $str .= "<p>\n";
+ $str .= '<input type="submit" name="fileupload" value="'.
+ &mt('Upload class list').'">'."\n";
+ $str .= '<input type="checkbox" name="noFirstLine" /> '.
+ &mt('Ignore First Line')."</p>\n";
+ $str .= &Apache::loncommon::help_open_topic("Course_Create_Class_List",
+ &mt("How do I create a class list from a spreadsheet")).
+ "<br />\n";
+ $str .= &Apache::loncommon::help_open_topic("Course_Convert_To_CSV",
+ &mt("How do I create a CSV file from a spreadsheet")).
+ "<br />\n";
+ $str .= "</body>\n</html>\n";
+ $r->print($str);
return;
}
@@ -1371,6 +1692,7 @@ sub upfile_drop_add {
my $r=shift;
&Apache::loncommon::load_tmp_file($r);
my @studentdata=&Apache::loncommon::upfile_record_sep();
+ if($ENV{'form.noFirstLine'}){shift(@studentdata);}
my @keyfields = split(/\,/,$ENV{'form.keyfields'});
my $cid = $ENV{'request.course.id'};
my %fields=();
@@ -1384,10 +1706,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'};
@@ -1396,8 +1718,9 @@ sub upfile_drop_add {
} else {
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');
+ $r->print('<font color="#ff0000">'.&mt('Error').'</font>'.
+ &mt('Invalid home server specified'));
+ $r->print("</body>\n</html>\n");
return;
}
}
@@ -1419,11 +1742,19 @@ sub upfile_drop_add {
$genpwd=$ENV{'form.locarg'};
}
}
+ if ($amode =~ /^krb/) {
+ if (! defined($genpwd) || $genpwd eq '') {
+ $r->print('<font color="red" size="+1">'.
+ &mt('Unable to enroll students').'</font> '.
+ &mt('No Kerberos domain was specified.').'</p>');
+ $amode = ''; # This causes the loop below to be skipped
+ }
+ }
unless (($domain=~/\W/) || ($amode eq '')) {
#######################################
## Enroll Students ##
#######################################
- $r->print('<h3>Enrolling Students</h3>');
+ $r->print('<h3>'.&mt('Enrolling Students')."</h3>\n<p>\n");
my $count=0;
my $flushc=0;
my %student=();
@@ -1452,9 +1783,10 @@ sub upfile_drop_add {
}
}
if ($entries{$fields{'username'}}=~/\W/) {
- $r->print('<p><b>Unacceptable username: '.
- $entries{$fields{'username'}}.' for user '.
- $fname.' '.$mname.' '.$lname.' '.$gen.'</b><p>');
+ $r->print('<br />'.
+ &mt('<b>[_1]</b>: Unacceptable username for user [_2] [_3] [_4] [_5]',
+ $entries{$fields{'username'}},$fname,$mname,$lname,$gen).
+ '</b>');
} else {
# determine section number
my $sec='';
@@ -1464,6 +1796,8 @@ sub upfile_drop_add {
$sec=$entries{$fields{'sec'}};
}
}
+ # remove non alphanumeric values from section
+ $sec =~ s/\W//g;
# determine student id number
my $id='';
if (defined($fields{'id'})) {
@@ -1472,6 +1806,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) {
@@ -1488,17 +1830,18 @@ sub upfile_drop_add {
\$lname,\$gen,\$sec) {
$$_ =~ s/(\s+$|^\s+)//g;
}
- if ($password) {
+ if ($password || $ENV{'form.login'} eq 'loc') {
&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 />'.
+ &mt('<b>[_1]</b>: Unable to enroll: [_2]',$username,$reply));
} else {
$count++; $flushc++;
$student{$username}=1;
@@ -1509,23 +1852,28 @@ sub upfile_drop_add {
}
}
} else {
- $r->print("<p><b>No password for $username</b><p>");
+ $r->print('<br />'.
+ &mt('<b>[_1]</b>: Unable to enroll. No password specified.',$username)
+ );
}
}
}
} # end of foreach (@studentdata)
- $r->print('<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>");
+ $r->print("</p>\n<p>\n".&mt('Processed [_1] student(s).',$count).
+ "</p>\n");
+ $r->print("<p>\n".
+ &mt('If active, the new role will be available when the '.
+ 'students next log in to LON-CAPA.')."</p>\n");
#####################################
# Drop students #
#####################################
if ($ENV{'form.fullup'} eq 'yes') {
- $r->print('<h3>Dropping Students</h3>');
+ $r->print('<h3>'.&mt('Dropping Students')."</h3>\n");
# Get current classlist
my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist();
if (! defined($classlist)) {
- $r->print("There are no students currently enrolled.\n");
+ $r->print(&mt('There are no students currently enrolled.').
+ "\n");
} else {
# Remove the students we just added from the list of students.
foreach (@studentdata) {
@@ -1558,15 +1906,16 @@ sub drop_student_list {
# drop student
my $result = &modifystudent($udom,$uname,$ENV{'request.course.id'});
if ($result eq 'ok' || $result eq 'ok:') {
- $r->print('Dropped '.$uname.' @ '.$udom.'<br>');
+ $r->print(&mt('Dropped [_1]',$uname.'@'.$udom).'<br>');
$count++;
} else {
- $r->print('Error dropping '.$uname.' @ '.$udom.': '.$result.
+ $r->print(
+ &mt('Error dropping [_1]:[_2]',$uname.'@'.$udom,$result).
'<br />');
}
}
- $r->print('<p><b>Dropped '.$count.' student(s).</b>');
- $r->print('<p>Re-enrollment will re-activate data.') if ($count);
+ $r->print('<p><b>'.&mt('Dropped [_1] student(s).',$count).'</b></p>');
+ $r->print('<p>'.&mt('Re-enrollment will re-activate data.')) if ($count);
}
###################################################################
@@ -1590,7 +1939,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
@@ -1605,7 +1955,7 @@ The response to the request is governed
sub handler {
my $r=shift;
if ($r->header_only) {
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
return OK;
}
@@ -1626,7 +1976,7 @@ sub handler {
$r->content_type('text/csv');
} else {
# Start page
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
$r->print(&header());
}
@@ -1658,11 +2008,13 @@ sub handler {
}
} 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'})) {