--- loncom/interface/lonpopulate.pm 2005/02/17 08:50:20 1.22 +++ loncom/interface/lonpopulate.pm 2005/11/04 15:03:29 1.28 @@ -1,5 +1,5 @@ # automated enrollment configuration handler -# $Id: lonpopulate.pm,v 1.22 2005/02/17 08:50:20 albertel Exp $ +# $Id: lonpopulate.pm,v 1.28 2005/11/04 15:03:29 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -151,27 +151,8 @@ function process(calling,numauto,nummanu } |; if ($action eq 'viewclass') { + $scripttag .= &Apache::loncommon::check_uncheck_jscript(); $scripttag .= qq| -function checkAll(field) { - if (field.length > 0) { - for (i = 0; i < field.length; i++) { - field[i].checked = true ; - } - } else { - field.checked = true - } -} - -function uncheckAll(field) { - if (field.length > 0) { - for (i = 0; i < field.length; i++) { - field[i].checked = false ; - } - } else { - field.checked = false ; - } -} - function countChecked(field) { var count = 0; if (field.length > 0) { @@ -207,8 +188,8 @@ ENDHEAD sub print_mainbox { my ($r,$tasklongref,$realm,$reply) = @_; my $action = "information"; - if ( exists($ENV{'form.action'}) ) { - $action = $ENV{'form.action'}; + if ( exists($env{'form.action'}) ) { + $action = $env{'form.action'}; } my $page = ''; if ($action eq "information") { @@ -245,8 +226,8 @@ ENDTHIS sub print_navmenu { my ($r,$tasksref,$tasklongref) = @_; my $action = "information"; - if (exists($ENV{'form.action'}) ) { - $action = $ENV{'form.action'}; + if (exists($env{'form.action'}) ) { + $action = $env{'form.action'}; } $r->print(<  @@ -284,8 +265,8 @@ ENDONE sub print_main_frame { my ($r,$realm,$dom,$crs,$tasktitleref) = @_; my $action = "information"; - if (exists($ENV{'form.action'}) ) { - $action = $ENV{'form.action'}; + if (exists($env{'form.action'}) ) { + $action = $env{'form.action'}; } # Get course settings @@ -504,15 +485,9 @@ ENDTWO ENDTWO } elsif ($action eq "notify") { - my @notified = (); - if ($enrollvar{notifylist} =~ m/,/) { - @notified = split/,/,$enrollvar{notifylist}; - } else { - @notified = $enrollvar{notifylist}; - } - my $notifycount = 0; + my @notified = split(/,/,$enrollvar{notifylist}); foreach (@notified) { - unless ($_ eq '') { $notifycount ++; } + unless ($_ eq '') { $notifycount ++; } } my $noteset = ''; if ($notifycount) { @@ -559,8 +534,8 @@ ENDTWO my @roleinfo = split/:/,$_; if ($roleinfo[0] eq 'cc') { unless (grep/^$roleinfo[1]\@$roleinfo[2]/,@ccs) { - my $active_cc = &LONCAPA::Enrollment::check_user_status($roleinfo[2],$roleinfo[1],$dom,$crs,'cc'); - if ($active_cc eq 'ok') { + my $active_cc = &Apache::loncommon::check_user_status($roleinfo[2],$roleinfo[1],$dom,$crs,'cc'); + if ($active_cc eq 'active') { push @ccs, "$roleinfo[1]\@$roleinfo[2]"; $pname{"$roleinfo[1]\@$roleinfo[2]"} = &Apache::loncommon::plainname($roleinfo[1],$roleinfo[2]); if (grep/^$roleinfo[1]\@$roleinfo[2]$/,@notified) { @@ -584,14 +559,14 @@ ENDTWO } } } - my $viewer = $ENV{'user.name'}.'@'.$ENV{'user.domain'}; + my $viewer = $env{'user.name'}.'@'.$env{'user.domain'}; unless ( (grep/^$viewer$/,@ccs) || ($viewer eq '') ) { push @ccs,$viewer; - $pname{$viewer} = &Apache::loncommon::plainname($ENV{'user.name'},$ENV{'user.domain'}); + $pname{$viewer} = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'}); $notifystate{$viewer} = 0; } - my $notifyshow = @ccs; + my $notifyshow = join(' ',@ccs); if (@ccs > 0) { @ccs = sort @ccs; @@ -657,13 +632,11 @@ ENDTWO "); } elsif ($action eq "crosslist") { - my @xlists = (); - if ($enrollvar{crosslistings} =~ m/,/) { - @xlists = split/,/,$enrollvar{crosslistings}; - } elsif ($enrollvar{crosslistings} ne '') { - $xlists[0] = $enrollvar{crosslistings}; + my @xlists; + if ($enrollvar{crosslistings} ne '') { + @xlists = split(/,/,$enrollvar{crosslistings}); } - my $cross_str = @xlists; + my $cross_str = join(' ',@xlists); $r->print("

@@ -742,14 +715,9 @@ ENDTWO } elsif ($action eq "sections") { my @sections = (); @sections = &Apache::lonnet::auto_get_sections($crs,$dom,$enrollvar{coursecode}); - my @storedsections = (); + my @storedsections = split(/,/,$enrollvar{sectionnums}); my @currsections = (); my %sec_id = (); - if ($enrollvar{sectionnums} =~ m/,/) { - @storedsections = split/,/,$enrollvar{sectionnums}; - } else { - $storedsections[0] = $enrollvar{sectionnums}; - } foreach (@storedsections) { if ($_ =~ m/^(\w+):(\w*)$/) { push @currsections, $1; @@ -757,7 +725,7 @@ ENDTWO } } if (@sections > 0) { - my $secshow = @sections; + my $secshow = join(' ',@sections); $r->print("
@@ -823,7 +791,7 @@ your changes. @@ -1000,13 +968,13 @@ Note: Any students previously added manu @@ -1246,11 +1214,11 @@ sub print_chgsettings_response { my $autoadds = ''; my $autodrops = ''; - if ( exists($ENV{'form.autoadds'}) ) { - $autoadds=$ENV{'form.autoadds'}; + if ( exists($env{'form.autoadds'}) ) { + $autoadds=$env{'form.autoadds'}; } - if ( exists($ENV{'form.autodrops'}) ) { - $autodrops=$ENV{'form.autodrops'}; + if ( exists($env{'form.autodrops'}) ) { + $autodrops=$env{'form.autodrops'}; } my $response = ""; @@ -1507,33 +1475,28 @@ sub print_notify_response { my %settings = &Apache::lonnet::get('environment',['internal.notifylist','internal.coursecode'],$dom,$crs); my $notifylist = $settings{'internal.notifylist'}; my $coursecode = $settings{'internal.coursecode'}; - my @currpeople = (); + my @currpeople = split(/,/,$notifylist); my $notify = 0; my @people = (); my $peoplestr = ""; my $response = ""; my $noprocess = 0; - if ($notifylist =~ m/,/) { - @currpeople = split/,/,$notifylist; - } else { - $currpeople[0] = $notifylist; - } my $currcount = 0; foreach (@currpeople) { unless ($_ eq '') { $currcount ++; } } - if ( exists($ENV{'form.notify'}) ) { - $notify=$ENV{'form.notify'}; + if ( exists($env{'form.notify'}) ) { + $notify=$env{'form.notify'}; } - if ( exists($ENV{'form.notifyshow'}) ) { - my $notifyshow = $ENV{'form.notifyshow'}; + if ( exists($env{'form.notifyshow'}) ) { + my $notifyshow = $env{'form.notifyshow'}; for (my $i=0; $i<$notifyshow; $i++) { - if ( exists($ENV{"form.note_$i"}) ) { - if ( exists($ENV{"form.notifyname_$i"}) ) { - unless ( $ENV{"form.notifyname_$i"} eq '' ) { - push @people, $ENV{"form.notifyname_$i"}; + if ( exists($env{"form.note_$i"}) ) { + if ( exists($env{"form.notifyname_$i"}) ) { + unless ( $env{"form.notifyname_$i"} eq '' ) { + push @people, $env{"form.notifyname_$i"}; } } } @@ -1593,23 +1556,21 @@ sub print_crosslistings_menu () { my $xliststr = ''; my $response = ''; my $coursecode = $settings{'internal.coursecode'}; - if ($settings{'internal.crosslistings'} =~ m/,/) { - @currxlists = split/,/,$settings{'internal.crosslistings'}; - } elsif ($settings{'internal.crosslistings'} ne '') { - $currxlists[0] = $settings{'internal.crosslistings'}; + if ($settings{'internal.crosslistings'} ne '') { + @currxlists = split(/,/,$settings{'internal.crosslistings'}); } if (@currxlists > 0) { for (my $i=0; $i<@currxlists; $i++) { my $xlist = "cross_".$i; my $gp = "gp_".$i; - if ( exists($ENV{"form.$xlist"}) ) { + if ( exists($env{"form.$xlist"}) ) { my $xlistentry = ''; if ($currxlists[$i] =~ m/^([^:]+)/) { $xlistentry = $1.':'; } - if ( exists($ENV{"form.$gp"}) ) { - $xlistentry .= $ENV{"form.$gp"}; + if ( exists($env{"form.$gp"}) ) { + $xlistentry .= $env{"form.$gp"}; } push @xlists,$xlistentry; $crosscount ++; @@ -1619,11 +1580,8 @@ sub print_crosslistings_menu () { } } - if ($crosscount > 1) { - $xliststr = join(",",@xlists); - } else { - $xliststr = $xlists[0]; - } + $xliststr = join(",",@xlists); + my %cenv = ('internal.crosslistings' => $xliststr); my $reply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs); if ($reply !~ /^ok$/) { @@ -1641,8 +1599,8 @@ sub print_crosslistings_menu () { $response .= "
\n"; } } - if ( exists($ENV{'form.numcross'}) ) { - my $numcross = $ENV{'form.numcross'}; + if ( exists($env{'form.numcross'}) ) { + my $numcross = $env{'form.numcross'}; if ($numcross > 0) { my @bgcolors=("#eeeeee","#cccccc"); $response .= qq(You indicated that you wish to add an additional $numcross crosslisting(s). For each new crosslisting enter the insititutional course section code (e.g., fs03zol101001, for section 001 of zol101 for fs03 semester), and the LON-CAPA section/group ID you wish to assign to students who will be enrolled in your LON-CAPA class as a result of their registration in the crosslisted course section. The LON-CAPA section/group ID can be left blank, if you do not wish to tie a section/group ID to this crosslisting. The institutional course section code should only contain letters and/or numbers, and must be consistent with the scheme adopted by your Domain Coordinator to map course codes (and section numbers) to your institution\'s student information system.

@@ -1701,33 +1659,31 @@ sub print_crosslistings_response () { my $warning = ''; my $warn_prefix = ''; - if ($xliststr =~ m/,/) { - @allxlists = split/,/,$xliststr; - } else { - unless ($xliststr eq '') { $allxlists[0] = $xliststr; } + if ($xliststr ne '') { + @allxlists = split(/,/,$xliststr); } - if ( exists($ENV{'form.numcross'}) ) { - $numcross = $ENV{'form.numcross'}; + if ( exists($env{'form.numcross'}) ) { + $numcross = $env{'form.numcross'}; } if ($numcross > 0) { for (my $i=0; $i<$numcross; $i++) { my $xl = "newcross_".$i; my $gp = "newgroupid_".$i; - if ( exists($ENV{"form.$xl"}) ) { + if ( exists($env{"form.$xl"}) ) { my $coursecheck = ''; - $coursecheck = &Apache::lonnet::auto_validate_courseID($crs,$dom,$ENV{"form.$xl"}); + $coursecheck = &Apache::lonnet::auto_validate_courseID($crs,$dom,$env{"form.$xl"}); if ($coursecheck eq 'ok') { my $addcheck = ''; - $addcheck = &Apache::lonnet::auto_new_course($crs,$dom,$ENV{"form.$xl"},$owner); + $addcheck = &Apache::lonnet::auto_new_course($crs,$dom,$env{"form.$xl"},$owner); if ($addcheck eq 'ok') { - push @xlists,$ENV{"form.$xl"}.":".$ENV{"form.$gp"}; + push @xlists,$env{"form.$xl"}.":".$env{"form.$gp"}; } else { - push @badowner,$ENV{"form.$xl"}.":".$ENV{"form.$gp"}; + push @badowner,$env{"form.$xl"}.":".$env{"form.$gp"}; } } else { - push @badxlists, $ENV{"form.$xl"}.":".$ENV{"form.$gp"}.":".$coursecheck; + push @badxlists, $env{"form.$xl"}.":".$env{"form.$gp"}.":".$coursecheck; } } } @@ -1736,11 +1692,8 @@ sub print_crosslistings_response () { if (@xlists > 0 ) { unless ($xliststr eq '') { $xliststr .= ","; } - if (@xlists > 1) { - $xliststr .= join(",",@xlists); - } else { - $xliststr .= $xlists[0]; - } + $xliststr .= join(",",@xlists); + my %cenv = ('internal.crosslistings' => $xliststr); my $reply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs); if ($reply !~ /^ok$/) { @@ -1755,12 +1708,7 @@ sub print_crosslistings_response () { } } else { if ($xliststr =~ m/:/) { - my @oldxlists = (); - if ($xliststr =~ m/,/) { - @oldxlists = split/,/,$xliststr; - } else { - $oldxlists[0] = $xliststr; - } + my @oldxlists = (split/,/,$xliststr); $response .= "Although no new crosslistings were added, the courses listed below continue to be crosslisted with your LON-CAPA course.
$$tasktitleref{$action}
"); if (@currsections) { - my $secshow = @currsections; + my $secshow = join(' ',@currsections); $r->print(" Currently, this LON-CAPA course incorporates enrollment from $secshow sections. Students enrolling in any of these course sections will be automatically added to the class roster for the course, if you have chosen to enable a nightly automated enrollment update. For each section, uncheck the checkbox if you want registered students in that section to cease being included in the student roster for LON-CAPA course: $realm ($enrollvar{coursecode}); otherwise leave it checked. If you want to change the section/group designation used for this section in LON-CAPA, delete the current value in the LON-CAPA section/groupID textbox and enter the new value. If you wish to add new course section, enter the number of new sections to add in the textbox at the bottom of the page. You will provide information about each of the new sections on a subsequent page. Click 'Go' to store your changes.
"); - if (! exists($ENV{'form.sortby'})) { - $ENV{'form.sortby'} = 'username'; + if (! exists($env{'form.sortby'})) { + $env{'form.sortby'} = 'username'; } - if ($ENV{'form.Status'} !~ /^(Any|Expired|Active)$/) { - $ENV{'form.Status'} = 'Active'; + if ($env{'form.Status'} !~ /^(Any|Expired|Active)$/) { + $env{'form.Status'} = 'Active'; } - my $status_select = &Apache::lonhtmlcommon::StatusOptions($ENV{'form.Status'}); + my $status_select = &Apache::lonhtmlcommon::StatusOptions($env{'form.Status'}); # Get current classlist my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist(); if (! defined($classlist)) { @@ -1017,7 +985,7 @@ Note: Any students previously added manu $r->print(''. "\n

\n"); - my ($studentcount,$autocount,$manualcount,$lockcount,$unlockcount) = &Apache::londropadd::show_class_list($r,'autoenroll','nothing',$ENV{'form.Status'},$classlist,$keylist); + my ($studentcount,$autocount,$manualcount,$lockcount,$unlockcount) = &Apache::londropadd::show_class_list($r,'autoenroll','nothing',$env{'form.Status'},$classlist,$keylist); $r->print("