--- loncom/interface/lonpopulate.pm 2006/02/07 05:08:32 1.34 +++ loncom/interface/lonpopulate.pm 2011/01/11 22:09:50 1.68 @@ -1,5 +1,5 @@ # automated enrollment configuration handler -# $Id: lonpopulate.pm,v 1.34 2006/02/07 05:08:32 raeburn Exp $ +# $Id: lonpopulate.pm,v 1.68 2011/01/11 22:09:50 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -32,30 +32,24 @@ use Apache::loncommon; use Apache::lonhtmlcommon; use Apache::lonlocal; use Apache::loncoursedata; +use Apache::longroup; +use Apache::lonuserutils; use Apache::Constants qw(:common :http REDIRECT); use Time::Local; use LONCAPA::Enrollment; ############################################################### sub header { - my $html=&Apache::lonxml::xmlbegin(); - my $bodytag=&Apache::loncommon::bodytag('Classlist Manager'); - return(< -LON-CAPA Classlist Manager - -$bodytag -ENDHEAD + return &Apache::loncommon::start_page('Classlist Manager'); } ############################################################### sub choose_header { - my $action = shift; - my $bodytag=&Apache::loncommon::bodytag('Classlist Manager'); + my ($action) = @_; + my $notify_check = '/^note_[0-9]+$/'; my $scripttag = qq| - |; - my $html=&Apache::lonxml::xmlbegin(); - return(< -LON-CAPA Classlist Manager -$scripttag -$bodytag -ENDHEAD + + return &Apache::loncommon::start_page('Classlist Manager', + $scripttag); } sub print_mainbox { @@ -193,33 +208,37 @@ sub print_mainbox { } my $page = ''; if ($action eq "information") { - $page = "Automated Enrollment"; + $page = "".&mt("Automated Enrollment").""; } else { - $page = 'Automated Enrollment'; + $page = ''.&mt('Automated Enrollment').''; if ($reply) { if ($action eq "newcross") { $action = "crosslist"; } elsif ($action eq "newsections") { $action = "sections"; } - $page .= "-> ".$$tasklongref{$action}." -> result"; + $page .= "» ".$$tasklongref{$action}." » result"; } else { - $page .= " -> ".$$tasklongref{$action}.""; + $page .= " » ".$$tasklongref{$action}.""; } } + my $usrmang = &mt('User Management'); + 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(< - - $realm -> Enrollment Manager -> $page
+ + $realm » $usrmang » $page
- - Automated Enrollment Manager  + + $autenrl  - - +
+
+ ENDTHIS } @@ -230,9 +249,7 @@ sub print_navmenu { $action = $env{'form.action'}; } $r->print(<  - - - - - + @@ -353,13 +368,13 @@ ENDONE ENDTWO if ($enrollvar{autoadds}) { $r->print(" -  Enable    -  Disable + + "); } else { $r->print(" -  Enable    -  Disable + + "); } $r->print(" @@ -370,12 +385,12 @@ ENDTWO Removals based on classlist changes:  "); if ($enrollvar{autodrops}) { $r->print(" -  Enable    -  Disable"); + + "); } else { $r->print(" -  Enable    -  Disable"); + + "); } $r->print(" @@ -383,18 +398,18 @@ ENDTWO
-
+ 		ENDONE foreach my $task (@{$tasksref}) { if ($task eq $action) { @@ -255,9 +272,7 @@ ENDONE $r->print("

 

  "); + "); } ############################################################### @@ -312,7 +327,7 @@ sub print_main_frame { Use "Section settings" to make changes to the choice of sections included for enrollment in your LON-CAPA course.
 Use "Student photos settings" to enable or disable automatic import of photos for registered students in your course.Use "Student photo settings" to enable or disable automatic import of photos for registered students in your course.
 
-Note: Any students added manually by course coordinators using the Enrollment Manager will be unaffected by the nightly removal process if you choose to enable it. +Note: Any students added manually by course coordinators using the User Manager will be unaffected by the nightly removal process if you choose to enable it.
- +
- - + + "); } elsif ($action eq "setdates") { @@ -412,7 +427,7 @@ Note: Any students added manually by cou } my $dateshow; if ( ($oldendshow eq '') && ($oldstartshow eq '') ) { - $dateshow = "
Warning. Currently NO first enrollment or last enrollment dates are set. You must 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 = "
Warning. Currently NO first enrollment or last enrollment dates are set. You must 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 { $dateshow = "Currently: First enrollment: $oldstartshow, Last enrollment: $oldendshow\n"; } @@ -466,12 +481,12 @@ Note: Any students added manually by cou
- +
- - + + ENDTWO } elsif ($action eq "setaccess") { @@ -480,19 +495,23 @@ ENDTWO
- +
- - + + ENDTWO } elsif ($action eq "notify") { my $notifycount = 0; my @notified = split(/,/,$enrollvar{notifylist}); - foreach (@notified) { - unless ($_ eq '') { $notifycount ++; } + my (@domcoord,@showdom,@olddomcoord,@futuredomcoord); + for (my $i=0; $i<@notified; $i++) { + if ($notified[$i] !~ /:/) { + $notified[$i] =~ s/\@/:/; + } + unless ($notified[$i] eq '') { $notifycount ++; } } my $noteset = ''; if ($notifycount) { @@ -500,7 +519,29 @@ 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); + } + } + } + } $r->print("

@@ -517,124 +558,164 @@ ENDTWO "); if ($notifycount) { $r->print(" -  Yes    -  No + + "); } else { $r->print(" -  Yes    -  No + + "); } $r->print(" "); - my @coursepersonnel = &Apache::lonnet::getkeys('nohist_userroles',$dom,$crs); - my @ccs = (); - my @oldccs = (); - my %pname = (); - my %notifystate = (); - foreach (@coursepersonnel) { - my @roleinfo = split/:/,$_; - if ($roleinfo[0] eq 'cc') { - 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; - } else { - $notifystate{"$roleinfo[1]\@$roleinfo[2]"} = 0; - } + my %coursepersonnel = &Apache::lonnet::dump('nohist_userroles',$dom,$crs); + my @ccs; + my %pname; + my %notifystate; + my %status; + foreach my $person (sort(keys(%coursepersonnel))) { + my $match = 0; + my ($role,$user,$usec) = ($person =~ /^([^:]+):([^:]+:[^:]+):([^:]*)/); + $user =~ s/:$//; + my ($end,$start) = split(/:/,$coursepersonnel{$person}); + if ($end == -1 || $start == -1) { + next; + } + if ($role eq 'cc') { + unless (grep(/^$user$/,@ccs)) { + if ($end && $end < $now) { + $status{$user} = 'previous'; + } elsif ($start > $now) { + $status{$user} = 'future'; } else { - push @oldccs, "$roleinfo[1]\@$roleinfo[2]"; + $status{$user} = 'active'; + } + push(@ccs,$user); + my ($uname,$udom) = split(/:/,$user); + $pname{$user} = + &Apache::loncommon::plainname($uname,$udom); + if (grep(/^$user$/,@notified)) { + $notifystate{$user} = 1; + } else { + $notifystate{$user} = 0; } } } } - if ($notifycount > 0) { - foreach my $person (@notified) { - unless ( (grep/^$person$/,@ccs) || ($person eq '') || (grep/^$person$/,@oldccs) ) { - push @ccs, $person; - my ($puname,$pdom) = split/\@/,$person; - $pname{$person} = &Apache::loncommon::plainname($puname,$pdom); - $notifystate{$person} = 1; - } - } - } - 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'}); - $notifystate{$viewer} = 0; - } - - my $notifyshow = @ccs; - + my $notifyshow = 0; + my %lt = &Apache::lonlocal::texthash( + name => 'Name', + usnm => 'username:domain', + coac => 'Course Access', + curn => 'Current notification status', + doms => 'Domain Coordinator status', + notf => 'Notification?', + ntac => 'Notification active', + ntin => 'Notification inactive', + ); if (@ccs > 0) { @ccs = sort @ccs; $r->print(" - - + + + - "); - } else { - $r->print(" - - "); + + "); + } + if (@ccs > 0 || @showdom > 0) { + $r->print(" + + "); } $r->print(" -
The table below contains a list of course coordinators in this course. Uncheck the 'Notification?' checkbox for each person who is to be removed from the list of recipients who are currently informed of roster changes whenever any adds or drops occur during the nightly enrollment check. To include individuals who are not currently recipients, simply check the 'Notification?' checkbox. Click 'Go' to store your changes. + ".&mt('The table below contains a list of [_1]s in this course.',&Apache::lonnet::plaintext('cc'))."
- - - - - - - - "); - for (my $i=0; $i<@ccs; $i++) { - my $colflag = $i%2; - $r->print(" - - - "); + } else { + $r->print(" + + + "); + } + my $viewer = $env{'user.name'}.':'.$env{'user.domain'}; + my $showalldc = 0; + if (grep(/^$viewer$/,@domcoord)) { + $showalldc = 1; + } + foreach my $dc (@domcoord,@futuredomcoord) { + if (!grep(/^$dc$/,@ccs)) { + if (grep(/^$dc$/,@notified)) { + $notifystate{$dc} = 1; } else { - $r->print("Notification inactive"); + $notifystate{$dc} = 0; + if (!$showalldc) { + next; + } } - if ($notifystate{$ccs[$i]} == 1) { - $r->print(""); - } else { - $r->print(""); + my ($dcuname,$dcdom) = split(/:/,$dc); + $pname{$dc} = &Apache::loncommon::plainname($dcuname,$dcdom); + 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(" -
NameusernameCurrent statusNotification?
$pname{$ccs[$i]}$ccs[$i] - "); - if ($notifystate{$ccs[$i]} == 1) { - $r->print("Notification active"); + "); + $r->print(¬ifier_tables('cc',\%lt,\@ccs,\%status,\%notifystate, + \%pname,\$notifyshow)); + $r->print("
". + &mt('No [_1]s found.',&Apache::lonnet::plaintext('cc'))." +
-
- - - - -
- -
+
 
"); + if ($showalldc) { + $r->print(&mt("The table below contains a list of [_1]s from this course's domain who are not also [_2]s.",&Apache::lonnet::plaintext('dc'),&Apache::lonnet::plaintext('cc'))); + } else { + $r->print(&mt("The table below contains a list of [_1] from this course's domain who currently receive notification, and are not also [_2]s.",&Apache::lonnet::plaintext('dc'),&Apache::lonnet::plaintext('cc'))); + } + $r->print("
- No course coordinators found. -
"); + $r->print(¬ifier_tables('dc',\%lt,\@showdom,\%status,\%notifystate,\%pname, + \$notifyshow,\@olddomcoord,\@futuredomcoord)); + $r->print(" +
 
"); + if ($notifycount) { + $r->print(&mt("Uncheck the checkbox(es) to terminate notification for people currently informed of roster changes from the nightly enrollment update.
")); + } + if ((@ccs + @showdom) > $notifycount) { + $r->print(&mt("Check the checkbox(es) to initiate notification for people not currently informed of roster changes from the nightly enrollment update.
")); + } + $r->print(&mt("Click 'Go' to save your changes.")." +
+ + + + +
+ +
+
- - - -
+ + + + + "); } elsif ($action eq "crosslist") { my @xlists; @@ -650,42 +731,37 @@ ENDTWO "); 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: $realm ($enrollvar{coursecode}); 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: $realm ($enrollvar{coursecode}); 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 save your changes.
- - - - -
- - - - - - + "); + $r->print(&Apache::loncommon::start_data_table()); + $r->print(&Apache::loncommon::start_data_table_row()); + $r->print(" + + + "); + $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(" - - + - - + "); + $r->print(&Apache::loncommon::end_data_table_row()); } - $r->print("
Enrollment?Crosslisted courseLON-CAPA section/groupID
Enrollment?Crosslisted courseLON-CAPA section ID
$xl
-
- "); + $r->print(&Apache::loncommon::end_data_table()); } else { $r->print(" @@ -709,12 +785,12 @@ ENDTWO
- +
- - + + "); } elsif ($action eq "sections") { @@ -741,23 +817,25 @@ ENDTWO - 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: $realm ($enrollvar{coursecode}); 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 -your changes. + 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: $realm ($enrollvar{coursecode}); 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 save your changes.
- - - - - - - "); + $r->print(&Apache::loncommon::start_data_table()); + $r->print(&Apache::loncommon::start_data_table_row()); + $r->print(" + + + + + "); + $r->print(&Apache::loncommon::end_data_table_row()); for (my $i=0; $i<@sections; $i++) { my $colflag = $i%2; my $shrflag = 0; - $r->print(" + $r->print(&Apache::loncommon::start_data_table_row()); + $r->print(" $r->print("Enrollment inactive"); } if ($shrflag) { - $r->print(""); + $r->print(""); } else { - $r->print(""); + $r->print(""); } + $r->print(&Apache::loncommon::end_data_table_row()); } + $r->print(&Apache::loncommon::end_data_table()); $r->print(" -
SectionCurrent statusLON-CAPA section/group IDEnrollment in this course?
SectionCurrent statusLON-CAPA section IDEnrollment in this course?
$sections[$i] "); @@ -768,24 +846,25 @@ your changes.

- +
- - + + "); } else { @@ -798,36 +877,31 @@ your changes. 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: $realm ($enrollvar{coursecode}); 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: $realm ($enrollvar{coursecode}); 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 save your changes.
- - - - -
- - - - - - "); + $r->print(&Apache::loncommon::start_data_table()); + $r->print(&Apache::loncommon::start_data_table_row()); + $r->print(" + + + + "); + $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(" - - + - - + "); + $r->print(&Apache::loncommon::end_data_table_row()); } - $r->print("
Enrollment?SectionLON-CAPA section/groupID
Enrollment?SectionLON-CAPA section ID
$currsections[$j]
-
- "); + $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. @@ -850,12 +924,12 @@ your changes.
- +
- - + + "); } @@ -866,7 +940,7 @@ your changes.
$$tasktitleref{$action}
- Currently: Student photo import: $photosets[$enrollvar{showphotos}] + Currently: Student photo import: $photosets[$enrollvar{showphoto}]
@@ -876,15 +950,15 @@ your changes. Automatic import of student photos from institutional data repository:   "); - if ($enrollvar{showphotos}) { + if ($enrollvar{showphoto}) { $r->print(" -  Yes    -  No + + "); } else { $r->print(" -  Yes    -  No + + "); } $r->print(' @@ -893,17 +967,17 @@ your changes. '); my ($result,$perm_reqd)=&Apache::lonnet::auto_photo_permission($crs,$dom); my $can_enable = 1; - my $institution = $Apache::lonnet::domaindescription{$dom}; + my $institution = &Apache::lonnet::domain($dom,'description'); if ($result eq 'ok') { if ($perm_reqd eq 'yes') { if (!($enrollvar{'photopermission'} eq 'yes')) { $can_enable = 0; } else { - if ($env{'user.name'} eq $enrollvar{'courseowner'}) { + if (&user_is_courseowner($enrollvar{'courseowner'})) { $r->print(' '. -&mt('Previously the owner of this course agreed to the conditions of use of digital student photos required by [_1].', $institution).'
'.&mt('As a result Course Coordinators can choose to automatically import student photos into this course.').'
+&mt('Previously the owner of this course agreed to the conditions of use of digital student photos required by [_1].', $institution).'
'.&mt('As a result [_1]s can choose to automatically import student photos into this course.',&Apache::lonnet::plaintext('cc')).'
'); @@ -914,7 +988,7 @@ your changes. $r->print(' '. -&mt('There was a problem determining whether course owner permission is required in order for a course coordinator to have access to student photos in this domain.').' '.&mt('As a result you will not be able to configure access to student photos at this time').'

+&mt('There was a problem determining whether course owner permission is required in order for a course coordinator to have access to student photos in this domain.').' '.&mt('As a result you will not be able to configure access to student photos at this time').'

@@ -926,13 +1000,13 @@ your changes. '. -&mt('Note: if you enable automatic import of student photos, your course will automatically have access to photos stored by your institution for officially registered students, via a conduit established by your LON-CAPA domain coordinator.').' +&mt('Note: if you enable automatic import of student photos, your course will automatically have access to photos saved by your institution for officially registered students, via a conduit established by your LON-CAPA domain coordinator.').' '); } else { - if ($env{'user.name'} eq $enrollvar{'courseowner'}) { + if (&user_is_courseowner($enrollvar{'courseowner'})) { $r->print(' '. @@ -943,10 +1017,17 @@ your changes. } else { my ($ownername,$owneremail) = &get_ownerinfo($dom, $enrollvar{'courseowner'}); + my $emailstr; + if ($owneremail) { + $emailstr = "(e-mail: $owneremail)"; + } $r->print(' - '. -&mt('The policies of your institution [_1] require that the course owner [_2] must indicate acceptance of the conditions of use of digital photos of registered students, before they may be made available for use in a course.',$institution,$ownername).'

'.&mt('Please direct the course owner (e-mail: [_1]) to visit the "Student photos" page in the Automated Enrollment Manager to indicate acceptance of these conditions of use',$owneremail).'

+ ' + .&mt('The policies of your institution ([_1]) require that the course owner ([_2]) must indicate acceptance of the conditions of use of digital photos of registered students, before they may be made available for use in a course.',$institution,$ownername) + .'

' + .&mt('Please direct the course owner [_1] to visit the "Student photos" page in the Automated Enrollment Manager to indicate acceptance of these conditions of use.',$emailstr) + .'

@@ -960,12 +1041,12 @@ your changes. - + - - + + '); } elsif ($action eq "updatenow") { @@ -981,14 +1062,15 @@ your changes. Add any students currently included in institutional classlist(s) but not enrolled in your LON-CAPA course.
-  Yes  No  + + Expire students previously added by nightly enrollment process, but no longer listed in institutional classlist(s).
-  Yes  -  No 
+ +
@@ -1006,7 +1088,7 @@ Note: Any students previously added manu - + @@ -1021,16 +1103,21 @@ Note: Any students previously added manu $$tasktitleref{$action} "); - if ($enrollvar{'showphotos'}) { - my ($update,$commentary) = &Apache::lonnet::auto_photochoice( - $crs,$dom); - $r->print('
'.$commentary.'

+ if ($enrollvar{'showphoto'}) { + my ($update,$commentary) = &Apache::lonnet::auto_photochoice($crs, + $dom); + if ($update) { + $r->print('
'.$commentary.'

- - - + +
'); + } else { + $r->print(&mt('Update of photos via the Automated Enrollment Manager is unavailable in this domain.') + .'

'); + } } else { $r->print('Update of photos is unavailable, as import of student photos is currently disabled.
Enable this first via: '.$$tasktitleref{'photos'}.''); } @@ -1057,21 +1144,40 @@ onclick="javascript:document.photoupdate if (! exists($env{'form.sortby'})) { $env{'form.sortby'} = 'username'; } - if ($env{'form.Status'} !~ /^(Any|Expired|Active)$/) { + if ($env{'form.Status'} !~ /^(Any|Expired|Active|Future)$/) { $env{'form.Status'} = 'Active'; } my $status_select = &Apache::lonhtmlcommon::StatusOptions($env{'form.Status'}); # Get current classlist - my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist(); + my %userlist; + my ($indexhash,$keylist) = &Apache::lonuserutils::make_keylist_array(); + my $classlist = &Apache::loncoursedata::get_classlist(); + my $secidx = &Apache::loncoursedata::CL_SECTION(); + 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'}) { + next; + } else { + $userlist{$student} = $classlist->{$student}; + } + } else { + $userlist{$student} = $classlist->{$student}; + } + } + if (! defined($classlist)) { - $r->print(&mt('There are no students either currently or previously enrolled.'). - "\n"); + $r->print(&mt('There are no students either currently or previously enrolled.')." + + \n"); } else { $r->print(&mt('Student Status: [_1]',$status_select)."\n"); $r->print(''. "\n

\n"); - - my ($studentcount,$autocount,$manualcount,$lockcount,$unlockcount) = &Apache::londropadd::show_class_list($r,'autoenroll','nothing',$env{'form.Status'},$classlist,$keylist); + my $context = 'course'; + my $mode = 'autoenroll'; + my ($studentcount,$autocount,$manualcount,$lockcount,$unlockcount) = &Apache::lonuserutils::show_users_list($r,$context,$mode,$permission,$env{'form.Status'},\%userlist,$keylist); $r->print(" @@ -1084,14 +1190,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 } @@ -1101,7 +1207,7 @@ END } $cellcount ++; $r->print(<
 Lock manual   +
Lock manual  
END } @@ -1111,7 +1217,7 @@ END } $cellcount ++; $r->print(<
 Unlock manual   +
Unlock manual  
END } @@ -1122,10 +1228,18 @@ END - + "); + } else { + $r->print(' + +
+ '.&mt('There are no students with the selected status.').' + + + '); } $r->print(" @@ -1137,6 +1251,59 @@ END } } +sub notifier_tables { + my ($role,$lt,$users,$status,$notifystate,$pname,$notifyshow,$olddomcoord, + $futuredomcoord) = @_; + 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') { + $output .= "$$lt{coac}"; + } + $output .= "$$lt{curn} + $$lt{notf}"; + $output .= &Apache::loncommon::end_data_table_header_row(); + for (my $i=0; $i<@{$users}; $i++) { + $output .= &Apache::loncommon::start_data_table_row(); + $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') { + $output .= ''.$$status{$$users[$i]}.''; + } + $output .= ''; + if ($$notifystate{$$users[$i]} == 1) { + $output .= $$lt{ntac}; + } else { + $output .= $$lt{ntin}; + } + $output .= ' 'for registered students added via automated enrollment', '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). To change access dates for currently active students, you should change the access dates via this screen, then use Enrollment manager -> Drop Students to drop the students, and then use Automated Enrollment Manager -> Update roster now to re-enroll them with the new access dates.' - + '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 -> "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 '') ) { - $dateshow = "
".&mt('Warning').". ".$lt{'cuno'}." "; + $dateshow = "
".&mt('Warning').". ".$lt{'cuno'}." "; if ($action eq 'setaccess') { $dateshow .= $lt{'ifyo'}."\n"; } elsif ($action eq 'updatenow') { @@ -1244,7 +1411,7 @@ ENDFOUR   - ".&mt('Note').": ".$lt{'ncds'}." + ".&mt('Note').": ".$lt{'ncds'}.' '.$lt{'tcha'}." "); @@ -1258,15 +1425,14 @@ ENDFOUR ############################################################### sub print_doc_base { - my $r = shift; + my ($r) = @_; $r->print(< -
- - +
ENDBASE + $r->print(&Apache::loncommon::end_page()); } ################################################################### @@ -1333,20 +1499,20 @@ sub print_chgsettings_response { } if ($autodrops) { if ($currdrops) { - $response .= "Nightly removals based on classlist changes still enabled
"; + $response .= "Nightly removals based on classlist changes still enabled
"; } else { $response .= "Nightly removals based on classlist changes now enabled
"; } } else { if ($currdrops) { - $response .= "Nightly removals based on classlist changes now disabled
"; + $response .= "Nightly removals based on classlist changes now disabled
"; } else { $response .= "Nightly removals based on classlist changes still disabled"; } } if ($autoadds || $autodrops) { $warning = &warning_message($dom,$crs,$action); - $warn_prefix = "
Warning. Although you indicated that nightly "; + $warn_prefix = "
Warning. Although you indicated that nightly "; $warn_suffix = " should be enabled, additional action is required.
"; } if ($autoadds) { @@ -1440,11 +1606,11 @@ sub print_setdates_response { $firstaccess = "a date prior to today"; } if (($nowstamp >= $autostart) && ($rosterupdated == 0)) { - $response .= qq|
Although you have now set the first enrollment date to $firstaccess, automatic enrollment will not occur until the next automatic enrollment update occurs for all LON-CAPA courses at 1.30 am $nextupdate. If you wish to immediately enroll registered students included in the institutional classlist for this class, please visit the roster update page.
|; + $response .= qq|
Although you have now set the first enrollment date to $firstaccess, automatic enrollment will not occur until the next automatic enrollment update occurs for all LON-CAPA courses at 1.30 am $nextupdate. If you wish to immediately enroll registered students included in the institutional classlist for this class, please visit the roster update page.
|; } } $warning = &warning_message($dom,$crs,$action); - $warn_prefix = "
Warning. Although you set a start and end date for auto-enrollment, additional action is required.
"; + $warn_prefix = "
Warning. Although you set a start and end date for auto-enrollment, additional action is required.
"; unless ($warning eq '') { $response .= $warn_prefix.$warning; } @@ -1485,17 +1651,16 @@ start and end access dates for this cour $response = "There was a problem processing your requested changes. The automated enrollment settings for this course have been left unchanged.
"; } else { if ($currstart == $startaccess) { - $response = "The first access date for students added via automated enrollment has been left unchanged as $showstart.
"; + $response = "The first access date for students being added via automated enrollment has been left unchanged as $showstart.
"; } else { - $response = "The first access date for students added via automated enrollment has been changed to -$showstart.
"; + $response = "The first access date for students being added via automated enrollment has been changed to $showstart.
"; } if ($currend == $endaccess) { - $response .= "The last access date for students added via automated enrollment has been left unchanged as $showend.
"; + $response .= "The last access date for students being added via automated enrollment has been left unchanged as $showend.
"; } else { - $response .= "The last access date for students automated enrollment has been changed to -$showend.
"; + $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 -> "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. @@ -1540,11 +1705,11 @@ $showend.
"; $firstaccess = "a date prior to today"; } if (($nowstamp >= $startaccess) && ($accessgiven == 0)) { - $response .= qq|
Although you have now set the first access date to $firstaccess, automatic enrollment will not occur until the next automatic enrollment update occurs for all LON-CAPA courses $nextupdate. If you wish to grant immediate course access for registered students included in the institutional classlist for this class, please visit the roster update page.
|; + $response .= qq|
Although you have now set the first access date to $firstaccess, automatic enrollment will not occur until the next automatic enrollment update occurs for all LON-CAPA courses $nextupdate. If you wish to grant immediate course access for registered students included in the institutional classlist for this class, please visit the roster update page.
|; } } $warning = &warning_message($dom,$crs,$action); - $warn_prefix = "
Warning. Although you have set default first and last access dates for students who are added via automatic enrollment, additional action is required.
"; + $warn_prefix = "
Warning. Although you have set default first and last access dates for students who are added via automatic enrollment, additional action is required.
"; unless ($warning eq '') { $response .= $warn_prefix.$warning; } @@ -1617,7 +1782,7 @@ sub print_notify_response { } $response .= "\n"; } else { - $response = "Notification of enrollment changes was not enabled as no course coordinators were selected as recipients.
"; + $response = &mt('Notification of enrollment changes was not enabled as no [_1]s were selected as recipients.
',&Apache::lonnet::plaintext('cc')); } } else { if ($currcount) { @@ -1649,14 +1814,14 @@ sub print_crosslistings_menu () { 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 ++; @@ -1679,8 +1844,8 @@ sub print_crosslistings_menu () { 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.
    \n"; foreach (@xlists) { - my ($xlist,$gp) = split/:/,$_; - $response .= "
  • $xlist - ID: $gp
    • \n"; + my ($xlist,$lc_sec) = split/:/,$_; + $response .= "
  • $xlist - ID: $lc_sec
    • \n"; } $response .= "

\n"; } @@ -1689,38 +1854,36 @@ sub print_crosslistings_menu () { 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.

-
- - -
- - - - - + $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.

+ ); #' stupid emacs + $response .= &Apache::loncommon::start_data_table(); + $response .= &Apache::loncommon::start_data_table_row(); + $response .= qq( + + ); + $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( - - - + ); + $response .= &Apache::loncommon::end_data_table_row(); } - $response .= qq(
CrosslistingLON-CAPA section/groupID
CrosslistingLON-CAPA section ID
+ $response .= &Apache::loncommon::end_data_table(); + $response .= qq(
- +
- - - + + +
); } @@ -1731,16 +1894,19 @@ sub print_crosslistings_menu () { sub print_crosslistings_response () { my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_; - my %settings = &Apache::lonnet::get('environment',['internal.crosslistings','internal.coursecode','internal.courseowner'],$dom,$crs); + my %settings = &Apache::lonnet::get('environment',['internal.crosslistings','internal.coursecode','internal.courseowner','internal.co-owners'],$dom,$crs); my @currxlists = (); my @xlists = (); my @allxlists = (); my @badxlists = (); my @badowner = (); + my @reserved = (); + my @matchgroup = (); my $numcross = 0; my $xliststr = $settings{'internal.crosslistings'}; my $coursecode = $settings{'internal.coursecode'}; my $owner = $settings{'internal.courseowner'}; + my $coowners = $settings{'internal.co-owners'}; my $response = ''; my $warning = ''; my $warn_prefix = ''; @@ -1754,22 +1920,34 @@ sub print_crosslistings_response () { } if ($numcross > 0) { + my %curr_groups = &Apache::longroup::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); + $addcheck = &Apache::lonnet::auto_new_course($crs,$dom,$env{"form.$xl"},$owner,$coowners); 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; } } } @@ -1787,8 +1965,8 @@ sub print_crosslistings_response () { } 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.
    \n"; foreach (@allxlists) { - my ($xlist,$gp) = split/:/,$_; - $response .= "
  • $xlist - ID: $gp
    • \n"; + my ($xlist,$lc_sec) = split/:/,$_; + $response .= "
  • $xlist - ID: $lc_sec
    • \n"; } $response .= "


\n"; } @@ -1797,8 +1975,8 @@ sub print_crosslistings_response () { my @oldxlists = (split/,/,$xliststr); $response .= "Although no new crosslistings were added, the courses listed below continue to be crosslisted with your LON-CAPA course.
    \n"; foreach (@oldxlists) { - my ($xlist,$gp) = split/:/,$_; - $response .= "
  • $xlist - ID: $gp
    • \n"; + my ($xlist,$lc_sec) = split/:/,$_; + $response .= "
  • $xlist - ID: $lc_sec
    • \n"; } $response .= "


\n"; } @@ -1806,8 +1984,8 @@ sub print_crosslistings_response () { 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.
    \n"; foreach (@badxlists) { - my ($xlist,$gp,$prob) = split/:/,$_; - $response .= "
  • $xlist - ID: $gp - Error: $prob
    • \n"; + my ($xlist,$lc_sec,$prob) = split/:/,$_; + $response .= "
  • $xlist - ID: $lc_sec - Error: $prob
    • \n"; } $response .= "


\n"; } @@ -1815,15 +1993,32 @@ sub print_crosslistings_response () { 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.
    \n"; foreach (@badowner) { - my ($xlist,$gp) = split/:/,$_; - $response .= "
  • $xlist - ID: $gp
    • \n"; + my ($xlist,$lc_sec) = split/:/,$_; + $response .= "
  • $xlist - ID: $lc_sec
    • \n"; } $response .= "


\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 go back and change the section ID for each of these courses.
    \n"; + foreach (@reserved) { + my ($xlist,$lc_sec) = split/:/,$_; + $response .= "
  • $xlist - ID: $lc_sec
    • \n"; + } + $response .= "


\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 go back and change the section ID for each of these courses.
    \n"; + foreach (@matchgroup) { + my ($xlist,$lc_sec) = split/:/,$_; + $response .= "
  • $xlist - ID: $lc_sec
    • \n"; + } + $response .= "


\n"; + } if (@allxlists > 0) { $warning = &warning_message($dom,$crs,$action); - $warn_prefix = "
Warning. Although you have selected crosslisted courses to contribute enrollment to this course, additional action is required.
"; + $warn_prefix = "
Warning. Although you have selected crosslisted courses to contribute enrollment to this course, additional action is required.
"; unless ($warning eq '') { $response .= $warn_prefix.$warning; } @@ -1835,7 +2030,7 @@ sub print_crosslistings_response () { sub print_sections_menu () { my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_; - my %settings = &Apache::lonnet::get('environment',['internal.sectionnums','internal.coursecode','internal.courseowner'],$dom,$crs); + my %settings = &Apache::lonnet::get('environment',['internal.sectionnums','internal.coursecode','internal.courseowner','internal.co-owners'],$dom,$crs); my @currsections = (); my @sections = (); my @badowner = (); @@ -1849,13 +2044,14 @@ sub print_sections_menu () { my $warn_prefix = ""; my $coursecode = $settings{'internal.coursecode'}; my $owner = $settings{'internal.courseowner'}; + my $coowners = $settings{'internal.co-owners'}; if ($settings{'internal.sectionnums'} ne '') { @currsections = split(/,/,$settings{'internal.sectionnums'}); } 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"} ) ) { @@ -1863,8 +2059,8 @@ sub print_sections_menu () { 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; @@ -1873,16 +2069,16 @@ sub print_sections_menu () { my $newsec = $coursecode.$env{"form.$secnum"}; 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); + my $addcheck = &Apache::lonnet::auto_new_course($crs,$dom,$newsec,$owner,$coowners); 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; } } } @@ -1900,14 +2096,14 @@ sub print_sections_menu () { } 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 ++; @@ -1934,8 +2130,8 @@ sections which contribute to enrollment 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.
    \n"; foreach (@sections) { - my ($sec,$gp) = split/:/,$_; - $response .= "
  • $sec - ID: $gp
    • \n"; + my ($sec,$lc_sec) = split/:/,$_; + $response .= "
  • $sec - ID: $lc_sec
    • \n"; } $response .= "

\n"; } @@ -1944,8 +2140,8 @@ sections which contribute to enrollment 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.
    \n"; foreach (@badsections) { - my ($secnum,$gp,$prob) = split/:/,$_; - $response .= "
  • $secnum - ID: $gp - Error: $prob
    • \n"; + my ($secnum,$lc_sec,$prob) = split/:/,$_; + $response .= "
  • $secnum - ID: $lc_sec - Error: $prob
    • \n"; } $response .= "


\n"; } @@ -1953,15 +2149,15 @@ sections which contribute to enrollment 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.
    \n"; foreach (@badowner) { - my ($secnum,$gp) = split/:/,$_; - $response .= "
  • $secnum - ID: $gp
    • \n"; + my ($secnum,$lc_sec) = split/:/,$_; + $response .= "
  • $secnum - ID: $lc_sec
    • \n"; } $response .= "


\n"; } if ($seccount > 0) { $warning = &warning_message($dom,$crs,$action); - $warn_prefix = "
Warning. Although you have selected sections to contribute enrollment to this course, additional action is required.
"; + $warn_prefix = "
Warning. Although you have selected sections to contribute enrollment to this course, additional action is required.
"; unless ($warning eq '') { $response .= $warn_prefix.$warning; } @@ -1972,38 +2168,41 @@ sections which contribute to enrollment 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.

+ 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.

-
- - - - - - ); + + + ); + $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( - - - - - ); + + + ); + $response .= &Apache::loncommon::end_data_table_row(); } - $response .= qq(
Section numberLON-CAPA section/groupID
); + $response .= &Apache::loncommon::start_data_table(); + $response .= &Apache::loncommon::start_data_table_row(); + $response .= qq( + Section numberLON-CAPA section ID
+ +
+ $response .= &Apache::loncommon::end_data_table(); + $response .= qq(
- +
- - - + + +
); } @@ -2014,16 +2213,19 @@ sections which contribute to enrollment sub print_sections_response () { my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_; - my %settings = &Apache::lonnet::get('environment',['internal.sectionnums','internal.coursecode','internal.courseowner'],$dom,$crs); + my %settings = &Apache::lonnet::get('environment',['internal.sectionnums','internal.coursecode','internal.courseowner','internal.co-owners'],$dom,$crs); my @currsections = (); my @sections = (); my @allsections = (); my @badowner = (); my @badsections = (); + my @reserved = (); + my @matchgroup = (); my $numsec = 0; my $secstr = $settings{'internal.sectionnums'}; my $coursecode = $settings{'internal.coursecode'}; my $owner = $settings{'internal.courseowner'}; + my $coowners = $settings{'internal.co-owners'}; my $response = ''; my $putreply = ''; my $warning = ''; @@ -2037,22 +2239,31 @@ sub print_sections_response () { } if ($numsec > 0) { + my %curr_groups = &Apache::longroup::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); + my $addcheck = &Apache::lonnet::auto_new_course($crs,$dom,$newsec,$owner,$coowners); 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; } } } @@ -2073,8 +2284,8 @@ sub print_sections_response () { 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.
    \n"; foreach (@allsections) { - my ($sec,$gp) = split/:/,$_; - $response .= "
  • $sec - ID: $gp
    • \n"; + my ($sec,$lc_sec) = split/:/,$_; + $response .= "
  • $sec - ID: $lc_sec
    • \n"; } $response .= "


\n"; } @@ -2082,8 +2293,8 @@ sub print_sections_response () { 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.
    \n"; foreach (@badsections) { - my ($secnum,$gp,$prob) = split/:/,$_; - $response .= "
  • $secnum - ID: $gp - Error: $prob
    • \n"; + my ($secnum,$lc_sec,$prob) = split/:/,$_; + $response .= "
  • $secnum - ID: $lc_sec - Error: $prob
    • \n"; } $response .= "


\n"; } @@ -2091,15 +2302,34 @@ sub print_sections_response () { 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.
    \n"; foreach (@badowner) { - my ($secnum,$gp) = split/:/,$_; - $response .= "
  • $secnum - ID: $gp
    • \n"; + my ($secnum,$lc_sec) = split/:/,$_; + $response .= "
  • $secnum - ID: $lc_sec
    • \n"; } $response .= "


\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 go back and change the section ID for each of these sections.
    \n"; + foreach (@reserved) { + my ($xlist,$lc_sec) = split/:/,$_; + $response .= "
  • $xlist - ID: $lc_sec
    • \n"; + } + $response .= "


\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 go back and change the section ID for each of these sections.
    \n"; + foreach (@matchgroup) { + my ($xlist,$lc_sec) = split/:/,$_; + $response .= "
  • $xlist - ID: $lc_sec
    • \n"; + } + $response .= "


\n"; + } + + if (@allsections > 0) { $warning = &warning_message($dom,$crs,$action); - $warn_prefix = "
Warning. Although you have selected sections to contribute enrollment to this course, additional action is required.
"; + $warn_prefix = "
Warning. Although you have selected sections to contribute enrollment to this course, additional action is required.
"; unless ($warning eq '') { $response .= $warn_prefix.$warning; } @@ -2111,11 +2341,14 @@ sub print_sections_response () { sub photo_permission { my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_; - my %settings = &Apache::lonnet::get('environment',['internal.courseowner', - 'internal.photopermission','internal.showphotos'],$dom,$crs); + my %settings = &Apache::lonnet::get('environment', + ['internal.courseowner', + 'internal.photopermission', + 'internal.showphoto'], + $dom,$crs); my ($showphotos,$response); if (exists($env{'form.cancel_agreement'})) { - if ($env{'user.name'} eq $settings{'internal.courseowner'}) { + if (&user_is_courseowner($settings{'internal.courseowner'})) { my %cenv = ( 'internal.photopermission' => 'no', ); @@ -2143,25 +2376,27 @@ sub photo_permission { $response = &mt('There was a problem processing the record of your agreement to the conditions of use. Settings for this course have been left unchanged.').'
'."\n"; } else { &print_photos_response($r,$realm,$dom,$crs,$action, - $tasktitleref,$showphotos,$env{'form.photopermission'},\%cenv); + $tasktitleref,$showphotos, + $env{'form.photopermission'},\%cenv); } } else { my ($result,$perm_reqd,$conditions) = - &Apache::lonnet::auto_photo_permission($crs,$dom); + &Apache::lonnet::auto_photo_permission($crs,$dom); my $permcheck; if ($result eq 'ok') { if ($perm_reqd eq 'yes') { if ($settings{'internal.photopermission'} eq 'yes') { &print_photos_response($r,$realm,$dom,$crs,$action, - $tasktitleref,$showphotos); + $tasktitleref,$showphotos); } else { return(&print_photo_agreement($r,$realm,$dom,$crs, - $action,$tasktitleref,$conditions, - $settings{'internal.courseowner'})); + $action,$tasktitleref, + $conditions, + $settings{'internal.courseowner'})); } } elsif ($perm_reqd eq 'no') { &print_photos_response($r,$realm,$dom,$crs,$action, - $tasktitleref,$showphotos); + $tasktitleref,$showphotos); } else { $permcheck = 'fail'; } @@ -2182,10 +2417,10 @@ sub photo_permission { sub print_photo_agreement { my ($r,$realm,$dom,$crs,$action,$tasktitleref,$conditions,$courseowner)=@_; my $response; - my $institution = $Apache::lonnet::domaindescription{$dom}; - if ($env{'user.name'} eq $courseowner) { + my $institution = &Apache::lonnet::domain($dom,'description'); + if (&user_is_courseowner($courseowner)) { $response = ' -