--- loncom/interface/Attic/londropadd.pm 2002/04/16 19:08:49 1.25 +++ loncom/interface/Attic/londropadd.pm 2002/04/16 21:02:17 1.26 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to drop and add students in courses # -# $Id: londropadd.pm,v 1.25 2002/04/16 19:08:49 matthew Exp $ +# $Id: londropadd.pm,v 1.26 2002/04/16 21:02:17 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -75,35 +75,30 @@ ENDHEAD } # =========== Drop student from all sections of a course, except optional $csec - -sub dropstudent { +sub modifystudent { my ($udom,$unam,$courseid,$csec)=@_; + # if $csec is undefined, drop the student from all the courses matching + # this one. If $csec is defined, drop them from all other sections of + # this course and add them to section $csec $courseid=~s/\_/\//g; $courseid=~s/^(\w)/\/$1/; - 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 %roles = &Apache::lonnet::dump('roles',$udom,$unam); + my ($tmp) = keys(%roles); + # Bail out if we were unable to get the students roles + return if ($tmp =~ /^(con_lost|error|no_such_host)/i); + # Go through the roles looking for enrollment in this course + foreach my $course (keys(%roles)) { + my $value = $roles{$course}; + if ($course=~/^$courseid(?:\/)*(\w+)*\_st$/) { + # We are in this course my $section=$1; - if ($key eq $courseid.'_st') { $section=''; } + $section='' if ($course eq $courseid.'_st'); if (((!$section) && (!$csec)) || ($section ne $csec)) { - my ($dummy,$end,$start)=split(/\_/, - &Apache::lonnet::unescape - ($value)); + my (undef,$end,$start)=split(/\_/,$course); my $now=time; - my $notactive=0; - if ($start) { - if ($now<$start) { $notactive=1; } - } - if ($end) { - if ($now>$end) { $notactive=1; } - } - unless ($notactive) { + if (($start) && ($end) && ($now>$start) && ($now<$end)) { my $reply=&Apache::lonnet::modifystudent - ($udom,$unam,'','','', - '','','','',$section,time); + ($udom,$unam,'','','','','','','',$section,time); } } } @@ -111,7 +106,6 @@ sub dropstudent { } # ============================================================== Menu Phase One - sub menu_phase_one { my $r=shift; my $upfile_select=&Apache::loncommon::upfile_select_html(); @@ -130,7 +124,6 @@ $upfile_select ENDUPFORM } - sub phase_two_header { my ($r,$datatoken,$distotal,$krbdefdom)=@_; my $javascript; @@ -146,16 +139,16 @@ sub phase_two_header { 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 @@ -314,7 +307,6 @@ function verify(vf) { verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec); } - function flip(vf,tf) { var nw=eval('vf.f'+tf+'.selectedIndex'); var i; @@ -424,28 +416,28 @@ sub phase_two_end {

Login Type

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

- - - - - + + + + + Set Starting Date

@@ -460,21 +452,21 @@ LON-CAPA domain: 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); + $datatoken=&Apache::loncommon::upfile_store($r); } else { - $datatoken=$ENV{'form.datatoken'}; - &Apache::loncommon::load_tmp_file($r); + $datatoken=$ENV{'form.datatoken'}; + &Apache::loncommon::load_tmp_file($r); } my @records=&Apache::loncommon::upfile_record_sep(); my $total=$#records; @@ -510,7 +502,6 @@ sub menu_phase_two_upload { } # ======================================================= Enroll single student - sub enroll_single_student { my $r=shift; $r->print('

Enrolling Student

'); @@ -519,43 +510,41 @@ sub enroll_single_student { my $amode=''; my $genpwd=''; if ($ENV{'form.login'} eq 'krb') { - $amode='krb4'; - $genpwd=$ENV{'form.krbdom'}; + $amode='krb4'; + $genpwd=$ENV{'form.krbdom'}; } elsif ($ENV{'form.login'} eq 'int') { - $amode='internal'; - $genpwd=$ENV{'form.intpwd'}; + $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'}); - $r->print(&Apache::lonnet::modifystudent - ($ENV{'form.cdomain'},$ENV{'form.cuname'}, - $ENV{'form.cstid'},$amode,$genpwd, - $ENV{'form.cfirst'},$ENV{'form.cmiddle'}, - $ENV{'form.clast'},$ENV{'form.cgen'}, - $ENV{'form.csec'},$ENV{'form.enddate'}, - $ENV{'form.startdate'},$ENV{'form.forceid'})); + &modifystudent($ENV{'form.cdomain'},$ENV{'form.cuname'}, + $ENV{'request.course.id'},$ENV{'form.csec'}); + $r->print(&Apache::lonnet::modifystudent( + $ENV{'form.cdomain'},$ENV{'form.cuname'}, + $ENV{'form.cstid'},$amode,$genpwd, + $ENV{'form.cfirst'},$ENV{'form.cmiddle'}, + $ENV{'form.clast'},$ENV{'form.cgen'}, + $ENV{'form.csec'},$ENV{'form.enddate'}, + $ENV{'form.startdate'},$ENV{'form.forceid'})); } else { - $r->print('Invalid login mode or password'); + $r->print('Invalid login mode or password'); } } else { $r->print('Invalid username or domain'); - } + } } # ======================================================= Menu Phase Two Enroll - sub menu_phase_two_enroll { my $r=shift; - $ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/; - my $krbdefdom=$1; + my ($krbdefdom) = $ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/; $krbdefdom=~tr/a-z/A-Z/; - my $today=time; - my $halfyear=$today+15552000; + my $today = time; + my $halfyear = $today+15552000; my $defdom=$r->dir_config('lonDefDomain'); my $javascript_validations=&javascript_validations($krbdefdom); $r->print(<

Personal Data

-First Name:
-Middle Name:
-Last Name:
-Generation:

+First Name:
+Middle Name:
+Last Name:
+Generation: -ID/Student Number:

+

ID/Student Number:

-Group/Section:

+

Group/Section:

Login Data

-Username:

-Domain:

-Note: login settings below will not take effect if the user already exists

- - -Kerberos authenticated with domain -

- +

Username:

+

Domain:

+

Note: login settings below will not take effect if the user already exists +

+ +Kerberos authenticated with domain + +

+ Internally authenticated (with initial password -) -

- +) +

+ Local Authentication with argument - -

+ +

Starting and Ending Dates

+

Set Starting Date

- +>Set Starting Date +

Set Ending Date

+>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 } -# ========================================================= Menu Phase Two Drop - -sub menu_phase_two_drop { - my $r=shift; - my $cid=$ENV{'request.course.id'}; - my $classlst=&Apache::lonnet::reply - ('dump:'.$ENV{'course.'.$cid.'.domain'}.':'. - $ENV{'course.'.$cid.'.num'}.':classlist', - $ENV{'course.'.$cid.'.home'}); +# =================================================== get the current classlist +sub get_current_classlist { + my ($domain,$identifier) = @_; + # domain is the domain the class is being run in + # identifier is the internal, unique identifier for the class. my %currentlist=(); my $now=time; - unless ($classlst=~/^error\:/) { - foreach (split(/\&/,$classlst)) { - my ($name,$value)=split(/\=/,$_); - my ($end,$start)=split(/\:/, - &Apache::lonnet::unescape($value)); - my $active=1; - if (($end) && ($now>$end)) { $active=0; } - if ($active) { - $currentlist{&Apache::lonnet::unescape($name)}=1; + my %results=&Apache::lonnet::dump('classlist',$domain,$identifier); + my ($tmp) = keys(%results); + if ($tmp !~ /^(con_lost|error|no_such_host)/i) { + foreach my $student (keys(%results)) { + # Extract the start and end dates + my ($end,$start)=split(/\:/,$results{$student}); + # If the class isn't over, put it in the list + unless (($end) && ($now>$end)) { + $currentlist{$student}=1; } } -# ----------------------------------------------------------- Print out choices - &show_drop_list($r,%currentlist); + return %currentlist; } else { - $r->print('

Could not access classlist: '.$classlst. - '

'); + return undef; } } -# =================================================== Show student list to drop +# ========================================================= Menu Phase Two Drop +sub menu_phase_two_drop { + my $r=shift; + my $cid=$ENV{'request.course.id'}; + my %currentlist=&get_current_classlist($ENV{'course.'.$cid.'.domain'}, + $ENV{'course.'.$cid.'.num'}); + if (!defined(%currentlist)) { + $r->print(''. + '

Could not access classlist.

'); + } else { + # Print out the available choices + &show_drop_list($r,%currentlist); + } +} +# =================================================== Show student list to drop sub show_drop_list { my ($r,%currentlist)=@_; my $cid=$ENV{'request.course.id'}; - - $r->print(''); - $r->print(''); + $r->print(<<'END'); + +
+ + + +END foreach (sort keys %currentlist) { my ($sname,$sdom)=split(/\:/,$_); my %reply=&Apache::lonnet::idrget($sdom,$sname); my $ssec=&Apache::lonnet::usection($sdom,$sname,$cid); - my @reply=split(/[\&\=]/,&Apache::lonnet::reply - ('get:'.$sdom.':'.$sname. - ':environment:firstname&middlename&lastname&generation', - &Apache::lonnet::homeserver($sname,$sdom))); - $r->print('\n"); + my %info=&Apache::lonnet::get('environment', + ['firstname','middlename', + 'lastname','generation'], + $sdom, $sname); + my ($tmp) = keys(%info); + if ($tmp =~ /^(con_lost|error|no_such_host)/i) { + $r->print(''); + } else { + $r->print(<<"END"); + + + + + + + + + +END + } } $r->print('
 usernamedomainIDstudent namegenerationsection
'. - $sname.''.$sdom.''. - $reply{$sname}.''. - &Apache::lonnet::unescape($reply[2]).' '. - &Apache::lonnet::unescape($reply[3]).', '. - &Apache::lonnet::unescape($reply[0]).' '. - &Apache::lonnet::unescape($reply[1]). - ''. - $ssec."
'. + 'Internal error: unable to get environment '. + 'for '.$sname.' in domain '.$sdom.'
$sname$sdom$reply{$sname}$info{'lastname'}, $info{'firstname'} $info{'middlename'}$info{'generation'}$ssec

'); $r->print(''); } # ================================================= Drop/Add from uploaded file - sub upfile_drop_add { my $r=shift; &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 @keyfields = split(/\,/,$ENV{'form.keyfields'}); + my $cid = $ENV{'request.course.id'}; my %fields=(); - for (my $i=0;$i<=$ENV{'form.nfields'};$i++) { + for (my $i=0; $i<=$ENV{'form.nfields'}; $i++) { if ($ENV{'form.upfile_associate'} eq 'reverse') { if ($ENV{'form.f'.$i} ne 'none') { $fields{$keyfields[$i]}=$ENV{'form.f'.$i}; @@ -721,13 +734,16 @@ sub upfile_drop_add { $fields{$ENV{'form.f'.$i}}=$keyfields[$i]; } } - my $startdate=$ENV{'form.startdate'}; - my $enddate=$ENV{'form.enddate'}; + # + my $startdate = $ENV{'form.startdate'}; + my $enddate = $ENV{'form.enddate'}; if ($startdate=~/\D/) { $startdate=''; } - if ($enddate=~/\D/) { $enddate=''; } + if ($enddate=~/\D/) { $enddate=''; } + # my $domain=$ENV{'form.lcdomain'}; - my $amode=''; - my $genpwd=''; + # Determine authentication mechanism + my $amode = ''; + my $genpwd = ''; if ($ENV{'form.login'} eq 'krb') { $amode='krb4'; $genpwd=$ENV{'form.krbdom'}; @@ -743,20 +759,23 @@ sub upfile_drop_add { } } unless (($domain=~/\W/) || ($amode eq '')) { + ####################################### + ## Enroll Students ## + ####################################### $r->print('

Enrolling Students

'); my $count=0; my $flushc=0; my %student=(); -# ----------------------------------------------------------- Get new classlist -# --------------------------------------------------------- Enroll new students + # Get new classlist foreach (@studentdata) { my %entries=&Apache::loncommon::record_sep($_); + # Determine student name unless (($entries{$fields{'username'}} eq '') || (!defined($entries{$fields{'username'}}))) { - my $fname=''; my $mname=''; my $lname=''; my $gen=''; + my ($fname, $mname, $lname,$gen) = ('','','',''); if (defined($fields{'names'})) { - ($lname,$fname,$mname)= - ($entries{$fields{'names'}}=~/([^\,]+)\,\s*(\w+)\s*(.*)$/); + ($lname,$fname,$mname)=($entries{$fields{'names'}}=~ + /([^\,]+)\,\s*(\w+)\s*(.*)$/); } else { if (defined($fields{'fname'})) { $fname=$entries{$fields{'fname'}}; @@ -776,6 +795,7 @@ sub upfile_drop_add { $entries{$fields{'username'}}.' for user '. $fname.' '.$mname.' '.$lname.' '.$gen.'

'); } else { + # determine section number my $sec=''; my $username=$entries{$fields{'username'}}; if (defined($fields{'sec'})) { @@ -783,6 +803,7 @@ sub upfile_drop_add { $sec=$entries{$fields{'sec'}}; } } + # determine student id number my $id=''; if (defined($fields{'id'})) { if (defined($entries{$fields{'id'}})) { @@ -790,6 +811,7 @@ sub upfile_drop_add { } $id=~tr/A-Z/a-z/; } + # determine student password my $password=''; if ($genpwd) { $password=$genpwd; @@ -801,14 +823,15 @@ sub upfile_drop_add { } } if ($password) { - &dropstudent($domain,$username,$cid,$sec); + &modifystudent($domain,$username,$cid,$sec); my $reply=&Apache::lonnet::modifystudent ($domain,$username,$id,$amode,$password, $fname,$mname,$lname,$gen,$sec,$enddate, $startdate,$ENV{'form.forceid'}); - unless ($reply eq 'ok') { - $r->print( - "

Error enrolling $username: $reply

"); + if ($reply ne 'ok') { + $r->print('

'. + 'Error enrolling '.$username.': '. + $reply.'

'); } else { $count++; $flushc++; $student{$username}=1; @@ -822,130 +845,113 @@ sub upfile_drop_add { $r->print("

No password for $username

"); } } - } - } + } + } # end of foreach (@studentdata) $r->print('

Processed Students: '.$count); -# --------------------------------------------------------------- Drop students + ##################################### + # Drop students # + ##################################### if ($ENV{'form.fullup'} eq 'yes') { $r->print('

Dropping Students

'); -# ------------------------------------------------------- Get current classlist - my $classlst=&Apache::lonnet::reply - ('dump:'.$ENV{'course.'.$cid.'.domain'}.':'. - $ENV{'course.'.$cid.'.num'}.':classlist', - $ENV{'course.'.$cid.'.home'}); - my %currentlist=(); - my $now=time; - unless ($classlst=~/^error\:/) { - foreach (split(/\&/,$classlst)) { - my ($name,$value)=split(/\=/,$_); - my ($end,$start)=split(/\:/, - &Apache::lonnet::unescape($value)); - my $active=1; - if (($end) && ($now>$end)) { $active=0; } - if ($active) { - $currentlist{&Apache::lonnet::unescape($name)}=1; - } - } -# ------------------------------------------------ Now got up-to-date classlist + # Get current classlist + my %currentlist=&get_current_classlist + ($ENV{'course.'.$cid.'.domain'}, + $ENV{'course.'.$cid.'.num'}); + if (defined(%currentlist)) { + # Drop the students foreach (@studentdata) { my %entries=&Apache::loncommon::record_sep($_); unless (($entries{$fields{'username'}} eq '') || (!defined($entries{$fields{'username'}}))) { - delete($currentlist{ - $entries{$fields{'username'}}.':'. - $domain}); + delete($currentlist{$entries{$fields{'username'}}. + ':'.$domain}); } } -# ----------------------------------------------------------- Print out choices + # Print out list of dropped students &show_drop_list($r,%currentlist); } else { - $r->print('

Could not access classlist: '. - $classlst.'

'); + $r->print(''. + '

Could not access classlist

'); } } -# ------------------------------------------------------------------------ Done - } + } # end of unless } # ================================================================== Phase four - sub drop_student_list { my $r=shift; my $count=0; - 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++; - } + foreach (@{$ENV{'form.droplist'}}) { + my ($uname,$udom)=split(/\:/,$_); + &modifystudent($udom,$uname,$ENV{'request.course.id'}); + $r->print('Dropped '.$uname.' at '.$udom.'
'); + $count++; } $r->print('

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

Re-enrollment will re-activate data.'); } # ================================================================ Main Handler - sub handler { - my $r=shift; - $Apache::lonxml::debug=1; - if ($r->header_only) { - $r->content_type('text/html'); - $r->send_http_header; - return OK; - } -# ----------------------------------------------------- Needs to be in a course - if (($ENV{'request.course.fn'}) && - (&Apache::lonnet::allowed('cst',$ENV{'request.course.id'}))) { -# ------------------------------------------------------------------ Start page - $r->content_type('text/html'); - $r->send_http_header; - &header($r); -# --------------------------------------------------- Phase one, initial screen - unless ($ENV{'form.phase'}) { - &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); - } elsif ($ENV{'form.enroll'}) { - &menu_phase_two_enroll($r); - } elsif ($ENV{'form.drop'}) { - &menu_phase_two_drop($r); - } - } -# ----------------------------------------------------------------- Phase three - if ($ENV{'form.phase'} eq 'three') { - if ($ENV{'form.datatoken'}) { - &upfile_drop_add($r); - } - } -# ------------------------------------------------------------------ Phase four - if ($ENV{'form.phase'} eq 'four') { - &drop_student_list($r); - } -# ------------------------------------------------------------------ Phase five - if ($ENV{'form.phase'} eq 'five') { - &enroll_single_student($r); - } -# ------------------------------------------------------------------------- End - $r->print(''); - } else { -# ----------------------------- Not in a course, or not allowed to modify parms - $ENV{'user.error.msg'}= - "/adm/dropadd:cst:0:0:Cannot drop or add students"; - return HTTP_NOT_ACCEPTABLE; - } - return OK; + my $r=shift; + $Apache::lonxml::debug=1; + if ($r->header_only) { + $r->content_type('text/html'); + $r->send_http_header; + return OK; + } + # Needs to be in a course + if (($ENV{'request.course.fn'}) && + (&Apache::lonnet::allowed('cst',$ENV{'request.course.id'}))) { + # Start page + $r->content_type('text/html'); + $r->send_http_header; + &header($r); + # Phase one, initial screen + unless ($ENV{'form.phase'}) { + &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); + } elsif ($ENV{'form.enroll'}) { + &menu_phase_two_enroll($r); + } elsif ($ENV{'form.drop'}) { + &menu_phase_two_drop($r); + } + } + # Phase three + if ($ENV{'form.phase'} eq 'three') { + if ($ENV{'form.datatoken'}) { + &upfile_drop_add($r); + } + } + # Phase four + if ($ENV{'form.phase'} eq 'four') { + &drop_student_list($r); + } + # Phase five + if ($ENV{'form.phase'} eq 'five') { + &enroll_single_student($r); + } + # End + $r->print(''); + } else { + # Not in a course, or not allowed to modify parms + $ENV{'user.error.msg'}= + "/adm/dropadd:cst:0:0:Cannot drop or add students"; + return HTTP_NOT_ACCEPTABLE; + } + return OK; } 1;