version 1.64, 2009/07/17 22:24:08
|
version 1.67, 2009/11/24 14:26:15
|
Line 217 sub print_mainbox {
|
Line 217 sub print_mainbox {
|
} elsif ($action eq "newsections") { |
} elsif ($action eq "newsections") { |
$action = "sections"; |
$action = "sections"; |
} |
} |
$page .= "-> <a href=\"/adm/populate?action=$action\">".$$tasklongref{$action}."</a> -> <b>result</b>"; |
$page .= "» <a href=\"/adm/populate?action=$action\">".$$tasklongref{$action}."</a> » <b>result</b>"; |
} else { |
} else { |
$page .= " -> <b>".$$tasklongref{$action}."</b>"; |
$page .= " » <b>".$$tasklongref{$action}."</b>"; |
} |
} |
} |
} |
my $usrmang = &mt('User Management'); |
my $usrmang = &mt('User Management'); |
my $autenrl = &mt('Automated Enrollment Manager'); |
my $autenrl = &mt('Automated Enrollment Manager'); |
|
#LC_pick_box is used in the following. This is only a temporary solution to adapt the site to the design. |
$r->print(<<ENDTHIS); |
$r->print(<<ENDTHIS); |
<table width="100%" border="0" cellpadding="0" cellspacing="0"> |
<table width="100%" border="0" cellpadding="0" cellspacing="0"> |
<tr> |
<tr> |
<td bgcolor="#CCCCFF"> |
<td bgcolor="#C5DB99"> |
<font size="2"><a href="/adm/menu">$realm</a> -> <a href="/adm/createuser">$usrmang</a> -> $page</font><br/> |
<a href="/adm/menu">$realm</a> » <a href="/adm/createuser">$usrmang</a> » $page<br/> |
</td> |
</td> |
<td align="right" bgcolor="#CCCCFF" valign="top"> |
<td align="right" bgcolor="#C5DB99" valign="top"> |
<font size="+1">$autenrl </font> |
$autenrl |
</td> |
</td> |
</tr> |
</tr> |
</table> |
</table> |
<table width="100%" border="0" cellpadding="0" cellspacing="0"> |
<br/> |
<tr> |
<table width="100%" border="0" cellpadding="0" cellspacing="0" class="LC_pick_box"> |
|
<tr class="LC_pick_box_row"> |
ENDTHIS |
ENDTHIS |
} |
} |
|
|
Line 247 sub print_navmenu {
|
Line 249 sub print_navmenu {
|
$action = $env{'form.action'}; |
$action = $env{'form.action'}; |
} |
} |
$r->print(<<ENDONE); |
$r->print(<<ENDONE); |
<td width="10" valign="top" bgcolor="#DDFFFF"> </td> |
<td valign="top" class="LC_pick_box_title"> |
<td width="20%" valign="top" bgcolor="#DDFFFF"> |
|
<br/> |
|
ENDONE |
ENDONE |
foreach my $task (@{$tasksref}) { |
foreach my $task (@{$tasksref}) { |
if ($task eq $action) { |
if ($task eq $action) { |
Line 272 ENDONE
|
Line 272 ENDONE
|
$r->print(" |
$r->print(" |
<p> </p> |
<p> </p> |
</td> |
</td> |
<td width=\"10\" valign=\"top\" bgcolor=\"#CCCCFF\"> </td> |
<td valign=\"top\" class=\"LC_pick_box_value\">"); |
<td width=\"10\" valign=\"top\" bgcolor=\"#FFFFFF\"> </td> |
|
<td bgcolor=\"#ffffff\" valign=\"top\">"); |
|
} |
} |
|
|
############################################################### |
############################################################### |
Line 429 Note: Any students added manually by cou
|
Line 427 Note: Any students added manually by cou
|
} |
} |
my $dateshow; |
my $dateshow; |
if ( ($oldendshow eq '') && ($oldstartshow eq '') ) { |
if ( ($oldendshow eq '') && ($oldstartshow eq '') ) { |
$dateshow = "<br/><font size='+1'>Warning</font>. Currently <b>NO</b> first enrollment or last enrollment dates are set. You <b>must</b> use this menu to set a start date and an end date if you plan to utilise automated adds and/or drops in this course.\n"; |
$dateshow = "<br/>Warning. Currently <b>NO</b> first enrollment or last enrollment dates are set. You <b>must</b> use this menu to set a start date and an end date if you plan to utilise automated adds and/or drops in this course.\n"; |
} else { |
} else { |
$dateshow = "Currently: First enrollment: <b><i>$oldstartshow</i></b>, Last enrollment: <b><i>$oldendshow</i></b>\n"; |
$dateshow = "Currently: First enrollment: <b><i>$oldstartshow</i></b>, Last enrollment: <b><i>$oldendshow</i></b>\n"; |
} |
} |
Line 508 ENDTWO
|
Line 506 ENDTWO
|
} elsif ($action eq "notify") { |
} elsif ($action eq "notify") { |
my $notifycount = 0; |
my $notifycount = 0; |
my @notified = split(/,/,$enrollvar{notifylist}); |
my @notified = split(/,/,$enrollvar{notifylist}); |
my @domcoord; |
my (@domcoord,@showdom,@olddomcoord,@futuredomcoord); |
my @showdom; |
|
for (my $i=0; $i<@notified; $i++) { |
for (my $i=0; $i<@notified; $i++) { |
if ($notified[$i] !~ /:/) { |
if ($notified[$i] !~ /:/) { |
$notified[$i] =~ s/\@/:/; |
$notified[$i] =~ s/\@/:/; |
Line 522 ENDTWO
|
Line 519 ENDTWO
|
} else { |
} else { |
$noteset = "OFF"; |
$noteset = "OFF"; |
} |
} |
|
my $now = time; |
my %dompersonnel = &Apache::lonnet::get_domain_roles($dom,['dc']); |
my %dompersonnel = &Apache::lonnet::get_domain_roles($dom,['dc']); |
foreach my $server (keys(%dompersonnel)) { |
foreach my $server (keys(%dompersonnel)) { |
foreach my $user (sort(keys(%{$dompersonnel{$server}}))) { |
foreach my $user (sort(keys(%{$dompersonnel{$server}}))) { |
my ($trole,$uname,$udom,$runame,$rudom,$rsec) = split(/:/,$user); |
my ($trole,$uname,$udom,$runame,$rudom,$rsec) = split(/:/,$user); |
if (!grep(/^$uname:$udom$/,@domcoord)) { |
my ($end,$start) = split(':',$dompersonnel{$server}{$user}); |
push(@domcoord,$uname.':'.$udom); |
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); |
|
} |
} |
} |
} |
} |
} |
} |
Line 565 ENDTWO
|
Line 576 ENDTWO
|
my %pname; |
my %pname; |
my %notifystate; |
my %notifystate; |
my %status; |
my %status; |
my $now = time; |
|
foreach my $person (sort(keys(%coursepersonnel))) { |
foreach my $person (sort(keys(%coursepersonnel))) { |
my $match = 0; |
my $match = 0; |
my ($role,$user,$usec) = ($person =~ /^([^:]+):([^:]+:[^:]+):([^:]*)/); |
my ($role,$user,$usec) = ($person =~ /^([^:]+):([^:]+:[^:]+):([^:]*)/); |
Line 601 ENDTWO
|
Line 611 ENDTWO
|
usnm => 'username:domain', |
usnm => 'username:domain', |
coac => 'Course Access', |
coac => 'Course Access', |
curn => 'Current notification status', |
curn => 'Current notification status', |
|
doms => 'Domain Coordinator status', |
notf => 'Notification?', |
notf => 'Notification?', |
ntac => 'Notification active', |
ntac => 'Notification active', |
ntin => 'Notification inactive', |
ntin => 'Notification inactive', |
Line 630 ENDTWO
|
Line 641 ENDTWO
|
if (grep(/^$viewer$/,@domcoord)) { |
if (grep(/^$viewer$/,@domcoord)) { |
$showalldc = 1; |
$showalldc = 1; |
} |
} |
foreach my $dc (@domcoord) { |
foreach my $dc (@domcoord,@futuredomcoord) { |
if (!grep(/^$dc$/,@ccs)) { |
if (!grep(/^$dc$/,@ccs)) { |
if (grep(/^$dc$/,@notified)) { |
if (grep(/^$dc$/,@notified)) { |
$notifystate{$dc} = 1; |
$notifystate{$dc} = 1; |
Line 645 ENDTWO
|
Line 656 ENDTWO
|
push(@showdom,$dc); |
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); |
my $showdomnum = scalar(@showdom); |
if ($showdomnum) { |
if ($showdomnum) { |
$r->print(" |
$r->print(" |
Line 662 ENDTWO
|
Line 683 ENDTWO
|
</tr> |
</tr> |
<tr> |
<tr> |
<td>"); |
<td>"); |
$r->print(¬ifier_tables('dc',\%lt,\@showdom,\%status,\%notifystate, |
$r->print(¬ifier_tables('dc',\%lt,\@showdom,\%status,\%notifystate,\%pname, |
\%pname,\$notifyshow)); |
\$notifyshow,\@olddomcoord,\@futuredomcoord)); |
$r->print(" |
$r->print(" |
</td> |
</td> |
</tr>"); |
</tr>"); |
Line 1132 onclick="javascript:document.photoupdate
|
Line 1153 onclick="javascript:document.photoupdate
|
my ($indexhash,$keylist) = &Apache::lonuserutils::make_keylist_array(); |
my ($indexhash,$keylist) = &Apache::lonuserutils::make_keylist_array(); |
my $classlist = &Apache::loncoursedata::get_classlist(); |
my $classlist = &Apache::loncoursedata::get_classlist(); |
my $secidx = &Apache::loncoursedata::CL_SECTION(); |
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})) { |
foreach my $student (keys(%{$classlist})) { |
if (exists($permission->{'view_section'})) { |
if (exists($permission->{'view_section'})) { |
if ($classlist->{$student}[$secidx] ne $permission->{'view_section'}) { |
if ($classlist->{$student}[$secidx] ne $permission->{'view_section'}) { |
Line 1230 END
|
Line 1252 END
|
} |
} |
|
|
sub notifier_tables { |
sub notifier_tables { |
my ($role,$lt,$users,$status,$notifystate,$pname,$notifyshow) = @_; |
my ($role,$lt,$users,$status,$notifystate,$pname,$notifyshow,$olddomcoord, |
|
$futuredomcoord) = @_; |
my $output = &Apache::loncommon::start_data_table(); |
my $output = &Apache::loncommon::start_data_table(); |
$output .= &Apache::loncommon::start_data_table_header_row(); |
$output .= &Apache::loncommon::start_data_table_header_row(); |
$output .= "<th>$$lt{name}</th> |
$output .= "<th>$$lt{name}</th> |
<th>$$lt{usnm}</th>"; |
<th>$$lt{usnm}</th>"; |
if ($role eq 'cc') { |
if ($role eq 'dc') { |
|
$output .= "<th>$$lt{doms}</th>"; |
|
} elsif ($role eq 'cc') { |
$output .= "<th>$$lt{coac}</th>"; |
$output .= "<th>$$lt{coac}</th>"; |
} |
} |
$output .= "<th>$$lt{curn}</th> |
$output .= "<th>$$lt{curn}</th> |
Line 1246 sub notifier_tables {
|
Line 1271 sub notifier_tables {
|
$output .= '<td>'.$$pname{$$users[$i]}.'</td>'. |
$output .= '<td>'.$$pname{$$users[$i]}.'</td>'. |
'<td><input type="hidden" name="notifyname_'.$$notifyshow. |
'<td><input type="hidden" name="notifyname_'.$$notifyshow. |
'" value="'.$$users[$i].'" />'.$$users[$i].'</td>'; |
'" value="'.$$users[$i].'" />'.$$users[$i].'</td>'; |
if ($role eq 'cc') { |
if ($role eq 'dc') { |
|
$output .= '<td>'; |
|
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 .= '</td>'; |
|
} elsif ($role eq 'cc') { |
$output .= '<td>'.$$status{$$users[$i]}.'</td>'; |
$output .= '<td>'.$$status{$$users[$i]}.'</td>'; |
} |
} |
$output .= '<td>'; |
$output .= '<td>'; |
Line 1295 sub print_accessdate_table {
|
Line 1332 sub print_accessdate_table {
|
); |
); |
my $dateshow; |
my $dateshow; |
if ( ($oldendshow eq '') && ($oldstartshow eq '') ) { |
if ( ($oldendshow eq '') && ($oldstartshow eq '') ) { |
$dateshow = "<br/><font size='+1'>".&mt('Warning')."</font>. ".$lt{'cuno'}." "; |
$dateshow = "<br/>".&mt('Warning').". ".$lt{'cuno'}." "; |
if ($action eq 'setaccess') { |
if ($action eq 'setaccess') { |
$dateshow .= $lt{'ifyo'}."\n"; |
$dateshow .= $lt{'ifyo'}."\n"; |
} elsif ($action eq 'updatenow') { |
} elsif ($action eq 'updatenow') { |
Line 1475 sub print_chgsettings_response {
|
Line 1512 sub print_chgsettings_response {
|
} |
} |
if ($autoadds || $autodrops) { |
if ($autoadds || $autodrops) { |
$warning = &warning_message($dom,$crs,$action); |
$warning = &warning_message($dom,$crs,$action); |
$warn_prefix = "<br/><font size ='+1'><b>Warning</b></font>. Although you indicated that nightly "; |
$warn_prefix = "<br/><b>Warning</b>. Although you indicated that nightly "; |
$warn_suffix = " should be enabled, additional action is required.<br/>"; |
$warn_suffix = " should be enabled, additional action is required.<br/>"; |
} |
} |
if ($autoadds) { |
if ($autoadds) { |
Line 1573 sub print_setdates_response {
|
Line 1610 sub print_setdates_response {
|
} |
} |
} |
} |
$warning = &warning_message($dom,$crs,$action); |
$warning = &warning_message($dom,$crs,$action); |
$warn_prefix = "<br/><font size ='+1'><b>Warning</b></font>. Although you set a start and end date for auto-enrollment, additional action is required.<br/>"; |
$warn_prefix = "<br/><b>Warning</b>. Although you set a start and end date for auto-enrollment, additional action is required.<br/>"; |
unless ($warning eq '') { |
unless ($warning eq '') { |
$response .= $warn_prefix.$warning; |
$response .= $warn_prefix.$warning; |
} |
} |
Line 1672 start and end access dates for this cour
|
Line 1709 start and end access dates for this cour
|
} |
} |
} |
} |
$warning = &warning_message($dom,$crs,$action); |
$warning = &warning_message($dom,$crs,$action); |
$warn_prefix = "<br/><font size ='+1'><b>Warning</b></font>. Although you have set default first and last access dates for students who are added via automatic enrollment, additional action is required.<br/>"; |
$warn_prefix = "<br/><b>Warning</b>. Although you have set default first and last access dates for students who are added via automatic enrollment, additional action is required.<br/>"; |
unless ($warning eq '') { |
unless ($warning eq '') { |
$response .= $warn_prefix.$warning; |
$response .= $warn_prefix.$warning; |
} |
} |
Line 1980 sub print_crosslistings_response () {
|
Line 2017 sub print_crosslistings_response () {
|
|
|
if (@allxlists > 0) { |
if (@allxlists > 0) { |
$warning = &warning_message($dom,$crs,$action); |
$warning = &warning_message($dom,$crs,$action); |
$warn_prefix = "<br/><font size ='+1'><b>Warning</b></font>. Although you have selected crosslisted courses to contribute enrollment to this course, additional action is required.<br/>"; |
$warn_prefix = "<br/><b>Warning</b>. Although you have selected crosslisted courses to contribute enrollment to this course, additional action is required.<br/>"; |
unless ($warning eq '') { |
unless ($warning eq '') { |
$response .= $warn_prefix.$warning; |
$response .= $warn_prefix.$warning; |
} |
} |
Line 2118 sections which contribute to enrollment
|
Line 2155 sections which contribute to enrollment
|
|
|
if ($seccount > 0) { |
if ($seccount > 0) { |
$warning = &warning_message($dom,$crs,$action); |
$warning = &warning_message($dom,$crs,$action); |
$warn_prefix = "<br/><font size ='+1'><b>Warning</b></font>. Although you have selected sections to contribute enrollment to this course, additional action is required.<br/>"; |
$warn_prefix = "<br/><b>Warning</b>. Although you have selected sections to contribute enrollment to this course, additional action is required.<br/>"; |
unless ($warning eq '') { |
unless ($warning eq '') { |
$response .= $warn_prefix.$warning; |
$response .= $warn_prefix.$warning; |
} |
} |
Line 2289 sub print_sections_response () {
|
Line 2326 sub print_sections_response () {
|
|
|
if (@allsections > 0) { |
if (@allsections > 0) { |
$warning = &warning_message($dom,$crs,$action); |
$warning = &warning_message($dom,$crs,$action); |
$warn_prefix = "<br/><font size ='+1'><b>Warning</b></font>. Although you have selected sections to contribute enrollment to this course, additional action is required.<br/>"; |
$warn_prefix = "<br/><b>Warning</b>. Although you have selected sections to contribute enrollment to this course, additional action is required.<br/>"; |
unless ($warning eq '') { |
unless ($warning eq '') { |
$response .= $warn_prefix.$warning; |
$response .= $warn_prefix.$warning; |
} |
} |