version 1.98, 2004/01/15 03:18:19
|
version 1.100, 2004/02/10 22:15:53
|
Line 190 sub hidden_input {
|
Line 190 sub hidden_input {
|
sub print_upload_manager_header { |
sub print_upload_manager_header { |
my ($r,$datatoken,$distotal,$krbdefdom)=@_; |
my ($r,$datatoken,$distotal,$krbdefdom)=@_; |
my $javascript; |
my $javascript; |
|
# |
if (! exists($ENV{'form.upfile_associate'})) { |
if (! exists($ENV{'form.upfile_associate'})) { |
$ENV{'form.upfile_associate'} = 'forward'; |
$ENV{'form.upfile_associate'} = 'forward'; |
} |
} |
Line 205 sub print_upload_manager_header {
|
Line 206 sub print_upload_manager_header {
|
} else { |
} else { |
$javascript=&upload_manager_javascript_forward_associate(); |
$javascript=&upload_manager_javascript_forward_associate(); |
} |
} |
my $javascript_validations=&javascript_validations('auth',$krbdefdom); |
# |
|
# Deal with restored settings |
|
my $password_choice = ''; |
|
if (exists($ENV{'form.ipwd_choice'}) && |
|
$ENV{'form.ipwd_choice'} ne '') { |
|
# If a column was specified for password, assume it is for an |
|
# internal password. This is a bug waiting to be filed (could be |
|
# local or krb auth instead of internal) but I do not have the |
|
# time to mess around with this now. |
|
$password_choice = 'int'; |
|
} |
|
# |
|
my $javascript_validations=&javascript_validations('auth',$krbdefdom, |
|
$password_choice); |
my $checked=(($ENV{'form.noFirstLine'})?' checked="1"':''); |
my $checked=(($ENV{'form.noFirstLine'})?' checked="1"':''); |
$r->print('<h3>'.&mt('Uploading Class List')."</h3>\n". |
$r->print('<h3>'.&mt('Uploading Class List')."</h3>\n". |
"<hr>\n". |
"<hr>\n". |
Line 239 sub javascript_validations {
|
Line 253 sub javascript_validations {
|
my $authheader; |
my $authheader; |
if ($mode eq 'auth') { |
if ($mode eq 'auth') { |
my %param = ( formname => 'studentform', |
my %param = ( formname => 'studentform', |
kerb_def_dom => $krbdefdom ); |
kerb_def_dom => $krbdefdom, |
|
curr_authtype => $curr_authtype); |
$authheader = &Apache::loncommon::authform_header(%param); |
$authheader = &Apache::loncommon::authform_header(%param); |
} elsif ($mode eq 'createcourse') { |
} elsif ($mode eq 'createcourse') { |
my %param = ( formname => 'ccrs', |
my %param = ( formname => 'ccrs', |
kerb_def_dom => $krbdefdom ); |
kerb_def_dom => $krbdefdom, |
|
curr_authtype => $curr_authtype ); |
$authheader = &Apache::loncommon::authform_header(%param); |
$authheader = &Apache::loncommon::authform_header(%param); |
} elsif ($mode eq 'modifycourse') { |
} elsif ($mode eq 'modifycourse') { |
my %param = ( formname => 'cmod', |
my %param = ( formname => 'cmod', |
Line 561 sub print_upload_manager_footer {
|
Line 577 sub print_upload_manager_footer {
|
kerb_def_dom => $krbdefdom, |
kerb_def_dom => $krbdefdom, |
kerb_def_auth => $krbdef |
kerb_def_auth => $krbdef |
); |
); |
|
if (exists($ENV{'form.ipwd_choice'}) && |
|
defined($ENV{'form.ipwd_choice'}) && |
|
$ENV{'form.ipwd_choice'} ne '') { |
|
$param{'curr_authtype'} = 'int'; |
|
} |
my $krbform = &Apache::loncommon::authform_kerberos(%param); |
my $krbform = &Apache::loncommon::authform_kerberos(%param); |
my $intform = &Apache::loncommon::authform_internal(%param); |
my $intform = &Apache::loncommon::authform_internal(%param); |
my $locform = &Apache::loncommon::authform_local(%param); |
my $locform = &Apache::loncommon::authform_local(%param); |
Line 601 sub print_upload_manager_footer {
|
Line 622 sub print_upload_manager_footer {
|
############################################################### |
############################################################### |
sub print_upload_manager_form { |
sub print_upload_manager_form { |
my $r=shift; |
my $r=shift; |
|
|
my $firstLine; |
my $firstLine; |
my $datatoken; |
my $datatoken; |
if (!$ENV{'form.datatoken'}) { |
if (!$ENV{'form.datatoken'}) { |
Line 617 sub print_upload_manager_form {
|
Line 639 sub print_upload_manager_form {
|
my $distotal=$total+1; |
my $distotal=$total+1; |
my $today=time; |
my $today=time; |
my $halfyear=$today+15552000; |
my $halfyear=$today+15552000; |
|
# |
|
# Restore memorized settings |
|
&Apache::loncommon::restore_course_settings |
|
('enrollment_upload',{ 'username_choice' => 'scalar', # column settings |
|
'names_choice' => 'scalar', |
|
'fname_choice' => 'scalar', |
|
'mname_choice' => 'scalar', |
|
'lname_choice' => 'scalar', |
|
'gen_choice' => 'scalar', |
|
'id_choice' => 'scalar', |
|
'sec_choice' => 'scalar', |
|
'ipwd_choice' => 'scalar', |
|
'email_choice' => 'scalar', |
|
}); |
|
# |
|
# Determine kerberos parameters as appropriate |
my $defdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}; |
my $defdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}; |
my ($krbdef,$krbdefdom) = |
my ($krbdef,$krbdefdom) = |
&Apache::loncommon::get_kerberos_defaults($defdom); |
&Apache::loncommon::get_kerberos_defaults($defdom); |
|
# |
&print_upload_manager_header($r,$datatoken,$distotal,$krbdefdom); |
&print_upload_manager_header($r,$datatoken,$distotal,$krbdefdom); |
my $i; |
my $i; |
my $keyfields; |
my $keyfields; |
if ($total>=0) { |
if ($total>=0) { |
my @field=(['username',&mt('Username')], |
my @field= |
['names',&mt('Last Name, First Names')], |
(['username',&mt('Username'), $ENV{'form.username_choice'}], |
['fname',&mt('First Name')], |
['names',&mt('Last Name, First Names'),$ENV{'form.names_choice'}], |
['mname',&mt('Middle Names/Initials')], |
['fname',&mt('First Name'), $ENV{'form.fname_choice'}], |
['lname',&mt('Last Name')], |
['mname',&mt('Middle Names/Initials'),$ENV{'form.mname_choice'}], |
['gen',&mt('Generation')], |
['lname',&mt('Last Name'), $ENV{'form.lname_choice'}], |
['id',&mt('ID/Student Number')], |
['gen', &mt('Generation'), $ENV{'form.gen_choice'}], |
['sec',&mt('Group/Section')], |
['id', &mt('ID/Student Number'),$ENV{'form.id_choice'}], |
['ipwd',&mt('Initial Password')], |
['sec', &mt('Group/Section'), $ENV{'form.sec_choice'}], |
['email',&mt('EMail Address')]); |
['ipwd', &mt('Initial Password'),$ENV{'form.ipwd_choice'}], |
|
['email',&mt('EMail Address'), $ENV{'form.email_choice'}]); |
if ($ENV{'form.upfile_associate'} eq 'reverse') { |
if ($ENV{'form.upfile_associate'} eq 'reverse') { |
&Apache::loncommon::csv_print_samples($r,\@records); |
&Apache::loncommon::csv_print_samples($r,\@records); |
$i=&Apache::loncommon::csv_print_select_table($r,\@records, |
$i=&Apache::loncommon::csv_print_select_table($r,\@records, |
Line 1071 sub print_html_classlist {
|
Line 1111 sub print_html_classlist {
|
} |
} |
my $status_select = &Apache::lonhtmlcommon::StatusOptions |
my $status_select = &Apache::lonhtmlcommon::StatusOptions |
($ENV{'form.Status'},'studentform'); |
($ENV{'form.Status'},'studentform'); |
|
my $cid=$ENV{'request.course.id'}; |
|
my $cdom=$ENV{'course.'.$cid.'.domain'}; |
|
my $cnum=$ENV{'course.'.$cid.'.num'}; |
|
# -------------------------------------------------------- Get course personnel |
|
my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum); |
|
$r->print('<table border="2">'); |
|
foreach (sort keys %coursepersonnel) { |
|
$r->print('<tr><td>'.$_.'</td><td>'); |
|
foreach (split(/\,/,$coursepersonnel{$_})) { |
|
my ($puname,$pudom)=split(/\:/,$_); |
|
$r->print(' '.&Apache::loncommon::aboutmewrapper( |
|
&Apache::loncommon::plainname($puname, |
|
$pudom),$puname,$pudom)); |
|
} |
|
$r->print('</td></tr>'); |
|
} |
|
$r->print('</table>'); |
|
# --------------------------------------------------------------- Student roles |
my $CCL=&mt('Current Class List'); |
my $CCL=&mt('Current Class List'); |
$r->print(<<END); |
$r->print(<<END); |
<input type="hidden" name="action" value="$ENV{'form.action'}" /> |
<input type="hidden" name="action" value="$ENV{'form.action'}" /> |
Line 1095 $lt{'ss'}:
|
Line 1153 $lt{'ss'}:
|
END |
END |
} |
} |
$r->print($status_select."</p>\n"); |
$r->print($status_select."</p>\n"); |
my $cid=$ENV{'request.course.id'}; |
|
my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist(); |
my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist(); |
if (! defined($classlist)) { |
if (! defined($classlist)) { |
$r->print(&mt('There are no students currently enrolled.')."\n"); |
$r->print(&mt('There are no students currently enrolled.')."\n"); |
Line 1753 sub upfile_drop_add {
|
Line 1810 sub upfile_drop_add {
|
} |
} |
} |
} |
# |
# |
|
# Store the field choices away |
|
foreach my $field (qw/username names |
|
fname mname lname gen id sec ipwd email/) { |
|
$ENV{'form.'.$field.'_choice'}=$fields{$field}; |
|
} |
|
&Apache::loncommon::store_course_settings('enrollment_upload', |
|
{ 'username_choice' => 'scalar', |
|
'names_choice' => 'scalar', |
|
'fname_choice' => 'scalar', |
|
'mname_choice' => 'scalar', |
|
'lname_choice' => 'scalar', |
|
'gen_choice' => 'scalar', |
|
'id_choice' => 'scalar', |
|
'sec_choice' => 'scalar', |
|
'ipwd_choice' => 'scalar', |
|
'email_choice' => 'scalar' }); |
|
|
|
# |
my ($startdate,$enddate) = &get_dates_from_form(); |
my ($startdate,$enddate) = &get_dates_from_form(); |
if ($ENV{'form.makedatesdefault'}) { |
if ($ENV{'form.makedatesdefault'}) { |
$r->print(&make_dates_default($startdate,$enddate)); |
$r->print(&make_dates_default($startdate,$enddate)); |