--- loncom/interface/Attic/londropadd.pm 2002/01/04 15:56:07 1.18 +++ loncom/interface/Attic/londropadd.pm 2002/04/04 20:41:17 1.23 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to drop and add students in courses # -# $Id: londropadd.pm,v 1.18 2002/01/04 15:56:07 www Exp $ +# $Id: londropadd.pm,v 1.23 2002/04/04 20:41:17 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -129,22 +129,22 @@ sub record_sep { if ($ENV{'form.upfiletype'} eq 'xml') { } elsif ($ENV{'form.upfiletype'} eq 'space') { my $i=0; - map { + foreach (split(/\s+/,$record)) { my $field=$_; $field=~s/^(\"|\')//; $field=~s/(\"|\')$//; $components{$i}=$field; $i++; - } split(/\s+/,$record); + } } elsif ($ENV{'form.upfiletype'} eq 'tab') { my $i=0; - map { + foreach (split(/\t+/,$record)) { my $field=$_; $field=~s/^(\"|\')//; $field=~s/(\"|\')$//; $components{$i}=$field; $i++; - } split(/\t+/,$record); + } } else { my @allfields=split(/\,/,$record); my $i=0; @@ -173,7 +173,9 @@ 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$/) { @@ -197,8 +199,7 @@ sub dropstudent { } } } - } split(/\&/,&Apache::lonnet::reply('dump:'.$udom.':'.$unam.':roles', - &Apache::lonnet::homeserver($unam,$udom))); + } } # ============================================================== Menu Phase One @@ -226,33 +227,18 @@ 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)=@_; $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 - 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(<print(< @@ -505,11 +454,76 @@ LON-CAPA domain: ID/Student Number Disable ID/Student Number Safeguard and Force Change of Conflicting IDs -(only do if you know what you are doing) +(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=&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'); + + &phase_two_header($r,$datatoken,$distotal,$krbdefdom); + + 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]); + } + foreach (sort keys %sone) { + $r->print('

'); + $i++; + } + $i--; + } + my $keyfields=join(',',sort keys %sone); + + &phase_two_end($r,$i,$keyfields,$defdom,$today,$halfyear); +} # ======================================================= Enroll single student @@ -540,7 +554,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'); } @@ -752,7 +766,7 @@ Local Authentication with argument

ID/Student Number

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


ENDSENROLL @@ -770,7 +784,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)); @@ -779,7 +793,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 { @@ -797,7 +811,7 @@ sub show_drop_list { $r->print(''); $r->print('

FieldSamples
'); - if (defined($sone{$_})) { - $r->print($sone{$_}."
\n"); - } - if (defined($stwo{$_})) { - $r->print($stwo{$_}."
\n"); - } - if (defined($sthree{$_})) { - $r->print($sthree{$_}."
\n"); - } - $r->print('
'); + if (defined($sone{$_})) { + $r->print($sone{$_}."
\n"); + } + if (defined($stwo{$_})) { + $r->print($stwo{$_}."
\n"); + } + if (defined($sthree{$_})) { + $r->print($sthree{$_}."
\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); @@ -815,7 +829,7 @@ sub show_drop_list { &Apache::lonnet::unescape($reply[1]). '\n"); - } sort keys %currentlist; + } $r->print('
'. $ssec."

'); $r->print(''); } @@ -863,7 +877,7 @@ sub upfile_drop_add { my %student=(); # ----------------------------------------------------------- Get new classlist # --------------------------------------------------------- Enroll new students - map { + foreach (@studentdata) { my %entries=&record_sep($_); unless (($entries{$fields{'username'}} eq '') || @@ -919,7 +933,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

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

Processed Students: '.$count); # --------------------------------------------------------------- Drop students if ($ENV{'form.fullup'} eq 'yes') { @@ -951,7 +966,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)); @@ -960,9 +975,9 @@ sub upfile_drop_add { if ($active) { $currentlist{&Apache::lonnet::unescape($name)}=1; } - } split(/\&/,$classlst); + } # ------------------------------------------------ Now got up-to-date classlist - map { + foreach (@studentdata) { my %entries=&record_sep($_); unless (($entries{$fields{'username'}} eq '') || (!defined($entries{$fields{'username'}}))) { @@ -970,7 +985,7 @@ sub upfile_drop_add { $entries{$fields{'username'}}.':'. $domain}); } - } @studentdata; + } # ----------------------------------------------------------- Print out choices &show_drop_list($r,%currentlist); } else { @@ -989,14 +1004,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.'); }