--- loncom/interface/Attic/londropadd.pm 2001/02/14 22:51:48 1.12 +++ loncom/interface/Attic/londropadd.pm 2002/04/15 23:37:37 1.24 @@ -1,12 +1,37 @@ # The LearningOnline Network with CAPA # Handler to drop and add students in courses # +# $Id: londropadd.pm,v 1.24 2002/04/15 23:37:37 albertel Exp $ +# +# Copyright Michigan State University Board of Trustees +# +# This file is part of the LearningOnline Network with CAPA (LON-CAPA). +# +# LON-CAPA is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# LON-CAPA is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LON-CAPA; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# /home/httpd/html/adm/gpl.txt +# +# http://www.lon-capa.org/ +# # (Handler to set parameters for assessments # # (Handler to resolve ambiguous file locations # # (TeX Content Handler # +# YEAR=2000 # 05/29/00,05/30,10/11 Gerd Kortemeyer) # # 10/11,10/12,10/16 Gerd Kortemeyer) @@ -15,12 +40,20 @@ # 12/08,12/12 Gerd Kortemeyer) # # 12/26,12/27,12/28, -# 01/01/01,01/15,02/10,02/13,02/14 Gerd Kortemeyer +# YEAR=2001 +# 01/01/01,01/15,02/10,02/13,02/14,02/22 Gerd Kortemeyer +# 8/6 Scott Harrison +# Guy Albertelli +# 9/25 Gerd Kortemeyer +# 12/19 Guy Albertelli +# YEAR=2002 +# 1/4 Gerd Kortemeyer package Apache::londropadd; use strict; -use Apache::lonnet; +use Apache::lonnet(); +use Apache::loncommon(); use Apache::Constants qw(:common :http REDIRECT); # ================================================================ Print header @@ -41,113 +74,21 @@ 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; - map { - my $field=$_; - $field=~s/^(\"|\')//; - $field=~s/(\"|\')$//; - $components{$i}=$field; - $i++; - } split(/\s+/,$record); - } elsif ($ENV{'form.upfiletype'} eq 'tab') { - my $i=0; - map { - my $field=$_; - $field=~s/^(\"|\')//; - $field=~s/(\"|\')$//; - $components{$i}=$field; - $i++; - } split(/\t+/,$record); - } 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 { my ($udom,$unam,$courseid,$csec)=@_; $courseid=~s/\_/\//g; $courseid=~s/^(\w)/\/$1/; - map { + foreach (split(/\&/, + &Apache::lonnet::reply('dump:'.$udom.':'.$unam.':roles', + &Apache::lonnet::homeserver($unam,$udom)))) { my ($key,$value)=split(/\=/,$_); $key=&Apache::lonnet::unescape($key); if ($key=~/^$courseid(?:\/)*(\w+)*\_st$/) { my $section=$1; if ($key eq $courseid.'_st') { $section=''; } - if ($section ne $csec) { + if (((!$section) && (!$csec)) || ($section ne $csec)) { my ($dummy,$end,$start)=split(/\_/, &Apache::lonnet::unescape($value)); my $now=time; @@ -165,25 +106,19 @@ sub dropstudent { } } } - } split(/\&/,&Apache::lonnet::reply('dump:'.$udom.':'.$unam.':roles', - &Apache::lonnet::homeserver($unam,$udom))); + } } # ============================================================== Menu Phase One 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

@@ -194,51 +129,43 @@ sub menu_phase_one { ENDUPFORM } -# ======================================================= Menu Phase Two Upload - -sub menu_phase_two_upload { - my $r=shift; - - my $datatoken=&upfile_store($r); - - my @records=&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'); +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 +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; @@ -257,6 +184,10 @@ function verify(vf) { 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; @@ -285,47 +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=''; - } - -} - -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) { @@ -334,6 +225,7 @@ function setkrb(vf) { vf.login[0].checked=true; vf.krbdom.value=vf.krbdom.value.toUpperCase(); vf.intpwd.value=''; + vf.locarg.value=''; } } @@ -342,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=''; } } @@ -349,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() { @@ -382,62 +290,153 @@ function clickint(vf) { pclose(); } - - ENDPICK - my %sone; my %stwo; my %sthree; - my $i=0; +} - if ($total>=0) { - %sone=&record_sep($records[0]); - if ($total>=1) { - %stwo=&record_sep($records[1]); - - } - if ($total>=2) { - %sthree=&record_sep($records[2]); - } - map { - $r->print(''); - $i++; - } sort keys %sone; - $i--; - } - my $keyfields=join(',',sort keys %sone); - $r->print(<=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 +} + +sub phase_two_end { + my ($r,$i,$keyfields,$defdom,$today,$halfyear)=@_; + $r->print(<

Login Type

-Note: this will not take effect if the user already exists

- +

Note: this will not take effect if the user already exists

+

+ Kerberos authenticated with domain -

- + +

+

+ Internally authenticated (with initial password -) +) +

+

+ +Local Authentication with argument + +

LON-CAPA Domain for Students

LON-CAPA domain:

Starting and Ending Dates

@@ -456,11 +455,67 @@ LON-CAPA domain: Full Update Full update (also print list of users not enrolled anymore)

+

ID/Student Number

+ +Disable ID/Student Number Safeguard and Force Change of Conflicting IDs +(only do if you know what you are doing)


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; + 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; + + $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'); + + &phase_two_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']); + 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))); + } + } + + + &phase_two_end($r,$i,$keyfields,$defdom,$today,$halfyear); +} + # ======================================================= Enroll single student sub enroll_single_student { @@ -476,7 +531,11 @@ sub enroll_single_student { } elsif ($ENV{'form.login'} eq 'int') { $amode='internal'; $genpwd=$ENV{'form.intpwd'}; - } + } elsif ($ENV{'form.login'} eq 'loc') { + $amode='localauth'; + $genpwd=$ENV{'form.locarg'}; + if (!$genpwd) { $genpwd=" "; } + } if (($amode) && ($genpwd)) { &dropstudent($ENV{'form.cdomain'},$ENV{'form.cuname'}, $ENV{'request.course.id'},$ENV{'form.csec'}); @@ -486,7 +545,7 @@ sub enroll_single_student { $ENV{'form.cfirst'},$ENV{'form.cmiddle'}, $ENV{'form.clast'},$ENV{'form.cgen'}, $ENV{'form.csec'},$ENV{'form.enddate'}, - $ENV{'form.startdate'})); + $ENV{'form.startdate'},$ENV{'form.forceid'})); } else { $r->print('Invalid login mode or password'); } @@ -508,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) { @@ -517,123 +576,34 @@ function verify(vf) { var foundname=0; var foundid=0; var foundsec=0; - var foundatype=0; var tw; - var message=''; - if ((vf.cuname.value!=undefined) && (vf.cuname.value!='') && - (vf.cdomain.value!=undefined) && (vf.cdomain.value!='')) { + if ((typeof(vf.cuname.value)!="undefined") && (vf.cuname.value!='') && + (typeof(vf.cdomain.value)!="undefined") && (vf.cdomain.value!='')) { founduname=1; } - if ((vf.cfirst.value!=undefined) && (vf.cfirst.value!='') && - (vf.clast.value!=undefined) && (vf.clast.value!='')) { + if ((typeof(vf.cfirst.value)!="undefined") && (vf.cfirst.value!='') && + (typeof(vf.clast.value)!="undefined") && (vf.clast.value!='')) { foundname=1; } - if ((vf.csec.value!=undefined) && (vf.csec.value!='')) { + if ((typeof(vf.csec.value)!="undefined") && (vf.csec.value!='')) { foundsec=1; } - if ((vf.cstid.value!=undefined) && (vf.cstid.value!='')) { + if ((typeof(vf.cstid.value)!="undefined") && (vf.cstid.value!='')) { foundid=1; } if (founduname==0) { 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 (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:
@@ -656,7 +626,11 @@ Kerberos authenticated with domain Internally authenticated (with initial password ) - +

+ +Local Authentication with argument + +

Starting and Ending Dates

@@ -670,6 +644,10 @@ Internally authenticated (with initial p Set Ending Date

+

ID/Student Number

+ +Disable ID/Student Number Safeguard and Force Change of Conflicting IDs +(only do if you know what you are doing)


ENDSENROLL @@ -687,7 +665,7 @@ sub menu_phase_two_drop { my %currentlist=(); my $now=time; unless ($classlst=~/^error\:/) { - map { + foreach (split(/\&/,$classlst)) { my ($name,$value)=split(/\=/,$_); my ($end,$start)=split(/\:/, &Apache::lonnet::unescape($value)); @@ -696,7 +674,7 @@ sub menu_phase_two_drop { if ($active) { $currentlist{&Apache::lonnet::unescape($name)}=1; } - } split(/\&/,$classlst); + } # ----------------------------------------------------------- Print out choices &show_drop_list($r,%currentlist); } else { @@ -714,7 +692,7 @@ sub show_drop_list { $r->print(''); $r->print('

FieldSamples
'); - if (defined($sone{$i})) { - $r->print($sone{$i}."
\n"); - } - if (defined($stwo{$i})) { - $r->print($stwo{$i}."
\n"); - } - if (defined($sthree{$i})) { - $r->print($sthree{$i}."
\n"); - } - $r->print('
'); - map { + foreach (sort keys %currentlist) { my ($sname,$sdom)=split(/\:/,$_); my %reply=&Apache::lonnet::idrget($sdom,$sname); my $ssec=&Apache::lonnet::usection($sdom,$sname,$cid); @@ -732,7 +710,7 @@ sub show_drop_list { &Apache::lonnet::unescape($reply[1]). '\n"); - } sort keys %currentlist; + } $r->print('
'. $ssec."

'); $r->print(''); } @@ -742,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'}; @@ -767,7 +750,12 @@ sub upfile_drop_add { if ((defined($ENV{'form.intpwd'})) && ($ENV{'form.intpwd'})) { $genpwd=$ENV{'form.intpwd'}; } - } + } elsif ($ENV{'form.login'} eq 'loc') { + $amode='localauth'; + if ((defined($ENV{'form.locarg'})) && ($ENV{'form.locarg'})) { + $genpwd=$ENV{'form.locarg'}; + } + } unless (($domain=~/\W/) || ($amode eq '')) { $r->print('

Enrolling Students

'); my $count=0; @@ -775,8 +763,8 @@ sub upfile_drop_add { my %student=(); # ----------------------------------------------------------- Get new classlist # --------------------------------------------------------- Enroll new students - map { - my %entries=&record_sep($_); + foreach (@studentdata) { + my %entries=&Apache::loncommon::record_sep($_); unless (($entries{$fields{'username'}} eq '') || (!defined($entries{$fields{'username'}}))) { @@ -831,7 +819,8 @@ sub upfile_drop_add { &dropstudent($domain,$username,$cid,$sec); my $reply=&Apache::lonnet::modifystudent( $domain,$username,$id,$amode,$password, - $fname,$mname,$lname,$gen,$sec,$enddate,$startdate); + $fname,$mname,$lname,$gen,$sec,$enddate,$startdate, + $ENV{'form.forceid'}); unless ($reply eq 'ok') { $r->print( "

Error enrolling $username: $reply

"); @@ -850,7 +839,7 @@ sub upfile_drop_add { } } } - } @studentdata; + } $r->print('

Processed Students: '.$count); # --------------------------------------------------------------- Drop students if ($ENV{'form.fullup'} eq 'yes') { @@ -863,7 +852,7 @@ sub upfile_drop_add { my %currentlist=(); my $now=time; unless ($classlst=~/^error\:/) { - map { + foreach (split(/\&/,$classlst)) { my ($name,$value)=split(/\=/,$_); my ($end,$start)=split(/\:/, &Apache::lonnet::unescape($value)); @@ -872,17 +861,17 @@ sub upfile_drop_add { if ($active) { $currentlist{&Apache::lonnet::unescape($name)}=1; } - } split(/\&/,$classlst); + } # ------------------------------------------------ Now got up-to-date classlist - map { - my %entries=&record_sep($_); + foreach (@studentdata) { + my %entries=&Apache::loncommon::record_sep($_); unless (($entries{$fields{'username'}} eq '') || (!defined($entries{$fields{'username'}}))) { delete($currentlist{ $entries{$fields{'username'}}.':'. $domain}); } - } @studentdata; + } # ----------------------------------------------------------- Print out choices &show_drop_list($r,%currentlist); } else { @@ -901,14 +890,14 @@ sub upfile_drop_add { sub drop_student_list { my $r=shift; my $count=0; - map { + foreach (keys %ENV) { if ($_=~/^form\.drop\:/) { my ($dummy,$uname,$udom)=split(/\:/,$_); &dropstudent($udom,$uname,$ENV{'request.course.id'}); $r->print('Dropped '.$uname.' at '.$udom.'
'); $count++; } - } keys %ENV; + } $r->print('

Dropped '.$count.' student(s).'); $r->print('

Re-enrollment will re-activate data.'); } @@ -917,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; @@ -939,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); @@ -962,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); } @@ -980,6 +978,3 @@ sub handler { 1; __END__ - - -