--- loncom/interface/lonpopulate.pm 2006/02/07 22:15:56 1.36 +++ loncom/interface/lonpopulate.pm 2013/08/16 03:25:05 1.79 @@ -1,5 +1,5 @@ # automated enrollment configuration handler -# $Id: lonpopulate.pm,v 1.36 2006/02/07 22:15:56 raeburn Exp $ +# $Id: lonpopulate.pm,v 1.79 2013/08/16 03:25:05 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -32,31 +32,41 @@ 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 + my ($action) = @_; + my $args = &make_crumbs($action); + return + &Apache::loncommon::start_page('Classlist Manager',undef,$args); } ############################################################### sub choose_header { - my $action = shift; - my $bodytag=&Apache::loncommon::bodytag('Classlist Manager'); - my $scripttag = qq| - -|; - my $html=&Apache::lonxml::xmlbegin(); - return(< -LON-CAPA Classlist Manager -$scripttag -$bodytag -ENDHEAD -} - -sub print_mainbox { - my ($r,$tasklongref,$realm,$reply) = @_; - my $action = "information"; - if ( exists($env{'form.action'}) ) { - $action = $env{'form.action'}; - } - my $page = ''; - if ($action eq "information") { - $page = "Automated Enrollment"; - } else { - $page = 'Automated Enrollment'; - if ($reply) { - if ($action eq "newcross") { - $action = "crosslist"; - } elsif ($action eq "newsections") { - $action = "sections"; - } - $page .= "-> ".$$tasklongref{$action}." -> result"; - } else { - $page .= " -> ".$$tasklongref{$action}.""; - } +ENDJS + my $args = &make_crumbs($action); + return &Apache::loncommon::start_page('Classlist Manager', + $scripttag,$args); +} + +sub make_crumbs { + my ($action) = @_; + my ($tasklong,$tasktitle) = &get_task_text(); + my $brcrum = [{href=>"/adm/createuser", + text=>"User Management",}, + {href=>"/adm/populate", + text=>"Automated Enrollment", + help=>'Course_Automated_Enrollment'}, + ]; + if ($action eq 'newcross') { + $action = 'crosslist'; + } elsif ($action eq 'newsections') { + $action = 'sections'; + } + my ($tasklong,$tasktitle) = &get_task_text(); + my $text; + if (ref($tasklong) eq 'HASH') { + $text = $tasklong->{$action}; + } + unless ($action eq 'information') { + push(@{$brcrum}, + {href => "javascript:backPage(document.crtuser)", + text => $text} + ); } - $r->print(< - - - $realm -> Enrollment Manager -> $page
- - - Automated Enrollment Manager  - - - - - -ENDTHIS + return {bread_crumbs => $brcrum, + bread_crumbs_component => 'Automated Management'}; } sub print_navmenu { - my ($r,$tasksref,$tasklongref) = @_; - my $action = "information"; - if (exists($env{'form.action'}) ) { - $action = $env{'form.action'}; - } - $r->print(<  - - + - +
-
-ENDONE + my ($r,$tasksref,$tasklongref,$action,$state) = @_; +#LC_pick_box is used in the following. This is only a temporary solution to adapt the site to the design. + $r->print(' +
+ + + - - -
+'); foreach my $task (@{$tasksref}) { - if ($task eq $action) { - $r->print(" + if (($task eq $action) && ($state eq 'choose')) { + $r->print('

- - $$tasklongref{$task}
+ + '.$tasklongref->{$task}.'
 -

"); +

'); } else { - $r->print(" + $r->print('

- - $$tasklongref{$task}
+ + '.$tasklongref->{$task}.'
 -

"); +

'); } } - $r->print(" + $r->print('

 

  "); + '); } ############################################################### @@ -271,7 +289,6 @@ sub print_main_frame { # Get course settings my %enrollvar; - my @bgcolors=("#eeeeee","#cccccc"); my %settings = &Apache::lonnet::dump('environment',$dom,$crs); foreach my $item (keys %settings) { if ($item =~ m/^internal\.(.+)$/) { @@ -281,123 +298,131 @@ sub print_main_frame { } } - if ($action eq "information") { - $r->print(< + if ($action eq 'information') { + $r->print(' +
- + + - + - + - + - + - + - + + - + - + - + - + - + - + -
 Use the menu on the left to choose an enrollment management task.

'.&mt('Use the menu on the left to choose an enrollment management task.').'

 Use "Automated adds/drops" to enable or disable automatic nightly adds or drops in your LON-CAPA course based on institutional enrollment information.'.&mt('Use [_1]Automated adds/drops[_2] to enable or disable automatic nightly adds or drops in your LON-CAPA course based on institutional enrollment information.','"','"').'
 Use "Change enrollment dates" to change the date of first automated enrollment and/or the date of last automated enrollment for registered students.'.&mt('Use [_1]Change enrollment dates[_2] to change the date of first automated enrollment and/or the date of last automated enrollment for registered students.','"','"').'
 Use "Change access dates" to change the default start and/or end dates for student roles created by automated enrollment.'.&mt('Use [_1]Change access dates[_2] to change the default start and/or end dates for student roles created by automated enrollment.','"','"').'
 Use "Notification of changes" to enable or disable notification of enrollment changes and to add or remove course coordinators from the recipient list.'.&mt('Use [_1]Notification of changes[_2] to enable or disable notification of enrollment changes and to add or remove course coordinators from the recipient list.','"','"').'
 Use "Change crosslisting" to include or exclude enrollment from crosslisted classes.'.&mt('Use [_1]Change crosslisting[_2] to include or exclude enrollment from crosslisted classes.', + '"','"').'
 Use "Section settings" to make changes to the choice of sections included for enrollment in your LON-CAPA course.'.&mt('Use [_1]Section settings[_2] 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.'.&mt('Use [_1]Student photo settings[_2] to enable or disable automatic import of photos for registered students in your course.', + '"','"').'
 Use "Update roster now" to add and/or drop students from your course based on the most current institutional classlist information.'.&mt('Use [_1]Update roster now[_2] to add and/or drop students from your course based on the [_3]most current[_4] institutional classlist information.','"','"','','').'
 Use "Update student photos" to import your institution's most current digital photos for registered students in your course.'.&mt("Use [_1]Update student photos[_2] to import your institution's [_3]most current[_4] digital photos for registered students in your course.",'"','"','','').'
 Use "View students and change type" to display the current course roster, and (optionally) change enrollment type for selected students from 'auto' to 'manual' and vice versa.'.&mt('Use [_1]View students and change type[_2] to display the current course roster, and (optionally) change enrollment type for selected students from "auto" to "manual" and vice versa.','"','"').'
  
 Note: if automated adds and/or drops are enabled, the nightly enrollment update will ONLY occur once the first enrollment date has been reached.'.&mt('Note: if automated adds and/or drops are enabled, the nightly enrollment update will ONLY occur once the first enrollment date has been reached.').'
-ENDONE - } elsif ($action eq "chgsettings") { - my @autosets = ("OFF","ON"); - $r->print(<
+
'); + } elsif ($action eq 'chgsettings') { + my @autosets = (&mt('OFF'),&mt('ON')); + $r->print(' +

-
$$tasktitleref{$action}
- Currently: Nightly adds: $autosets[$enrollvar{autoadds}], Nightly drops: $autosets[$enrollvar{autodrops}] + 		'.$$tasktitleref{$action}.'
+ '.&mt('Currently: Nightly adds: [_1], Nightly drops: [_2]',"$autosets[$enrollvar{autoadds}]","$autosets[$enrollvar{autodrops}]").'
-
- Additions based on classlist changes:   -ENDTWO + '.&mt('Additions based on classlist changes:').'  '); if ($enrollvar{autoadds}) { - $r->print(" -  Enable    -  Disable - "); + $r->print(' + + '); } else { - $r->print(" -  Enable    -  Disable - "); + $r->print(' + + '); } - $r->print(" + $r->print('
- Removals based on classlist changes:  "); + '.&mt('Removals based on classlist changes:').'  '); if ($enrollvar{autodrops}) { - $r->print(" -  Enable    -  Disable"); + $r->print(' + + '); } else { - $r->print(" -  Enable    -  Disable"); + $r->print(' + + '); } - $r->print(" + $r->print('
- -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. - + '. +&mt('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") { + + + '."\n"); + } elsif ($action eq 'setdates') { my ($start_table,$end_table) = &date_setting_table($enrollvar{autostart},$enrollvar{autoend},$action); my $oldstartshow = ''; my $oldendshow = ''; @@ -407,21 +432,23 @@ Note: Any students added manually by cou if ( defined($enrollvar{autoend}) ) { $oldendshow = &Apache::lonlocal::locallocaltime($enrollvar{autoend}); if ($enrollvar{autoend} == 0) { - $oldendshow = "No ending date"; + $oldendshow = &mt("'No end date'"); } } 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 = '
'.&mt('Warning.').' '.&mt('Currently [_1]NO[_2] first enrollment or last enrollment dates are set.','','').' '. + &mt('You [_1]must[_2] 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"; + $dateshow = &mt('Currently: First enrollment[_1] Last enrollment[_2]', + " -- $oldstartshow"," -- $oldendshow")."\n"; } - $r->print(<
+ $r->print(' +

-
$$tasktitleref{$action}

- $dateshow + 		'.$$tasktitleref{$action}.'

+ '.$dateshow.'
@@ -431,293 +458,364 @@ Note: Any students added manually by cou -
- Set date of first automated enrollment for registered students + '.&mt('Set date of first automated enrollment for registered students').'
$start_table + '.$start_table.'
If automated adds and/or drops are enabled, then your class roster will be automatically updated nightly, once the first enrollment date has been reached. Prior to this date, the class roster will only contain students you have added directly using the standard LON-CAPA enrollment tools'. + &mt('If automated adds and/or drops are enabled, then your class roster will be automatically updated nightly, once the first enrollment date has been reached. Prior to this date, the class roster will only contain students you have added directly using the standard LON-CAPA enrollment tools.').'
- +
-
- Set date of last automated enrollment for registered students + '.&mt('Set date of last automated enrollment for registered students').'
$end_table + '.$end_table.'
If automated adds and/or drops are enabled, then your class roster will be automatically updated nightly, until the last enrollment date has been reached.'.&mt('If automated adds and/or drops are enabled, then your class roster will be automatically updated nightly, until the last enrollment date has been reached.').'
- +
- - + + -ENDTWO - } elsif ($action eq "setaccess") { +'); + } elsif ($action eq 'setaccess') { &print_accessdate_table($r,\%enrollvar,$tasktitleref,$action); - $r->print(<print('
- +
- - + + -ENDTWO - } elsif ($action eq "notify") { + '); + } 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) { - $noteset = "ON"; + $noteset = &mt('ON'); } else { - $noteset = "OFF"; + $noteset = &mt('OFF'); } - - $r->print(" -

- + 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(' +
+
-
$$tasktitleref{$action}
- Currently: Notification: $noteset + 		'.$tasktitleref->{$action}.'
'. + &mt('Currently -- Notification:').' '.$noteset.'
- +
- - "); - 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(" + $r->print(' - + + + - "); - } else { - $r->print(" - - "); + + '); + } + if (@ccs > 0 || @showdom > 0) { + $r->print(' + + '); } - $r->print(" -
- Notification of LON-CAPA course roster changes resulting from nightly automated enrollment process? - "); + '. + &mt('Notification of LON-CAPA course roster changes resulting from nightly automated enrollment process?') + ); if ($notifycount) { - $r->print(" -  Yes    -  No - "); + $r->print(' + + + '); } else { - $r->print(" -  Yes    -  No - "); + $r->print(' + + + '); } - $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(/^\Q$viewer\E$/,@domcoord)) { + $showalldc = 1; + } + foreach my $dc (@domcoord,@futuredomcoord) { + if (!grep(/^\Q$dc\E$/,@ccs)) { + if (grep(/^\Q$dc\E$/,@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(/^\Q$olddc\E$/,@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); } } - $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')).' +
-
- - - - -
- -
+ } + my $showdomnum = scalar(@showdom); + if ($showdomnum) { + $r->print(' +
 
'); + 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]s 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.").' +
+ + + + +
+ +
+
- - - -
- "); + $r->print(' + + + + + + '); } elsif ($action eq "crosslist") { my @xlists; if ($enrollvar{crosslistings} ne '') { @xlists = split(/,/,$enrollvar{crosslistings}); } my $cross_str = @xlists; - $r->print(" -

- + $r->print(' +
+
-
$$tasktitleref{$action}
- "); + 		'.$tasktitleref->{$action}.'
+ '); 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. + $r->print( + &mt('Currently, this LON-CAPA course is crosslisted with [quant,_1,course section,course sections].',$cross_str).' '. + &mt('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.').' '. + &mt('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: [_1; otherwise uncheck it.',"$realm ($enrollvar{coursecode})").' '. + &mt('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.').' '. + &mt('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.').' '. + &mt('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.').' '. + &mt('You will provide information about each of the new crosslistings on a subsequent page.').' '. + &mt("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(" - - - - - - "); + $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
'.&mt('Enrollment?').''.&mt('Crosslisted course').''.&mt('LON-CAPA section ID').'
$xl
'.$xl.'
-
- "); + $r->print(&Apache::loncommon::end_data_table()); } else { - $r->print(" - Currently no crosslisted courses are recorded for $enrollvar{coursecode}. + $r->print( + &mt('Currently no crosslisted courses are recorded for [_1].',$enrollvar{coursecode}).' - "); + '); } - $r->print(" -
- - -
- Add new crosslistings.
- Number of new crosslistings to add:   + $r->print(' +
+ + +
+ '.&mt('Add new crosslistings.').'
'. + &mt('Number of new crosslistings to add:[_1]','  ').'
-
- +
+
-
- + +
- - + + - "); - } elsif ($action eq "sections") { + '); + } elsif ($action eq 'sections') { my @sections = (); @sections = &Apache::lonnet::auto_get_sections($crs,$dom,$enrollvar{coursecode}); my @storedsections = split(/,/,$enrollvar{sectionnums}); @@ -725,167 +823,159 @@ ENDTWO my %sec_id = (); foreach (@storedsections) { if ($_ =~ m/^(\w+):(\w*)$/) { - push @currsections, $1; + push(@currsections,$1); $sec_id{$1} = $2; } } if (@sections > 0) { my $secshow = @sections; - $r->print(" -

- + $r->print(' +
+
- - +
- $$tasktitleref{$action}
- Your institution's course catalog includes $secshow sections for course code: $enrollvar{coursecode}. + 		+ '.$tasktitleref->{$action}.'
'. + &mt("Your institution's course catalog includes [quant,_1,section] for course code: [_2].",$secshow,$enrollvar{coursecode}).'
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.'.&mt('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: [_1]; otherwise uncheck it.',"$realm ($enrollvar{coursecode})").' '. + &mt('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.').' '. + &mt('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.').' '. + &mt("To add a new section, check the 'Enrollment in this course?' checkbox, and enter the desired LON-CAPA section ID in the appropriate textbox.").' '. + &mt("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(" - - "); - } else { - $r->print(""); + my $checked; + if (grep/^\Q$sections[$i]\E$/,@currsections) { + $checked = ' checked="checked"'; } + $r->print(&Apache::loncommon::start_data_table_row().' + + + '. + &Apache::loncommon::end_data_table_row()); } - $r->print(" -
SectionCurrent statusLON-CAPA section/group IDEnrollment in this course?
'.&mt('Enrollment').''.&mt('Institutional Section').''.&mt('LON-CAPA section ID').'
$sections[$i] - "); - if (grep/^$sections[$i]$/,@currsections) { - $r->print("Enrollment active"); - $shrflag = 1; - } else { - $r->print("Enrollment inactive"); - } - if ($shrflag) { - $r->print("
'.$sections[$i].'
-
- + $r->print(&Apache::loncommon::end_data_table()); + $r->print(' +
+
-
- - + + +
- - + +
- "); + '); } else { - $r->print(" -

- + $r->print(' +
+
-
$$tasktitleref{$action}
- "); + 		'.$tasktitleref->{$action}.'
+ '); 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. + $r->print( + &mt('Currently, this LON-CAPA course incorporates enrollment from [quant,_1,section].',$secshow).' '. + &mt('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.').' '. + &mt('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: [_1]; otherwise leave it checked.',"$realm ($enrollvar{coursecode})").' '. + &mt('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.').' '. + &mt('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.').' '. + &mt('You will provide information about each of the new sections on a subsequent page.').' '. + &mt("Click 'Go' to save your changes.").'
-
- - - - -
- - - - - - - "); +
+ '); + $r->print(&Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_row().' + + + + '); + $r->print(&Apache::loncommon::end_data_table_row()); for (my $j=0; $j<@currsections; $j++) { - my $colflag = $j%2; - $r->print(" - - - - - - "); + $r->print( + &Apache::loncommon::start_data_table_row(). + ' + + + '.&Apache::loncommon::end_data_table_row()); } - $r->print("
Enrollment?SectionLON-CAPA section/groupID
'.&mt('Enrollment?').''.&mt('Section').''.&mt('LON-CAPA section ID').'
$currsections[$j]
'.$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. + $r->print( + &mt('Currently no sections of [_1] are contributing enrollment to the LON-CAPA class roster.',"$realm ($enrollvar{coursecode})").'
- "); + '); } - $r->print(" -
- + $r->print(' +
+
-
- Add enrollment from additional sections.
- Number of new sections to add:   + 		+ '.&mt('Add enrollment from additional sections.').'
'. + &mt('Number of new sections to add:').'  
-
- +
+
-
- + +
- - + + - "); + '); } - } elsif ($action eq "photos") { - my @photosets = ("OFF","ON"); - $r->print(" -

- + } elsif ($action eq 'photos') { + my @photosets = (&mt('OFF'),&mt('ON')); + $r->print(' +
+
-
$$tasktitleref{$action}
- Currently: Student photo import: $photosets[$enrollvar{showphotos}] + 		'.$tasktitleref->{$action}.'
'. + &mt('Currently -- Student photo import:').' '.$photosets[$enrollvar{showphoto}].'
- +
@@ -893,17 +983,20 @@ 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(' '); @@ -914,7 +1007,9 @@ your changes. $r->print(' @@ -925,28 +1020,36 @@ your changes. $r->print(' -'); + '); } else { - if ($env{'user.name'} eq $enrollvar{'courseowner'}) { + if (&user_is_courseowner($enrollvar{'courseowner'})) { $r->print(' - '); + '); } else { my ($ownername,$owneremail) = &get_ownerinfo($dom, $enrollvar{'courseowner'}); + my $emailstr; + if ($owneremail) { + $emailstr = "(e-mail: $owneremail)"; + } $r->print(' - @@ -956,199 +1059,291 @@ your changes. } $r->print(' -   +
- Automatic import of student photos from institutional data repository:   - - "); - if ($enrollvar{showphotos}) { - $r->print(" -  Yes    -  No - "); + '.&mt('Automatic import of student photos from institutional data repository:').'  '); + if ($enrollvar{showphoto}) { + $r->print(' + + + '); } else { - $r->print(" -  Yes    -  No - "); + $r->print(' + + + '); } $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')). +'
'. -&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'). +'
- '. -&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.').' +
'. -&mt('[_1] requires a course owner to indicate acceptance of conditions of use of digital student photos before enabling automatic import into a course. If you choose to enable import of photos you will be prompted for your agreement on the next page.',$institution).' +&mt('[_1] requires a course owner to indicate acceptance of conditions of use of digital student photos before enabling automatic import into a course.',$institution).' '. +&mt('If you choose to enable import of photos you will be prompted for your agreement on the next page.').'
'. -&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) + .'
 
- +
- - + + '); } elsif ($action eq "updatenow") { - $r->print(" -

- + $r->print(' +
+
-
$$tasktitleref{$action} + '.$tasktitleref->{$action}.'
- +
- - - -
- Add any students currently included in institutional classlist(s) but not enrolled in your LON-CAPA course.
-  Yes  No  + 		'. + &mt('Add any students currently included in institutional classlist(s) but not enrolled in your LON-CAPA course.').'
+ +
- Expire students previously added by nightly enrollment process, but no longer listed in institutional classlist(s).
-  Yes  -  No 
+ 		'. + &mt('Expire students previously added by nightly enrollment process, but no longer listed in institutional classlist(s).').'
+ +
-Note: Any students previously added manually by course coordinator(s) using either 'Upload classlist CSV file' or 'Enroll a single user' will be unaffected by the removal process. - + '. +&mt("Note: Any students previously added manually by course coordinator(s) using either 'Upload classlist CSV file' or 'Enroll a single user' will be unaffected by the removal process.").' +
- "); + '); &print_accessdate_table($r,\%enrollvar,$tasktitleref,$action); - $r->print(" + $r->print('
- + +
- - + +
- "); + '); } elsif ($action eq 'updatephotos') { - $r->print(" - + $r->print(' +
- -
$$tasktitleref{$action} + '.$tasktitleref->{$action}.'
"); - if ($enrollvar{'showphotos'}) { +
'); + if ($enrollvar{'showphoto'}) { my ($update,$commentary) = &Apache::lonnet::auto_photochoice($crs, $dom); - $r->print('
'.$commentary.'

-
-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'}.''); + $r->print(&mt('Update of photos is unavailable, as import of student photos is currently disabled.').'
'. + &mt('Enable this first via: [_1]',''.$tasktitleref->{'photos'}.'')); } $r->print('
 
'); } elsif ($action eq 'viewclass') { - $r->print(" -

- + $r->print(' +
+
- - +
$$tasktitleref{$action} + '.$tasktitleref->{$action}.'
Section changes, name changes, and class drops that can be set to occur either automatically or when using the 'Update roster now' feature, will affect only those students with an enroll type of 'auto'. Students with an enroll type of 'manual', will be converted automatically to the 'auto' type, when they first appear in the institutional classlist for the course - as long as nightly adds are enabled and active, or the update roster utility is used. Use the 'Lock' checkbox for any manually enrolled students for whom you wish to prevent type conversion. Use the 'Change' checkbox to switch the enroll type from auto to manual, and vice versa. Use the 'Unlock' checkbox for any maually enrolled students for whom you no longer wish to lock the enroll type. Click the 'Go' button at the end of the page to process your desired changes.'. + &mt('Section changes, name changes, and class drops that can be set to occur either automatically or when using the [_1]Update roster now[_2] feature, will affect only those students with an enroll type of [_1]auto[_2].',"'","'").' '. + &mt("Students with an enroll type of [_1]manual[_2], will be converted automatically to the 'auto' type, when they first appear in the institutional classlist for the course - as long as nightly adds are enabled and active, or the update roster utility is used.","'","'").' '. + &mt("Use the 'Lock' checkbox for any manually enrolled students for whom you wish to prevent type conversion.").' '. + &mt("Use the 'Change' checkbox to switch the enroll type from auto to manual, and vice versa.").' '. + &mt("Use the 'Unlock' checkbox for any maually enrolled students for whom you no longer wish to lock the enroll type.").' '. + &mt("Click the 'Go' button at the end of the page to process your desired changes.").'
 
+ '."\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); - $r->print(" + "\n"); + 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(' - "); + '); if ($studentcount > 0) { - $r->print(" - + "; + if ($role eq 'dc') { + $output .= ""; + } elsif ($role eq 'cc') { + $output .= ""; + } + $output .= " + "; + $output .= &Apache::loncommon::end_data_table_header_row(); + for (my $i=0; $i<@{$users}; $i++) { + $output .= &Apache::loncommon::start_data_table_row(); + $output .= ''. + ''; + if ($role eq 'dc') { + $output .= ''; + } elsif ($role eq 'cc') { + $output .= ''; + } + $output .= ' + $r->print('
- "); + '); 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.').' +
- "); + $r->print(' + - + + '); + } else { + $r->print(' + + - "); + '); } - $r->print(" + $r->print('
+ '); my $cellcount = 0; if ($autocount > 0) { $cellcount ++; - $r->print(<
 Change auto   -
-END + $r->print(' + + '); } if ($manualcount > 0) { $cellcount ++; - $r->print(<
 Change manual   -
-END + $r->print(' + + '); } if ($lockcount > 0) { if ($cellcount == 2) { - $r->print(""); + $r->print(''); } $cellcount ++; - $r->print(<
 Lock manual   -
-END + $r->print(' + + '); } if ($unlockcount > 0) { if ($cellcount == 2) { - $r->print(""); + $r->print(''); } $cellcount ++; - $r->print(<
 Unlock manual   -
-END + $r->print(' + '); } - $r->print(" + $r->print('
'.&mt('Change auto').'   +
'.&mt('Change manual').'   +
'.&mt('Lock manual').'   +
'.&mt('Unlock manual').' +    +
 
- + + +

+ '.&mt('There are no students with the selected status.').'
- - + + - "); + '); } } } +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}$$lt{doms}$$lt{coac}$$lt{curn}$$lt{notf}'.$$pname{$$users[$i]}.''.$$users[$i].''; + 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 .= ''.$$status{$$users[$i]}.''; + 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.' - ); + $lt{'ncds'} = &mt('Changing default start and end access dates will affect [_1]future enrollments[_2] and also [_1]currently inactive[_2] students (i.e., those for whom access will begin in the future).','',''); + $lt{'tcha'} = &mt('To change access dates for [_1]currently active[_2] 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') { $dateshow .= $lt{'ifyd'}."\n"; } + $dateshow .= ''; } else { $dateshow = &mt('Currently: default first access').": $oldstartshow, ".&mt('default last access').": $oldendshow\n"; } if ($action eq 'setaccess') { - $r->print(<
+ $r->print(' +

-
$$tasktitleref{$action} -

- $dateshow + 		'.$tasktitleref->{$action}.' +

'. + $dateshow.'
-ENDONE + '); } elsif ($action eq 'updatenow') { - $r->print(" -

$dateshow\n"); + $r->print(' +

'.$dateshow."\n"); } - $r->print(<print(' -ENDFOUR + '); if ($action eq 'setaccess') { - $r->print(" + $r->print(' - + - + - +
-
-ENDTWO - if ($action eq 'setaccess') { - $r->print("$lt{'setf'} $lt{'freg'}"); - } elsif ($action eq 'updatenow') { - $r->print("$lt{'setf'} $lt{'fnew'}"); - } - $r->print(<print("$lt{'setf'} $lt{'freg'}"); + } elsif ($action eq 'updatenow') { + $r->print("$lt{'setf'} $lt{'fnew'}"); + } + $r->print('
$start_table + '.$start_table.'
@@ -1218,67 +1415,61 @@ ENDTWO -
-ENDTHREE + '); if ($action eq 'setaccess') { $r->print("$lt{'setl'} $lt{'freg'}"); } elsif ($action eq 'updatenow') { $r->print("$lt{'setl'} $lt{'fnew'}"); } - $r->print(<print('
$end_table + '.$end_table.'
$lt{'ifad'}'.$lt{'ifad'}.'
  
".&mt('Note').": ".$lt{'ncds'}."'.&mt('Note').': '.$lt{'ncds'}.' '.$lt{'tcha'}.'
- "); + '); } elsif ($action eq 'updatenow') { - $r->print(" -
- "); + '); } } ############################################################### sub print_doc_base { - my $r = shift; - $r->print(<print(' -
- - -ENDBASE +
'."\n". + &Apache::loncommon::end_page()); } ################################################################### sub print_chgsettings_response { my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_; my %settings = &Apache::lonnet::get('environment',['internal.sectionnums','internal.crosslistings','internal.autostart','internal.autoend','internal.autoadds','internal.autodrops'],$dom,$crs); - my $currend = ''; - my $currstart = ''; - my $currsecs = ''; - my $currxlists = ''; - my $curradds = ''; - my $currdrops = ''; + my ($currend,$currstart,$currsecs,$currxlists,$curradds,$currdrops, + $autoadds,$autodrops,$response,$warning,$warn_prefix,$warn_suffix, + $warnfiller); if ( defined($settings{'internal.autoadds'}) ) { $curradds = $settings{'internal.autoadds'}; } @@ -1297,72 +1488,68 @@ sub print_chgsettings_response { if ( defined($settings{'internal.crosslistings'}) ) { $currxlists = $settings{'internal.crosslistings'} } - my $autoadds = ''; - my $autodrops = ''; - if ( exists($env{'form.autoadds'}) ) { $autoadds=$env{'form.autoadds'}; } if ( exists($env{'form.autodrops'}) ) { $autodrops=$env{'form.autodrops'}; } - - my $response = ""; - my $warning = ""; - my $warn_prefix = ""; - my $warn_suffix = ""; - my $warnfiller = ""; my %cenv = ('internal.autoadds' => $autoadds, 'internal.autodrops' => $autodrops); my $reply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs); - if ($reply !~ /^ok$/) { - $response = "There was a problem processing your requested changes. The automated enrollment settings for this course have been left unchanged.
"; + if ($reply ne 'ok') { + $response = + &mt('There was a problem processing your requested changes.').' '. + &mt('The automated enrollment settings for this course have been left unchanged.').'
'; } else { if ($autoadds) { if ($curradds) { - $response = "Nightly additions based on classlist changes still enabled
"; + $response = + &mt('Nightly additions based on classlist changes still [_1]enabled[_2]','','').'
'; } else { - $response = "Nightly additions based on classlist changes now enabled
"; + $response = + &mt('Nightly additions based on classlist changes now [_1]enabled[_2]','','').'
'; } } else { if ($curradds) { - $response = "Nightly additions based on classlist changes now disabled
"; + $response = + &mt('Nightly additions based on classlist changes now [_1]disabled[_2]','','').'
'; } else { - $response = "Nightly additions based on classlist changes still disabled
"; + $response = + &mt('Nightly additions based on classlist changes still [_1]disabled[_2]','','').'
'; } } if ($autodrops) { if ($currdrops) { - $response .= "Nightly removals based on classlist changes still enabled
"; + $response .= &mt('Nightly removals based on classlist changes still [_1]enabled[_2]','','').'
'; } else { - $response .= "Nightly removals based on classlist changes now enabled
"; + $response .= &mt('Nightly removals based on classlist changes now [_1]enabled[_2]','','').'
'; } } else { if ($currdrops) { - $response .= "Nightly removals based on classlist changes now disabled
"; + $response .= &mt('Nightly removals based on classlist changes now [_1]disabled[_2]','','').'
'; } else { - $response .= "Nightly removals based on classlist changes still disabled"; + $response .= &mt('Nightly removals based on classlist changes still [_1]disabled[_2]','','').'
'; } } if ($autoadds || $autodrops) { $warning = &warning_message($dom,$crs,$action); - $warn_prefix = "
Warning. Although you indicated that nightly "; - $warn_suffix = " should be enabled, additional action is required.
"; - } - if ($autoadds) { - if ($autodrops) { - $warnfiller = "adds and drops"; - } else { - $warnfiller = "adds"; - } - } else { - if ($autodrops) { - $warnfiller = "drops"; + unless ($warning eq '') { + $response .= '
'. + ''.&mt('Warning.').' '; + if ($autodrops && $autodrops) { + $response .= + &mt('Although you indicated that nightly adds and drops should be enabled, additional action is required.'); + } elsif ($autoadds) { + $response .= + &mt('Although you indicated that nightly adds should be enabled, additional action is required.'); + } else { + $response .= + &mt('Although you indicated that nightly drops should be enabled, additional action is required.'); + } + $response .= '
'.$warning; } - } - unless ($warning eq '') { - $response = $warn_prefix.$warnfiller.$warn_suffix.$warning; - } + } } &print_reply($r,$response,$$tasktitleref{$action}); return; @@ -1370,51 +1557,55 @@ sub print_chgsettings_response { sub print_setdates_response { my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_; - my %settings = &Apache::lonnet::get('environment',['internal.autostart','internal.autoend'],$dom,$crs); + my %settings = + &Apache::lonnet::get('environment', + ['internal.autostart','internal.autoend'], + $dom,$crs); my $currstart = $settings{'internal.autostart'}; my $currend = $settings{'internal.autoend'}; - my $response = ''; - my $showstart = ''; - my $showend = ''; - my $warning = ''; - my $warn_prefix = ''; + my ($response,$showstart,$showend,$warning,$warn_prefix); my ($autostart,$autoend) = &get_dates_from_form(); if ( ($autostart eq '') || ($autoend eq '') ) { - $response = "There was a problem processing your requested changes. The automated enrollment settings for this course have been left unchanged.
"; + $response = + &mt('There was a problem processing your requested changes.').' '. + &mt('The automated enrollment settings for this course have been left unchanged.').'
'; } elsif (($autoend > 0) && ($autoend <= $autostart)) { - $response = 'The date/time selected for starting auto-enrollment was the same or later than the date/time selected for ending auto-enrollment. As this means auto-enrollment will never be active, your requested changes have not been processed, and the existing values remain in effect. Please go back to the previous page to try your changes again.'."\n"; + $response = + &mt('The date/time selected for starting auto-enrollment was the same or later than the date/time selected for ending auto-enrollment.').' '. + &mt('As this means auto-enrollment will never be active, your requested changes have not been processed, and the existing values remain in effect.').' '. + &mt('Please [_1]go back[_2] to the previous page to try your changes again.', + '','')."\n"; } else { $showstart = &Apache::lonlocal::locallocaltime($autostart); if ($autoend) { $showend = &Apache::lonlocal::locallocaltime($autoend); } else { - $showend = "'No end date'"; + $showend = &mt("'No end date'"); } my %cenv = ('internal.autostart' => $autostart, 'internal.autoend' => $autoend); my $reply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs); - if ($reply !~ /^ok$/) { - $response = "There was a problem processing your requested changes. The automated enrollment settings for this course have been left unchanged.
"; + if ($reply ne 'ok') { + $response = + &mt('There was a problem processing your requested changes.').' '. + &mt('The automated enrollment settings for this course have been left unchanged.').'
'; } else { if ($currstart == $autostart) { - $response = "The first date for automated enrollment has been left unchanged as $showstart.
"; + $response = &mt('The first date for automated enrollment has been left unchanged as [_1]',$showstart).'
'; } else { - $response = "The first date for automated enrollment has been changed to $showstart.
"; + $response = &mt('The first date for automated enrollment has been changed to [_1]',$showstart).'
'; } if ($currend == $autoend) { - $response .= "The last date for automated enrollment has been left unchanged as $showend.
"; + $response .= &mt('The last date for automated enrollment has been left unchanged as [_1]',$showend).'
'; } else { - $response .= "The last date for automated enrollment has been changed to $showend.
"; + $response .= &mt('The last date for automated enrollment has been changed to [_1]',$showend).'
'; } # Generate message in case where old first enrollment date was later than today, but new first enrollment date is now today or earlier. my $rosterupdated = 0; - my $firstaccess = ""; - my $nextupdate = ""; - my $lastupdate = ""; - + my ($firstaccess,$nextupdate,$lastupdate); my $nowstamp = time; my @date_list=localtime(time); my $cur_year = $date_list[5]; @@ -1440,13 +1631,20 @@ 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 .= + '
'. + &mt("Although you have now set the first enrollment date to $firstaccess, automatic enrollment will [_1]not[_2] occur until the next automatic enrollment update occurs for all LON-CAPA courses at 1.30 am $nextupdate.",'','').' '. + &mt('If you wish to immediately enroll registered students included in the institutional classlist for this class, please visit the [_1]roster update page[_2].'. + '',''). + '
'; } } $warning = &warning_message($dom,$crs,$action); - $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; + unless ($warning eq '') { + $response .= + '
'. + ''.&mt('Warning.').' '. + &mt('Although you set a start and end date for auto-enrollment, additional action is required.').'
'.$warning; } } } @@ -1456,54 +1654,65 @@ sub print_setdates_response { sub print_setaccess_response { my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_; - my %settings = &Apache::lonnet::get('environment',['default_enrollment_start_date','default_enrollment_end_date','internal.autostart'],$dom,$crs); + my %settings = + &Apache::lonnet::get('environment', + ['default_enrollment_start_date', + 'default_enrollment_end_date', + 'internal.autostart'],$dom,$crs); my $currstart = $settings{'default_enrollment_start_date'}; my $currend = $settings{'default_enrollment_end_date'}; my $autostart = $settings{'internal.autostart'}; - my $response = ''; + my $response; my ($startaccess,$endaccess) = &get_dates_from_form(); if (($startaccess eq '') || ($endaccess eq '')) { - $response = "There was a problem processing your requested changes. The default -start and end access dates for this course have been left unchanged.
"; + $response = + &mt('There was a problem processing your requested changes.').' '. + &mt('The default start and end access dates for this course have been left unchanged.'). + '
'; } elsif (($endaccess > 0) && ($endaccess <= $startaccess)) { - $response = 'The default start access date/time you chose was the same or later than the default end access date/time. As this means that roles will never be active, your requested changes have not been processed, and the existing values remain in effect. Please go back to the previous page to try your changes again.'."\n"; + $response = + &mt('The default start access date/time you chose was the same or later than the default end access date/time.').' '. + &mt('As this means that roles will never be active, your requested changes have not been processed, and the existing values remain in effect.').' '. + &mt('Please [_1]go back[_2] to the previous page to try your changes again.', + '','')."\n"; } else { my $showstart = &Apache::lonlocal::locallocaltime($startaccess); - my $showend = ''; - my $warning = ''; - my $warn_prefix = ''; + my ($showend,$warning,$warn_prefix); if ($endaccess) { $showend = &Apache::lonlocal::locallocaltime($endaccess); } else { - $showend = "'No end date'"; + $showend = &mt("'No end date'"); } my %cenv = ('default_enrollment_start_date' => $startaccess, 'default_enrollment_end_date' => $endaccess); my $reply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs); - if ($reply !~ /^ok$/) { - $response = "There was a problem processing your requested changes. The automated enrollment settings for this course have been left unchanged.
"; + if ($reply ne 'ok') { + $response = + &mt('There was a problem processing your requested changes.').' '. + &mt('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 = &mt('The first access date for students being added via automated enrollment has been left unchanged as [_1].',$showstart).'
'; } else { - $response = "The first access date for students added via automated enrollment has been changed to -$showstart.
"; + $response = &mt('The first access date for students being added via automated enrollment has been changed to [_1].',$showstart).'
'; } if ($currend == $endaccess) { - $response .= "The last access date for students added via automated enrollment has been left unchanged as $showend.
"; + $response .= &mt('The last access date for students being added via automated enrollment has been left unchanged as [_1].',$showend).'
'; } else { - $response .= "The last access date for students automated enrollment has been changed to -$showend.
"; + $response .= &mt('The last access date for students being added via automated enrollment has been changed to [_1]',$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 [_1]currently active[_2] 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".','',''). + '
'; + # Generate message in case where old first access date was later than today, but new first access date is now today or earlier. - - my $accessgiven= 0; - my $firstaccess = ""; - my $nextupdate = ""; - my $lastupdate = ""; + my $accessgiven= 0; + my ($firstaccess,$nextupdate,$lastupdate); my $nowstamp = time; my @date_list=localtime(time); my $cur_year = $date_list[5]; @@ -1518,9 +1727,9 @@ $showend.
"; if ($autostart < $nextmidnt) { if ($nowstamp < $todayupdate) { - $nextupdate = "at 1.30 am today"; + $nextupdate = 'at 1.30 am today'; } else { - $nextupdate = "at 1.30 am tomorrow"; + $nextupdate = 'at 1.30 am tomorrow'; } } else { my @enrollstart = localtime($autostart); @@ -1535,18 +1744,26 @@ $showend.
"; } if ($startaccess < $nextmidnt ) { if ( $startaccess >= $lastmidnt) { - $firstaccess = "today"; + $firstaccess = 'today'; } else { - $firstaccess = "a date prior to today"; + $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 .= + '
'. + &mt("Although you have now set the first access date to $firstaccess, automatic enrollment will [_1]not[_2] occur until the next automatic enrollment update occurs for all LON-CAPA courses $nextupdate.", + '','').' '. + &mt('If you wish to grant immediate course access for registered students included in the institutional classlist for this class, please visit the [_1]roster update page[_2].', + '',''). + '
'; } } $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.
"; - unless ($warning eq '') { - $response .= $warn_prefix.$warning; + unless ($warning eq '') { + $response .= '
'. + ''.&mt('Warning.').' '. + &mt('Although you have set default first and last access dates for students who are added via automatic enrollment, additional action is required.'). + '
'.$warning; } } } @@ -1558,21 +1775,20 @@ sub print_notify_response { my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_; # Get current settings - my %settings = &Apache::lonnet::get('environment',['internal.notifylist','internal.coursecode'],$dom,$crs); + my %settings = + &Apache::lonnet::get('environment', + ['internal.notifylist','internal.coursecode'], + $dom,$crs); my $notifylist = $settings{'internal.notifylist'}; my $coursecode = $settings{'internal.coursecode'}; my @currpeople = split(/,/,$notifylist); my $notify = 0; - my @people = (); - my $peoplestr = ""; - my $response = ""; + my ($peoplestr,$response,@people); my $noprocess = 0; - my $currcount = 0; - foreach (@currpeople) { - unless ($_ eq '') { $currcount ++; } + foreach my $item (@currpeople) { + unless ($item eq '') { $currcount ++; } } - if ( exists($env{'form.notify'}) ) { $notify=$env{'form.notify'}; } @@ -1582,16 +1798,17 @@ sub print_notify_response { if ( exists($env{"form.note_$i"}) ) { if ( exists($env{"form.notifyname_$i"}) ) { unless ( $env{"form.notifyname_$i"} eq '' ) { - push @people, $env{"form.notifyname_$i"}; + push(@people,$env{"form.notifyname_$i"}); } } } } - if ($notify) { $peoplestr = join(",",@people); } + if ($notify) { $peoplestr = join(',',@people); } } else { if ($notify) { if ($currcount) { - $response = "There was a problem retrieving the updated list of recipients of notification messages. The notification settings for this course have been left unchanged.
."; + $response = &mt('There was a problem retrieving the updated list of recipients of notification messages.').' '. + &mt('The notification settings for this course have been left unchanged.').'
'; $peoplestr = $notifylist; @people = @currpeople; $noprocess = 1; @@ -1601,29 +1818,39 @@ sub print_notify_response { unless ($noprocess == 1) { my %cenv = ('internal.notifylist' => $peoplestr); my $reply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs); - if ($reply !~ /^ok$/) { - $response = "There was a problem processing your requested changes. The notification settings for this course have been left unchanged.
"; + if ($reply ne 'ok') { + $response = + &mt('There was a problem processing your requested changes.').' '. + &mt('The notification settings for this course have been left unchanged.'). + '
'; } else { if ($notify) { if (@people) { if ($currcount) { - $response .= "Notification of enrollment changes still enabled
"; + $response .= + &mt('Notification of enrollment changes still [_1]enabled[_2]','',''). + '
'; } else { - $response .= "Notification of enrollment changes now enabled
"; + $response .= + &mt('Notification of enrollment changes now [_1]enabled[_2]'.'',''). + '
'; } - $response .= "
The following will receive notification if there are any changes in enrollment in LON-CAPA course: $realm ($coursecode) as a result of the nightly enrollment check:
    \n"; + $response .= + '
    '. + &mt('The following will receive notification if there are any changes in enrollment in LON-CAPA course: [_1] as a result of the nightly enrollment check:',"$realm ($coursecode)"). + '
      '."\n"; foreach my $person (@people) { $response .= "
    • $person
      • \n"; } $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 [_1]not enabled[_2] as no [_3]s were selected as recipients.','','',&Apache::lonnet::plaintext('cc')).'
    '; } } else { if ($currcount) { - $response = "Notification of enrollment changes now disabled
    "; + $response = &mt('Notification of enrollment changes now [_1]disabled[_2]','','').'
    '; } else { - $response = "Notification of enrollment changes still disabled
    "; + $response = &mt('Notification of enrollment changes still [_1]disabled[_2]','','').'
    '; } } } @@ -1632,33 +1859,32 @@ sub print_notify_response { return; } -sub print_crosslistings_menu () { +sub print_crosslistings_menu { my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_; - my %settings = &Apache::lonnet::get('environment',['internal.crosslistings','internal.coursecode'],$dom,$crs); - my @currxlists = (); - my @xlists = (); + my %settings = + &Apache::lonnet::get('environment', + ['internal.crosslistings','internal.coursecode'], + $dom,$crs); + my (@currxlists,@xlists,$xliststr,$response); my $crosscount = 0; my $removecount = 0; - my $xliststr = ''; - my $response = ''; my $coursecode = $settings{'internal.coursecode'}; if ($settings{'internal.crosslistings'} ne '') { @currxlists = split(/,/,$settings{'internal.crosslistings'}); } - 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/^([^:]+)/) { + if ($currxlists[$i] =~ /^([^:]+)/) { $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; + push(@xlists,$xlistentry); $crosscount ++; } else { $removecount ++; @@ -1666,114 +1892,123 @@ sub print_crosslistings_menu () { } } - $xliststr = join(",",@xlists); + $xliststr = join(',',@xlists); my %cenv = ('internal.crosslistings' => $xliststr); my $reply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs); - if ($reply !~ /^ok$/) { - $response = "There was a problem processing your requested changes. The automated enrollment settings for this course have been left unchanged.
    "; + if ($reply ne 'ok') { + $response = &mt('There was a problem processing your requested changes.').' '. + &mt('The automated enrollment settings for this course have been left unchanged.').'
    '; } else { if ($removecount > 0) { - $response = "A total of $removecount courses are no longer crosslisted with LON-CAPA course: $realm ($coursecode).

    "; + $response = &mt('A total of [quant,_1,course is,courses are] no longer crosslisted with LON-CAPA course: [_2].', + $removecount,"$realm ($coursecode").'

    '; } 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"; + $response .= &mt('The [quant,_1,course] 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.',$crosscount). + '
        '."\n"; + foreach my $xl (@xlists) { + my ($xlist,$lc_sec) = split(/:/,$xl); + $response .= + '
      • '.&mt('[_1] - ID: [_2]',$xlist,$lc_sec).'
        • '."\n"; } - $response .= "

      \n"; + $response .= '

    '."\n"; } } if ( exists($env{'form.numcross'}) ) { 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.

    - - - -
    - - - - - - ); - for (my $i=0; $i<$numcross; $i++) { - my $colflag = $i%2; - $response .= qq( - - - - - ); + if ($numcross) { + $response .= + &mt('You indicated that you wish to add an additional [quant,_1,crosslisting].',$numcross).' '. + &mt('For each new crosslisting enter the institutional 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.').' '. + &mt('The LON-CAPA section ID can be left blank, if you do not wish to tie a section ID to this crosslisting.').' '. + &mt("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."). + '

    + '. + &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_row().' + + '."\n". + &Apache::loncommon::end_data_table_row(); + for (my $i=0; $i<$numcross; $i++) { + $response .= + &Apache::loncommon::start_data_table_row().' + + '. + &Apache::loncommon::end_data_table_row(); } - $response .= qq(
    CrosslistingLON-CAPA section/groupID
    '.&mt('Crosslisting').''.&mt('LON-CAPA section ID').'
    + $response .= &Apache::loncommon::end_data_table().'
    - +
    - - - - - ); + + + + '."\n"; } } &print_reply($r,$response,$$tasktitleref{$action}); return; } -sub print_crosslistings_response () { +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 @currxlists = (); - my @xlists = (); - my @allxlists = (); - my @badxlists = (); - my @badowner = (); + my %settings = + &Apache::lonnet::get('environment', + ['internal.crosslistings','internal.coursecode', + 'internal.courseowner','internal.co-owners'], + $dom,$crs); + my (@currxlists,@xlists,@allxlists,@badxlists,@badowner,@reserved, + @matchgroup,$response,$warning,$warn_prefix); my $numcross = 0; my $xliststr = $settings{'internal.crosslistings'}; my $coursecode = $settings{'internal.coursecode'}; my $owner = $settings{'internal.courseowner'}; - my $response = ''; - my $warning = ''; - my $warn_prefix = ''; - + my $coowners = $settings{'internal.co-owners'}; if ($xliststr ne '') { @allxlists = split(/,/,$xliststr); } - if ( exists($env{'form.numcross'}) ) { $numcross = $env{'form.numcross'}; } - - if ($numcross > 0) { + if ($numcross) { + 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"}) ) { - my $coursecheck = ''; - $coursecheck = &Apache::lonnet::auto_validate_courseID($crs,$dom,$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 = + &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); } } } - push @allxlists, @xlists; + push(@allxlists,@xlists); } if (@xlists > 0 ) { @@ -1782,80 +2017,113 @@ sub print_crosslistings_response () { my %cenv = ('internal.crosslistings' => $xliststr); my $reply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs); - if ($reply !~ /^ok$/) { - $response = "There was a problem processing your requested changes. The automated enrollment settings for this course have been left unchanged.

    "; + if ($reply ne 'ok') { + $response = + &mt('There was a problem processing your requested changes.').' '. + &mt('The automated enrollment settings for this course have been left unchanged.'). + '

    '; } 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"; + $response = &mt('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 my $item (@allxlists) { + my ($xlist,$lc_sec) = split(/:/,$item); + $response .= '
      • '.&mt('[_1] - ID: [_2]',$xlist,$lc_sec).'
        • '. + "\n"; } - $response .= "


      \n"; + $response .= '


    '."\n"; } } else { - if ($xliststr =~ m/:/) { - 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"; + if ($xliststr =~ /:/) { + my @oldxlists = split(/,/,$xliststr); + $response .= &mt('Although no new crosslistings were added, the courses listed below continue to be crosslisted with your LON-CAPA course.'). + '
        '."\n"; + foreach my $xl (@oldxlists) { + my ($xlist,$lc_sec) = split(/:/,$xl); + $response .= '
      • '.&mt('[_1] - ID: [_2]',$xlist,$lc_sec).'
        • '. + "\n"; } - $response .= "


      \n"; + $response .= '


    '."\n"; } } 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"; + $response .= &mt("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 my $item (@badxlists) { + my ($xlist,$lc_sec,$prob) = split(/:/,$item); + $response .= '
      • '. + &mt('[_1] - ID: [_2] - Error: [_3]', + $xlist,$lc_sec,$prob). + '
        • '."\n"; } - $response .= "


      \n"; + $response .= '


    '."\n"; } - 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"; - } - $response .= "


    \n"; + $response .= &mt("The courses listed below could not be included in the crosslistings for this LON-CAPA course, because the owner of this course - [_1] - does not have rights to view enrollment in those classes, as determined by your instititution's policies on access to official classlists.",$owner). + '
      '."\n"; + foreach my $item (@badowner) { + my ($xlist,$lc_sec) = split(/:/,$item); + $response .= '
    • '.&mt('[_1] - ID: [_2]',$xlist,$lc_sec).'
      • '. + "\n"; + } + $response .= '


    '."\n"; + } + if (@reserved > 0) { + $response .= &mt('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.').' '. + &mt('Please [_1]go back[_2] and change the section ID for each of these courses.', + '','>/a>'). + '
      '."\n"; + foreach my $item (@reserved) { + my ($xlist,$lc_sec) = split(/:/,$item); + $response .= '
    • '.&mt('[_1] - ID: [_2]',$xlist,$lc_sec).'
      • '. + "\n"; + } + $response .= '


    '."\n"; + } + + if (@matchgroup > 0) { + $response .= &mt('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.').' '. + &mt('Please [_1]go back[_2] and change the section ID for each of these courses.','    ',''). + '
      '."\n"; + foreach my $item (@matchgroup) { + my ($xlist,$lc_sec) = split(/:/,$item); + $response .= '
    • '.&mt('[_1] - ID: [_2]',$xlist,$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.
    "; - unless ($warning eq '') { - $response .= $warn_prefix.$warning; + unless ($warning eq '') { + $response .= '
    '. + &mt('Warning.').' '. + &mt('Although you have selected crosslisted courses to contribute enrollment to this course, additional action is required.'). + '
    '.$warning; } } - &print_reply($r,$response,$$tasktitleref{$action}); return; } -sub print_sections_menu () { +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 @currsections = (); - my @sections = (); - my @badowner = (); - my @badsections = (); + my %settings = + &Apache::lonnet::get('environment', + ['internal.sectionnums','internal.coursecode', + 'internal.courseowner','internal.co-owners'], + $dom,$crs); + my (@currsections,@sections,@badowner,@badsections,$secstr,$response, + $warning,$warn_prefix); my $seccount = 0; my $removecount = 0; my $addcount = 0; - my $secstr = ''; - my $response = ''; - my $warning = ""; - 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,33 +2131,33 @@ 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; + if ( grep/\Q$env{"form.$secnum"}:\E/,@currsections) { + push(@sections,$secentry); $seccount ++; } else { 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); } } } } if (@currsections > 0) { for (my $i=0; $i<@currsections; $i++) { - if ($currsections[$i] =~ m/^(\w+:)/ ) { + if ($currsections[$i] =~ /^(\w+:)/) { my $oldsec = $1; unless (grep/^$oldsec/,@sections) { $removecount ++; @@ -1900,16 +2168,16 @@ 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+:)/ ) { + if ($currsections[$i] =~ /^(\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; + push(@sections,$secentry); $seccount ++; } else { $removecount ++; @@ -1917,194 +2185,245 @@ sub print_sections_menu () { } } - $secstr = join(",",@sections); + $secstr = join(',',@sections); my %cenv = ('internal.sectionnums' => $secstr); my $reply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs); - if ($reply !~ /^ok$/) { - $response = "There was a problem processing your requested changes. The automated enrollment settings for this course have been left unchanged.
    "; + if ($reply ne 'ok') { + $response = &mt('There was a problem processing your requested changes.').' '. + &mt('The automated enrollment settings for this course have been left unchanged.').'
    '; } else { - if ($removecount > 0) { - $response = "A total of $removecount sections have been removed from the list of sections which contribute to enrollment in LON-CAPA course: $realm ($coursecode).

    "; - } - if ($addcount > 0) { - $response .= "A total of $addcount sections have been added to the list of -sections which contribute to enrollment in LON-CAPA course: $realm ($coursecode).

    "; - } - 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"; + if ($removecount) { + $response = &mt('A total of [quant,_1,section] have been removed from the list of sections which contribute to enrollment in LON-CAPA course: [_2].',$removecount,"$realm ($coursecode)"). + '

      '; + } + if ($addcount) { + $response .= &mt('A total of [quant,_1,section] have been added to the list of sections which contribute to enrollment in LON-CAPA course: [_2].', + $addcount,"$realm ($coursecode)"). + '

      '; + } + if ($seccount) { + $response .= &mt('Students enrolling in the [quant,_1,section] listed below will be automatically added to the class roster for the course, if you have chosen to enable a nightly automated enrollment update.',$seccount). + '
        '."\n"; + foreach my $section (@sections) { + my ($sec,$lc_sec) = split(/:/,$section); + $response .= '
      • '.&mt('[_1] - ID: [_2]',$sec,$lc_sec).'
        • ' +. + "\n"; } - $response .= "

      \n"; + $response .= '

    '."\n"; } } - 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"; + $response .= &mt("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 my $section (@badsections) { + my ($secnum,$lc_sec,$prob) = split(/:/,$section); + $response .= '
      • '.&mt('[_1] - ID: [_2] - Error: [_3]', + $secnum,$lc_sec,$prob).'
        • '."\n"; } - $response .= "


      \n"; + $response .= "


    \n"; } 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"; + $response .= &mt("The sections listed below could not be included in the sections for this LON-CAPA course, because the owner of this course - [_1] - does not have rights to view enrollment in those classes as determined by your instititution's policies on access to official classlists.",$owner). + '
        '."\n"; + foreach my $section (@badowner) { + my ($secnum,$lc_sec) = split(/:/,$section); + $response .= '
      • '.&mt('[_1] - ID: [_2]',$secnum,$lc_sec).'
        • '. + "\n"; } - $response .= "


      \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.
    "; - unless ($warning eq '') { - $response .= $warn_prefix.$warning; + unless ($warning eq '') { + $response .= '
    '. + ''.&mt('Warning.').' '. + &mt('Although you have selected sections to contribute enrollment to this course, additional action is required.'). + '
    '.$warning; } } - if ( exists($env{'form.numsec'}) ) { my $numsec = $env{'form.numsec'}; 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.

    -
    + $response .= + &mt('You indicated that you wish to incorporate student enrollment in your LON-CAPA course from an additional [quant,_1,section].',$numsec).' '. + &mt('For each new section enter the institutional 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.').' '. + &mt('The LON-CAPA section ID can be left blank, if you do not wish to designate a section ID for this course section.').' '. + &mt("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.").' +

    + -
    - - - - - - ); + + '. + &Apache::loncommon::end_data_table_row(); for (my $i=0; $i<$numsec; $i++) { - my $colflag = $i%2; - $response .= qq( - - - - - ); + $response .= &Apache::loncommon::start_data_table_row().' + + + '.&Apache::loncommon::end_data_table_row(); } - $response .= qq(
    Section numberLON-CAPA section/groupID
    '. + &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_row().' + '.&mt('Section number').''.&mt('LON-CAPA section ID').'
    + +
    + $response .= &Apache::loncommon::end_data_table().'
    - +
    - - - + + +
    - ); + '; } } &print_reply($r,$response,$$tasktitleref{$action}); return; } -sub print_sections_response () { +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 @currsections = (); - my @sections = (); - my @allsections = (); - my @badowner = (); - my @badsections = (); + my %settings = &Apache::lonnet::get('environment', + ['internal.sectionnums','internal.coursecode', + 'internal.courseowner','internal.co-owners'], + $dom,$crs); + my (@currsections,@sections,@allsections,@badowner,@badsections, + @reserved,@matchgroup,$response,$putreply,$warning,$warn_prefix); my $numsec = 0; my $secstr = $settings{'internal.sectionnums'}; my $coursecode = $settings{'internal.coursecode'}; my $owner = $settings{'internal.courseowner'}; - my $response = ''; - my $putreply = ''; - my $warning = ''; - my $warn_prefix = ''; + my $coowners = $settings{'internal.co-owners'}; if ($secstr ne '') { @allsections = split(/,/,$secstr); } - if ( exists($env{'form.numsec'}) ) { $numsec = $env{'form.numsec'}; } - 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) ) { + unless ( (grep/^\Q$env{"form.$sec"}:\E/,@allsections) || + (grep/^\Q$env{"form.$sec"}:\E/,@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); } } } } - push @allsections, @sections; + push(@allsections,@sections); } - if (@sections > 0 ) { + if (@sections > 0) { unless ($secstr eq '') { $secstr .= ","; } - $secstr .= join(",",@sections); + $secstr .= join(',',@sections); my %cenv = ('internal.sectionnums' => $secstr); $putreply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs); - if ($putreply !~ /^ok$/) { - $response = "There was a problem processing your requested changes. The automated enrollment settings for this course have been left unchanged.

    "; + if ($putreply ne 'ok') { + $response = &mt('There was a problem processing your requested changes.').' '. + &mt('The automated enrollment settings for this course have been left unchanged.'). + '

    '; } } - 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"; + if ($putreply eq 'ok') { + $response = &mt('Students enrolling in the sections listed below will be automatically added to the class roster for LON-CAPA course [_1], if you have chosen to enable a nightly automated enrollment update.', + "$realm ($coursecode)").'
        '."\n"; + foreach my $section (@allsections) { + my ($sec,$lc_sec) = split(/:/,$section); + $response .= '
      • '.&mt('[_1] - ID: [_2]',$sec,$lc_sec).'
        • '. + "\n"; } - $response .= "


      \n"; + $response .= '


    '."\n"; } 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"; + $response .= &mt("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 my $item (@badsections) { + my ($secnum,$lc_sec,$prob) = split(/:/,$item); + $response .= '
      • '. + &mt('[_1] - ID: [_2] - Error: [_3]', + $secnum,$lc_sec,$prob). + '
        • '."\n"; } - $response .= "


      \n"; + $response .= '


    '."\n"; } 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"; - } - $response .= "


    \n"; + $response .= &mt("The sections listed below could not be included in the sections for this LON-CAPA course, because the owner of this course - [_1] - does not have rights to view enrollment in those classes as determined by your instititution's policies on access to official classlists.",$owner). + '
      '."\n"; + foreach my $item (@badowner) { + my ($secnum,$lc_sec) = split(/:/,$item); + $response .= '
    • '.&mt('[_1] - ID: [_2]',$secnum,$lc_sec).'
      • '. + "\n"; + } + $response .= '


    '."\n"; + } + + if (@reserved > 0) { + $response .= &mt('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.').' '. + &mt('Please [_1]go back[_2] and change the section ID for each of these sections.', + '',''). + '
      '."\n"; + foreach my $xl (@reserved) { + my ($xlist,$lc_sec) = split(/:/,$xl); + $response .= '
    • '. + &mt('[_1] - ID: [_2]',$xlist,$lc_sec). + '
      • '."\n"; + } + $response .= "


    \n"; + } + + if (@matchgroup > 0) { + $response .= &mt('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.').' '. + &mt('Please [_1]go back[_2] and change the section ID for each of these sections.','',''). + '
      '."\n"; + foreach my $section (@matchgroup) { + my ($xlist,$lc_sec) = split(/:/,$section); + $response .= '
    • '.&mt('[_1] - ID: [_2]',$xlist,$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.
    "; - unless ($warning eq '') { - $response .= $warn_prefix.$warning; + unless ($warning eq '') { + '
    '. + ''.&mt('Warning.').' '."\n". + &mt('Although you have selected sections to contribute enrollment to this course, additional action is required.').'
    '.$warning; } } - &print_reply($r,$response,$$tasktitleref{$action}); return; } @@ -2114,17 +2433,19 @@ sub photo_permission { my %settings = &Apache::lonnet::get('environment', ['internal.courseowner', 'internal.photopermission', - 'internal.showphotos'], + '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', ); my $reply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs); - if ($reply !~ /^ok$/) { - $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"; + if ($reply ne 'ok') { + $response = + &mt('There was a problem processing the record of your agreement to the conditions of use.').' '. + &mt('Settings for this course have been left unchanged.').'
    '."\n"; &print_reply($r,$response,$$tasktitleref{$action}); } else { &print_photos_response($r,$realm,$dom,$crs,$action, @@ -2142,8 +2463,10 @@ sub photo_permission { 'internal.photopermission' => $env{'form.photopermission'}, ); my $reply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs); - if ($reply !~ /^ok$/) { - $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"; + if ($reply ne 'ok') { + $response = + &mt('There was a problem processing the record of your agreement to the conditions of use.').' '. + &mt('Settings for this course have been left unchanged.').'
    '."\n"; } else { &print_photos_response($r,$realm,$dom,$crs,$action, $tasktitleref,$showphotos, @@ -2174,7 +2497,9 @@ sub photo_permission { $permcheck = 'fail'; } if ($permcheck eq 'fail') { - my $response = &mt('There was a problem processing your requested change, because it could not be determined whether course owner permission is required in order for a course coordinator to have access to student photos in this domain.').' '.&mt('The student photo import setting for this course has been left unchanged.').'
    '; + my $response = + &mt('There was a problem processing your requested change, because it could not be determined whether course owner permission is required in order for a course coordinator to have access to student photos in this domain.').' '. + &mt('The student photo import setting for this course has been left unchanged.').'
    '; &print_reply($r,$response,$$tasktitleref{$action}); } } @@ -2187,10 +2512,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 = ' - -
    + -
    Use of student photos
    '."\n". - &mt('Acceptance by the course owner of the conditions of use of photos is currently [_1] set.','not').'
    '.&mt('Please indicate your acceptance of the conditions of use of digital photos of registered students in courses at [_1].',$institution).' +     		'.&mt('Use of student photos').'
    '."\n". + &mt('Acceptance by the course owner of the conditions of use of photos is currently [_1]not[_2] set.','','').'
    '. + &mt('Please indicate your acceptance of the conditions of use of digital photos of registered students in courses at [_1].',$institution).'
    @@ -2216,22 +2542,28 @@ function agreement_result(caller) { - + - + - - - - + + + +
    '; } else { - my ($ownername,$owneremail) = &get_oenerinfo($dom,$courseowner); - $response = &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); + my ($ownername,$owneremail) = &get_ownerinfo($dom,$courseowner); + my $emailstr; + if ($owneremail) { + $emailstr = &mt('(e-mail: [_1])',$owneremail); + } + $response = &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); } &print_reply($r,$response,$$tasktitleref{$action}); } @@ -2248,45 +2580,46 @@ sub print_photos_response { } } } - my %settings = &Apache::lonnet::get('environment',['internal.showphotos'], + my %settings = &Apache::lonnet::get('environment',['internal.showphoto'], $dom,$crs); - my $currphotos = $settings{'internal.showphotos'}; + my $currphotos = $settings{'internal.showphoto'}; my $response = ""; if (defined($photopermission)) { if ($photopermission eq 'yes') { $response = &mt('Acceptance of photo use policy recorded.').'
    '."\n"; } else { - $response = &mt('Non-acceptance of photo use policy recorded.').'
    '."\n"; + $response = &mt('Rejection of photo use policy recorded.').'
    '."\n"; $showphotos = 0; } } - my %cenv = ('internal.showphotos' => $showphotos); + my %cenv = ('internal.showphoto' => $showphotos); my $reply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs); - if ($reply !~ /^ok$/) { - $response .= "There was a problem processing your requested change. The student photo retrieval setting for this course has been left unchanged.
    "; + if ($reply ne 'ok') { + $response .= &mt('There was a problem processing your requested change.').' '. + &mt('The student photo retrieval setting for this course has been left unchanged.').'
    '; } else { if ($showphotos) { if ($currphotos) { - $response .= "Retrieval of student photos is still enabled.
    "; + $response .= &mt('Retrieval of student photos is still [_1]enabled[_2].','','').'
    '; } else { - $response .= "Retrieval of student photos in now enabled.
    "; + $response .= &mt('Retrieval of student photos in now [_1]enabled[_2].','','').'
    '; my ($update,$commentary) = &Apache::lonnet::auto_photochoice($crs,$dom); if ($update) { $response .= '
    '.$commentary.'

    -
    - + - - + +
    '; } } } else { if ($currphotos) { - $response .= "Retrieval of student photos is now disabled.
    "; + $response .= &mt('Retrieval of student photos is now [_1]disabled[_2].','','').'
    '; } else { - $response .= "Retrieval of student photos is still disabled.
    "; + $response .= &mt('Retrieval of student photos is still [_1]disabled[_2].','','').'
    '; } } foreach my $key (keys(%cenv)) { @@ -2297,7 +2630,7 @@ onclick="javascript:document.photoupdate } } if (keys(%newenv) > 0) { - &Apache::lonnet::appenv(%newenv); + &Apache::lonnet::appenv(\%newenv); } &print_reply($r,$response,$$tasktitleref{$action}); return; @@ -2305,19 +2638,14 @@ onclick="javascript:document.photoupdate sub print_photoupdate_response { my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_; - my $response; - my %changes; + my ($response,$outcome,%changes,@allcourses,%LC_code,%affiliates); my %lt = &LONCAPA::Enrollment::photo_response_types(); my %settings = &Apache::lonnet::get('environment', ['internal.coursecode', 'internal.sectionnums', 'internal.crosslistings'], $dom,$crs); - my @allcourses = (); - my %LC_code; - my %affiliates; - my $outcome; - &get_institutional_codes(\%settings,,\@allcourses,\%LC_code); + &Apache::loncommon::get_institutional_codes(\%settings,\@allcourses,\%LC_code); if (@allcourses > 0) { @{$affiliates{$crs}} = @allcourses; $outcome = &Apache::lonnet::auto_photoupdate(\%affiliates,$dom,$crs,\%changes); @@ -2330,7 +2658,8 @@ sub print_photoupdate_response { } if ($outcome eq 'ok') { if (keys(%changes) > 0) { - $response = &mt('Update of photos for registered students resulted in the following ').':