--- loncom/interface/Attic/londropadd.pm 2007/09/27 18:58:52 1.170
+++ loncom/interface/Attic/londropadd.pm 2008/11/17 15:48:46 1.175
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to drop and add students in courses
#
-# $Id: londropadd.pm,v 1.170 2007/09/27 18:58:52 www Exp $
+# $Id: londropadd.pm,v 1.175 2008/11/17 15:48:46 jms Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -26,8 +26,23 @@
# http://www.lon-capa.org/
#
#
-###############################################################
-##############################################################
+
+=head1 NAME
+
+Apache::londropadd
+
+=head1 SYNOPSIS
+
+drop & add students
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 SUBROUTINES
+
+=over
+
+=cut
package Apache::londropadd;
@@ -42,8 +57,6 @@ use Apache::lonlocal;
use Apache::longroup;
use LONCAPA();
-###############################################################
-###############################################################
sub header {
my ($jscript,$loaditems) = @_;
my $start_page;
@@ -59,9 +72,14 @@ $start_page
ENDHEAD
}
-###############################################################
-###############################################################
-# Drop student from all sections of a course, except optional $csec
+=pod
+
+=item modifystudent()
+
+ Drop student from all sections of a course, except optional $csec
+
+=cut
+
sub modifystudent {
my ($udom,$unam,$courseid,$csec,$desiredhost)=@_;
# if $csec is undefined, drop the student from all the courses matching
@@ -104,9 +122,14 @@ sub modifystudent {
return $result;
}
-###############################################################
-###############################################################
-# build a domain and server selection form
+=pod
+
+=item domain_form()
+
+ build a domain and server selection form
+
+=cut
+
sub domain_form {
my ($defdom) = @_;
# Set up domain and server selection forms
@@ -135,9 +158,14 @@ sub domain_form {
return $result;
}
-###############################################################
-###############################################################
-# Menu Phase One
+=pod
+
+=item print_main_menu()
+
+ Menu Phase One
+
+=cut
+
sub print_main_menu {
my ($r,$permission)=@_;
#
@@ -224,13 +252,15 @@ sub print_main_menu {
return;
}
-###############################################################
-###############################################################
+
+
sub hidden_input {
my ($name,$value) = @_;
return ''."\n";
}
+
+
sub print_upload_manager_header {
my ($r,$datatoken,$distotal,$krbdefdom)=@_;
my $javascript;
@@ -262,8 +292,9 @@ sub print_upload_manager_header {
$password_choice = 'int';
}
#
- my $javascript_validations=&javascript_validations('auth',$krbdefdom,
- $password_choice);
+ my $javascript_validations =
+ &javascript_validations('auth',$krbdefdom,$password_choice,undef,
+ $env{'request.role.domain'});
my $checked=(($env{'form.noFirstLine'})?' checked="checked" ':'');
$r->print('
END
+ if ($krbform ne '') {
+ $user_data_html .= $krbform.' ';
+ }
+ if ($intform ne '') {
+ $user_data_html .= $intform.' ';
+ }
+ if ($locform ne '') {
+ $user_data_html .= $locform.' ';
+ }
+ $user_data_html .= "\n\n"
} else {
# User already exists. Do not worry about authentication
my %uenv = &Apache::lonnet::dump('environment',$ccdomain,$ccuname);
- $javascript_validations = &javascript_validations('noauth');
+ $javascript_validations = &Apache::lonuserutils::javascript_validations('noauth');
my %lt=&Apache::lonlocal::texthash(
'udf' => "User Data for",
'fn' => "First Name",
@@ -1147,7 +1203,7 @@ END
END
}
- my $date_table = &date_setting_table();
+ my $date_table = &Apache::lonuserutils::date_setting_table();
# Print it all out
my %lt=&Apache::lonlocal::texthash(
'cd' => "Course Data",
@@ -1236,7 +1292,14 @@ END
return;
}
-# ========================================================= Menu Phase Two Drop
+=pod
+
+=item print_drop_menu()
+
+ Menu Phase Two Drop
+
+=cut
+
sub print_drop_menu {
my $r=shift;
$r->print("
".&mt('Drop Students')."
");
@@ -1251,7 +1314,15 @@ sub print_drop_menu {
return;
}
-# ============================================== view classlist
+
+=pod
+
+=item print_html_classlist()
+
+ view classlist
+
+=cut
+
sub print_html_classlist {
my ($r,$mode,$permission) = @_;
if (! exists($env{'form.sortby'})) {
@@ -1341,7 +1412,15 @@ sub print_html_classlist {
}
}
-# =================================================== Show student list to drop
+
+=pod
+
+=item show_class_list()
+
+ Show student list to drop
+
+=cut
+
sub show_class_list {
my ($r,$mode,$linkto,$statusmode,$classlist,$keylist)=@_;
my $cid=$env{'request.course.id'};
@@ -1499,9 +1578,9 @@ END
time.'_'.rand(1000000000).'.csv';
unless ($CSVfile = Apache::File->new('>/home/httpd'.$CSVfilename)) {
$r->log_error("Couldn't open $CSVfilename for output $!");
- $r->print("Problems occured in writing the csv file. ".
- "This error has been logged. ".
- "Please alert your LON-CAPA administrator.");
+ $r->print(&mt('Problems occurred in writing the csv file. '
+ .'This error has been logged. '
+ .'Please alert your LON-CAPA administrator.'));
$CSVfile = undef;
}
#
@@ -1743,9 +1822,14 @@ END
}
-#
-# print out form for modification of a single students data
-#
+=pod
+
+=item print_modify_student_form()
+
+ print out form for modification of a single students data
+
+=cut
+
sub print_modify_student_form {
my $r = shift();
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
@@ -1796,7 +1880,8 @@ sub print_modify_student_form {
&Apache::lonlocal::locallocaltime($endtime)).' ';
}
- my $date_table = &date_setting_table($starttime,$endtime);
+ my $date_table =
+ &Apache::lonuserutils::date_setting_table($starttime,$endtime);
#
if (! exists($env{'form.Status'}) ||
$env{'form.Status'} !~ /^(Any|Expired|Active|Future)$/) {
@@ -1818,7 +1903,7 @@ sub print_modify_student_form {
'sm' => "Submit Modifications",
);
# Check if section name is valid
- my $section_check = §ion_check_js();
+ my $section_check = &Apache::lonuserutils::section_check_js();
$r->print(<<"END");
';
+ &Apache::loncreateuser::restore_prev_selections();
+ my $srch;
+ foreach my $item (@search) {
+ $srch->{$item} = $env{'form.'.$item};
+ }
+
if ($env{'form.state'} eq 'gotusername') {
- my $srch;
- foreach my $item (@search) {
- $srch->{$item} = $env{'form.'.$item};
- }
if ($env{'form.phase'} eq 'get_user_info') {
my ($currstate,$response,$forcenewuser,$results) =
&Apache::loncreateuser::user_search_result($srch);
+ if ($env{'form.currstate'} eq 'modify') {
+ $currstate = $env{'form.currstate'};
+ }
if ($currstate eq 'select') {
$r->print(&header());
&Apache::lonhtmlcommon::add_breadcrumb
@@ -2797,7 +2902,7 @@ sub handler {
&print_enroll_single_student_form($r,$jscript,$ccuname,
$ccdomain,$srch);
} else {
- &get_student_username_domain_form($r,$elements);
+ &get_student_username_domain_form($r,$elements,undef,$srch);
}
} elsif ($env{'form.state'} eq 'enrolling') {
$r->print(&header($jscript));
@@ -2818,7 +2923,7 @@ sub handler {
'Course_Add_Student'));
&enroll_single_student($r,\@search);
} else {
- &get_student_username_domain_form($r,$elements);
+ &get_student_username_domain_form($r,$elements,undef,$srch);
}
} elsif ($env{'form.action'} eq 'classlist' && $permission->{'view'}) {
$r->print(&header());
@@ -2867,10 +2972,12 @@ sub handler {
return OK;
}
-###################################################################
-###################################################################
1;
__END__
+=pod
+
+=back
+=cut