--- loncom/interface/lonpopulate.pm 2003/12/12 00:45:49 1.6 +++ loncom/interface/lonpopulate.pm 2004/06/17 18:31:24 1.14 @@ -1,5 +1,5 @@ # automated enrollment configuration handler -# $Id: lonpopulate.pm,v 1.6 2003/12/12 00:45:49 raeburn Exp $ +# $Id: lonpopulate.pm,v 1.14 2004/06/17 18:31:24 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -27,13 +27,14 @@ package Apache::lonpopulate; use strict; use lib qw(/home/httpd/lib/perl); -use Apache::lonnet (); -use Apache::loncommon (); -use Apache::lonhtmlcommon (); +use Apache::lonnet; +use Apache::loncommon; +use Apache::lonhtmlcommon; use Apache::lonlocal; +use Apache::loncoursedata; use Apache::Constants qw(:common :http REDIRECT); use Time::Local; -use LONCAPA::Enrollment (); +use LONCAPA::Enrollment; use localenroll; ############################################################### @@ -60,6 +61,9 @@ function process(calling) { var rad1 = 0 var rad2 = 0 var formName = document.forms.enter + if (calling == "viewclass") { + formName = document.forms.studentform + } formName.action.value = calling if (calling == "chgsettings") { for (var j=0; j   + Use "Change access dates" 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. @@ -328,18 +342,30 @@ Note: Any students added manually by cou "); } elsif ($action eq "setdates") { - my ($start_table,$end_table) = &date_setting_table($enrollvar{autostart},$enrollvar{autoend}); - my $oldstartshow = localtime($enrollvar{autostart}); - my $oldendshow = localtime($enrollvar{autoend}); - if ($enrollvar{autoend} == 0) { - $oldendshow = "No ending date"; + my ($start_table,$end_table) = &date_setting_table($enrollvar{autostart},$enrollvar{autoend},$action); + my $oldstartshow = ''; + my $oldendshow = ''; + if ( defined($enrollvar{autostart}) ) { + $oldstartshow = &Apache::lonlocal::locallocaltime($enrollvar{autostart}); + } + if ( defined($enrollvar{autoend}) ) { + $oldendshow = &Apache::lonlocal::locallocaltime($enrollvar{autoend}); + if ($enrollvar{autoend} == 0) { + $oldendshow = "No ending 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"; + } else { + $dateshow = "Currently: First enrollment: $oldstartshow, Last enrollment: $oldendshow\n"; } $r->print(<
-
$$tasktitleref{$action}
- Currently: First enrollment: $oldstartshow, Last enrollment: $oldendshow + 		$$tasktitleref{$action}

+ $dateshow
@@ -388,8 +414,22 @@ Note: Any students added manually by cou - - + + + +ENDTWO + } elsif ($action eq "setaccess") { + &print_accessdate_table($r,\%enrollvar,$tasktitleref,$action); + $r->print(< + + + + + + + + ENDTWO } elsif ($action eq "notify") { @@ -439,76 +479,111 @@ ENDTWO "); - my $option_str = ''; - my $lastpname = ''; - my $option_count = 0; - - my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($dom.'/'.$crs); - foreach (sort keys %coursepersonnel) { - if ($_ eq &mt("Course Coordinator") ) - { - my @ccs = (); - if ($coursepersonnel{$_} =~ m/,/) { - @ccs = split(/,/,$coursepersonnel{$_}); - } else { - @ccs = $coursepersonnel{$_}; - } - foreach (@ccs) { - my ($puname,$pudom)=split(/\:/,$_); - my $pname = &Apache::loncommon::plainname($puname,$pudom); - if (grep/^$puname\@$pudom$/,@notified) { - $option_str .="\n"; + 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 = &LONCAPA::Enrollment::check_user_status($roleinfo[2],$roleinfo[1],$dom,$crs,'cc'); + if ($active_cc eq 'ok') { + 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; + } } else { - $option_str .="\n"; + push @oldccs, "$roleinfo[1]\@$roleinfo[2]"; } - $option_count ++; - $lastpname = $pname.'@'.$pudom; } } } - if ($option_count > 1) { - my $optionsize = $option_count; - if ($optionsize > 6) { - $optionsize = 6; - } + 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; + + if (@ccs > 0) { + @ccs = sort @ccs; $r->print(" - -Select which course coordinators should receive information about roster changes whenever any adds or drops occur during the nightly enrollment check.

- + 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. - Select more than one recipient by using the following keyboard and mouse combinations:
-
    -
  • Apple-click: MacOS
    • -
  • Ctrl-click: Windows
    • -
  • Left click: Linux
    • -
- - + + + + + + + "); - } else { + for (my $i=0; $i<@ccs; $i++) { + my $colflag = $i%2; + $r->print(" + + + "); + } else { + $r->print(""); + } + } $r->print(" - - - +
NameusernameCurrent statusNotification?
$pname{$ccs[$i]}$ccs[$i] + "); + if ($notifystate{$ccs[$i]} == 1) { + $r->print("Notification active"); + } else { + $r->print("Notification inactive"); + } + if ($notifystate{$ccs[$i]} == 1) { + $r->print("
-As you are the only user with the role of course coordinator in this course, if you choose to enable notification of roster changes, you will be the sole recipient of LON-CAPA messages generated whenever any adds or drops occur during the nightly enrollment check. - -
+
+ + + + +
+ +
+ + "); + } else { + $r->print(" + + + No course coordinators found. + + "); } $r->print(" - - - - - - - - - + + + + + "); } elsif ($action eq "crosslist") { my @xlists = (); @@ -526,7 +601,7 @@ As you are the only user with the role o "); if ($cross_str > 0) { $r->print(" - Currently, LON-CAPA course: $realm ($enrollvar{coursecode}) is crosslisted with $cross_str course section(s). Students enrolling in these course sections will be automatically added to the class roster for the course, if you have chosen to enable a nightly automated enrollment update. For each crosslisting, leave the checkbox checked if you want registered students in that course to be included in the student roster for LON-CAPA course: $realm ($enrollvar{coursecode}); otherwise uncheck it. If you wish to change the section/group ID assigned in your LON-CAPA course for a crosslisted course, enter the new section/group ID in the appropriate textbox. The LON-CAPA section/group ID can be left (or set to) empty, if you do not wish to tie a section/group ID to this crosslisting. If you wish to add new crosslisted courses, enter the number of new courses to add in the textbox at the bottom of the page. You will provide information about each of the new crosslistings on a subsequent page. Click 'Go' to store your changes. + Currently, this LON-CAPA course is crosslisted with $cross_str course section(s). Students enrolling in these course sections will be automatically added to the class roster for the course, if you have chosen to enable a nightly automated enrollment update. For each crosslisting, leave the checkbox checked if you want registered students in that course to be included in the student roster for LON-CAPA course: $realm ($enrollvar{coursecode}); otherwise uncheck it. If you wish to change the section/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. @@ -544,7 +619,7 @@ As you are the only user with the role o for (my $i=0; $i<@xlists; $i++) { my $xl = ' '; my $gp = ' '; - if ($xlists[$i] =~ /(\w+):(.+)$/) { + if ($xlists[$i] =~ /(\w+):?(.*)$/) { $xl = $1; $gp = $2; } @@ -594,7 +669,8 @@ As you are the only user with the role o "); } elsif ($action eq "sections") { - my @sections = &localenroll::get_sections($enrollvar{coursecode}); + my @sections = (); + @sections = &Apache::lonnet::auto_get_sections($crs,$dom,$enrollvar{coursecode}); my @storedsections = (); my @currsections = (); my %sec_id = (); @@ -610,9 +686,8 @@ As you are the only user with the role o } } if (@sections > 0) { - if (@sections > 1) { - my $secshow = @sections; - $r->print(" + my $secshow = @sections; + $r->print("

@@ -627,71 +702,48 @@ your changes.

- - - - -
- - - - - - - - "); - for (my $i=0; $i<@sections; $i++) { - my $colflag = $i%2; - my $shrflag = 0; - $r->print(" +
SectionCurrent statusLON-CAPA section/group IDEnrollment in this course?
+ + + + + + + "); + for (my $i=0; $i<@sections; $i++) { + my $colflag = $i%2; + my $shrflag = 0; + $r->print(""); - } else { - $r->print(""); - } - } - $r->print(" - -
SectionCurrent statusLON-CAPA section/group IDEnrollment in this course?
$sections[$i] - "); - if (grep/^$sections[$i]$/,@currsections) { - $r->print("Enrollment active"); - $shrflag = 1; - } else { - $r->print("Enrollment inactive"); - } - if ($shrflag) { - $r->print("
-
-
- - - - -
- - -
- - -
"); - } else { - $r->print("
- - - "); + } else { + $r->print(""); + } + } + $r->print(" +
- $$tasktitleref{$action}
+ if (grep/^$sections[$i]$/,@currsections) { + $r->print("Enrollment active"); + $shrflag = 1; + } else { + $r->print("Enrollment inactive"); + } + if ($shrflag) { + $r->print("
+
+ + +
+ +
- - - - -
As your institution's course catalog only includes a single section for this course, there are no additional sections that can be set for inclusion in the LON-CAPA roster for the course.
- "); - } + + + + "); } else { $r->print("

@@ -702,7 +754,7 @@ your changes. if (@currsections) { my $secshow = @currsections; $r->print(" - Currently, LON-CAPA course: $realm ($enrollvar{coursecode}) incorporates enrollment from $secshow sections. Students enrolling in any of these course sections will be automatically added to the class roster for the course, if you have chosen to enable a nightly automated enrollment update. For each section, uncheck the checkbox if you want registered students in that section to cease being included in the student roster for LON-CAPA course: $realm ($enrollvar{coursecode}); otherwise leave it checked. If you want to change the section/group designation used for this section in LON-CAPA, delete the current value in the LON-CAPA section/groupID textbox and enter the new value. If you wish to add new course section, enter the number of new sections to add in the textbox at the bottom of the page. You will provide information about each of the new sections on a subsequent page. Click 'Go' to store your changes. + Currently, this LON-CAPA course incorporates enrollment from $secshow sections. Students enrolling in any of these course sections will be automatically added to the class roster for the course, if you have chosen to enable a nightly automated enrollment update. For each section, uncheck the checkbox if you want registered students in that section to cease being included in the student roster for LON-CAPA course: $realm ($enrollvar{coursecode}); otherwise leave it checked. If you want to change the section/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. @@ -834,30 +886,201 @@ Note: if you enable automatic import of Expire students previously added by nightly enrollment process, but no longer listed in institutional classlist(s). -  Yes  -  No 
- - - - - +  Yes  +  No 
+ + + + 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(" + + + + + + + + + + + + "); + } elsif ($action eq 'viewclass') { + $r->print(" +

+ + + + +
$$tasktitleref{$action} +
+ + + + + "); + if ($studentcount > 0) { + $r->print(" + + + + + + + "); + } + $r->print(" +
"); + if (! exists($ENV{'form.sortby'})) { + $ENV{'form.sortby'} = 'username'; + } + if ($ENV{'form.Status'} !~ /^(Any|Expired|Active)$/) { + $ENV{'form.Status'} = 'Active'; + } + my $status_select = &Apache::lonhtmlcommon::StatusOptions($ENV{'form.Status'}); +# Get current classlist + my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist(); + if (! defined($classlist)) { + $r->print(&mt('There are no students either currently or previously enrolled.'). + "\n"); + } else { + $r->print(&mt('Student Status: [_1]',$status_select)."\n"); + $r->print(''. + "\n

\n"); + + my $studentcount = &Apache::londropadd::show_class_list($r,'autoenroll','nothing',$ENV{'form.Status'},$classlist,$keylist); + $r->print(" +
 
+ +
+ + +
+ "); + } } } +sub print_accessdate_table { + my ($r,$enrollvar,$tasktitleref,$action) = @_; + my ($start_table,$end_table) = &date_setting_table($$enrollvar{'default_enrollment_start_date'},$$enrollvar{'default_enrollment_end_date'},$action); + my $oldstartshow = ''; + my $oldendshow = ''; + if ( defined($$enrollvar{'default_enrollment_start_date'}) ) { + $oldstartshow = &Apache::lonlocal::locallocaltime($$enrollvar{'default_enrollment_start_date'}); + } + if ( defined($$enrollvar{'default_enrollment_end_date'}) ) { + $oldendshow = &Apache::lonlocal::locallocaltime($$enrollvar{default_enrollment_end_date}); + if ($$enrollvar{'default_enrollment_end_date'} eq '0') { + $oldendshow = "No ending date"; + } + } + my %lt =&Apache::lonlocal::texthash( + 'cuno' => 'Currently NO default first access or last access dates are set.', + 'ifyo' => 'If you do not set a start date and an end date, then student roles for students added by the automated enrollment process will start immediately when the student is added and will never become inactive.', + 'ifyd' => 'If you do not set an access start date and an end date, then student roles for new students added when you click "Go" will become active immediately and will never become inactive.', + 'setf' => 'Set date of first access', + 'setl' => 'Set date of last access', + 'freg' => '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.' + ); + my $dateshow; + if ( ($oldendshow eq '') && ($oldstartshow eq '') ) { + $dateshow = "
".&mt('Warning').". ".$lt{'cuno'}." "; + if ($action eq 'setaccess') { + $dateshow .= $lt{'ifyo'}."\n"; + } elsif ($action eq 'updatenow') { + $dateshow .= $lt{'ifyd'}."\n"; + } + } else { + $dateshow = &mt('Currently: default first access').": $oldstartshow, ".&mt('default last access').": $oldendshow\n"; + } + if ($action eq 'setaccess') { + $r->print(<
+ + + + +
$$tasktitleref{$action} +

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

$dateshow\n"); + } + $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(< +
$start_table +
+ + + + + + + + + + +
+ENDTHREE + if ($action eq 'setaccess') { + $r->print("$lt{'setl'} $lt{'freg'}"); + } elsif ($action eq 'updatenow') { + $r->print("$lt{'setl'} $lt{'fnew'}"); + } + $r->print(< +
$end_table +
+ + +ENDFOUR + if ($action eq 'setaccess') { + $r->print(" + + $lt{'ifad'} + + + "); + } elsif ($action eq 'updatenow') { + $r->print(" + + + "); + } +} + ############################################################### sub print_doc_base { my $r = shift; @@ -874,9 +1097,31 @@ ENDBASE ################################################################### sub print_chgsettings_response { my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_; - my %settings = &Apache::lonnet::get('environment',['internal.autoadds','internal.autodrops'],$dom,$crs); - my $curradds = $settings{'internal.autoadds'}; - my $currdrops = $settings{'internal.autodrops'}; + 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 = ''; + if ( defined($settings{'internal.autoadds'}) ) { + $curradds = $settings{'internal.autoadds'}; + } + if ( defined($settings{'internal.autodrops'}) ) { + $currdrops = $settings{'internal.autodrops'}; + } + if ( defined($settings{'internal.autostart'}) ) { + $currstart = $settings{'internal.autostart'}; + } + if ( defined($settings{'internal.autoend'}) ) { + $currend = $settings{'internal.autoend'}; + } + if ( defined($settings{'internal.sectionnums'}) ) { + $currsecs = $settings{'internal.sectionnums'}; + } + if ( defined($settings{'internal.crosslistings'}) ) { + $currxlists = $settings{'internal.crosslistings'} + } my $autoadds = ''; my $autodrops = ''; @@ -888,6 +1133,10 @@ sub print_chgsettings_response { } 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); @@ -899,7 +1148,7 @@ sub print_chgsettings_response { $response = "Nightly additions based on classlist changes still enabled
"; } else { $response = "Nightly additions based on classlist changes now enabled
"; - } + } } else { if ($curradds) { $response = "Nightly additions based on classlist changes now disabled
"; @@ -920,6 +1169,25 @@ sub print_chgsettings_response { $response .= "Nightly removals based on classlist changes still disabled"; } } + if ($autoadds || $autodrops) { + $warning = &warning_message($dom,$crs,$action); + $warn_prefix = "
Warning. Although you indicated that nightly "; + $warn_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 = $warn_prefix.$warnfiller.$warn_suffix.$warning; + } } &print_reply($r,$response,$$tasktitleref{$action}); return; @@ -932,10 +1200,12 @@ sub print_setdates_response { my $currend = $settings{'internal.autoend'}; my $response = ''; my ($autostart,$autoend) = &get_dates_from_form(); - my $showstart = localtime($autostart); + my $showstart = &Apache::lonlocal::locallocaltime($autostart); my $showend = ''; + my $warning = ''; + my $warn_prefix = ''; if ($autoend) { - $showend = localtime($autoend); + $showend = &Apache::lonlocal::locallocaltime($autoend); } else { $showend = "'No end date'"; } @@ -954,10 +1224,10 @@ sub print_setdates_response { if ($currend == $autoend) { $response .= "The last date for automated enrollment has been left unchanged as $showend.
"; } else { - $response .= "The last date for enrollment has been left unchanged as $showend.
"; + $response .= "The last date for automated enrollment has been changed to $showend.
"; } -# Generate message in case where old first access date was later than today, but new first access date is now today or earlier. +# 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 = ""; @@ -972,7 +1242,7 @@ sub print_setdates_response { my $lastmidnt = timelocal(0,0,0,$date_list[3],$date_list[4],$date_list[5]); my $nextmidnt = 86400 + $lastmidnt; - my $todayupdate = timelocal(0,40,4,$date_list[3],$date_list[4],$date_list[5]); + my $todayupdate = timelocal(0,30,1,$date_list[3],$date_list[4],$date_list[5]); my $lastupdate = $todayupdate - 86400; if ($nowstamp < $todayupdate) { $nextupdate = "today"; @@ -989,8 +1259,106 @@ 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 4.40 am $nextupdate. If you wish to grant immediate course access for registered students included in the institutional classlist for this class, please visit the roster update page.
|; + $response .= qq|
Although you have now set the first enrollment date to $firstaccess, automatic enrollment will not occur until the next automatic enrollment update occurs for all LON-CAPA courses at 1.30 am $nextupdate. If you wish to immediately enroll registered students included in the institutional classlist for this class, please visit the roster update page.
|; + } + } + $warning = &warning_message($dom,$crs,$action); + $warn_prefix = "
Warning. Although you set a start and end date for auto-enrollment, additional action is required.
"; + unless ($warning eq '') { + $response .= $warn_prefix.$warning; + } + } + &print_reply($r,$response,$$tasktitleref{$action}); + return; +} + +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 $currstart = $settings{'default_enrollment_start_date'}; + my $currend = $settings{'default_enrollment_end_date'}; + my $autostart = $settings{'internal.autostart'}; + my $response = ''; + my ($startaccess,$endaccess) = &get_dates_from_form(); + my $showstart = &Apache::lonlocal::locallocaltime($startaccess); + my $showend = ''; + my $warning = ''; + my $warn_prefix = ''; + if ($endaccess) { + $showend = &Apache::lonlocal::locallocaltime($endaccess); + } else { + $showend = "'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.
"; + } else { + if ($currstart == $startaccess) { + $response = "The first access date for students added via automated enrollment has been left unchanged as $showstart.
"; + } else { + $response = "The first access date for students added via automated enrollment has been changed to +$showstart.
"; + } + if ($currend == $endaccess) { + $response .= "The last access date for students added via automated enrollment has been left unchanged as $showend.
"; + } else { + $response .= "The last access date for students automated enrollment has been changed to +$showend.
"; + } + +# 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 $nowstamp = time; + my @date_list=localtime(time); + my $cur_year = $date_list[5]; + my $curday = $date_list[3]; + my $curmonth = $date_list[4]; + my $lastmidnt = timelocal(0,0,0,$date_list[3],$date_list[4],$date_list[5]); + my $nextmidnt = 86400 + $lastmidnt; + + my $todayupdate = timelocal(0,30,1,$date_list[3],$date_list[4],$date_list[5]); + my $tomorrowupdate = $todayupdate + 86400; + my $lastupdate = $todayupdate - 86400; + + if ($autostart < $nextmidnt) { + if ($nowstamp < $todayupdate) { + $nextupdate = "at 1.30 am today"; + } else { + $nextupdate = "at 1.30 am tomorrow"; + } + } else { + my @enrollstart = &Apache::lonlocal::locallocaltime($autostart); + $nextupdate = timelocal(0,30,1,$enrollstart[3],$enrollstart[4],$enrollstart[5]); + unless (($enrollstart[2] < 1) || ($enrollstart[2] == 1 && $enrollstart[1] <=30)) { + $nextupdate += 86400; + } + $nextupdate = &Apache::lonlocal::locallocaltime($nextupdate); + } + if (($currstart < $lastupdate) && ($autostart < $lastupdate)) { + $accessgiven = 1; + } + if ($startaccess < $nextmidnt ) { + if ( $startaccess >= $lastmidnt) { + $firstaccess = "today"; + } else { + $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.
|; + } + } + $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; } } &print_reply($r,$response,$$tasktitleref{$action}); @@ -1007,11 +1375,14 @@ sub print_notify_response { my @currpeople = (); my $notify = 0; my @people = (); + my $peoplestr = ""; + my $response = ""; + my $noprocess = 0; if ($notifylist =~ m/,/) { @currpeople = split/,/,$notifylist; } else { - @currpeople = $notifylist; + $currpeople[0] = $notifylist; } my $currcount = 0; foreach (@currpeople) { @@ -1020,43 +1391,56 @@ sub print_notify_response { if ( exists($ENV{'form.notify'}) ) { $notify=$ENV{'form.notify'}; - } - if ( exists($ENV{'form.notifylist'}) ) { - if (ref($ENV{'form.notifylist'})) { - @people=@{ $ENV{'form.notifylist'} }; - } else { - $people[0]=$ENV{'form.notifylist'}; - } } - my $response = ""; - my $peoplestr = ""; - if ($notify) { $peoplestr = join(",",@people); } - 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 ( exists($ENV{'form.notifyshow'}) ) { + my $notifyshow = $ENV{'form.notifyshow'}; + for (my $i=0; $i<$notifyshow; $i++) { + if ( exists($ENV{"form.note_$i"}) ) { + if ( exists($ENV{"form.notifyname_$i"}) ) { + unless ( $ENV{"form.notifyname_$i"} eq '' ) { + push @people, $ENV{"form.notifyname_$i"}; + } + } + } + } + if ($notify) { $peoplestr = join(",",@people); } } else { if ($notify) { - if (@people) { - if ($currcount) { - $response = "Notification of enrollment changes still enabled
"; - } else { - $response = "Notification of enrollment changes now enabled
"; - } - $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"; - 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.
"; + 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.
."; + $peoplestr = $notifylist; + @people = @currpeople; + $noprocess = 1; } + } + } + 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.
"; } else { - if ($currcount) { - $response = "Notification of enrollment changes now disabled
"; + if ($notify) { + if (@people) { + if ($currcount) { + $response .= "Notification of enrollment changes still enabled
"; + } else { + $response .= "Notification of enrollment changes now enabled
"; + } + $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"; + 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.
"; + } } else { - $response = "Notification of enrollment changes still disabled
"; + if ($currcount) { + $response = "Notification of enrollment changes now disabled
"; + } else { + $response = "Notification of enrollment changes still disabled
"; + } } } } @@ -1086,8 +1470,8 @@ sub print_crosslistings_menu () { my $gp = "gp_".$i; if ( exists($ENV{"form.$xlist"}) ) { my $xlistentry = ''; - if ($currxlists[$i] =~ m/^(\w+:)/) { - $xlistentry = $1; + if ($currxlists[$i] =~ m/^([^:]+)/) { + $xlistentry = $1.':'; } if ( exists($ENV{"form.$gp"}) ) { $xlistentry .= $ENV{"form.$gp"}; @@ -1180,6 +1564,8 @@ sub print_crosslistings_response () { my $coursecode = $settings{'internal.coursecode'}; my $owner = $settings{'internal.courseowner'}; my $response = ''; + my $warning = ''; + my $warn_prefix = ''; if ($xliststr =~ m/,/) { @allxlists = split/,/,$xliststr; @@ -1196,14 +1582,16 @@ sub print_crosslistings_response () { my $xl = "newcross_".$i; my $gp = "newgroupid_".$i; if ( exists($ENV{"form.$xl"}) ) { - my $coursecheck = &localenroll::validate_courseID($ENV{"form.$xl"}); + my $coursecheck = ''; + $coursecheck = &Apache::lonnet::auto_validate_courseID($crs,$dom,$ENV{"form.$xl"}); if ($coursecheck eq 'ok') { - my $addcheck = &localenroll::new_course($ENV{"form.$xl"},$owner); + my $addcheck = ''; + $addcheck = &Apache::lonnet::auto_new_course($crs,$dom,$ENV{"form.$xl"},$owner); if ($addcheck eq 'ok') { push @xlists,$ENV{"form.$xl"}.":".$ENV{"form.$gp"}; } else { push @badowner,$ENV{"form.$xl"}.":".$ENV{"form.$gp"}; - } + } } else { push @badxlists, $ENV{"form.$xl"}.":".$ENV{"form.$gp"}.":".$coursecheck; } @@ -1265,21 +1653,34 @@ sub print_crosslistings_response () { $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; + } + } + &print_reply($r,$response,$$tasktitleref{$action}); return; } sub print_sections_menu () { my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_; - my %settings = &Apache::lonnet::get('environment',['internal.sectionnums','internal.coursecode'],$dom,$crs); + my %settings = &Apache::lonnet::get('environment',['internal.sectionnums','internal.coursecode','internal.courseowner'],$dom,$crs); my @currsections = (); my @sections = (); + my @badowner = (); + my @badsections = (); 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'}; if ($settings{'internal.sectionnums'} =~ m/,/) { @currsections = split/,/,$settings{'internal.sectionnums'}; } elsif ($settings{'internal.sectionnums'} ne '') { @@ -1287,35 +1688,49 @@ sub print_sections_menu () { } if ( exists($ENV{'form.secshow'}) ) { - for (my $i=0; $i<$ENV{'form.secshow'}; $i++) { - my $gp = "loncapasec_".$i; - my $secnum = "secnum_".$i; - my $sec = "sec_".$i; - if ( exists( $ENV{"form.$sec"} ) ) { - my $secentry; - if ( exists( $ENV{"form.$secnum"} ) ) { - $secentry = $ENV{"form.$secnum"}.':'; - } - if ( exists( $ENV{"form.$gp"} ) ) { - $secentry .= $ENV{"form.$gp"}; - } - push @sections, $secentry; - $seccount ++; - unless (grep/^$ENV{"form.$secnum"}:/,@currsections) { - $addcount ++; - } - } - } - if (@currsections > 0) { - for (my $i=0; $i<@currsections; $i++) { - if ($currsections[$i] =~ m/^(\w+:)/ ) { - my $oldsec = $1; - unless (grep/^$oldsec/,@sections) { - $removecount ++; - } - } - } - } + for (my $i=0; $i<$ENV{'form.secshow'}; $i++) { + my $gp = "loncapasec_".$i; + my $secnum = "secnum_".$i; + my $sec = "sec_".$i; + if ( exists( $ENV{"form.$sec"} ) ) { + my $secentry; + if ( exists( $ENV{"form.$secnum"} ) ) { + $secentry = $ENV{"form.$secnum"}.':'; + } + if ( exists( $ENV{"form.$gp"} ) ) { + $secentry .= $ENV{"form.$gp"}; + } + if ( grep/^$ENV{"form.$secnum"}:/,@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); + if ($addcheck eq 'ok') { + push @sections,$ENV{"form.$secnum"}.":".$ENV{"form.$gp"}; + $seccount ++; + $addcount ++; + } else { + push @badowner,$ENV{"form.$secnum"}.":".$ENV{"form.$gp"}; + } + } else { + push @badsections, $ENV{"form.$secnum"}.":".$ENV{"form.$gp"}.":".$coursecheck; + } + } + } + } + if (@currsections > 0) { + for (my $i=0; $i<@currsections; $i++) { + if ($currsections[$i] =~ m/^(\w+:)/ ) { + my $oldsec = $1; + unless (grep/^$oldsec/,@sections) { + $removecount ++; + } + } + } + } } elsif (@currsections > 0) { for (my $i=0; $i<@currsections; $i++) { my $sec = "sec_".$i; @@ -1363,6 +1778,32 @@ sections which contribute to enrollment } } + if (@badsections > 0) { + $response .= "The sections listed below could not be included in the sections for this LON-CAPA course, because they are not valid section numbers according to your institution's official schedule of classes and sections.
    \n"; + foreach (@badsections) { + my ($secnum,$gp,$prob) = split/:/,$_; + $response .= "
  • $secnum - ID: $gp - Error: $prob
    • \n"; + } + $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"; + } + + 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; + } + } + if ( exists($ENV{'form.numsec'}) ) { my $numsec = $ENV{'form.numsec'}; if ($numsec > 0) { @@ -1410,15 +1851,20 @@ sections which contribute to enrollment sub print_sections_response () { my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_; - my %settings = &Apache::lonnet::get('environment',['internal.sectionnums','internal.coursecode'],$dom,$crs); + 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 $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 = ''; if ($secstr =~ m/,/) { @allsections = split/,/,$secstr; } else { @@ -1428,18 +1874,31 @@ sub print_sections_response () { if ( exists($ENV{'form.numsec'}) ) { $numsec = $ENV{'form.numsec'}; } - + if ($numsec > 0) { for (my $i=0; $i<$numsec; $i++) { my $sec = "newsec_".$i; my $gp = "newsecgp_".$i; if ( exists($ENV{"form.$sec"}) ) { - push @sections,$ENV{"form.$sec"}.":".$ENV{"form.$gp"}; + unless ( (grep/^$ENV{"form.$sec"}:/,@allsections) || (grep/^$ENV{"form.$sec"}:/,@sections) ) { + my $newsec = $coursecode.$ENV{"form.$sec"}; + my $coursecheck = &Apache::lonnet::auto_validate_courseID($crs,$dom,$newsec); + if ($coursecheck eq 'ok') { + my $addcheck = &Apache::lonnet::auto_new_course($crs,$dom,$newsec,$owner); + if ($addcheck eq 'ok') { + push @sections,$ENV{"form.$sec"}.":".$ENV{"form.$gp"}; + } else { + push @badowner,$ENV{"form.$sec"}.":".$ENV{"form.$gp"}; + } + } else { + push @badsections, $ENV{"form.$sec"}.":".$ENV{"form.$gp"}.":".$coursecheck; + } + } } } push @allsections, @sections; } - + if (@sections > 0 ) { unless ($secstr eq '') { $secstr .= ","; } if (@sections > 1) { @@ -1448,20 +1907,47 @@ sub print_sections_response () { $secstr .= $sections[0]; } 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.
"; - } else { - $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"; + $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.

    "; } } - - foreach (@allsections) { - my ($sec,$gp) = split/:/,$_; - $response .= "
  • $sec - ID: $gp
    • \n"; + + 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"; + } + $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 .= "


\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"; + } + + 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; + } + } + &print_reply($r,$response,$$tasktitleref{$action}); return; } @@ -1474,7 +1960,7 @@ sub print_photos_response () { if ( exists($ENV{'form.showphotos'}) ) { $showphotos=$ENV{'form.showphotos'}; } - + my $response = ""; my %cenv = ('internal.showphotos' => $showphotos); my $reply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs); @@ -1512,13 +1998,12 @@ sub print_update_result () { my $logmsg = ''; my $newusermsg = ''; - my %settings = &Apache::lonnet::get('environment',['internal.coursecode','internal.sectionnums','internal.crosslistings','internal.authtype','internal.autharg','internal.autostart','internal.autoend'],$dom,$crs); + my %settings = &Apache::lonnet::get('environment',['internal.coursecode','internal.sectionnums','internal.crosslistings','internal.authtype','internal.autharg'],$dom,$crs); my $coursecode = $settings{'internal.coursecode'}; my $authtype = $settings{'internal.authtype'}; my $autharg = $settings{'internal.autharg'}; - my $autostart = $settings{'internal.autostart'}; - my $autoend = $settings{'internal.autoend'}; - + my ($startaccess,$endaccess) = &get_dates_from_form(); + if ( exists($ENV{'form.updateadds'}) ) { $updateadds = $ENV{'form.updateadds'}; } @@ -1572,9 +2057,9 @@ sub print_update_result () { if (@allcourses > 0) { @{$affiliates{$crs}} = @allcourses; - &localenroll::fetch_enrollment($dom,\%affiliates,\%reply); + my $outcome = &Apache::lonnet::fetch_enrollment_query('updatenow',\%affiliates,\%reply,$dom,$crs); if ($reply{$crs} > 0) { - ($changecount,$response) = &LONCAPA::Enrollment::update_LC($dom,$crs,$updateadds,$updatedrops,$autostart,$autoend,$authtype,$autharg,\@allcourses,\%LC_code,\$logmsg,\$newusermsg,"updatenow"); + ($changecount,$response) = &LONCAPA::Enrollment::update_LC($dom,$crs,$updateadds,$updatedrops,$startaccess,$endaccess,$authtype,$autharg,\@allcourses,\%LC_code,\$logmsg,\$newusermsg,"updatenow"); } else { $response = "There was a problem retrieving institutional class list data for the course sections and crosslisted courses which contribute enrollment to this course. No updates have been carried out, and the roster remains unchanged."; } @@ -1596,13 +2081,184 @@ sub print_update_result () { return; } +sub print_viewclass_response { + my ($r,$realm,$dom,$crs,$action,$tasktitleref) = @_; + my $response; + my $chgtotal = 0; + my $chgok = 0; + my $chgfail = 0; + my $othdom = 0; + my $cid = $dom."_".$crs; + my %chg = (); + my %nochg = (); + my %otherdom = (); + my $modreply = ''; + my $classlist = &Apache::loncoursedata::get_classlist($cid,$dom,$crs); + my $endidx = &Apache::loncoursedata::CL_END; + my $startidx = &Apache::loncoursedata::CL_START; + my $ididx=&Apache::loncoursedata::CL_ID; + my $secidx=&Apache::loncoursedata::CL_SECTION; + my $typeidx=&Apache::loncoursedata::CL_TYPE; + foreach (sort keys %ENV) { + if (/^form\.switch:(.+)$/) { + my $student = $1; + my ($uname,$udom) = split/:/,$student; + my $sdata = $classlist->{$student}; + my $section = $sdata->[$secidx]; + my $uid = $sdata->[$ididx]; + my $start = $sdata->[$startidx]; + my $end = $sdata->[$endidx]; + my $type = $sdata->[$typeidx]; + $chgtotal ++; + my $newtype = 'auto'; + my $change = 'auto'; + my $oldtype = 'manual'; + if ($type eq 'auto') { + $oldtype = 'auto'; + $newtype = ''; + $change = 'manual'; + } + if ($udom eq $dom) { + $modreply = &Apache::lonnet::modify_student_enrollment($udom,$uname,$uid,'','','','',$section,$end,$start,$newtype,$cid); + if ($modreply eq 'ok') { + $chgok ++; + $chg{$student} = "Changed to $change"; + } else { + $chgfail ++; + $nochg{$student} = "Still set to $oldtype"; + } + } else { + $othdom ++; + $otherdom{$student} = "Still set to $oldtype"; + } + } + } + if ($chgtotal > 0) { + $response = "You requested a change in enrollment type for $chgtotal students.

\n"; + $classlist = &Apache::loncoursedata::get_classlist($cid,$dom,$crs); + if ($chgok > 0) { + $response .= "The following $chgok changes were successful:
"; + $response .= &enrolltype_result(\%chg,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx); + } + if ($chgfail > 0) { + $response .= "The following $chgfail students were not modified successfully: 
"; + $response .= &enrolltype_result(\%nochg,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx); + } + if ($othdom > 0) { + $response .= "The following $othdom students were not modified because students must be in the same LON-CAPA domain as the course, in order to be set to an enrollment type of 'auto':
"; + $response .= &enrolltype_result(\%otherdom,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx); + } + } + &print_reply($r,$response,$$tasktitleref{$action}); + return; +} + +sub enrolltype_result { + my ($changes,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx) = @_; + my $reply = " + + + + + + + + + + + "; + foreach (sort keys %{$changes}) { + my $sdata = $classlist->{$_}; + my ($uname,$udom) = split/:/,$_; + my $section = $sdata->[$secidx]; + my $uid = $sdata->[$ididx]; + my $start = $sdata->[$startidx]; + my $end = $sdata->[$endidx]; + my $type = $sdata->[$typeidx]; + if (! defined($start) || $start == 0) { + $start = &mt('none'); + } else { + $start = &Apache::lonlocal::locallocaltime($start); + } + if (! defined($end) || $end == 0) { + $end = &mt('none'); + } else { + $end = &Apache::lonlocal::locallocaltime($end); + } + if (!defined($section) || ($section eq '')) { + $section eq ' '; + } + if (!defined($uid) || ($uid eq '')) { + $uid = ' '; + } + $reply .= " + + + + + + + + + + "; + } + $reply .= "
usernamedomainIDstudent namesectionstart dateend dateenrollment change
$uname$udom$uid".&Apache::loncommon::plainname($uname,$udom)."$section$start$end$$changes{$_}
"; + return $reply; +} + +sub warning_message { + my ($dom,$crs,$caller) = @_; + my %settings = &Apache::lonnet::get('environment',['internal.autoadds','internal.autodrops','internal.sectionnums','internal.crosslistings','internal.autostart','internal.autoend'],$dom,$crs); + my $currend = ''; + my $currstart = ''; + my $currsecs = ''; + my $currxlists = ''; + my $warning = ''; + my $curradds = ''; + my $currdrops = ''; + if ( defined($settings{'internal.autoadds'}) ) { + $curradds = $settings{'internal.autoadds'}; + } + if (defined($settings{'internal.autodrops'}) ) { + $currdrops = $settings{'internal.autodrops'}; + } + if ( defined($settings{'internal.autostart'}) ) { + $currstart = $settings{'internal.autostart'}; + } + if ( defined($settings{'internal.autoend'}) ) { + $currend = $settings{'internal.autoend'}; + } + if ( defined($settings{'internal.sectionnums'}) ) { + $currsecs = $settings{'internal.sectionnums'}; + } + if ( defined($settings{'internal.crosslistings'}) ) { + $currxlists = $settings{'internal.crosslistings'} + } + unless ($caller eq 'setdates') { + if ( ($currstart eq '') && ($currend eq '') ) { + $warning = "You must now use Change enrollment dates to set a start date and an end date for the enrollment (or check the 'No end date' checkbox) for the nightly adds process to actually occur.

"; + } + } + unless ( ($caller eq 'sections') || ($caller eq 'crosslist') ) { + if ( ($currsecs eq '') && ($currxlists eq '') ) { + $warning .= "You must now use Section settings and/or Change crosslistings to choose at least one section of the course, or at least one crosslisted course which will contribute enrollment to this LON-CAPA course. At present there are NO sections or crosslisted courses that are affiliated with this course that are set to contribute to the automated enrollment process.

"; + } + } + unless ( $caller eq 'chgsettings') { + if ( (!$curradds) && (!$currdrops) ) { + $warning .= "You must now use Automated adds/drops to enable automated adds and/or drops if you want automatic enrollment updates to occur in this course.

."; + } + } + return $warning; +} + sub print_reply () { my ($r,$response,$caller) = @_; $r->print("
- $caller - result

$response - +
$caller - result

$response
"); @@ -1610,24 +2266,25 @@ sub print_reply () { } sub setup_date_selectors { - my ($starttime,$endtime) = @_; - if ($endtime == 0) { - $endtime = 1999915200; - } + my ($starttime,$endtime,$action) = @_; if (! defined($starttime)) { $starttime = time; - if (exists($ENV{'course.'.$ENV{'request.course.id'}. + if ($action eq 'setdates') { + if (exists($ENV{'course.'.$ENV{'request.course.id'}. '.default_enrollment_start_date'})) { - $starttime = $ENV{'course.'.$ENV{'request.course.id'}. + $starttime = $ENV{'course.'.$ENV{'request.course.id'}. '.default_enrollment_start_date'}; + } } } if (! defined($endtime)) { $endtime = time+(6*30*24*60*60); # 6 months from now, approx - if (exists($ENV{'course.'.$ENV{'request.course.id'}. + if ($action eq 'setdates') { + if (exists($ENV{'course.'.$ENV{'request.course.id'}. '.default_enrollment_end_date'})) { - $endtime = $ENV{'course.'.$ENV{'request.course.id'}. + $endtime = $ENV{'course.'.$ENV{'request.course.id'}. '.default_enrollment_end_date'}; + } } } my $startdateform = &Apache::lonhtmlcommon::date_setter('enter', @@ -1640,8 +2297,10 @@ sub setup_date_selectors { } sub get_dates_from_form { - my $startdate = &Apache::lonhtmlcommon::get_date_from_form('startdate'); - my $enddate = &Apache::lonhtmlcommon::get_date_from_form('enddate'); + my $startdate; + my $enddate; + $startdate = &Apache::lonhtmlcommon::get_date_from_form('startdate'); + $enddate = &Apache::lonhtmlcommon::get_date_from_form('enddate'); if ( exists ($ENV{'form.no_end_date'}) ) { $enddate = 0; } @@ -1649,10 +2308,10 @@ sub get_dates_from_form { } sub date_setting_table { - my ($starttime,$endtime) = @_; - my ($startform,$endform) = &setup_date_selectors($starttime,$endtime); + my ($starttime,$endtime,$action) = @_; + my ($startform,$endform) = &setup_date_selectors($starttime,$endtime,$action); my $perpetual = ''; @@ -1690,31 +2349,35 @@ sub handler { $r->content_type('text/html'); $r->send_http_header; - my @tasks = ("information","chgsettings","setdates","notify","crosslist","sections","photos","updatenow"); + my @tasks = ("information","chgsettings","setdates","setaccess","notify","crosslist","sections","photos","updatenow","viewclass"); my %tasklong = ( information => "Task information", chgsettings => "Automated adds/drops", setdates => "Change enrollment dates", + setaccess => "Change access dates", notify => "Notification of changes", crosslist => "Change crosslistings", sections => "Section settings", photos => "Student photos", updatenow => "Update roster now", newcross => "Add crosslistings", - newsections => "Add sections" + newsections => "Add sections", + viewclass => "View students and type", ); my %tasktitle = ( chgsettings => "Changes to nightly automated enrollments", setdates => "Changes to first and/or last automated enrollment dates", + setaccess => "Changes to default start and/or end dates for student access", notify => "Notification of enrollment changes", crosslist => "Changes to crosslistings", sections => "Changes to section settings", photos => "Automatic import of student photos", updatenow => "Immediate course roster update", newcross => "Adding new crosslisted courses", - newsections => "Adding new course sections" + newsections => "Adding new course sections", + viewclass => "Viewing class roster and enrollment type" ); my $realm = ''; @@ -1770,7 +2433,7 @@ sub handler { } } } - + my $reply = 0; unless ($state eq "choose") { $reply = 1; } @@ -1783,6 +2446,8 @@ sub handler { &print_chgsettings_response($r,$realm,$dom,$crs,$action,\%tasktitle); } elsif ($action eq "setdates") { &print_setdates_response($r,$realm,$dom,$crs,$action,\%tasktitle); + } elsif ($action eq "setaccess") { + &print_setaccess_response($r,$realm,$dom,$crs,$action,\%tasktitle); } elsif ($action eq "notify") { &print_notify_response($r,$realm,$dom,$crs,$action,\%tasktitle); } elsif ($action eq "sections") { @@ -1797,6 +2462,8 @@ sub handler { &print_crosslistings_response($r,$realm,$dom,$crs,$action,\%tasktitle); } elsif ($action eq "newsections") { &print_sections_response($r,$realm,$dom,$crs,$action,\%tasktitle); + } elsif ($action eq "viewclass") { + &print_viewclass_response($r,$realm,$dom,$crs,$action,\%tasktitle); } &print_doc_base($r); return OK;