--- loncom/interface/Attic/londropadd.pm 2002/04/04 20:41:17 1.23 +++ loncom/interface/Attic/londropadd.pm 2002/04/15 23:37:37 1.24 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to drop and add students in courses # -# $Id: londropadd.pm,v 1.23 2002/04/04 20:41:17 albertel Exp $ +# $Id: londropadd.pm,v 1.24 2002/04/15 23:37:37 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -52,7 +52,8 @@ package Apache::londropadd; use strict; -use Apache::lonnet; +use Apache::lonnet(); +use Apache::loncommon(); use Apache::Constants qw(:common :http REDIRECT); # ================================================================ Print header @@ -73,100 +74,6 @@ action="/adm/dropadd" name="studentform" ENDHEAD } -# ========================================================= Store uploaded file -# needs $ENV{'form.upfile'} -# return $datatoken to be put into hidden field - -sub upfile_store { - my $r=shift; - $ENV{'form.upfile'}=~s/\r/\n/gs; - $ENV{'form.upfile'}=~s/\f/\n/gs; - $ENV{'form.upfile'}=~s/\n+/\n/gs; - $ENV{'form.upfile'}=~s/\n+$//gs; - - my $datatoken=$ENV{'user.name'}.'_'.$ENV{'user.domain'}. - '_enroll_'.$ENV{'request.course.id'}.'_'.time.'_'.$$; - { - my $fh=Apache::File->new('>'.$r->dir_config('lonDaemons'). - '/tmp/'.$datatoken.'.tmp'); - print $fh $ENV{'form.upfile'}; - } - return $datatoken; -} - -# ================================================= Load uploaded file from tmp -# needs $ENV{'form.datatoken'} -# sets $ENV{'form.upfile'} - -sub load_tmp_file { - my $r=shift; - my @studentdata=(); - { - my $fh; - if ($fh=Apache::File->new($r->dir_config('lonDaemons'). - '/tmp/'.$ENV{'form.datatoken'}.'.tmp')) { - @studentdata=<$fh>; - } - } - $ENV{'form.upfile'}=join('',@studentdata); -} - -# ========================================= Separate uploaded file into records -# returns array of records - -sub upfile_record_sep { - if ($ENV{'form.upfiletype'} eq 'xml') { - } else { - return split(/\n/,$ENV{'form.upfile'}); - } -} - -# =============================================== Separate a record into fields - -sub record_sep { - my $record=shift; - my %components=(); - if ($ENV{'form.upfiletype'} eq 'xml') { - } elsif ($ENV{'form.upfiletype'} eq 'space') { - my $i=0; - foreach (split(/\s+/,$record)) { - my $field=$_; - $field=~s/^(\"|\')//; - $field=~s/(\"|\')$//; - $components{$i}=$field; - $i++; - } - } elsif ($ENV{'form.upfiletype'} eq 'tab') { - my $i=0; - foreach (split(/\t+/,$record)) { - my $field=$_; - $field=~s/^(\"|\')//; - $field=~s/(\"|\')$//; - $components{$i}=$field; - $i++; - } - } else { - my @allfields=split(/\,/,$record); - my $i=0; - my $j; - for ($j=0;$j<=$#allfields;$j++) { - my $field=$allfields[$j]; - if ($field=~/^\s*(\"|\')/) { - my $delimiter=$1; - while (($field!~/$delimiter$/) && ($j<$#allfields)) { - $j++; - $field.=','.$allfields[$j]; - } - $field=~s/^\s*$delimiter//; - $field=~s/$delimiter\s*$//; - } - $components{$i}=$field; - $i++; - } - } - return %components; -} - # =========== Drop student from all sections of a course, except optional $csec sub dropstudent { @@ -206,17 +113,12 @@ sub dropstudent { sub menu_phase_one { my $r=shift; + my $upfile_select=&Apache::loncommon::upfile_select_html(); $r->print(<

Upload a courselist

- -
Type: +$upfile_select

Enroll a single student

@@ -230,33 +132,40 @@ ENDUPFORM sub phase_two_header { my ($r,$datatoken,$distotal,$krbdefdom)=@_; + my $javascript; + if ($ENV{'form.upfile_associate'} eq 'reverse') { + $javascript=&phase_two_javascript_reverse_associate(); + } else { + $javascript=&phase_two_javascript_forward_associate(); + } + my $javascript_validations=&javascript_validations($krbdefdom); $r->print(< - -

Identify fields

Total number of records found in file: $distotal
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.
+ + + + + + +
+ENDPICK +} + +sub javascript_validations { + my ($krbdefdom)=@_; + return (<=2) && (tw<=6)) { foundname=1; } - if (tw==7) { foundid=1; } - if (tw==8) { foundsec=1; } - if (tw==9) { foundpwd=1; } - } if (founduname==0) { alert('You need to specify at least the username field'); return; @@ -307,48 +216,7 @@ function verify(vf) { } else { pclose(); vf.submit(); - } -} - -function flip(vf,tf) { - var nw=eval('vf.f'+tf+'.selectedIndex'); - var i; - for (i=0;i<=vf.nfields.value;i++) { - if ((i!=tf) && (eval('vf.f'+i+'.selectedIndex')==nw)) { - eval('vf.f'+i+'.selectedIndex=0;') - } - } - if (nw==2) { - for (i=0;i<=vf.nfields.value;i++) { - if ((eval('vf.f'+i+'.selectedIndex')>=3) && - (eval('vf.f'+i+'.selectedIndex')<=6)) { - eval('vf.f'+i+'.selectedIndex=0;') - } - } - } - if ((nw>=3) && (nw<=6)) { - for (i=0;i<=vf.nfields.value;i++) { - if (eval('vf.f'+i+'.selectedIndex')==2) { - eval('vf.f'+i+'.selectedIndex=0;') - } - } - } - if (nw==9) { - vf.login[1].checked=true; - vf.intpwd.value=''; - vf.krbdom.value=''; - vf.locarg.value=''; - } - -} - -function clearpwd(vf) { - var i; - for (i=0;i<=vf.nfields.value;i++) { - if (eval('vf.f'+i+'.selectedIndex')==9) { - eval('vf.f'+i+'.selectedIndex=0;') - } - } + } } function setkrb(vf) { @@ -357,6 +225,7 @@ function setkrb(vf) { vf.login[0].checked=true; vf.krbdom.value=vf.krbdom.value.toUpperCase(); vf.intpwd.value=''; + vf.locarg.value=''; } } @@ -365,6 +234,15 @@ function setint(vf) { clearpwd(vf); vf.login[1].checked=true; vf.krbdom.value=''; + vf.locarg.value=''; + } +} + +function setloc(vf) { + if (vf.locarg.value!='') { + vf.login[2].checked=true; + vf.krbdom.value=''; + vf.intpwd.value=''; } } @@ -372,10 +250,17 @@ function clickkrb(vf) { vf.krbdom.value='$krbdefdom'; clearpwd(vf); vf.intpwd.value=''; + vf.locarg.value=''; } function clickint(vf) { vf.krbdom.value=''; + vf.locarg.value=''; +} + +function clickloc(vf) { + vf.krbdom.value=''; + vf.intpwd.value=''; } function pclose() { @@ -405,8 +290,127 @@ function clickint(vf) { pclose(); } - - +ENDPICK +} + +sub phase_two_javascript_forward_associate { + return(<=2) && (tw<=6)) { foundname=1; } + if (tw==7) { foundid=1; } + if (tw==8) { foundsec=1; } + if (tw==9) { foundpwd=1; } + } + verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec); +} + + +function flip(vf,tf) { + var nw=eval('vf.f'+tf+'.selectedIndex'); + var i; + for (i=0;i<=vf.nfields.value;i++) { + if ((i!=tf) && (eval('vf.f'+i+'.selectedIndex')==nw)) { + eval('vf.f'+i+'.selectedIndex=0;') + } + } + if (tf==1 && nw!=0) { + for (i=2;i<=5;i++) { + eval('vf.f'+i+'.selectedIndex=0;') + } + } + if (nw==2) { + for (i=0;i<=vf.nfields.value;i++) { + if ((eval('vf.f'+i+'.selectedIndex')>=3) && + (eval('vf.f'+i+'.selectedIndex')<=6)) { + eval('vf.f'+i+'.selectedIndex=0;') + } + } + } + if ((nw>=3) && (nw<=6)) { + for (i=0;i<=vf.nfields.value;i++) { + if (eval('vf.f'+i+'.selectedIndex')==2) { + eval('vf.f'+i+'.selectedIndex=0;') + } + } + } + if (nw==9) { + vf.login[1].checked=true; + vf.intpwd.value=''; + vf.krbdom.value=''; + vf.locarg.value=''; + } +} + +function clearpwd(vf) { + var i; + for (i=0;i<=vf.nfields.value;i++) { + if (eval('vf.f'+i+'.selectedIndex')==9) { + eval('vf.f'+i+'.selectedIndex=0;') + } + } +} + +ENDPICK +} + +sub phase_two_javascript_reverse_associate { + return(<=1) && (i<=5)) && tw!=0 ) { foundname=1; } + if (i==6 && tw!=0) { foundid=1; } + if (i==7 && tw!=0) { foundsec=1; } + if (i==8 && tw!=0) { foundpwd=1; } + } + verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec); +} + +function flip(vf,tf) { + var nw=eval('vf.f'+tf+'.selectedIndex'); + var i; + // picked the all one one name field, reset the other name ones to blank + if (tf==1 && nw!=0) { + for (i=2;i<=5;i++) { + eval('vf.f'+i+'.selectedIndex=0;') + } + } + //picked one of the piecewise name fields, reset the all in + //one field to blank + if ((tf>=2) && (tf<=5) && (nw!=0)) { + eval('vf.f1.selectedIndex=0;') + } + // intial password specified, pick internal authentication + if (tf==8 && nw!=0) { + vf.login[1].checked=true; + vf.intpwd.value=''; + vf.krbdom.value=''; + vf.locarg.value=''; + } +} + +function clearpwd(vf) { + var i; + if (eval('vf.f8.selectedIndex')!=0) { + eval('vf.f8.selectedIndex=0;') + } +} ENDPICK } @@ -459,14 +463,20 @@ Disable ID/Student Number Safeguard and Note: for large courses, this operation might be time consuming. ENDPICK } + # ======================================================= Menu Phase Two Upload sub menu_phase_two_upload { my $r=shift; - my $datatoken=&upfile_store($r); - - my @records=&upfile_record_sep(); + my $datatoken; + if (!$ENV{'form.datatoken'}) { + $datatoken=&Apache::loncommon::upfile_store($r); + } else { + $datatoken=$ENV{'form.datatoken'}; + &Apache::loncommon::load_tmp_file($r); + } + my @records=&Apache::loncommon::upfile_record_sep(); my $total=$#records; my $distotal=$total+1; @@ -481,46 +491,27 @@ sub menu_phase_two_upload { &phase_two_header($r,$datatoken,$distotal,$krbdefdom); - my %sone; my %stwo; my %sthree; - my $i=0; - + my $i; + my $keyfields; if ($total>=0) { - %sone=&record_sep($records[0]); - if ($total>=1) { - %stwo=&record_sep($records[1]); - } - if ($total>=2) { - %sthree=&record_sep($records[2]); - } - foreach (sort keys %sone) { - $r->print(''); - $i++; + 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']); + 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].','; } + chop($keyfields); + } else { + unshift(@d,['none','']); + $i=&Apache::loncommon::csv_samples_select_table($r,\@records,\@d); + my %sone=&Apache::loncommon::record_sep($records[0]); + $keyfields=join(',',sort(keys(%sone))); } - $i--; } - my $keyfields=join(',',sort keys %sone); + &phase_two_end($r,$i,$keyfields,$defdom,$today,$halfyear); } @@ -576,7 +567,7 @@ sub menu_phase_two_enroll { my $halfyear=$today+15552000; my $defdom=$r->dir_config('lonDefDomain'); - + my $javascript_validations=&javascript_validations($krbdefdom); $r->print(< function verify(vf) { @@ -585,9 +576,7 @@ function verify(vf) { var foundname=0; var foundid=0; var foundsec=0; - var foundatype=0; var tw; - var message=''; if ((typeof(vf.cuname.value)!="undefined") && (vf.cuname.value!='') && (typeof(vf.cdomain.value)!="undefined") && (vf.cdomain.value!='')) { founduname=1; @@ -606,123 +595,15 @@ function verify(vf) { alert('You need to specify at least the username and domain fields'); return; } - if (vf.login[0].checked) { - foundatype=1; - if (vf.krbdom.value=='') { - alert('You need to specify the Kerberos domain'); - return; - } - } - if (vf.login[1].checked) { - foundatype=1; - if ((vf.intpwd.value=='') && (foundpwd==0)) { - alert('You need to specify the initial password'); - return; - } - } - if (vf.login[2].checked) { - foundatype=1; - //An argument is not required - } - if (foundatype==0) { - alert('You need to set the login type'); - return; - } - if (foundname==0) { message='No first and last name 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)

Personal Data

First Name:
@@ -839,15 +720,20 @@ sub show_drop_list { sub upfile_drop_add { my $r=shift; - &load_tmp_file($r); - my @studentdata=&upfile_record_sep(); + &Apache::loncommon::load_tmp_file($r); + my @studentdata=&Apache::loncommon::upfile_record_sep(); my @keyfields=split(/\,/,$ENV{'form.keyfields'}); my $cid=$ENV{'request.course.id'}; - my %fields=(); for (my $i=0;$i<=$ENV{'form.nfields'};$i++) { - $fields{$ENV{'form.f'.$i}}=$keyfields[$i]; + if ($ENV{'form.upfile_associate'} eq 'reverse') { + if ($ENV{'form.f'.$i} ne 'none') { + $fields{$keyfields[$i]}=$ENV{'form.f'.$i}; + } + } else { + $fields{$ENV{'form.f'.$i}}=$keyfields[$i]; + } } my $startdate=$ENV{'form.startdate'}; my $enddate=$ENV{'form.enddate'}; @@ -878,7 +764,7 @@ sub upfile_drop_add { # ----------------------------------------------------------- Get new classlist # --------------------------------------------------------- Enroll new students foreach (@studentdata) { - my %entries=&record_sep($_); + my %entries=&Apache::loncommon::record_sep($_); unless (($entries{$fields{'username'}} eq '') || (!defined($entries{$fields{'username'}}))) { @@ -978,7 +864,7 @@ sub upfile_drop_add { } # ------------------------------------------------ Now got up-to-date classlist foreach (@studentdata) { - my %entries=&record_sep($_); + my %entries=&Apache::loncommon::record_sep($_); unless (($entries{$fields{'username'}} eq '') || (!defined($entries{$fields{'username'}}))) { delete($currentlist{ @@ -1020,7 +906,7 @@ sub drop_student_list { sub handler { my $r=shift; - + $Apache::lonxml::debug=1; if ($r->header_only) { $r->content_type('text/html'); $r->send_http_header; @@ -1042,6 +928,15 @@ sub handler { &menu_phase_one($r); } # ------------------------------------------------------------------- Phase two + + if ($ENV{'form.associate'} eq 'Reverse Association') { + $ENV{'form.phase'} = 'two'; + if ( $ENV{'form.upfile_associate'} ne 'reverse' ) { + $ENV{'form.upfile_associate'} = 'reverse'; + } else { + $ENV{'form.upfile_associate'} = 'forward'; + } + } if ($ENV{'form.phase'} eq 'two') { if ($ENV{'form.fileupload'}) { &menu_phase_two_upload($r); @@ -1065,7 +960,7 @@ sub handler { if ($ENV{'form.phase'} eq 'four') { &drop_student_list($r); } -# ------------------------------------------------------------------ Phase four +# ------------------------------------------------------------------ Phase five if ($ENV{'form.phase'} eq 'five') { &enroll_single_student($r); } @@ -1083,6 +978,3 @@ sub handler { 1; __END__ - - -
FieldSamples
'); - if (defined($sone{$_})) { - $r->print($sone{$_}."
\n"); - } - if (defined($stwo{$_})) { - $r->print($stwo{$_}."
\n"); - } - if (defined($sthree{$_})) { - $r->print($sthree{$_}."
\n"); - } - $r->print('