@@ -876,15 +876,15 @@ your changes.
Automatic import of student photos from institutional data repository:
");
- if ($enrollvar{showphotos}) {
+ if ($enrollvar{showphoto}) {
$r->print("
- Yes
- No
+
+
");
} else {
$r->print("
- Yes
- No
+
+
");
}
$r->print('
@@ -914,7 +914,7 @@ your changes.
$r->print('
'.
-&mt('There was a problem determining whether course owner permission is required in order for a course coordinator to have access to student photos in this domain.').' '.&mt('As a result you will not be able to configure access to student photos at this time').'
+&mt('There was a problem determining whether course owner permission is required in order for a course coordinator to have access to student photos in this domain.').' '.&mt('As a result you will not be able to configure access to student photos at this time').'
@@ -943,10 +943,14 @@ your changes.
} else {
my ($ownername,$owneremail) = &get_ownerinfo($dom,
$enrollvar{'courseowner'});
+ my $emailstr;
+ if ($owneremail) {
+ $emailstr = "(e-mail: $owneremail)";
+ }
$r->print('
'.
-&mt('The policies of your institution [_1] require that the course owner [_2] must indicate acceptance of the conditions of use of digital photos of registered students, before they may be made available for use in a course.',$institution,$ownername).'
'.&mt('Please direct the course owner (e-mail: [_1]) to visit the "Student photos" page in the Automated Enrollment Manager to indicate acceptance of these conditions of use',$owneremail).'
+&mt('The policies of your institution [_1] require that the course owner [_2] must indicate acceptance of the conditions of use of digital photos of registered students, before they may be made available for use in a course.',$institution,$ownername).'
'.&mt('Please direct the course owner [_1] to visit the "Student photos" page in the Automated Enrollment Manager to indicate acceptance of these conditions of use.',$emailstr).'
Add any students currently included in institutional classlist(s) but not enrolled in your LON-CAPA course.
- Yes No
+
+
Expire students previously added by nightly enrollment process, but no longer listed in institutional classlist(s).
- Yes
- No
+
+
@@ -1006,7 +1011,7 @@ Note: Any students previously added manu
-
+
@@ -1021,7 +1026,7 @@ Note: Any students previously added manu
$$tasktitleref{$action}
");
- if ($enrollvar{'showphotos'}) {
+ if ($enrollvar{'showphoto'}) {
my ($update,$commentary) = &Apache::lonnet::auto_photochoice($crs,
$dom);
$r->print(' '.$commentary.'
@@ -1122,7 +1127,7 @@ END
-
+
");
@@ -1333,13 +1338,13 @@ sub print_chgsettings_response {
}
if ($autodrops) {
if ($currdrops) {
- $response .= "Nightly removals based on classlist changes still enabled ";
+ $response .= "Nightly removals based on classlist changes still enabled ";
} else {
$response .= "Nightly removals based on classlist changes now enabled ";
}
} else {
if ($currdrops) {
- $response .= "Nightly removals based on classlist changes now disabled ";
+ $response .= "Nightly removals based on classlist changes now disabled ";
} else {
$response .= "Nightly removals based on classlist changes still disabled";
}
@@ -1440,7 +1445,7 @@ sub print_setdates_response {
$firstaccess = "a date prior to today";
}
if (($nowstamp >= $autostart) && ($rosterupdated == 0)) {
- $response .= qq| Although you have now set the first enrollment date to $firstaccess, automatic enrollment will not occur until the next automatic enrollment update occurs for all LON-CAPA courses at 1.30 am $nextupdate. If you wish to immediately enroll registered students included in the institutional classlist for this class, please visit the roster update page. |;
+ $response .= qq| Although you have now set the first enrollment date to $firstaccess, automatic enrollment will not occur until the next automatic enrollment update occurs for all LON-CAPA courses at 1.30 am $nextupdate. If you wish to immediately enroll registered students included in the institutional classlist for this class, please visit the roster update page. |;
}
}
$warning = &warning_message($dom,$crs,$action);
@@ -1540,7 +1545,7 @@ $showend. ";
$firstaccess = "a date prior to today";
}
if (($nowstamp >= $startaccess) && ($accessgiven == 0)) {
- $response .= qq| Although you have now set the first access date to $firstaccess, automatic enrollment will not occur until the next automatic enrollment update occurs for all LON-CAPA courses $nextupdate. If you wish to grant immediate course access for registered students included in the institutional classlist for this class, please visit the roster update page. |;
+ $response .= qq| Although you have now set the first access date to $firstaccess, automatic enrollment will not occur until the next automatic enrollment update occurs for all LON-CAPA courses $nextupdate. If you wish to grant immediate course access for registered students included in the institutional classlist for this class, please visit the roster update page. |;
}
}
$warning = &warning_message($dom,$crs,$action);
@@ -1714,13 +1719,13 @@ sub print_crosslistings_menu () {
-
+
-
-
-
+
+
+
);
}
@@ -1997,13 +2002,13 @@ sections which contribute to enrollment
-
+
-
-
-
+
+
+
);
}
@@ -2114,7 +2119,7 @@ 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'})) {
@@ -2248,9 +2253,9 @@ 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') {
@@ -2260,7 +2265,7 @@ sub print_photos_response {
$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. ";
@@ -2372,7 +2377,7 @@ sub get_ownerinfo {
my ($ownername,$owneremail);
if ($owner) {
$ownername=&Apache::loncommon::plainname($owner,$dom,'firstname');
- my %ownerinfo = &Apache::lonnet::get('environment','permanentemail',
+ my %ownerinfo = &Apache::lonnet::get('environment',['permanentemail'],
$dom,$owner);
$owneremail = $ownerinfo{'permanentemail'};
}
@@ -2392,11 +2397,11 @@ sub print_update_result () {
my $logmsg = '';
my $newusermsg = '';
my %phototypes = ();
- my %settings = &Apache::lonnet::get('environment',['internal.coursecode','internal.sectionnums','internal.crosslistings','internal.authtype','internal.autharg','internal.showphotos'],$dom,$crs);
+ my %settings = &Apache::lonnet::get('environment',['internal.coursecode','internal.sectionnums','internal.crosslistings','internal.authtype','internal.autharg','internal.showphoto'],$dom,$crs);
my $coursecode = $settings{'internal.coursecode'};
my $authtype = $settings{'internal.authtype'};
my $autharg = $settings{'internal.autharg'};
- my $showphotos = $settings{'internal.showphotos'};
+ my $showphotos = $settings{'internal.showphoto'};
my ($startaccess,$endaccess) = &get_dates_from_form();
if ( exists($env{'form.updateadds'}) ) {
$updateadds = $env{'form.updateadds'};
@@ -2453,15 +2458,15 @@ sub get_institutional_codes {
my @currsections = ();
my @currxlists = ();
my $coursecode = $$settings{'internal.coursecode'};
-
+
if ($$settings{'internal.sectionnums'} ne '') {
@currsections = split(/,/,$$settings{'internal.sectionnums'});
}
-
+
if ($$settings{'internal.crosslistings'} ne '') {
@currxlists = split(/,/,$$settings{'internal.crosslistings'});
}
-
+
if (@currxlists > 0) {
foreach (@currxlists) {
if (m/^([^:]+):(\w*)$/) {
@@ -2775,11 +2780,11 @@ sub get_dates_from_form {
sub date_setting_table {
my ($starttime,$endtime,$action) = @_;
my ($startform,$endform) = &setup_date_selectors($starttime,$endtime,$action);
- my $perpetual = '';
+ $perpetual.= ' />'.' no ending date';
my $start_table = '';
$start_table .= "