--- loncom/interface/lonmodifycourse.pm 2006/02/10 23:36:47 1.21
+++ loncom/interface/lonmodifycourse.pm 2009/07/31 03:01:31 1.46
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
-# automated enrollment course setup handler
+# handler for DC-only modifiable course settings
#
-# $Id: lonmodifycourse.pm,v 1.21 2006/02/10 23:36:47 albertel Exp $
+# $Id: lonmodifycourse.pm,v 1.46 2009/07/31 03:01:31 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -31,132 +31,373 @@ use strict;
use Apache::Constants qw(:common :http);
use Apache::lonnet;
use Apache::loncommon;
+use Apache::lonhtmlcommon;
use Apache::lonlocal;
-use Apache::londropadd;
+use Apache::lonuserutils;
+use Apache::lonpickcourse;
use LONCAPA::Enrollment;
use lib '/home/httpd/lib/perl';
+use LONCAPA;
-sub print_course_selection_page {
- my ($r,$tasklongref) = @_;
- my $dom = $env{'request.role.domain'};
+sub get_dc_settable {
+ return ('courseowner','coursecode','authtype','autharg');
+}
+
+sub catalog_settable {
+ my ($confhash) = @_;
+ my @settable;
+ if (ref($confhash) eq 'HASH') {
+ if ($confhash->{'togglecats'} ne 'crs') {
+ push(@settable,'togglecats');
+ }
+ if ($confhash->{'categorize'} ne 'crs') {
+ push(@settable,'categorize');
+ }
+ } else {
+ push(@settable,('togglecats','categorize'));
+ }
+ return @settable;
+}
+
+sub get_enrollment_settings {
+ my ($cdom,$cnum) = @_;
+ my %settings = &Apache::lonnet::dump('environment',$cdom,$cnum);
+ my %enrollvar;
+ $enrollvar{'autharg'} = '';
+ $enrollvar{'authtype'} = '';
my %lt=&Apache::lonlocal::texthash(
- 'csae' => "Course settings for automated enrollment",
- 'unst' => "Unlike standard LON-CAPA course parameters, such as course description, feedback addresses, and top level map, which are displayed and/or modified using the 'Course Environment Parameters' screen, settings that control automated enrollment based on classlist data available from your institution's student information system are handled differently. Automated enrollment settings fall into two groups: (a) settings that can be modified by a Course Coordinator using the Automated Enrollment Manager and (b) settings that may only be modified by a Domain Coordinator via the 'View/Modify Course settings' menu accessed from this page.",
- 'chcs' => "Choose the course for which you wish to view/modify automated enrollment settings from the select box below and click 'Go' to proceed.",
- 'eaen' => "Each entry in the select box contains: course code -- course title ------- course owner, and entries are ordered alphabetically by course code.",
- 'psac' => "Please select a course",
- 'ccrs' => "Choose a course",
- 'gobt' => "Go"
+ 'noen' => "No end date",
);
-
-# Determine the courses
- my %courseIDs = &Apache::lonnet::courseiddump($dom,'.',1,'.','.','.');
- &print_header($r,$tasklongref);
- $r->print(< $lt{'unst'}
- $lt{'chcs'}
-
-$lt{'ccrs'}:
-
-
-
-
- ';
+ $menu_html.='';
+ $menu_html.=
+ qq||;
+ $menu_html.= &mt($menu_item->{'text'}).'';
+ $menu_html.='$lt{'csae'}
-
$lt{'eaen'}
-'.&mt('Search for a course in the [_1] domain',$domdesc).'
'.
+ &mt('Actions available after searching for a course:').''.
+ '
');
+ } else {
+ $r->print(
+ ''.&mt('Search for a community in the [_1] domain',$domdesc).'
'.
+ &mt('Actions available after searching for a community:').''.
+ '
');
+ }
+ $r->print(&Apache::lonpickcourse::build_filters($filterlist,$type,
+ undef,undef,$filter,$action,\$numtitles,'modifycourse'));
+}
+
+sub print_course_selection_page {
+ my ($r,$dom,$domdesc) = @_;
+ &print_header($r);
+
+# Criteria for course search
+ my $filterlist = ['descriptfilter',
+ 'instcodefilter','ownerfilter',
+ 'ownerdomfilter','coursefilter'];
+ my %filter;
+ my $type = $env{'form.type'};
+ if (!defined($type)) {
+ $type = 'Course';
+ }
+ my $action = '/adm/modifycourse';
+ my $dctitle = &Apache::lonnet::plaintext('dc');
+ my $numtitles;
+ $r->print(&Apache::lonpickcourse::js_changer());
+ $r->print(&mt('Revise your search criteria for this domain').' ('.$domdesc.').
');
+ $r->print(&Apache::lonpickcourse::build_filters($filterlist,$type,
+ undef,undef,\%filter,$action,\$numtitles));
+ $filter{'domainfilter'} = $dom;
+ my %courses = &Apache::lonpickcourse::search_courses($r,$type,0,
+ \%filter,$numtitles);
+ &Apache::lonpickcourse::display_matched_courses($r,$type,0,$action,undef,undef,undef,
+ %courses);
return;
}
-sub print_course_modification_page {
- my ($r,$tasklongref,$typeref) = @_;
- my %enrollvar = ();
- my $javascript_validations;
- my $course = '';
- my $dom = $env{'request.role.domain'};
- if ( defined($env{'form.course'}) ) {
- $course = $env{'form.course'};
+sub print_modification_menu {
+ my ($r,$cdesc,$domdesc,$dom) = @_;
+ &print_header($r,$cdesc);
+ my $type = 'Course';
+ my $action = '/adm/modifycourse';
+ my $cctitle = &Apache::lonnet::plaintext('cc',$type);
+ my $dctitle = &Apache::lonnet::plaintext('dc');
+ my %lt=&Apache::lonlocal::texthash(
+ 'some' => "Certain settings which control auto-enrollment of students from your institution's student information system.",
+ 'crqo' => 'The total disk space allocated for storage of portfolio files in all groups in a course.',
+ );
+ my @menu =
+ (
+ { text => 'Modify quota for group portfolio',
+ phase => 'setquota',
+ },
+ { text => 'Display current settings for automated enrollment',
+ phase => 'viewparms',
+ },
+ { text => 'Modify institutional code, course owner and/or default authentication',
+ phase => 'setparms',
+ },
+ );
+ my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom);
+ my @additional_params = &catalog_settable($domconf{'coursecategories'});
+ if (@additional_params > 0) {
+ push (@menu, { text => 'Modify course catalog settings for course',
+ phase => 'catsettings',
+ });
+ }
+ my $menu_html = ''.&mt('View/Modify settings for: ').$cdesc.'
'."\n".
+ &mt('Although almost all course settings can be modified by a [_1], a number of settings exist which only a [_2] may change:',$cctitle,$dctitle).'
+
+
+'."\n".
+ &hidden_form_elements();
+
+ foreach my $menu_item (@menu) {
+ $menu_html.='
".&mt("The LON-CAPA course selected was not a valid course for this domain");
- $r->print($reply);
- &print_footer($r);
- return;
+sub print_ccrole_selected {
+ my ($r,$cdesc,$domdesc) = @_;
+ &print_header($r);
+ my ($cdom,$cnum) = split(/_/,$env{'form.pickedcourse'});
+ $r->print('');
+}
+
+sub print_settings_display {
+ my ($r,$cdom,$cnum,$cdesc,$type) = @_;
+ my %enrollvar = &get_enrollment_settings($cdom,$cnum);
+ my %longtype = &course_settings_descrip();
+ my %lt = &Apache::lonlocal::texthash(
+ 'cset' => "Course setting",
+ 'valu' => "Current value",
+ 'caes' => 'Current automated enrollment settings for ',
+ 'cour' => "Course settings that control automated enrollment in this LON-CAPA course are currently:",
+ 'cose' => "Course settings for LON-CAPA courses that control auto-enrollment based on classlist data available from your institution's student information system fall into two groups:",
+ 'dcon' => "Modifiable by DC only",
+ 'back' => "Back to options page",
+ );
+
+ my $cctitle = &Apache::lonnet::plaintext('cc',$type);
+ my $dctitle = &Apache::lonnet::plaintext('dc');
+ my @modifiable_params = &get_dc_settable();
+
+ my $disp_table = &Apache::loncommon::start_data_table()."\n".
+ &Apache::loncommon::start_data_table_header_row()."\n".
+ "$lt{'cset'} \n".
+ "$lt{'valu'} \n".
+ "$lt{'dcon'} \n".
+ &Apache::loncommon::end_data_table_header_row()."\n";
+ foreach my $key (sort(keys(%enrollvar))) {
+ $disp_table .= &Apache::loncommon::start_data_table_row()."\n".
+ "$longtype{$key} \n".
+ "$enrollvar{$key} \n";
+ if (grep(/^\Q$key\E$/,@modifiable_params)) {
+ $disp_table .= ''.&mt('Yes').' '."\n";
+ } else {
+ $disp_table .= ''.&mt('No').' '."\n";
+ }
+ $disp_table .= &Apache::loncommon::end_data_table_row()."\n";
+ }
+ $disp_table .= &Apache::loncommon::end_data_table()."\n";
+ &print_header($r,$cdesc);
+ $r->print('
+'.$lt{'caes'}.$cdesc.'
+
+'.$lt{'cour'}.' +
+'.$disp_table.' +
+'.$lt{'back'}.' +'.&mt('Modify [_1]-only settings',$dctitle).''."\n". +&hidden_form_elements(). +'
'); +} + +sub print_setquota { + my ($r,$cdom,$cnum,$cdesc,$type) = @_; + my $dctitle = &Apache::lonnet::plaintext('dc'); + my $cctitle = &Apache::lonnet::plaintext('cc',$type); + my $subdiv = &mt('Although a [_1] will assign the disk quota for each individual group, the size of the quota is constrained by the total disk space allocated by the [_2] for portfolio files in a course.',$cctitle,$dctitle); + my %lt = &Apache::lonlocal::texthash( + 'cquo' => 'Disk space for storage of group portfolio', + 'gpqu' => 'Course portfolio files disk space', + 'each' => 'Each course group can be assigned a quota for portfolio files uploaded to the group.', + 'modi' => 'Save', + 'back' => "Back to options page", + ); + my %settings = &Apache::lonnet::get('environment',['internal.coursequota'],$cdom,$cnum); + my $coursequota = $settings{'internal.coursequota'}; + if ($coursequota eq '') { + $coursequota = 20; } + &print_header($r,$cdesc); + my $hidden_elements = &hidden_form_elements(); + $r->print(<
+$lt{'each'}
+$subdiv
+
+$lt{'gpqu'}: Mb + +
+$hidden_elements +$lt{'back'} + +ENDDOCUMENT + return; +} - my @bgcolors=("#eeeeee","#cccccc"); +sub print_catsettings { + my ($r,$cdom,$cnum,$cdesc) = @_; + &print_header($r,$cdesc); + my %lt = &Apache::lonlocal::texthash( + 'back' => 'Back to options page', + ); + $r->print(''."\n"); + return; +} + +sub print_course_modification_page { + my ($r,$cdom,$cnum,$cdesc,$domdesc) = @_; + my %longtype = &course_settings_descrip(); + my %enrollvar = &get_enrollment_settings($cdom,$cnum); my $ownertable; my %lt=&Apache::lonlocal::texthash( 'actv' => "Active", @@ -165,21 +406,20 @@ sub print_course_modification_page { 'noen' => "No end date", 'ownr' => "Owner", 'name' => "Name", - 'unme' => "Username", + 'unme' => "Username:Domain", 'stus' => "Status", - 'aecs' => "Automated Enrollment Course Settings", + 'cquo' => "Disk space for storage of group portfolio", + 'gpqu' => "Course portfolio files disk space", + 'each' => "Each course group can be assigned a quota for portfolio files uploaded to the group.", 'cose' => "Course settings for LON-CAPA courses that control automated student enrollment based on classlist data available from your institution's student information system fall into two groups: (a) settings that can be modified by a Course Coordinator using the ", 'aenm' => "Automated Enrollment Manager", 'andb' => " and (b) settings that may only be modified by a Domain Coordinator via this page.", 'caes' => 'Current automated enrollment settings', 'cour' => "Course settings that control automated enrollment in this LON-CAPA course are currently:", - 'cset' => "Course setting", - 'valu' => "Current value", 'nocc' => "There is currently no course owner set for this course. In addition, no active course coordinators from this LON-CAPA domain were found, so you will not be able assign a course owner. If you wish to assign a course owner, it is recommended that you use the 'User Roles' screen to add a course coordinator with a LON-CAPA account in this domain to the course.", 'ccus' => "A course coordinator can use the 'Automated Enrollment Manager' to change all settings except course code, course owner, and default authentication method for students added to your course (who are also new to the LON-CAPA system at this domain).", - 'mkch' => "Make changes to course settings set by Domain Coordinator", 'ccod' => "Course Code", 'ccus' => "The course code is used during automated enrollment to map the internal LON-CAPA course ID for this course to the corresponding course section ID(s) used by the office responsible for providing official class lists for courses at your institution.", 'cown' => "Course Owner", @@ -188,67 +428,39 @@ all settings except course code, course 'usrd' => 'Use the radio buttons to select a different course owner.', 'deam' => "Default Authentication method", 'deus' => "The default authentication method, and default authentication parameter (domain, initial password or argument) are used when automatic enrollment of students in a course requires addition of new user accounts in your domain, and the class list file contains empty entries for the <authtype> and <autharg> properties for the new student. If you choose 'internally authenticated', and leave the initial password field empty, the automated enrollment process will create a randomized password for each new student account that it adds to your LON-CAPA domain.", - 'gobt' => "Modify settings", + 'gobt' => "Save", ); - my %settings = &Apache::lonnet::dump('environment',$dom,$course); - $enrollvar{'autharg'} = ''; - $enrollvar{'authtype'} = ''; - foreach my $item (keys %settings) { - if ($item =~ m/^internal\.(.+)$/) { - my $type = $1; - - if ( ($type eq "autoadds") || ($type eq "autodrops") ) { - if ($settings{$item} == 1) { - $enrollvar{$type} = "ON"; - } else { - $enrollvar{$type} = "OFF"; - } - } elsif ( ($type eq "autostart") || ($type eq "autoend") ) { - if ( ($type eq "autoend") && ($settings{$item} == 0) ) { - $enrollvar{$type} = $lt{'noen'}; - } else { - $enrollvar{$type} = localtime($settings{$item}); - } - } elsif ($type eq "courseowner" || $type eq "authtype" - || $type eq "autharg" || $type eq "sectionums" - || $type eq "coursecode" || $type eq "crosslistings") { - $enrollvar{$type} = $settings{$item}; - } - } elsif ($item =~ m/^default_enrollment_(start|end)_date$/) { - my $type = $1; - if ( ($type eq 'end') && ($settings{$item} == 0) ) { - $enrollvar{$item} = $lt{'noen'}; - } elsif ( ($type eq 'start') && ($settings{$item} eq '') ) { - $enrollvar{$item} = 'When enrolled'; - } else { - $enrollvar{$item} = localtime($settings{$item}); - } - } - } - - my @coursepersonnel = &Apache::lonnet::getkeys('nohist_userroles',$dom,$course); + my @coursepersonnel = &Apache::lonnet::getkeys('nohist_userroles',$cdom,$cnum); my @local_ccs = (); my %cc_status = (); my %pname = (); my $active_cc; - foreach (@coursepersonnel) { - my @roleinfo = split/:/,$_; - if ( ($roleinfo[0] eq 'cc') && ($roleinfo[2] eq $dom) ) { - unless (grep/^$roleinfo[1]$/,@local_ccs) { - $active_cc = &Apache::loncommon::check_user_status($roleinfo[2],$roleinfo[1],$dom,$course,'cc'); + foreach my $person (@coursepersonnel) { + my ($role,$user) = split(/:/,$person,2); + $user =~ s/:$//; + if (($role eq 'cc') && ($user ne '')) { + if (!grep(/^\Q$user\E$/,@local_ccs)) { + my ($ccname,$ccdom) = split(/:/,$user); + $active_cc = + &Apache::loncommon::check_user_status($ccdom,$ccname,$cdom, + $cnum,'cc'); if ($active_cc eq 'active') { - push @local_ccs, $roleinfo[1]; - $pname{$roleinfo[1]} = &Apache::loncommon::plainname($roleinfo[1],$roleinfo[2]); - $cc_status{$roleinfo[1]} = $lt{'actv'}; + push(@local_ccs,$user); + $pname{$user} = &Apache::loncommon::plainname($ccname,$ccdom); + $cc_status{$user} = $lt{'actv'}; } } } } - unless ( (grep/^$enrollvar{'courseowner'}$/,@local_ccs) || ($enrollvar{'courseowner'} eq '') ) { - push @local_ccs, $enrollvar{'courseowner'}; - $pname{$enrollvar{'courseowner'}} = &Apache::loncommon::plainname($enrollvar{'courseowner'},$dom); - $active_cc = &Apache::loncommon::check_user_status($dom,$enrollvar{'coursecode'},$dom,$course,'cc'); + if ( (!grep(/^$enrollvar{'courseowner'}$/,@local_ccs)) && + ($enrollvar{'courseowner'} ne '') ) { + my ($owneruname,$ownerdom) = split(/:/,$enrollvar{'courseowner'}); + push(@local_ccs,$enrollvar{'courseowner'}); + $pname{$enrollvar{'courseowner'}} = + &Apache::loncommon::plainname($owneruname,$ownerdom); + $active_cc = &Apache::loncommon::check_user_status($ownerdom,$owneruname, + $cdom,$cnum,'cc'); if ($active_cc eq 'active') { $cc_status{$enrollvar{'courseowner'}} = $lt{'actv'}; } else { @@ -256,9 +468,9 @@ all settings except course code, course } } my $numlocalcc = @local_ccs; - my $bodytag=&Apache::loncommon::bodytag(&mt("Modify Course Settings")); + my $helplink=&Apache::loncommon::help_open_topic('Modify_Course',&mt("Help on Modifying Courses")); - my ($krbdef,$krbdefdom)=&Apache::loncommon::get_kerberos_defaults($dom); + my ($krbdef,$krbdefdom)=&Apache::loncommon::get_kerberos_defaults($cdom); my $curr_authtype = ''; my $curr_authfield = ''; if ($enrollvar{'authtype'} =~ /^krb/) { @@ -270,48 +482,24 @@ all settings except course code, course } unless ($curr_authtype eq '') { $curr_authfield = $curr_authtype.'arg'; - } - $javascript_validations=&Apache::londropadd::javascript_validations('modifycourse',$krbdefdom,$curr_authtype,$curr_authfield); - my %param = ( formname => 'document.cmod', + } + my $javascript_validations=&Apache::lonuserutils::javascript_validations('modifycourse',$krbdefdom,$curr_authtype,$curr_authfield); + my %param = ( formname => 'document.'.$env{'form.phase'}, kerb_def_dom => $krbdefdom, kerb_def_auth => $krbdef, mode => 'modifycourse', curr_authtype => $curr_authtype, curr_autharg => $enrollvar{'autharg'} ); - my $krbform = &Apache::loncommon::authform_kerberos(%param); - my $intform = &Apache::loncommon::authform_internal(%param); - my $locform = &Apache::loncommon::authform_local(%param); - - my $disp_table = qq|
-
|
-
$lt{'tabl'} ($dom). $lt{'usrd'} + | $lt{'tabl'} - $cdom ($domdesc). $lt{'usrd'} | ||||||||||||||||||||
-
| ). + &Apache::loncommon::start_data_table()."\n". + &Apache::loncommon::start_data_table_header_row()."\n". + " | $lt{'ownr'} | \n". + "$lt{'name'} | \n". + "$lt{'unme'} | \n". + "$lt{'stus'} | \n". + &Apache::loncommon::end_data_table_header_row()."\n"; + foreach my $cc (@local_ccs) { + $ownertable .= &Apache::loncommon::start_data_table_row()."\n"; + if ($cc eq $enrollvar{'courseowner'}) { + $ownertable .= ''."\n"; + } else { + $ownertable .= ' | '."\n"; + } + $ownertable .= + ' | '.$pname{$cc}.' | '."\n". + ''.$cc.' | '."\n". + ''.$cc_status{$cc}.' '.$lt{'ccor'}.' | '."\n". + &Apache::loncommon::end_data_table_row()."\n"; + } + $ownertable .= &Apache::loncommon::end_data_table()."
---|
-
- | $lt{'caes'} |
-
-$lt{'cour'} -
-$disp_table
-
-
- -
- |
- $lt{'mkch'}- |
-