[LON-CAPA-cvs] cvs: loncom /enrollment Autoenroll.pl /interface lonpopulate.pm
raeburn
lon-capa-cvs@mail.lon-capa.org
Tue, 16 May 2006 21:56:15 -0000
This is a MIME encoded message
--raeburn1147816575
Content-Type: text/plain
raeburn Tue May 16 17:56:15 2006 EDT
Modified files:
/loncom/enrollment Autoenroll.pl
/loncom/interface lonpopulate.pm
Log:
Use ':' as separator between username and domain instead of '@' in notifylist but retain backwards compatibility. Replace "Section/Group ID" with "Section ID" now group is distinct from section. Use loncommon::*_data_table() routines instead of nested tables. Prevent use of 'none' or 'all' (reserved words) or a group name for a section ID.
--raeburn1147816575
Content-Type: text/plain
Content-Disposition: attachment; filename="raeburn-20060516175615.txt"
Index: loncom/enrollment/Autoenroll.pl
diff -u loncom/enrollment/Autoenroll.pl:1.17 loncom/enrollment/Autoenroll.pl:1.18
--- loncom/enrollment/Autoenroll.pl:1.17 Sat Apr 8 03:12:16 2006
+++ loncom/enrollment/Autoenroll.pl Tue May 16 17:55:56 2006
@@ -1,7 +1,7 @@
#!/usr/bin/perl
#
#Automated Enrollment script
-# $Id: Autoenroll.pl,v 1.17 2006/04/08 07:12:16 albertel Exp $
+# $Id: Autoenroll.pl,v 1.18 2006/05/16 21:55:56 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -153,7 +153,12 @@
$to_notify[0] = $enrollvar{$crs}{notifylist};
}
foreach my $cc (@to_notify) {
- my ($ccname,$ccdom) = split/@/,$cc;
+ my ($ccname,$ccdom);
+ if ($cc =~ /:/) {
+ ($ccname,$ccdom) = split/:/,$cc;
+ } elsif ($cc =~ /\@/) {
+ ($ccname,$ccdom) = split/\@/,$cc;
+ }
my $status = &Apache::lonmsg::user_normal_msg($ccname,$ccdom,$subject,$message);
}
if ( ($enrollvar{$crs}{notifylist} eq '') && ($newusermsg ne '') ) {
Index: loncom/interface/lonpopulate.pm
diff -u loncom/interface/lonpopulate.pm:1.41 loncom/interface/lonpopulate.pm:1.42
--- loncom/interface/lonpopulate.pm:1.41 Wed Mar 15 17:11:04 2006
+++ loncom/interface/lonpopulate.pm Tue May 16 17:56:14 2006
@@ -1,5 +1,5 @@
# automated enrollment configuration handler
-# $Id: lonpopulate.pm,v 1.41 2006/03/15 22:11:04 albertel Exp $
+# $Id: lonpopulate.pm,v 1.42 2006/05/16 21:56:14 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -299,7 +299,7 @@
<td>Use <i>"Section settings"</i> to make changes to the choice of sections included for enrollment in your LON-CAPA course.</td>
</tr>
<td> </td>
- <td>Use <i>"Student photos settings"</i> to enable or disable automatic import of photos for registered students in your course.</td>
+ <td>Use <i>"Student photo settings"</i> to enable or disable automatic import of photos for registered students in your course.</td>
</tr>
<tr>
<td> </td>
@@ -478,8 +478,11 @@
} elsif ($action eq "notify") {
my $notifycount = 0;
my @notified = split(/,/,$enrollvar{notifylist});
- foreach (@notified) {
- unless ($_ eq '') { $notifycount ++; }
+ for (my $i=0; $i<@notified; $i++) {
+ if ($notified[$i] !~ /:/) {
+ $notified[$i] =~ s/\@/:/;
+ }
+ unless ($notified[$i] eq '') { $notifycount ++; }
}
my $noteset = '';
if ($notifycount) {
@@ -525,18 +528,18 @@
foreach (@coursepersonnel) {
my @roleinfo = split/:/,$_;
if ($roleinfo[0] eq 'cc') {
- unless (grep/^$roleinfo[1]\@$roleinfo[2]/,@ccs) {
+ unless (grep/^$roleinfo[1]\:$roleinfo[2]/,@ccs) {
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) {
- $notifystate{"$roleinfo[1]\@$roleinfo[2]"} = 1;
+ 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) {
+ $notifystate{$roleinfo[1].':'.$roleinfo[2]} = 1;
} else {
- $notifystate{"$roleinfo[1]\@$roleinfo[2]"} = 0;
+ $notifystate{$roleinfo[1].':'.$roleinfo[2]} = 0;
}
} else {
- push @oldccs, "$roleinfo[1]\@$roleinfo[2]";
+ push @oldccs, $roleinfo[1].':'.$roleinfo[2];
}
}
}
@@ -545,13 +548,13 @@
foreach my $person (@notified) {
unless ( (grep/^$person$/,@ccs) || ($person eq '') || (grep/^$person$/,@oldccs) ) {
push @ccs, $person;
- my ($puname,$pdom) = split/\@/,$person;
+ my ($puname,$pdom) = split/:/,$person;
$pname{$person} = &Apache::loncommon::plainname($puname,$pdom);
$notifystate{$person} = 1;
}
}
}
- 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'});
@@ -568,18 +571,19 @@
</td>
</tr>
<tr>
- <td>
- <table border=\"0\" cellpadding=\"3\" cellspacing=\"3\">
- <tr bgcolor=\"#CCCCFF\">
- <td><b>Name</b></td>
- <td><b>username</b></td>
- <td><b>Current status</b></td>
- <td><b>Notification?</b></td>
- </tr>
+ <td>");
+ $r->print(&Apache::loncommon::start_data_table());
+ $r->print(&Apache::loncommon::start_data_table_row());
+ $r->print("
+ <th>Name</th>
+ <th>username:domain</th>
+ <th>Current status</th>
+ <th>Notification?</th>
");
+ $r->print(&Apache::loncommon::end_data_table_row());
for (my $i=0; $i<@ccs; $i++) {
- my $colflag = $i%2;
- $r->print("<tr bgcolor=\"$bgcolors[$colflag]\" align=\"left\">
+ $r->print(&Apache::loncommon::start_data_table_row());
+ $r->print("
<td>$pname{$ccs[$i]}</td>
<td><input type=\"hidden\" name=\"notifyname_$i\" value=\"$ccs[$i]\" />$ccs[$i]</td>
<td>
@@ -590,13 +594,14 @@
$r->print("Notification inactive");
}
if ($notifystate{$ccs[$i]} == 1) {
- $r->print("</td><td><input type=\"checkbox\" name=\"note_$i\" checked=\"true\" /></td></tr>");
+ $r->print("</td><td><input type=\"checkbox\" name=\"note_$i\" checked=\"true\" /></td>");
} else {
- $r->print("</td><td><input type=\"checkbox\" name=\"note_$i\" /></td></tr>");
+ $r->print("</td><td><input type=\"checkbox\" name=\"note_$i\" /></td>");
}
+ $r->print(&Apache::loncommon::end_data_table_row());
}
+ $r->print(&Apache::loncommon::end_data_table());
$r->print("
- </table>
<br/>
<table width=\"100%\" border=\"0\" cellspadding=\"2\" cellspacing=\"2\">
<tr>
@@ -637,42 +642,37 @@
");
if ($cross_str > 0) {
$r->print("
- Currently, this LON-CAPA course is crosslisted with $cross_str course section(s). Students enrolling in 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 crosslisting, leave the checkbox checked if you want registered students in that course to be included in the student roster for LON-CAPA course: <b>$realm ($enrollvar{coursecode})</b>; otherwise uncheck it. If you wish to change the section/group ID assigned in your LON-CAPA course for a crosslisted course, enter the new section/group ID in the appropriate textbox. The LON-CAPA section/group ID can be left (or set to) empty, if you do not wish to tie a section/group ID to this crosslisting. If you wish to add new crosslisted courses, enter the number of new courses to add in the textbox at the bottom of the page. You will provide information about each of the new crosslistings on a subsequent page. Click 'Go' to store your changes.
+ Currently, this LON-CAPA course is crosslisted with $cross_str course section(s). Students enrolling in 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 crosslisting, leave the checkbox checked if you want registered students in that course to be included in the student roster for LON-CAPA course: <b>$realm ($enrollvar{coursecode})</b>; otherwise uncheck it. If you wish to change the section ID assigned in your LON-CAPA course for a crosslisted course, enter the new section ID in the appropriate textbox. The LON-CAPA section ID can be left (or set to) empty, if you do not wish to tie a section ID to this crosslisting. If you wish to add new crosslisted courses, enter the number of new courses to add in the textbox at the bottom of the page. You will provide information about each of the new crosslistings on a subsequent page. Click 'Go' to store your changes.
</td>
</tr>
</table>
<br/>
- <table border=\"0\" cellpadding=\"3\" cellspacing=\"3\">
- <tr>
- <td>
- <table border=\"0\" width=\"100%\" cellspacing=\"3\" cellpadding=\"3\">
- <tr bgcolor=\"#CCCCFF\" align=\"left\">
- <td><b>Enrollment?</b></td>
- <td><b>Crosslisted course</b></td>
- <td><b>LON-CAPA section/groupID</b></td>
- </tr>
+ ");
+ $r->print(&Apache::loncommon::start_data_table());
+ $r->print(&Apache::loncommon::start_data_table_row());
+ $r->print("
+ <th>Enrollment?</th>
+ <th>Crosslisted course</th>
+ <th>LON-CAPA section ID</th>
");
+ $r->print(&Apache::loncommon::end_data_table_row());
for (my $i=0; $i<@xlists; $i++) {
my $xl = ' ';
- my $gp = ' ';
+ my $lc_sec = ' ';
if ($xlists[$i] =~ /^([^:]+):?(.*)$/) {
$xl = $1;
- $gp = $2;
+ $lc_sec = $2;
}
my $colflag = $i%2;
+ $r->print(&Apache::loncommon::start_data_table_row());
$r->print("
- <tr bgcolor=\"$bgcolors[$colflag]\" align=\"left\">
<td><input type=\"checkbox\" name=\"cross_$i\" checked=\"true\" /></td>
<td>$xl</td>
- <td><input type =\"text\" size=\"10\" name=\"gp_$i\" value=\"$gp\" /></td>
- </tr>
+ <td><input type =\"text\" size=\"10\" name=\"lcsec_$i\" value=\"$lc_sec\" /></td>
");
+ $r->print(&Apache::loncommon::end_data_table_row());
}
- $r->print(" </table>
- </td>
- </tr>
- </table>
- ");
+ $r->print(&Apache::loncommon::end_data_table());
}
else {
$r->print("
@@ -728,23 +728,26 @@
</td>
</tr>
<tr>
- <td>For each section, check the checkbox if you want registered students in that section to be included in the student roster for LON-CAPA course: <b>$realm ($enrollvar{coursecode})</b>; otherwise uncheck it. 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/group textbox and enter the new value. The LON-CAPA section/group ID can be left (or set to) empty, if you do not wish to tie a section/group ID to this section. To add a new section, check the 'Enrollment in this course?' checkbox, and enter the desired LON-CAPA section/groupID in the appropriate textbox. Click 'Go' to store
+ <td>For each section, check the checkbox if you want registered students in that section to be included in the student roster for LON-CAPA course: <b>$realm ($enrollvar{coursecode})</b>; otherwise uncheck it. If you want to change the section ID designation used for this section in LON-CAPA, delete the current value in the LON-CAPA section ID textbox and enter the new value. The LON-CAPA section ID can be left (or set to) empty, if you do not wish to tie a section ID to this section. To add a new section, check the 'Enrollment in this course?' checkbox, and enter the desired LON-CAPA section ID in the appropriate textbox. Click 'Go' to store
your changes.</td>
</tr>
</table>
<br/>
- <table border=\"0\" cellpadding=\"3\" cellspacing=\"3\">
- <tr bgcolor=\"#CCCCFF\">
- <td><b>Section</b></td>
- <td><b>Current status</b></td>
- <td><b>LON-CAPA section/group ID</b></td>
- <td><b>Enrollment in this course?</b></td>
- </tr>
");
+ $r->print(&Apache::loncommon::start_data_table());
+ $r->print(&Apache::loncommon::start_data_table_row());
+ $r->print("
+ <th>Section</th>
+ <th>Current status</th>
+ <th>LON-CAPA section ID</th>
+ <th>Enrollment in this course?</th>
+ ");
+ $r->print(&Apache::loncommon::end_data_table_row());
for (my $i=0; $i<@sections; $i++) {
my $colflag = $i%2;
my $shrflag = 0;
- $r->print("<tr bgcolor=\"$bgcolors[$colflag]\" align=\"left\">
+ $r->print(&Apache::loncommon::start_data_table_row());
+ $r->print("
<td>$sections[$i]<input type=\"hidden\" name=\"secnum_$i\" value=\"$sections[$i]\" /></td>
<td>
");
@@ -755,13 +758,14 @@
$r->print("Enrollment inactive");
}
if ($shrflag) {
- $r->print("</td><td><input type=\"text\" size=\"10\" name=\"loncapasec_$i\" value=\"$sec_id{$sections[$i]}\"></td><td><input type=\"checkbox\" name=\"sec_$i\" checked=\"true\" /></td></tr>");
+ $r->print("</td><td><input type=\"text\" size=\"10\" name=\"loncapasec_$i\" value=\"$sec_id{$sections[$i]}\"></td><td><input type=\"checkbox\" name=\"sec_$i\" checked=\"true\" /></td>");
} else {
- $r->print("</td><td><input type=\"text\" size=\"10\" name=\"loncapasec_$i\" value=\"\" /></td><td><input type=\"checkbox\" name=\"sec_$i\" /></td></tr>");
+ $r->print("</td><td><input type=\"text\" size=\"10\" name=\"loncapasec_$i\" value=\"\" /></td><td><input type=\"checkbox\" name=\"sec_$i\" /></td>");
}
+ $r->print(&Apache::loncommon::end_data_table_row());
}
+ $r->print(&Apache::loncommon::end_data_table());
$r->print("
- </table>
<br/>
<table width=\"100%\" border=\"0\" cellspacing=\"3\" cellpadding=\"3\">
<tr>
@@ -785,36 +789,31 @@
if (@currsections) {
my $secshow = @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: <b>$realm ($enrollvar{coursecode})</b>; 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.
+ 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: <b>$realm ($enrollvar{coursecode})</b>; otherwise leave it checked. If you want to change the section ID designation used for this section in LON-CAPA, delete the current value in the LON-CAPA section ID 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.
</td>
</tr>
</table>
<br/>
- <table border=\"0\" cellpadding=\"3\" cellspacing=\"3\">
- <tr>
- <td>
- <table border=\"0\" width=\"100%\" cellspacing=\"3\" cellpadding=\"3\">
- <tr bgcolor=\"#CCCCFF\">
- <td><b>Enrollment?</b></td>
- <td><b>Section</b></td>
- <td><b>LON-CAPA section/groupID</b></td>
- </tr>
");
+ $r->print(&Apache::loncommon::start_data_table());
+ $r->print(&Apache::loncommon::start_data_table_row());
+ $r->print("
+ <th>Enrollment?</th>
+ <th>Section</th>
+ <th>LON-CAPA section ID</th>
+ ");
+ $r->print(&Apache::loncommon::end_data_table_row());
for (my $j=0; $j<@currsections; $j++) {
my $colflag = $j%2;
+ $r->print(&Apache::loncommon::start_data_table_row());
$r->print("
- <tr bgcolor=\"$bgcolors[$colflag]\" align=\"left\">
<td><input type=\"checkbox\" name=\"sec_$j\" checked=\"true\" /></td>
<td>$currsections[$j]</td>
- <td><input type=\"text\" name=\"secgp_$j\" size=\"10\" value=\"$sec_id{$currsections[$j]}\" /></td>
- </tr>
+ <td><input type=\"text\" name=\"lcsec_$j\" size=\"10\" value=\"$sec_id{$currsections[$j]}\" /></td>
");
+ $r->print(&Apache::loncommon::end_data_table_row());
}
- $r->print(" </table>
- </td>
- </tr>
- </table>
- ");
+ $r->print(&Apache::loncommon::end_data_table());
} else {
$r->print("
Currently no sections of $realm ($enrollvar{coursecode}) are contributing enrollment to the LON-CAPA class roster.
@@ -1644,14 +1643,14 @@
if (@currxlists > 0) {
for (my $i=0; $i<@currxlists; $i++) {
my $xlist = "cross_".$i;
- my $gp = "gp_".$i;
+ my $lc_sec = "lcsec_".$i;
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.$lc_sec"}) ) {
+ $xlistentry .= $env{"form.$lc_sec"};
}
push @xlists,$xlistentry;
$crosscount ++;
@@ -1674,8 +1673,8 @@
if ($crosscount > 0) {
$response .= "The $crosscount courses listed below remain crosslisted with this LON-CAPA course, and students enrolling in 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.<br/><ul>\n";
foreach (@xlists) {
- my ($xlist,$gp) = split/:/,$_;
- $response .= "<li>$xlist - ID: $gp</li>\n";
+ my ($xlist,$lc_sec) = split/:/,$_;
+ $response .= "<li>$xlist - ID: $lc_sec</li>\n";
}
$response .= "</ul><br/>\n";
}
@@ -1684,27 +1683,25 @@
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.<br/><br/>
- <form name="enter" method="post">
- <table border="0" cellpadding="2" cellspacing="2" width="100%">
- <tr>
- <td>
- <table border="0" cellspacing="3" cellpadding="3">
- <tr bgcolor="#CCCCFF" align="left">
- <td><b>Crosslisting</b></td>
- <td><b>LON-CAPA section/groupID</b></td>
- </tr>
+ $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 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 ID can be left blank, if you do not wish to tie a section 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.<br/><br/>
+ <form name="enter" method="post">);
+ $response .= &Apache::loncommon::start_data_table();
+ $response .= &Apache::loncommon::start_data_table_row();
+ $response .= qq(
+ <th>Crosslisting</th>
+ <th>LON-CAPA section ID</th>
);
+ $response .= &Apache::loncommon::end_data_table_row();
for (my $i=0; $i<$numcross; $i++) {
- my $colflag = $i%2;
+ $response .= &Apache::loncommon::start_data_table_row();
$response .= qq(
- <tr bgcolor="$bgcolors[$colflag]" align="left">
<td><input type="text" size="15" name="newcross_$i" /></td>
- <td><input type="text" size="10" name="newgroupid_$i" /></td>
- </tr>
+ <td align="right"><input type="text" size="10" name="newlcsec_$i" /></td>
);
+ $response .= &Apache::loncommon::end_data_table_row();
}
- $response .= qq( </table>
+ $response .= &Apache::loncommon::end_data_table();
+ $response .= qq(
</td>
</tr>
<tr>
@@ -1732,6 +1729,8 @@
my @allxlists = ();
my @badxlists = ();
my @badowner = ();
+ my @reserved = ();
+ my @matchgroup = ();
my $numcross = 0;
my $xliststr = $settings{'internal.crosslistings'};
my $coursecode = $settings{'internal.coursecode'};
@@ -1749,22 +1748,34 @@
}
if ($numcross > 0) {
+ my %curr_groups = &Apache::loncommon::coursegroups();
for (my $i=0; $i<$numcross; $i++) {
my $xl = "newcross_".$i;
- my $gp = "newgroupid_".$i;
+ my $lc_sec = "newlcsec_".$i;
if ( exists($env{"form.$xl"}) ) {
+ if (exists($env{"form.$lc_sec"})) {
+ my $lc_sec_check = &validate_lcsec(\%curr_groups,
+ $env{"form.$lc_sec"});
+ if ($lc_sec_check eq 'reserved') {
+ push(@reserved,$env{"form.$xl"}.":".$env{"form.$lc_sec"});
+ next;
+ } elsif ($lc_sec_check eq 'group') {
+ push (@matchgroup,$env{"form.$xl"}.":".$env{"form.$lc_sec"});
+ next;
+ }
+ }
my $coursecheck = '';
$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);
if ($addcheck eq 'ok') {
- push @xlists,$env{"form.$xl"}.":".$env{"form.$gp"};
+ push @xlists,$env{"form.$xl"}.":".$env{"form.$lc_sec"};
} else {
- push @badowner,$env{"form.$xl"}.":".$env{"form.$gp"};
+ push @badowner,$env{"form.$xl"}.":".$env{"form.$lc_sec"};
}
} else {
- push @badxlists, $env{"form.$xl"}.":".$env{"form.$gp"}.":".$coursecheck;
+ push @badxlists, $env{"form.$xl"}.":".$env{"form.$lc_sec"}.":".$coursecheck;
}
}
}
@@ -1782,8 +1793,8 @@
} else {
$response = "The courses listed below are now crosslisted with this LON-CAPA course, and students enrolling in 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.<br/><ul>\n";
foreach (@allxlists) {
- my ($xlist,$gp) = split/:/,$_;
- $response .= "<li>$xlist - ID: $gp</li>\n";
+ my ($xlist,$lc_sec) = split/:/,$_;
+ $response .= "<li>$xlist - ID: $lc_sec</li>\n";
}
$response .= "</ul><br/><br/>\n";
}
@@ -1792,8 +1803,8 @@
my @oldxlists = (split/,/,$xliststr);
$response .= "Although no new crosslistings were added, the courses listed below continue to be crosslisted with your LON-CAPA course.<br/><ul>\n";
foreach (@oldxlists) {
- my ($xlist,$gp) = split/:/,$_;
- $response .= "<li>$xlist - ID: $gp</li>\n";
+ my ($xlist,$lc_sec) = split/:/,$_;
+ $response .= "<li>$xlist - ID: $lc_sec</li>\n";
}
$response .= "</ul><br/><br/>\n";
}
@@ -1801,8 +1812,8 @@
if (@badxlists > 0) {
$response .= "The courses listed below could not be included in the crosslistings for this LON-CAPA course, because they are not valid courses according to your institution's official schedule of classes and sections.<br/><ul>\n";
foreach (@badxlists) {
- my ($xlist,$gp,$prob) = split/:/,$_;
- $response .= "<li>$xlist - ID: $gp - Error: $prob</li>\n";
+ my ($xlist,$lc_sec,$prob) = split/:/,$_;
+ $response .= "<li>$xlist - ID: $lc_sec - Error: $prob</li>\n";
}
$response .= "</ul><br/><br/>\n";
}
@@ -1810,11 +1821,28 @@
if (@badowner > 0) {
$response .= "The courses listed below could not be included in the crosslistings for this LON-CAPA course, because the owner of this course - $owner - does not have rights to view enrollment in those classes as determined by your instititution's policies on access to official classlists.<br/><ul>\n";
foreach (@badowner) {
- my ($xlist,$gp) = split/:/,$_;
- $response .= "<li>$xlist - ID: $gp</li>\n";
+ my ($xlist,$lc_sec) = split/:/,$_;
+ $response .= "<li>$xlist - ID: $lc_sec</li>\n";
}
$response .= "</ul><br/><br/>\n";
}
+ if (@reserved > 0) {
+ $response .= "The courses listed below could not be included in the crosslistings for this LON-CAPA course, because the section ID associated with the crosslisted course is a reserved word. Please <a href=\"javascript:history(-1)\">go back</a> and change the section ID for each of these courses.<br/><ul>\n";
+ foreach (@reserved) {
+ my ($xlist,$lc_sec) = split/:/,$_;
+ $response .= "<li>$xlist - ID: $lc_sec</li>\n";
+ }
+ $response .= "</ul><br/><br/>\n";
+ }
+
+ if (@matchgroup > 0) {
+ $response .= "The courses listed below could not be included in the crosslistings for this LON-CAPA course, because the section ID associated with the crosslisted course is the name of a group in this course. Please <a href=\"javascript:history(-1)\">go back</a> and change the section ID for each of these courses.<br/><ul>\n";
+ foreach (@matchgroup) {
+ my ($xlist,$lc_sec) = split/:/,$_;
+ $response .= "<li>$xlist - ID: $lc_sec</li>\n";
+ }
+ $response .= "</ul><br/><br/>\n";
+ }
if (@allxlists > 0) {
$warning = &warning_message($dom,$crs,$action);
@@ -1850,7 +1878,7 @@
if ( exists($env{'form.secshow'}) ) {
for (my $i=0; $i<$env{'form.secshow'}; $i++) {
- my $gp = "loncapasec_".$i;
+ my $lc_sec = "loncapasec_".$i;
my $secnum = "secnum_".$i;
my $sec = "sec_".$i;
if ( exists( $env{"form.$sec"} ) ) {
@@ -1858,8 +1886,8 @@
if ( exists( $env{"form.$secnum"} ) ) {
$secentry = $env{"form.$secnum"}.':';
}
- if ( exists( $env{"form.$gp"} ) ) {
- $secentry .= $env{"form.$gp"};
+ if ( exists( $env{"form.$lc_sec"} ) ) {
+ $secentry .= $env{"form.$lc_sec"};
}
if ( grep/^$env{"form.$secnum"}:/,@currsections) {
push @sections, $secentry;
@@ -1870,14 +1898,14 @@
if ($coursecheck eq 'ok') {
my $addcheck = &Apache::lonnet::auto_new_course($crs,$dom,$newsec,$owner);
if ($addcheck eq 'ok') {
- push @sections,$env{"form.$secnum"}.":".$env{"form.$gp"};
+ push @sections,$env{"form.$secnum"}.":".$env{"form.$lc_sec"};
$seccount ++;
$addcount ++;
} else {
- push @badowner,$env{"form.$secnum"}.":".$env{"form.$gp"};
+ push @badowner,$env{"form.$secnum"}.":".$env{"form.$lc_sec"};
}
} else {
- push @badsections, $env{"form.$secnum"}.":".$env{"form.$gp"}.":".$coursecheck;
+ push @badsections, $env{"form.$secnum"}.":".$env{"form.$lc_sec"}.":".$coursecheck;
}
}
}
@@ -1895,14 +1923,14 @@
} elsif (@currsections > 0) {
for (my $i=0; $i<@currsections; $i++) {
my $sec = "sec_".$i;
- my $gp = "secgp_".$i;
+ my $lc_sec = "lcsec_".$i;
if ( exists($env{"form.$sec"}) ) {
my $secentry = '';
if ($currsections[$i] =~ m/^(\w+:)/ ) {
$secentry = $1;
}
- if ( exists($env{"form.$gp"}) ) {
- $secentry .= $env{"form.$gp"};
+ if ( exists($env{"form.$lc_sec"}) ) {
+ $secentry .= $env{"form.$lc_sec"};
}
push @sections,$secentry;
$seccount ++;
@@ -1929,8 +1957,8 @@
if ($seccount > 0) {
$response .= "Students enrolling in the $seccount section(s) listed below will be automatically added to the class roster for the course, if you have chosen to enable a nightly automated enrollment update.<br/><ul>\n";
foreach (@sections) {
- my ($sec,$gp) = split/:/,$_;
- $response .= "<li>$sec - ID: $gp</li>\n";
+ my ($sec,$lc_sec) = split/:/,$_;
+ $response .= "<li>$sec - ID: $lc_sec</li>\n";
}
$response .= "</ul><br/>\n";
}
@@ -1939,8 +1967,8 @@
if (@badsections > 0) {
$response .= "The sections listed below could not be included in the sections for this LON-CAPA course, because they are not valid section numbers according to your institution's official schedule of classes and sections.<br/><ul>\n";
foreach (@badsections) {
- my ($secnum,$gp,$prob) = split/:/,$_;
- $response .= "<li>$secnum - ID: $gp - Error: $prob</li>\n";
+ my ($secnum,$lc_sec,$prob) = split/:/,$_;
+ $response .= "<li>$secnum - ID: $lc_sec - Error: $prob</li>\n";
}
$response .= "</ul><br/><br/>\n";
}
@@ -1948,8 +1976,8 @@
if (@badowner > 0) {
$response .= "The sections listed below could not be included in the sections for this LON-CAPA course, because the owner of this course - $owner - does not have rights to view enrollment in those classes as determined by your instititution's policies on access to official classlists.<br/><ul>\n";
foreach (@badowner) {
- my ($secnum,$gp) = split/:/,$_;
- $response .= "<li>$secnum - ID: $gp</li>\n";
+ my ($secnum,$lc_sec) = split/:/,$_;
+ $response .= "<li>$secnum - ID: $lc_sec</li>\n";
}
$response .= "</ul><br/><br/>\n";
}
@@ -1967,27 +1995,30 @@
if ($numsec > 0) {
my @bgcolors=("#eeeeee","#cccccc");
$response .= qq(
- You indicated that you wish to incorporate student enrollment in your LON-CAPA course from an additional $numsec section(s). For each new section enter the insititutional section code (e.g., 004), 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 this particular section. The LON-CAPA section/group ID can be left blank, if you do not wish to designate a section/group ID for this course section. The institutional section code should only contain letters and/or numbers, and must be consistent with the scheme adopted by your Domain Coordinator to map course section numbers to your institution\'s student information system.<br/><br/>
+ You indicated that you wish to incorporate student enrollment in your LON-CAPA course from an additional $numsec section(s). For each new section enter the insititutional section code (e.g., 004), and the LON-CAPA section ID you wish to assign to students who will be enrolled in your LON-CAPA class as a result of their registration in this particular section. The LON-CAPA section ID can be left blank, if you do not wish to designate a section ID for this course section. The institutional section code should only contain letters and/or numbers, and must be consistent with the scheme adopted by your Domain Coordinator to map course section numbers to your institution\'s student information system.<br/><br/>
<form name="enter" method="post">
<table border="0" cellpadding="2" cellspacing="2" width="100%">
<tr>
- <td>
- <table border="0" cellspacing="3" cellpadding="3">
- <tr bgcolor="#CCCCFF" align="left">
- <td><b>Section number</b></td>
- <td><b>LON-CAPA section/groupID</b></td>
- </tr>
- );
+ <td>);
+ $response .= &Apache::loncommon::start_data_table();
+ $response .= &Apache::loncommon::start_data_table_row();
+ $response .= qq(
+ <th>Section number</th>
+ <th>LON-CAPA section ID</th>
+ );
+ $response .= &Apache::loncommon::end_data_table_row();
for (my $i=0; $i<$numsec; $i++) {
- my $colflag = $i%2;
+ $response .= &Apache::loncommon::start_data_table_row();
$response .= qq(
- <tr bgcolor="$bgcolors[$colflag]" align="left">
- <td><input type="text" size="15" name="newsec_$i" /></td>
- <td><input type="text" size="10" name="newsecgp_$i" /></td>
- </tr>
- );
+ <td><input type="text" size="10" name="newsec_$i" /></td>
+ <td align="right">
+ <input type="text" size="10" name="newlcsec_$i" />
+ </td>
+ );
+ $response .= &Apache::loncommon::end_data_table_row();
}
- $response .= qq( </table>
+ $response .= &Apache::loncommon::end_data_table();
+ $response .= qq(
</td>
</tr>
<tr>
@@ -2015,6 +2046,8 @@
my @allsections = ();
my @badowner = ();
my @badsections = ();
+ my @reserved = ();
+ my @matchgroup = ();
my $numsec = 0;
my $secstr = $settings{'internal.sectionnums'};
my $coursecode = $settings{'internal.coursecode'};
@@ -2032,22 +2065,31 @@
}
if ($numsec > 0) {
+ my %curr_groups = &Apache::loncommon::coursegroups();
for (my $i=0; $i<$numsec; $i++) {
my $sec = "newsec_".$i;
- my $gp = "newsecgp_".$i;
+ my $lc_sec = "newlcsec_".$i;
if ( exists($env{"form.$sec"}) ) {
unless ( (grep/^$env{"form.$sec"}:/,@allsections) || (grep/^$env{"form.$sec"}:/,@sections) ) {
+ my $lc_sec_check = &validate_lcsec(\%curr_groups, $env{"form.$lc_sec"});
+ if ($lc_sec_check eq 'reserved') {
+ push(@reserved,$env{"form.$sec"}.":".$env{"form.$lc_sec"});
+ next;
+ } elsif ($lc_sec_check eq 'group') {
+ push (@matchgroup,$env{"form.$sec"}.":".$env{"form.$lc_sec"});
+ next;
+ }
my $newsec = $coursecode.$env{"form.$sec"};
my $coursecheck = &Apache::lonnet::auto_validate_courseID($crs,$dom,$newsec);
if ($coursecheck eq 'ok') {
my $addcheck = &Apache::lonnet::auto_new_course($crs,$dom,$newsec,$owner);
if ($addcheck eq 'ok') {
- push @sections,$env{"form.$sec"}.":".$env{"form.$gp"};
+ push @sections,$env{"form.$sec"}.":".$env{"form.$lc_sec"};
} else {
- push @badowner,$env{"form.$sec"}.":".$env{"form.$gp"};
+ push @badowner,$env{"form.$sec"}.":".$env{"form.$lc_sec"};
}
} else {
- push @badsections, $env{"form.$sec"}.":".$env{"form.$gp"}.":".$coursecheck;
+ push @badsections, $env{"form.$sec"}.":".$env{"form.$lc_sec"}.":".$coursecheck;
}
}
}
@@ -2068,8 +2110,8 @@
if ($putreply =~ /^ok/) {
$response = "Students enrolling in the sections listed below will be automatically added to the class roster for LON-CAPA course $realm ($coursecode), if you have chosen to enable a nightly automated enrollment update.<br/><ul>\n";
foreach (@allsections) {
- my ($sec,$gp) = split/:/,$_;
- $response .= "<li>$sec - ID: $gp</li>\n";
+ my ($sec,$lc_sec) = split/:/,$_;
+ $response .= "<li>$sec - ID: $lc_sec</li>\n";
}
$response .= "</ul><br/><br/>\n";
}
@@ -2077,8 +2119,8 @@
if (@badsections > 0) {
$response .= "The sections listed below could not be included in the sections for this LON-CAPA course, because they are not valid section numbers according to your institution's official schedule of classes and sections.<br/><ul>\n";
foreach (@badsections) {
- my ($secnum,$gp,$prob) = split/:/,$_;
- $response .= "<li>$secnum - ID: $gp - Error: $prob</li>\n";
+ my ($secnum,$lc_sec,$prob) = split/:/,$_;
+ $response .= "<li>$secnum - ID: $lc_sec - Error: $prob</li>\n";
}
$response .= "</ul><br/><br/>\n";
}
@@ -2086,12 +2128,31 @@
if (@badowner > 0) {
$response .= "The sections listed below could not be included in the sections for this LON-CAPA course, because the owner of this course - $owner - does not have rights to view enrollment in those classes as determined by your instititution's policies on access to official classlists.<br/><ul>\n";
foreach (@badowner) {
- my ($secnum,$gp) = split/:/,$_;
- $response .= "<li>$secnum - ID: $gp</li>\n";
+ my ($secnum,$lc_sec) = split/:/,$_;
+ $response .= "<li>$secnum - ID: $lc_sec</li>\n";
}
$response .= "</ul><br/><br/>\n";
}
+ if (@reserved > 0) {
+ $response .= "The sections listed below could not be included in the sections for this LON-CAPA course, because the section ID associated with the institutional section is a reserved word. Please <a href=\"javascript:history.go(-1)\">go back</a> and change the section ID for each of these sections.<br/><ul>\n";
+ foreach (@reserved) {
+ my ($xlist,$lc_sec) = split/:/,$_;
+ $response .= "<li>$xlist - ID: $lc_sec</li>\n";
+ }
+ $response .= "</ul><br/><br/>\n";
+ }
+
+ if (@matchgroup > 0) {
+ $response .= "The sections listed below could not be included in the sections for this LON-CAPA course, because the section ID associated with the institutional section is the name of a group in this course. Please <a href=\"javascript:history.go(-1)\">go back</a> and change the section ID for each of these sections.<br/><ul>\n";
+ foreach (@matchgroup) {
+ my ($xlist,$lc_sec) = split/:/,$_;
+ $response .= "<li>$xlist - ID: $lc_sec</li>\n";
+ }
+ $response .= "</ul><br/><br/>\n";
+ }
+
+
if (@allsections > 0) {
$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/>";
@@ -2472,10 +2533,10 @@
foreach (@currsections) {
if (m/^(\w+):(\w*)$/) {
my $sec = $coursecode.$1;
- my $gp = $2;
+ my $lc_sec = $2;
unless (grep/^$sec$/,@{$allcourses}) {
push @{$allcourses},$sec;
- $$LC_code{$sec} = $gp;
+ $$LC_code{$sec} = $lc_sec;
}
}
}
@@ -2790,6 +2851,18 @@
return ($start_table, $end_table);
}
+sub validate_lcsec {
+ my ($curr_groups,$lcsec) = @_;
+ if (($lcsec eq 'all') || ($lcsec eq 'none')) {
+ return 'reserved';
+ } else {
+ if (exists($$curr_groups{$lcsec})) {
+ return 'group';
+ }
+ }
+ return 'ok';
+}
+
###################################################################
sub handler {
my $r = shift;
--raeburn1147816575--