--- loncom/interface/lonpopulate.pm 2009/09/10 11:39:05 1.62.4.1 +++ loncom/interface/lonpopulate.pm 2009/07/17 22:24:08 1.64 @@ -1,5 +1,5 @@ # automated enrollment configuration handler -# $Id: lonpopulate.pm,v 1.62.4.1 2009/09/10 11:39:05 raeburn Exp $ +# $Id: lonpopulate.pm,v 1.64 2009/07/17 22:24:08 droeschl Exp $ # # Copyright Michigan State University Board of Trustees # @@ -508,7 +508,8 @@ ENDTWO } elsif ($action eq "notify") { my $notifycount = 0; my @notified = split(/,/,$enrollvar{notifylist}); - my (@domcoord,@showdom,@olddomcoord,@futuredomcoord); + my @domcoord; + my @showdom; for (my $i=0; $i<@notified; $i++) { if ($notified[$i] !~ /:/) { $notified[$i] =~ s/\@/:/; @@ -521,26 +522,12 @@ 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); - 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); - } + if (!grep(/^$uname:$udom$/,@domcoord)) { + push(@domcoord,$uname.':'.$udom); } } } @@ -578,6 +565,7 @@ ENDTWO my %pname; my %notifystate; my %status; + my $now = time; foreach my $person (sort(keys(%coursepersonnel))) { my $match = 0; my ($role,$user,$usec) = ($person =~ /^([^:]+):([^:]+:[^:]+):([^:]*)/); @@ -613,7 +601,6 @@ ENDTWO usnm => 'username:domain', coac => 'Course Access', curn => 'Current notification status', - doms => 'Domain Coordinator status', notf => 'Notification?', ntac => 'Notification active', ntin => 'Notification inactive', @@ -643,7 +630,7 @@ ENDTWO if (grep(/^$viewer$/,@domcoord)) { $showalldc = 1; } - foreach my $dc (@domcoord,@futuredomcoord) { + foreach my $dc (@domcoord) { if (!grep(/^$dc$/,@ccs)) { if (grep(/^$dc$/,@notified)) { $notifystate{$dc} = 1; @@ -658,16 +645,6 @@ 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(" @@ -685,8 +662,8 @@ ENDTWO "); - $r->print(¬ifier_tables('dc',\%lt,\@showdom,\%status,\%notifystate,\%pname, - \$notifyshow,\@olddomcoord,\@futuredomcoord)); + $r->print(¬ifier_tables('dc',\%lt,\@showdom,\%status,\%notifystate, + \%pname,\$notifyshow)); $r->print(" "); @@ -1191,14 +1168,14 @@ onclick="javascript:document.photoupdate if ($autocount > 0) { $cellcount ++; $r->print(<
 Change auto   +
Change auto  
END } if ($manualcount > 0) { $cellcount ++; $r->print(<
 Change manual   +
Change manual  
END } @@ -1208,7 +1185,7 @@ END } $cellcount ++; $r->print(<
 Lock manual   +
Lock manual  
END } @@ -1218,7 +1195,7 @@ END } $cellcount ++; $r->print(<
 Unlock manual   +
Unlock manual  
END } @@ -1253,17 +1230,14 @@ END } sub notifier_tables { - my ($role,$lt,$users,$status,$notifystate,$pname,$notifyshow,$olddomcoord, - $futuredomcoord) = @_; + my ($role,$lt,$users,$status,$notifystate,$pname,$notifyshow) = @_; my $output = &Apache::loncommon::start_data_table(); $output .= &Apache::loncommon::start_data_table_header_row(); $output .= "$$lt{name} $$lt{usnm}"; - if ($role eq 'dc') { - $output .= "$$lt{doms}"; - } elsif ($role eq 'cc') { + if ($role eq 'cc') { $output .= "$$lt{coac}"; - } + } $output .= "$$lt{curn} $$lt{notf}"; $output .= &Apache::loncommon::end_data_table_header_row(); @@ -1272,19 +1246,7 @@ sub notifier_tables { $output .= ''.$$pname{$$users[$i]}.''. ''.$$users[$i].''; - if ($role eq 'dc') { - $output .= ''; - if ((ref($olddomcoord) eq 'ARRAY') && (ref($futuredomcoord) eq 'ARRAY')) { - if (grep(/^\Q$users->[$i]\E$/,@{$olddomcoord})) { - $output .= &mt('expired'); - } elsif (grep(/^\Q$users->[$i]\E$/,@{$futuredomcoord})) { - $output .= &mt('future'); - } else { - $output .= &mt('active'); - } - } - $output .= ''; - } elsif ($role eq 'cc') { + if ($role eq 'cc') { $output .= ''.$$status{$$users[$i]}.''; } $output .= ''; @@ -1329,7 +1291,7 @@ sub print_accessdate_table { 'fnew' => 'for new students added when you update the class roster', 'ifad' => 'If automated adds are enabled, then when students are added their student roles will become active on the date set here for first access, and their roles will become inactive on the date set here for last access. These default access dates will be overridden for specific students if the institutional classlist data supplied to the automatic enrollment process includes entries for the startdate and enddate fields for those students.', 'ncds' => 'changing default start and end access dates will affect future enrollments and also currently inactive students (i.e., those for whom access will begin in the future).', - 'tcha' => 'To change access dates for currently active students, use User Management -> "Display Class Lists and Manage Multiple Users" to display currently active students, then use the dropdown menu for "Action to take for selected users:" to choose "Change starting/ending dates", select the students to change, and click "Proceed".', + 'tcha' => 'To change access dates for currently active students, use User Management -> "Manage Course Users" to display currently active students, then use the dropdown menu for "Action to take for selected users:" to choose "Change starting/ending dates", select the students to change, and click "Proceed".', ); my $dateshow; if ( ($oldendshow eq '') && ($oldstartshow eq '') ) { @@ -1661,7 +1623,7 @@ start and end access dates for this cour } else { $response .= "The last access date for students being added via automated enrollment has been changed to $showend.
"; } - $response .= '
'.&mt('Any change in access dates will only apply to students who are not currently active, i.e., those who currently have access start dates in the future, and to those added by future automated enrollment.').'

'.&mt('To change access dates for any currently active students, use User Management -> "Display Class Lists and Manage Multiple Users" to display currently active students, then use the dropdown menu for "Action to take for selected users:" to choose "Change starting/ending dates", select the students to change, and click "Proceed".').'
'; + $response .= '
'.&mt('Any change in access dates will only apply to students who are not currently active, i.e., those who currently have access start dates in the future, and to those added by future automated enrollment.').'

'.&mt('To change access dates for any currently active students, use User Management -> "Manage Users" to display currently active students, then use the dropdown menu for "Action to take for selected users:" to choose "Change starting/ending dates", select the students to change, and click "Proceed".').'
'; # Generate message in case where old first access date was later than today, but new first access date is now today or earlier.