--- loncom/interface/lonpopulate.pm 2009/05/06 13:37:56 1.62
+++ loncom/interface/lonpopulate.pm 2009/10/30 20:35:34 1.66
@@ -1,5 +1,5 @@
# automated enrollment configuration handler
-# $Id: lonpopulate.pm,v 1.62 2009/05/06 13:37:56 bisitz Exp $
+# $Id: lonpopulate.pm,v 1.66 2009/10/30 20:35:34 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -508,8 +508,7 @@ ENDTWO
} elsif ($action eq "notify") {
my $notifycount = 0;
my @notified = split(/,/,$enrollvar{notifylist});
- my @domcoord;
- my @showdom;
+ my (@domcoord,@showdom,@olddomcoord,@futuredomcoord);
for (my $i=0; $i<@notified; $i++) {
if ($notified[$i] !~ /:/) {
$notified[$i] =~ s/\@/:/;
@@ -522,12 +521,26 @@ ENDTWO
} else {
$noteset = "OFF";
}
+ my $now = time;
my %dompersonnel = &Apache::lonnet::get_domain_roles($dom,['dc']);
foreach my $server (keys(%dompersonnel)) {
foreach my $user (sort(keys(%{$dompersonnel{$server}}))) {
my ($trole,$uname,$udom,$runame,$rudom,$rsec) = split(/:/,$user);
- if (!grep(/^$uname:$udom$/,@domcoord)) {
- push(@domcoord,$uname.':'.$udom);
+ my ($end,$start) = split(':',$dompersonnel{$server}{$user});
+ if (($end eq '') || ($end == 0) || ($end > $now)) {
+ if ($start > $now) {
+ if (!grep(/^\Q$uname\E:\Q$udom\E$/,@futuredomcoord)) {
+ push(@futuredomcoord,$uname.':'.$udom);
+ }
+ } else {
+ if (!grep(/^\Q$uname\E:\Q$udom\E$/,@domcoord)) {
+ push(@domcoord,$uname.':'.$udom);
+ }
+ }
+ } else {
+ if (!grep(/^\Q$uname\E:\Q$udom\E$/,@olddomcoord)) {
+ push(@olddomcoord,$uname.':'.$udom);
+ }
}
}
}
@@ -565,7 +578,6 @@ ENDTWO
my %pname;
my %notifystate;
my %status;
- my $now = time;
foreach my $person (sort(keys(%coursepersonnel))) {
my $match = 0;
my ($role,$user,$usec) = ($person =~ /^([^:]+):([^:]+:[^:]+):([^:]*)/);
@@ -601,6 +613,7 @@ ENDTWO
usnm => 'username:domain',
coac => 'Course Access',
curn => 'Current notification status',
+ doms => 'Domain Coordinator status',
notf => 'Notification?',
ntac => 'Notification active',
ntin => 'Notification inactive',
@@ -630,7 +643,7 @@ ENDTWO
if (grep(/^$viewer$/,@domcoord)) {
$showalldc = 1;
}
- foreach my $dc (@domcoord) {
+ foreach my $dc (@domcoord,@futuredomcoord) {
if (!grep(/^$dc$/,@ccs)) {
if (grep(/^$dc$/,@notified)) {
$notifystate{$dc} = 1;
@@ -645,6 +658,16 @@ ENDTWO
push(@showdom,$dc);
}
}
+ foreach my $olddc (@olddomcoord) {
+ if (grep(/^$olddc$/,@notified)) {
+ if (!grep(/^\Q$olddc\E$/,@ccs)) {
+ $notifystate{$olddc} = 1;
+ my ($dcname,$dcdom) = split(/:/,$olddc);
+ $pname{$olddc} = &Apache::loncommon::plainname($dcname,$dcdom);
+ push(@showdom,$olddc);
+ }
+ }
+ }
my $showdomnum = scalar(@showdom);
if ($showdomnum) {
$r->print("
@@ -662,8 +685,8 @@ ENDTWO
");
- $r->print(¬ifier_tables('dc',\%lt,\@showdom,\%status,\%notifystate,
- \%pname,\$notifyshow));
+ $r->print(¬ifier_tables('dc',\%lt,\@showdom,\%status,\%notifystate,\%pname,
+ \$notifyshow,\@olddomcoord,\@futuredomcoord));
$r->print("
|
");
@@ -1132,7 +1155,8 @@ onclick="javascript:document.photoupdate
my ($indexhash,$keylist) = &Apache::lonuserutils::make_keylist_array();
my $classlist = &Apache::loncoursedata::get_classlist();
my $secidx = &Apache::loncoursedata::CL_SECTION();
- my ($permission,$allowed) = &Apache::lonuserutils::get_permission();
+ my $crstype =&Apache::loncommon::course_type();
+ my ($permission,$allowed) = &Apache::lonuserutils::get_permission('course',$crstype);
foreach my $student (keys(%{$classlist})) {
if (exists($permission->{'view_section'})) {
if ($classlist->{$student}[$secidx] ne $permission->{'view_section'}) {
@@ -1168,14 +1192,14 @@ onclick="javascript:document.photoupdate
if ($autocount > 0) {
$cellcount ++;
$r->print(<