--- loncom/interface/lonpopulate.pm 2005/04/07 06:56:23 1.23 +++ loncom/interface/lonpopulate.pm 2005/10/04 18:27:32 1.27 @@ -1,5 +1,5 @@ # automated enrollment configuration handler -# $Id: lonpopulate.pm,v 1.23 2005/04/07 06:56:23 albertel Exp $ +# $Id: lonpopulate.pm,v 1.27 2005/10/04 18:27:32 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) { @@ -559,8 +540,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) { @@ -2241,44 +2222,19 @@ sub print_viewclass_response { my %otherdom = (); my %lockchg = (); my %nolockchg = (); - my $classlist = &Apache::loncoursedata::get_classlist($cid,$dom,$crs); + my $classlist = &Apache::loncoursedata::get_classlist($dom,$crs); my $endidx = &Apache::loncoursedata::CL_END; my $startidx = &Apache::loncoursedata::CL_START; my $ididx=&Apache::loncoursedata::CL_ID; my $secidx=&Apache::loncoursedata::CL_SECTION; my $typeidx=&Apache::loncoursedata::CL_TYPE; my $lockedidx=&Apache::loncoursedata::CL_LOCKEDTYPE; - my @typechglist = (); - my @lockchglist = (); &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['chgauto','chgmanual','lockchg','unlockchg']); - if ($env{'form.chgauto'}) { - if (ref($env{'form.chgauto'}) eq 'ARRAY') { - push @typechglist, @{$env{'form.chgauto'}}; - } else { - push @typechglist, $env{'form.chgauto'}; - } - } - if ($env{'form.chgmanual'}) { - if (ref($env{'form.chgmanual'}) eq 'ARRAY') { - push @typechglist, @{$env{'form.chgmanual'}}; - } else { - push @typechglist, $env{'form.chgmanual'}; - } - } - if ($env{'form.lockchg'}) { - if (ref($env{'form.lockchg'}) eq 'ARRAY') { - push @lockchglist, @{$env{'form.lockchg'}}; - } else { - push @lockchglist, $env{'form.lockchg'}; - } - } - if ($env{'form.unlockchg'}) { - if (ref($env{'form.unlockchg'}) eq 'ARRAY') { - push @lockchglist, @{$env{'form.unlockchg'}}; - } else { - push @lockchglist, $env{'form.unlockchg'}; - } - } + my @typechglist = (&Apache::loncommon::get_env_multiple('form.chgauto'), + &Apache::loncommon::get_env_multiple('form.chgmanual')); + my @lockchglist = (&Apache::loncommon::get_env_multiple('form.lockchg'), + &Apache::loncommon::get_env_multiple('form.unlockchg')); + foreach my $student (sort @typechglist) { my ($uname,$udom) = split/:/,$student; my $sdata = $classlist->{$student}; @@ -2348,7 +2304,7 @@ sub print_viewclass_response { } if ($chgtotal > 0) { $response = "You requested a change in enrollment type for $chgtotal students.

\n"; - $classlist = &Apache::loncoursedata::get_classlist($cid,$dom,$crs); + $classlist = &Apache::loncoursedata::get_classlist($dom,$crs); if ($chgok > 0) { $response .= "The following $chgok changes were successful:
"; $response .= &enrolltype_result(\%chg,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx); @@ -2365,7 +2321,7 @@ sub print_viewclass_response { } if ($locktotal > 0) { $response .= "You requested locking/unlocking for $locktotal manually enrolled students.

\n"; - $classlist = &Apache::loncoursedata::get_classlist($cid,$dom,$crs); + $classlist = &Apache::loncoursedata::get_classlist($dom,$crs); if ($lockok > 0) { $response .= "The following $lockok changes were successful:
"; $response .= &enrolltype_result(\%lockchg,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx,$lockedidx);