--- loncom/interface/coursecatalog.pm 2006/10/18 14:07:47 1.10
+++ loncom/interface/coursecatalog.pm 2017/08/08 15:32:30 1.94
@@ -1,3 +1,7 @@
+# The LearningOnline Network with CAPA
+# Handler for displaying the course catalog interface
+#
+# $Id: coursecatalog.pm,v 1.94 2017/08/08 15:32:30 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -34,6 +38,7 @@ use Apache::lonlocal;
use Apache::courseclassifier;
use Apache::lonacc;
use LONCAPA;
+use LONCAPA::lonauthcgi;
sub handler {
my ($r) = @_;
@@ -42,529 +47,1508 @@ sub handler {
if ($r->header_only) {
return OK;
}
- my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
- my $lonid=$cookies{'lonID'};
+ my $handle = &Apache::lonnet::check_for_valid_session($r);
my $lonidsdir=$r->dir_config('lonIDsDir');
- my $handle;
- if ($lonid) {
- $handle=$lonid->value;
- $handle=~s/\W//g;
- }
- if ((-e "$lonidsdir/$handle.id") && ($handle ne '')) {
+ if ($handle ne '') {
&Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
}
&Apache::lonacc::get_posted_cgi($r);
&Apache::lonlocal::get_language_handle($r);
- &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['sortby']);
- my $codedom = $Apache::lonnet::perlvar{'lonDefDomain'};
- my $formname = 'coursecatalog';
- my $domdesc = $Apache::lonnet::domaindescription{$codedom};
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['sortby','showdom']);
+ my $serverdefdom = &Apache::lonnet::default_login_domain();
+ my $codedom = $serverdefdom;
+
+ if (($env{'user.domain'} ne '') && ($env{'user.domain'} ne 'public')) {
+ $codedom = $env{'user.domain'};
+ if ($env{'request.role.domain'} ne '') {
+ $codedom = $env{'request.role.domain'};
+ }
+ }
+ my $formname = 'coursecatalog';
+ if ($env{'form.showdom'} ne '') {
+ $env{'form.showdom'} = &LONCAPA::clean_domain($env{'form.showdom'});
+ if (&Apache::lonnet::domain($env{'form.showdom'}) ne '') {
+ $codedom = $env{'form.showdom'};
+ } else {
+ $env{'form.showdom'} = '';
+ }
+ }
+ my $domdesc = &Apache::lonnet::domain($serverdefdom,'description');
&Apache::lonhtmlcommon::clear_breadcrumbs();
- if ($env{'form.coursenum'} ne '' && &user_is_known()) {
- &course_details($r,$codedom,$formname,$domdesc);
+
+ unless (($serverdefdom eq $codedom) ||
+ (&Apache::lonnet::will_trust('catalog',$serverdefdom,$codedom))) {
+ my $serverdomdesc = &Apache::lonnet::domain($serverdefdom,'description');
+ $r->print(&Apache::loncommon::start_page('Course/Community Catalog'));
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"/adm/coursecatalog",
+ text=>"Course/Community Catalog"});
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog'));
+ $r->print('
'.&mt('Access to catalog LON-CAPA courses/communities unavailable for: "[_1]" on servers run by: "[_2]".',
+ $domdesc,$serverdomdesc).'
');
+ $r->print(&Apache::loncommon::end_page());
+ return OK;
+ }
+ my %domconfig =
+ &Apache::lonnet::get_dom('configuration',['coursecategories'],$codedom);
+ my $knownuser = &user_is_known();
+ my $canviewall = &canview_all($knownuser,$codedom);
+
+ my ($cathash,$cattype);
+ if (ref($domconfig{'coursecategories'}) eq 'HASH') {
+ $cathash = $domconfig{'coursecategories'}{'cats'};
+ if ($knownuser || $canviewall) {
+ $cattype = $domconfig{'coursecategories'}{'auth'};
+ } else {
+ $cattype = $domconfig{'coursecategories'}{'unauth'};
+ }
+ if ($cattype eq '') {
+ $cattype = 'std';
+ }
} else {
- &course_selector($r,$codedom,$formname,$domdesc);
- if ($env{'form.state'} eq 'listing') {
- $r->print('
'.&print_course_listing($codedom).'
');
+ $cathash = {};
+ $cattype = 'std';
+ }
+ if ($cattype eq 'none') {
+ $r->print(&Apache::loncommon::start_page('Course/Community Catalog'));
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"/adm/coursecatalog",
+ text=>"Course/Community Catalog"});
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog'));
+ if ($knownuser || $canviewall) {
+ $r->print(''.&mt('No catalog of LON-CAPA courses/communities is provided for: [_1]',$domdesc).'
');
+ } else {
+ if ($domconfig{'coursecategories'}{'auth'} eq 'none') {
+ $r->print(''.&mt('No catalog of LON-CAPA courses/communities is provided for: [_1]',$domdesc).'
');
+ } else {
+ $r->print(''.&mt('The catalog of LON-CAPA courses/communities provided for: "[_1]" is only available to users who are logged in.',$domdesc).'
');
+ }
+ }
+ $r->print(&Apache::loncommon::end_page());
+ return OK;
+ }
+
+ my $cnum;
+ if ($cattype eq 'codesrch') {
+ my ($uniquecode,$codemsg,$brtext);
+ if ($env{'form.uniquecode'}) {
+ $uniquecode = $env{'form.uniquecode'};
+ $uniquecode =~ s/^\s+|\s+$//g;
+ }
+ my $js = ''."\n";
+ $r->print(&Apache::loncommon::start_page('Search for a Course/Community',$js));
+ if ($uniquecode =~ /^\w{6}$/) {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"/adm/coursecatalog",
+ text=>"Course/Community Catalog"});
+ $brtext = 'Search Result';
+ } else {
+ $brtext = 'Course/Community Catalog';
+ }
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"/adm/coursecatalog",
+ text=>"$brtext"});
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog'));
+ $r->print(&coursesearch($codedom,$domdesc,$uniquecode));
+ if ($uniquecode =~ /^\w{6}$/) {
+ $r->print('
');
+ my $confname = $codedom.'-domainconfig';
+ my %codes = &Apache::lonnet::get('uniquecodes',[$uniquecode],$codedom,$confname);
+ if ($codes{$uniquecode}) {
+ $cnum = $codes{$uniquecode};
+ my %courses = &Apache::lonnet::courseiddump($codedom,'.',1,'.','.',
+ $cnum,undef,undef,'.',1);
+ if (keys(%courses)) {
+ $env{'form.coursenum'} = $cnum;
+ my %courseinfo = &build_courseinfo_hash(\%courses,$knownuser,$codedom,$canviewall);
+ undef($env{'form.coursenum'});
+ if (ref($courseinfo{$codedom.'_'.$cnum}) eq 'HASH') {
+ $r->print(&Apache::lonhtmlcommon::start_pick_box());
+ my @cols = ('title','ownerlastnames','seclist','access');
+ my %lt = &Apache::lonlocal::texthash(
+ title => 'Title',
+ ownerlastnames => 'Owner & Co-owner(s)',
+ seclist => 'Sections',
+ access => 'Default Access Dates for Students',
+ );
+ my @shown;
+ foreach my $item (@cols) {
+ if ($courseinfo{$codedom.'_'.$cnum}{$item}) {
+ push(@shown,$item);
+ }
+ }
+ my $num = 0;
+ foreach my $item (@shown) {
+ $num ++;
+ $r->print(&Apache::lonhtmlcommon::row_title($lt{$item}).
+ $courseinfo{$codedom.'_'.$cnum}{$item});
+ if ($item eq 'title') {
+ if ($courseinfo{$codedom.'_'.$cnum}{'showsyllabus'}) {
+ my $usehttp = 0;
+ if (($ENV{'SERVER_PORT'} == 443) && ($courseinfo{$codedom.'_'.$cnum}{'extsyllplain'})) {
+ $usehttp = 1;
+ }
+ $r->print(' '.
+ ''.
+ &mt('Syllabus').'');
+ }
+ }
+ my $arg = ( $num == scalar(@shown) ? 1 : '' );
+ $r->print(&Apache::lonhtmlcommon::row_closure($arg));
+ }
+ $r->print(&Apache::lonhtmlcommon::end_pick_box());
+ my $selfenroll = &selfenroll_status($courseinfo{$codedom.'_'.$cnum},$codedom.'_'.$cnum);
+ if ($selfenroll) {
+ $r->print('
'.$selfenroll);
+ }
+ $r->print(''."\n");
+
+ } else {
+ $codemsg = &mt('Code matched, but course ID to which this mapped is invalid.');
+ }
+ } else {
+ $codemsg = &mt('Code matched, but course ID to which this mapped is invalid.');
+ }
+ } else {
+ $codemsg = &mt('No match');
+ }
}
+ $r->print('
'.&Apache::loncommon::end_page());
+ return OK;
+ } else {
+ if ($env{'form.coursenum'}) {
+ $cnum = $env{'form.coursenum'};
+ }
+ }
+
+ if ($env{'form.catalog_maxdepth'} ne '') {
+ $env{'form.catalog_maxdepth'} =~ s{\D}{}g;
+ }
+
+ my (@cats,@trails,%allitems,%idx,@jsarray,%subcathash,$subcats);
+ if ($env{'form.withsubcats'}) {
+ $subcats = \%subcathash;
}
- $r->print(&Apache::loncommon::end_page());
+ &Apache::loncommon::extract_categories($cathash,\@cats,\@trails,\%allitems,
+ \%idx,\@jsarray,$subcats);
+ my ($numtitles,@codetitles);
+ if (($env{'form.coursenum'} ne '') && ($knownuser)) {
+ &course_details($r,$codedom,$formname,$domdesc,\@trails,\%allitems,\@codetitles);
+ } else {
+ my ($catlinks,$has_subcats,$selitem) = &category_breadcrumbs($codedom,@cats);
+ my $wasacctext = &get_wasactive_text();
+ my $catjs = <<"ENDSCRIPT";
+
+function setCatDepth(depth) {
+ document.coursecats.catalog_maxdepth.value = depth;
+ if (depth == '') {
+ document.coursecats.currcat_0.value = '';
+ }
+ document.coursecats.submit();
+ return;
+}
+
+function changeSort(caller) {
+ document.$formname.sortby.value = caller;
+ document.$formname.submit();
+}
+
+function setCourseId(caller) {
+ document.$formname.coursenum.value = caller;
+ document.$formname.submit();
+}
+
+ENDSCRIPT
+ $catjs .= &courselink_javascript($r);
+ if (&user_is_dc($codedom) || $canviewall) {
+ $catjs .= <print(&print_course_listing($codedom,$numtitles,undef,undef,undef,
+ \@codetitles,$canviewall));
+ }
+ } else {
+ my (%add_entries);
+ my ($currdepth,$deeper) = &get_depth_values();
+ if ($selitem) {
+ my $alert = &mt('Choose a subcategory to display');
+ if (!$deeper) {
+ $alert = &mt('Choose a category to display');
+ }
+ &js_escape(\$alert);
+ $catjs .= <'."\n".$catjs."\n".'';
+ &cat_header($r,$codedom,$catjs,\%add_entries,$catlinks,undef,$cattype);
+ if ($env{'form.currcat_0'} ne '') {
+ $r->print('
');
+ }
+ if ($env{'form.state'} eq 'listing') {
+ $r->print(&print_course_listing($codedom,undef,\@trails,\%allitems,$subcats,\@codetitles,
+ $canviewall));
+ }
+ }
+ }
+ $r->print('
'.&Apache::loncommon::end_page());
return OK;
}
sub course_details {
- my ($r,$codedom,$formname,$domdesc) = @_;
+ my ($r,$codedom,$formname,$domdesc,$trails,$allitems,$codetitles) = @_;
my $output;
my %add_entries = (topmargin => "0",
marginheight => "0",);
+ my $js = ''."\n";
my $start_page =
- &Apache::loncommon::start_page('Course Catalog','',
- {
- 'add_entries' => \%add_entries,
- 'no_inline_link' => 1,});
+ &Apache::loncommon::start_page('Course/Community Catalog',$js,
+ {'add_entries' => \%add_entries, });
$r->print($start_page);
+ if ($env{'form.numtitles'} > 0) {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"/adm/coursecatalog",
+ text=>"Course/Community Catalog"});
+ }
+ my $brtextone = 'Course listing';
+ my $brtexttwo = 'Course details';
+ my $textthree = &mt('Detailed course information:');
+ my $textfour = &mt('Back to course listing');
+ if ($env{'form.currcat_0'} eq 'communities::0') {
+ $brtextone = 'Community listing';
+ $brtexttwo = 'Community details';
+ $textthree = &mt('Detailed community information:');
+ $textfour = &mt('Back to community listing');
+ } elsif ($env{'form.currcat_0'} eq 'placement::0') {
+ $brtextone = 'Placement test listing';
+ $brtexttwo = 'Placement test details';
+ $textthree = &mt('Detailed placement test information:');
+ $textfour = &mt('Back to placement test listing');
+ }
&Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"/adm/coursecatalog",
- text=>"Select courses"},
- {href=>"javascript:document.$formname.submit()",
- text=>"Course listing"},
- {text=>"Course details"});
- $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Details'));
- $r->print('
'.&mt('Detailed course information:').'
'.
- '');
+ ({href=>"javascript:document.$formname.submit()",
+ text=>$brtextone},
+ {text=>$brtexttwo});
+ $r->print(
+ &Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog').
+ ''.$textthree.'
'.
+ &print_course_listing($codedom,undef,$trails,$allitems,undef,$codetitles).
+ '
'.
+ '');
+ return;
}
-sub course_selector {
- my ($r,$codedom,$formname,$domdesc) = @_;
+sub coursesearch {
+ my ($codedom,$domdesc,$uniquecode) = @_;
+ my %lt = &Apache::lonlocal::texthash (
+ crlk => 'Course look-up',
+ code => 'Code',
+ ifyo => 'Enter the course code (six letters and numbers)',
+ srch => 'Find course',
+ );
+ return <<"END";
+$lt{'crlk'} ($domdesc)
+$lt{'ifyo'}
+
+END
+}
+
+sub courselink_javascript {
+ my ($r) = @_;
+ my $hostname = $r->hostname();
+ return <<"END";
+
+function ToSyllabus(cdom,cnum,usehttp) {
+ if (cdom == '' || cdom == null) {
+ return;
+ }
+ if (cnum == '' || cnum == null) {
+ return;
+ }
+ document.linklaunch.action = "/public/"+cdom+"/"+cnum+"/syllabus";
+ if (usehttp == 1) {
+ var hostname = '$hostname';
+ if (hostname != '') {
+ document.linklaunch.action = 'http://'+hostname+document.linklaunch.action;
+ }
+ document.linklaunch.action += '?usehttp=1';
+ }
+ document.linklaunch.submit();
+}
+
+function ToSelfenroll(courseid) {
+ if (courseid == '') {
+ return;
+ }
+ document.linklaunch.action = "/adm/selfenroll";
+ document.linklaunch.courseid.value = courseid;
+ document.linklaunch.submit();
+}
+
+END
+}
+
+sub instcode_course_selector {
+ my ($r,$codedom,$formname,$domdesc,$catlinks,$catjs,$codetitles,$cattype,$canviewall) = @_;
my %coursecodes = ();
my %codes = ();
- my @codetitles = ();
my %cat_titles = ();
my %cat_order = ();
- my %idlist = ();
- my %idnums = ();
- my %idlist_titles = ();
- my %by_year;
- my %by_sem;
- my %by_dept;
my %cat_items;
my $caller = 'global';
my $format_reply;
- my $totcodes = 0;
- my $jscript = '';
- my ($numtitles,$lasttitle);
- $totcodes = &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,$codedom,$totcodes);
- if ($totcodes > 0) {
- $format_reply = &Apache::lonnet::auto_instcode_format($caller,$codedom,\%coursecodes,\%codes,\@codetitles,\%cat_titles,\%cat_order);
- if ($format_reply eq 'ok') {
- my $numtypes = @codetitles;
- &Apache::courseclassifier::build_code_selections(\%codes,\@codetitles,\%cat_titles,\%cat_order,\%idlist,\%idnums,\%idlist_titles);
- my ($scripttext,$longtitles) = &Apache::courseclassifier::javascript_definitions(\@codetitles,\%idlist,\%idlist_titles,\%idnums,\%cat_titles);
- my $longtitles_str = join('","',@{$longtitles});
- my $allidlist = $idlist{$codetitles[0]};
- $numtitles = @codetitles;
- $lasttitle = $numtitles;
- if ($numtitles > 4) {
- $lasttitle = 4;
- }
- my @data = ('top');
- for (my $k=0; $k<$lasttitle; $k++) {
- my $cat = $codetitles[$k];
- my $level = 1;
- $level = &recurse_options($codetitles[$k],$idlist{$codetitles[$k]},$level,$cat,\%cat_items,\@data,\%by_year,\%by_sem,\%by_dept); }
- $scripttext .= &build_javascript(\%by_year,\%by_sem,\%by_dept,\%cat_order,\@codetitles);
- $jscript .= &javascript_select_filler($formname,$scripttext,\@codetitles,$longtitles_str,$allidlist);
- }
- if ($env{'form.state'} eq 'listing') {
- $jscript .= '
-function setElements() {
-';
- for (my $i=0; $i<@codetitles-1; $i++) {
- if ($env{'form.'.$codetitles[$i]} != -1) {
- $jscript .= '
- for (var j=0; j "0",
+ marginheight => "0",);
+ my ($jscript,$totcodes,$numtitles,$lasttitle) =
+ &Apache::courseclassifier::instcode_selectors_data($codedom,$formname,
+ \%cat_items,$codetitles,\%cat_titles,\%cat_order);
+ my $js = '';
+ if ($totcodes) {
+ if (($env{'form.state'} eq 'listing') && ($numtitles > 0)) {
+ $add_entries{'onload'} = 'setElements();';
+ }
+ if (&user_is_dc($codedom) || $canviewall) {
+ $add_entries{'onload'} .= ' toggleStatuses();toggleWasActive();'
+ }
+ &cat_header($r,$codedom,$js,\%add_entries,$catlinks,$numtitles,$cattype);
+ my $cat_maxdepth = $env{'form.catalog_maxdepth'};
+ $r->print('
');
+ } else {
+ $js = '';
+ &cat_header($r,$codedom,$js,\%add_entries,$catlinks,$numtitles,$cattype);
+ my $cat_maxdepth = $env{'form.catalog_maxdepth'};
+ $r->print('');
}
-';
- }
- $jscript .= '}';
- $jscript .= qq|
-function changeSort(caller) {
- document.$formname.sortby.value = caller;
- document.$formname.submit();
+ return $numtitles;
}
-function setCourseId(caller) {
- document.$formname.coursenum.value = caller;
- document.$formname.submit();
-}\n|;
- }
- my $js = '';
- my %add_entries = (topmargin => "0",
- marginheight => "0",);
- if ($env{'form.state'} eq 'listing') {
- $add_entries{'onLoad'} = 'setElements()';
- }
- my $start_page =
- &Apache::loncommon::start_page('Course Catalog',$js,
- {
- 'add_entries' => \%add_entries,
- 'no_inline_link' => 1,});
- $r->print($start_page);
- if ($env{'form.state'} eq 'listing') {
+
+sub cat_header {
+ my ($r,$codedom,$js,$add_entries,$catlinks,$numtitles,$cattype) = @_;
+ my $start_page =
+ &Apache::loncommon::start_page('Course/Community Catalog',$js,
+ { 'add_entries' => $add_entries, });
+ $r->print($start_page);
+ my $brtext = 'Course listing';
+ if ($env{'form.currcat_0'} eq 'communities::0') {
+ $brtext = 'Community listing';
+ } elsif ($env{'form.currcat_0'} eq 'placement::0') {
+ $brtext = 'Placement test listing';
+ }
+ if ($env{'form.state'} eq 'listing') {
+ if ($numtitles > 0) {
&Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"/adm/coursecatalog",
- text=>"Select courses"},
- {text=>"Course listing"});
- $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Listing'));
+ ({href=>"/adm/coursecatalog",
+ text=>"Course/Community Catalog"},
+ {text=>$brtext});
} else {
&Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"/adm/coursecatalog",
- text=>"Select courses"});
- $r->print(&Apache::lonhtmlcommon::breadcrumbs('Select courses'));
+ ({text=>$brtext});
}
- $r->print(''.&mt('Display information about official [_1] classes for which LON-CAPA courses have been created:',$domdesc).'
');
- $r->print(&mt('Choose which course(s) to list.
'));
- $r->print('';
+ return $output;
+}
+
+sub construct_data_table {
+ my ($knownuser,$domain,$courses,$details,$usersections,$now,$trails,$allitems,$canviewall) = @_;
my %sortname;
- if ($env{'form.coursenum'} eq '') {
+ if (($details eq '') || ($env{'form.showdetails'})) {
$sortname{'Code'} = 'code';
+ $sortname{'Categories'} = 'cats';
$sortname{'Title'} = 'title';
- $sortname{'Owner'} = 'owner';
+ $sortname{'Owner & Co-owner(s)'} = 'owner';
+ }
+ my $output = &Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row();
+ my @coltitles = ('Count');
+ if ($env{'form.currcat_0'} eq 'instcode::0') {
+ push(@coltitles,'Code');
+ } else {
+ push(@coltitles,'Categories');
+ }
+ push(@coltitles,('Sections','Crosslisted','Title','Owner & Co-owner(s)'));
+ if (ref($usersections) eq 'HASH') {
+ $coltitles[1] = 'Your Section';
}
foreach my $item (@coltitles) {
$output .= '';
if (defined($sortname{$item})) {
$output .= ''.&mt($item).'';
+ } elsif ($item eq 'Count') {
+ $output .= ' ';
} else {
$output .= &mt($item);
}
$output .= ' | ';
}
- if (&user_is_known()) {
- if ($env{'form.coursenum'} eq '') {
- $output .= ' | ';
+ my (@fields,%fieldtitles,$wasactiveon);
+ if ($knownuser || ($canviewall && $details)) {
+ if ($details) {
+ if ($env{'form.currcat_0'} eq 'communities::0') {
+ $output .= ''.&mt('Default Access Dates for Members').' | '.
+ ''.&mt('Member Counts').' | ';
+ } elsif ($env{'form.currcat_0'} eq 'placement::0') {
+ $output .=
+ ''.&mt('Default Access Dates for Students').' | '.
+ ''.&mt('Student Counts').' | ';
+ } else {
+ $output .=
+ ''.&mt('Default Access Dates for Students').' | '.
+ ''.&mt('Student Counts').' | '.
+ ''.&mt('Auto-enrollment of[_1]registered students',' ').' | ';
+ }
+ my ($titlesref,$orderref) = &get_statustitles();
+ my @statuses;
+ if (&user_is_dc($domain) || $canviewall) {
+ @statuses = &Apache::loncommon::get_env_multiple('form.showcounts');
+ if (grep(/^Previous$/,@statuses)) {
+ if ($env{'form.wasactive'} eq 'date') {
+ $wasactiveon =
+ &Apache::lonhtmlcommon::get_date_from_form('wasactiveon');
+ } else {
+ $wasactiveon = $env{'form.wasactive'};
+ }
+ }
+ if (ref($orderref) eq 'ARRAY') {
+ foreach my $status (@{$orderref}) {
+ if (grep(/^\Q$status\E$/,@statuses)) {
+ push(@fields,$status);
+ }
+ }
+ }
+ } else {
+ @fields = ('Active','Future');
+ }
+ foreach my $status (@fields) {
+ my $title;
+ if (ref($titlesref) eq 'HASH') {
+ $title = $titlesref->{$status};
+ }
+ unless ($title) {
+ $title = &mt($status);
+ }
+ $fieldtitles{$status} = $title;
+ }
} else {
- $output .=
- ''.&mt('Default Access Dates for Students').' | '.
- ''.&mt('Student Counts').' | '.
- ''.&mt('Auto-enrollment of registered students').' | ';
+ $output .= ''.&mt('Details').' | ';
}
}
+ $output .= ''.&mt('Self-enroll (if permitted)').' | ';
&Apache::loncommon::end_data_table_header_row();
- my %courseinfo = &build_courseinfo_hash(%courses);
+ my (%numbers,%creditsum);
+ my ($showcredits,$defofficial,$defunofficial,$deftextbook);
+ my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);
+ unless (($env{'form.currcat_0'} eq 'communities::0') || ($env{'form.currcat_0'} eq 'placement::0')) {
+ if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'} || $domdefaults{'textbookcredits'}) {
+ $showcredits = 1;
+ $defofficial = $domdefaults{'officialcredits'};
+ $defunofficial = $domdefaults{'unofficialcredits'};
+ $deftextbook = $domdefaults{'textbookcredits'};
+ }
+ }
+ my %courseinfo = &build_courseinfo_hash($courses,$knownuser,$domain,$canviewall,$details,
+ $usersections,\@fields,\%fieldtitles,
+ $wasactiveon,\%numbers,\%creditsum,
+ $showcredits,$defofficial,$defunofficial,$deftextbook);
my %Sortby;
- foreach my $course (sort(keys(%courses))) {
+ foreach my $course (sort(keys(%{$courses}))) {
if ($env{'form.sortby'} eq 'code') {
push(@{$Sortby{$courseinfo{$course}{'code'}}},$course);
+ } elsif ($env{'form.sortby'} eq 'cats') {
+ push(@{$Sortby{$courseinfo{$course}{'categories'}}},$course);
} elsif ($env{'form.sortby'} eq 'owner') {
- push(@{$Sortby{$courseinfo{$course}{'ownerlastname'}}},$course);
+ push(@{$Sortby{$courseinfo{$course}{'ownerlastnames'}}},$course);
} else {
- push(@{$Sortby{$courseinfo{$course}{'title'}}},$course);
+ my $clean_title = $courseinfo{$course}{'title'};
+ $clean_title =~ s/\W+//g;
+ if ($clean_title eq '') {
+ $clean_title = $courseinfo{$course}{'title'};
+ }
+ push(@{$Sortby{$clean_title}},$course);
}
}
my @sorted_courses;
- if (($env{'form.sortby'} eq 'code') || ($env{'form.sortby'} eq 'owner')) {
+ if (($env{'form.sortby'} eq 'code') || ($env{'form.sortby'} eq 'owner') ||
+ ($env{'form.sortby'} eq 'cats')) {
@sorted_courses = sort(keys(%Sortby));
} else {
@sorted_courses = sort { lc($a) cmp lc($b) } (keys(%Sortby));
}
+ my $count = 1;
+ my $totalsec = 0;
foreach my $item (@sorted_courses) {
foreach my $course (@{$Sortby{$item}}) {
$output.=&Apache::loncommon::start_data_table_row();
- $output.=&courseinfo_row($courseinfo{$course});
+ $output.=&courseinfo_row($courseinfo{$course},$knownuser,$details,
+ \$count,$now,$course,$trails,$allitems,\%numbers,$canviewall);
$output.=&Apache::loncommon::end_data_table_row();
}
}
+ if (($knownuser || $canviewall) && ($count > 1) && $env{'form.showdetails'}) {
+ if (&user_is_dc($domain) || $canviewall) {
+ my %lt = &Apache::lonlocal::texthash (
+ 'Active' => 'Total current students',
+ 'Future' => 'Total future students',
+ 'Previous' => 'Total previous students',
+ 'courses' => 'Total unique codes and courses without codes',
+ 'sections' => 'Total sections',
+ 'xlists' => 'Total cross-listings',
+ );
+ if ($showcredits) {
+ $lt{'cr_Active'} = &mt('Total current student credit hours');
+ $lt{'cr_Future'} = &mt('Total future student credit hours');
+ $lt{'cr_Previous'} = &mt('Total previous student credit hours');
+ }
+ if ($env{'form.currcat_0'} eq 'communities::0') {
+ $lt{'courses'} = &mt('Total communities');
+ $lt{'Active'} = &mt('Total current members');
+ $lt{'Future'} = &mt('Total future members');
+ $lt{'Previous'} = &mt('Total previous members');
+ } elsif ($env{'form.currcat_0'} eq 'placement::0') {
+ $lt{'courses'} = &mt('Total placement tests');
+ }
+ my $colspan = 8;
+ if ($showcredits) {
+ $colspan = 4;
+ }
+ $output .= '';
+ }
+ }
+ }
$output .= &Apache::loncommon::end_data_table();
- my $echo = &Apache::lonhtmlcommon::echo_form_input(['coursenum','state','catalogfilter','sortby']);
- $output .= $echo;
return $output;
}
sub build_courseinfo_hash {
- my (%courses) = @_;
+ my ($courses,$knownuser,$domain,$canviewall,$details,$usersections,$fields,$fieldtitles,
+ $wasactiveon,$numbers,$creditsum,$showcredits,$defofficial,$defunofficial) = @_;
my %courseinfo;
my $now = time;
- foreach my $course (keys(%courses)) {
+ my $gettotals;
+ if ((keys(%{$courses}) > 0) && (&user_is_dc($domain) || $canviewall) && ($details)) {
+ $gettotals = 1;
+ }
+ my (%uniquecodes,$nocodes,$defcreds);
+ foreach my $course (keys(%{$courses})) {
my $descr;
- if ($courses{$course} =~ m/^([^:]*):/i) {
- $descr = &unescape($1);
- } else {
- $descr = &unescape($courses{$course});
+ if (ref($courses->{$course}) eq 'HASH') {
+ $descr = $courses->{$course}{'description'};
}
my $cleandesc=&HTML::Entities::encode($descr,'<>&"');
$cleandesc=~s/'/\\'/g;
$cleandesc =~ s/^\s+//;
my ($cdom,$cnum)=split(/\_/,$course);
-
- my ($desc,$instcode,$owner,$ttype) = split(/:/,$courses{$course});
- $owner = &unescape($owner);
- my ($ownername,$ownerdom);
- if ($owner =~ /:/) {
- ($ownername,$ownerdom) = split(/:/,$owner);
- } else {
- $ownername = $owner;
- if ($owner ne '') {
- $ownerdom = $cdom;
+ my ($instcode,$singleowner,$ttype,$selfenroll_types,$extsyllplain,
+ $selfenroll_start,$selfenroll_end,@owners,%ownernames,$categories);
+ if (ref($courses->{$course}) eq 'HASH') {
+ $descr = $courses->{$course}{'description'};
+ $instcode = $courses->{$course}{'inst_code'};
+ $singleowner = $courses->{$course}{'owner'};
+ $ttype = $courses->{$course}{'type'};
+ $selfenroll_types = $courses->{$course}{'selfenroll_types'};
+ $selfenroll_start = $courses->{$course}{'selfenroll_start_date'};
+ $selfenroll_end = $courses->{$course}{'selfenroll_end_date'};
+ $categories = $courses->{$course}{'categories'};
+ $extsyllplain = $courses->{$course}{'extsyllplain'};
+ push(@owners,$singleowner);
+ if ($courses->{$course}{'co-owners'} ne '') {
+ foreach my $item (split(/,/,$courses->{$course}{'co-owners'})) {
+ push(@owners,$item);
+ }
}
}
- my %ownernames;
- if ($ownername ne '' && $ownerdom ne '') {
- %ownernames = &Apache::loncommon::getnames($ownername,$ownerdom);
+ if ($instcode ne '') {
+ $uniquecodes{$instcode} = 1;
+ } else {
+ $nocodes ++;
+ }
+ foreach my $owner (@owners) {
+ my ($ownername,$ownerdom);
+ if ($owner =~ /:/) {
+ ($ownername,$ownerdom) = split(/:/,$owner);
+ } else {
+ $ownername = $owner;
+ if ($owner ne '') {
+ $ownerdom = $cdom;
+ }
+ }
+ if ($ownername ne '' && $ownerdom ne '') {
+ my %namehash=&Apache::loncommon::getnames($ownername,$ownerdom);
+ $ownernames{$ownername.':'.$ownerdom} = \%namehash;
+ }
}
$courseinfo{$course}{'cdom'} = $cdom;
$courseinfo{$course}{'cnum'} = $cnum;
$courseinfo{$course}{'code'} = $instcode;
- $courseinfo{$course}{'ownerlastname'} = $ownernames{'lastname'};
+ my @lastnames;
+ foreach my $owner (keys(%ownernames)) {
+ if (ref($ownernames{$owner}) eq 'HASH') {
+ push(@lastnames,$ownernames{$owner}{'lastname'});
+ }
+ }
+ $courseinfo{$course}{'ownerlastnames'} = join(', ',sort(@lastnames));
$courseinfo{$course}{'title'} = $cleandesc;
- $courseinfo{$course}{'owner'} = $owner;
+ $courseinfo{$course}{'owner'} = $singleowner;
+ $courseinfo{$course}{'selfenroll_types'} = $selfenroll_types;
+ $courseinfo{$course}{'selfenroll_start'} = $selfenroll_start;
+ $courseinfo{$course}{'selfenroll_end'} = $selfenroll_end;
+ $courseinfo{$course}{'categories'} = $categories;
+ $courseinfo{$course}{'extsyllplain'} = $extsyllplain;
my %coursehash = &Apache::lonnet::dump('environment',$cdom,$cnum);
my @classids;
my @crosslistings;
- my $seclist = &identify_sections($coursehash{'internal.sectionnums'});
+ my ($seclist,$numsec) =
+ &identify_sections($coursehash{'internal.sectionnums'});
$courseinfo{$course}{'seclist'} = $seclist;
- my $xlist_items = &identify_sections($coursehash{'internal.crosslistings'});
+ my ($xlist_items,$numxlist) =
+ &identify_sections($coursehash{'internal.crosslistings'});
+ if (ref($numbers) eq 'HASH') {
+ $numbers->{'sections'} += $numsec;
+ $numbers->{'xlists'} += $numxlist;
+ }
my $showsyllabus = 1; # default is to include a syllabus link
if (defined($coursehash{'showsyllabus'})) {
$showsyllabus = $coursehash{'showsyllabus'};
}
$courseinfo{$course}{'showsyllabus'} = $showsyllabus;
- if (defined($env{'form.coursenum'})) {
- if ($cnum eq $env{'form.coursenum'}) {
- $courseinfo{$course}{'counts'} = &count_students($cdom,$cnum);
+ if ($showcredits) {
+ if ($coursehash{'internal.defaultcredits'}) {
+ $courseinfo{$course}{'defaultcredits'} = $coursehash{'internal.defaultcredits'};
+ } elsif ($instcode ne '') {
+ $courseinfo{$course}{'defaultcredits'} = $defofficial;
+ } else {
+ $courseinfo{$course}{'defaultcredits'} = $defunofficial;
+ }
+ $defcreds = $courseinfo{$course}{'defaultcredits'};
+ }
+ if (((defined($env{'form.coursenum'}) && ($cnum eq $env{'form.coursenum'}))) ||
+ (($knownuser || $canviewall) && ($details == 1))) {
+ my $milestone;
+ if ($wasactiveon eq 'accessend') {
+ if ($coursehash{'default_enrollment_end_date'}) {
+ $milestone = $coursehash{'default_enrollment_end_date'};
+ } else {
+ $milestone = time;
+ }
+ } elsif ($wasactiveon eq 'enrollend') {
+ if ($coursehash{'internal.autoend'}) {
+ $milestone = $coursehash{'internal.autoend'};
+ } else {
+ $milestone = time;
+ }
+ } else {
+ $milestone = $wasactiveon;
+ }
+ $courseinfo{$course}{'counts'} =
+ &count_students($cdom,$cnum,$numsec,$fields,$fieldtitles,$gettotals,
+ $numbers,$creditsum,$showcredits,$defcreds,$milestone);
+ if ($instcode ne '') {
$courseinfo{$course}{'autoenrollment'} =
- &autoenroll_info(\%coursehash,$now,$seclist,$xlist_items,
- $instcode,$owner,$cdom,$cnum);
-
- my $startaccess = '';
- my $endaccess = '';
- my $accessdates;
- if ( defined($coursehash{'default_enrollment_start_date'}) ) {
- $startaccess = &Apache::lonlocal::locallocaltime($coursehash{'default_enrollment_start_date'});
- }
- if ( defined($coursehash{'default_enrollment_end_date'}) ) {
- $endaccess = &Apache::lonlocal::locallocaltime($coursehash{'default_enrollment_end_date'});
- if ($coursehash{'default_enrollment_end_date'} == 0) {
- $endaccess = "No ending date";
- }
- }
- if ($startaccess) {
- $accessdates .= &mt('From: ').$startaccess.'
';
- }
- if ($endaccess) {
- $accessdates .= &mt('To: ').$endaccess.'
';
- }
- $courseinfo{$course}{'access'} = $accessdates;
+ &autoenroll_info(\%coursehash,$now,$seclist,$xlist_items,
+ $instcode,\@owners,$cdom,$cnum);
}
+ my $startaccess = '';
+ my $endaccess = '';
+ my $accessdates;
+ if ( defined($coursehash{'default_enrollment_start_date'}) ) {
+ $startaccess = &Apache::lonlocal::locallocaltime($coursehash{'default_enrollment_start_date'});
+ }
+ if ( defined($coursehash{'default_enrollment_end_date'}) ) {
+ $endaccess = &Apache::lonlocal::locallocaltime($coursehash{'default_enrollment_end_date'});
+ if ($coursehash{'default_enrollment_end_date'} == 0) {
+ $endaccess = &mt('No ending date');
+ }
+ }
+ if ($startaccess) {
+ $accessdates .= ''.&mt('From:[_1]',' '.$startaccess).'
';
+ }
+ if ($endaccess) {
+ $accessdates .= ''.&mt('To:[_1]',' '.$endaccess).'
';
+ }
+ if (($selfenroll_types ne '') &&
+ ($selfenroll_end > 0 && $selfenroll_end > $now)) {
+ my ($selfenroll_start_access,$selfenroll_end_access);
+ if (($coursehash{'default_enrollment_start_date'} ne
+ $coursehash{'internal.selfenroll_start_access'}) ||
+ ($coursehash{'default_enrollment_end_date'} ne
+ $coursehash{'internal.selfenroll_end_access'})) {
+ if ( defined($coursehash{'internal.selfenroll_start_access'}) ) {
+ $selfenroll_start_access = &Apache::lonlocal::locallocaltime($coursehash{'internal.selfenroll_start_access'});
+ }
+ if ( defined($coursehash{'default_enrollment_end_date'}) ) {
+ $selfenroll_end_access = &Apache::lonlocal::locallocaltime($coursehash{'internal.selfenroll_end_access'});
+ if ($coursehash{'internal.selfenroll_end_access'} == 0) {
+ $selfenroll_end_access = &mt('No ending date');
+ }
+ }
+ if ($selfenroll_start_access || $selfenroll_end_access) {
+ $accessdates .= '
'.&mt('Self-enrollers:').'
';
+ if ($selfenroll_start_access) {
+ $accessdates .= ''.&mt('From:[_1]',' '.$selfenroll_start_access).'
';
+ }
+ if ($selfenroll_end_access) {
+ $accessdates .= ''.&mt('To:[_1]',' '.$selfenroll_end_access).'
';
+ }
+ }
+ }
+ }
+ $courseinfo{$course}{'access'} = $accessdates;
}
if ($xlist_items eq '') {
$xlist_items = &mt('No');
}
$courseinfo{$course}{'xlist'} = $xlist_items;
}
+ if (ref($numbers) eq 'HASH') {
+ $numbers->{'courses'} = $nocodes + scalar(keys(%uniquecodes));
+ }
return %courseinfo;
}
sub count_students {
- my ($cdom,$cnum) = @_;
+ my ($cdom,$cnum,$numsec,$fieldsref,$titlesref,$getcounts,$numbers,$creditsum,
+ $showcredits,$defcreds,$wasactiveon) = @_;
+ my $countslist = ''.
+ &mt('[quant,_1,section,sections,No sections]',$numsec).'';
+ my (@fields,%titles,$showexpired);
+ if ((ref($fieldsref) eq 'ARRAY') && (ref($titlesref) eq 'HASH') &&
+ (ref($numbers) eq 'HASH')) {
+ @fields = @{$fieldsref};
+ %titles = %{$titlesref};
+ if (grep(/^Previous$/,@fields)) {
+ $showexpired = 1;
+ }
+ } else {
+ return;
+ }
my $classlist = &Apache::loncoursedata::get_classlist($cdom,$cnum);
- my %student_count = (
- Active => 0,
- Future => 0,
- Expired => 0,
- );
+ my (%student_count,%credit_count);
+ %student_count = (
+ Active => 0,
+ Future => 0,
+ Previous => 0,
+ );
+ if ($showcredits) {
+ %credit_count = (
+ Active => 0,
+ Future => 0,
+ Previous => 0,
+ );
+ }
my %idx;
$idx{'status'} = &Apache::loncoursedata::CL_STATUS();
- my %status_title = &Apache::lonlocal::texthash(
- Expired => 'Previous access',
- Active => 'Current access',
- Future => 'Future access',
- );
-
+ $idx{'end'} = &Apache::loncoursedata::CL_END();
+ $idx{'credits'} = &Apache::loncoursedata::CL_CREDITS();
while (my ($student,$data) = each(%$classlist)) {
- $student_count{$data->[$idx{'status'}]} ++;
+ my $status = $data->[$idx{'status'}];
+ my $credits = $data->[$idx{'credits'}];
+ if ($credits eq '') {
+ $credits = $defcreds;
+ }
+ if ($status eq 'Expired') {
+ if (($showexpired) &&
+ ($data->[$idx{'end'}] >= $wasactiveon)) {
+ $student_count{'Previous'} ++;
+ if ($showcredits) {
+ $credit_count{'Previous'} += $credits;
+ }
+ }
+ } else {
+ $student_count{$status} ++;
+ if ($showcredits) {
+ $credit_count{$status} += $credits;
+ }
+ }
}
-
- my $countslist;
- foreach my $status ('Active','Future') {
- $countslist .= ''.$status_title{$status}.': '.
- $student_count{$status}.'
';
+ if (@fields) {
+ $countslist .= ':
';
+ foreach my $status (@fields) {
+ $countslist .= ''.$titles{$status}.': '.
+ $student_count{$status}.'
';
+ $numbers->{$status} += $student_count{$status};
+ if ($showcredits) {
+ $creditsum->{$status} += $credit_count{$status};
+ }
+ }
}
return $countslist;
}
sub courseinfo_row {
- my ($info) = @_;
+ my ($info,$knownuser,$details,$countref,$now,$course,$trails,$allitems,$numbers,$canviewall) = @_;
my ($cdom,$cnum,$title,$ownerlast,$code,$owner,$seclist,$xlist_items,
- $accessdates,$showsyllabus,$counts,$autoenrollment,$output);
+ $accessdates,$showsyllabus,$counts,$autoenrollment,$output,$categories,
+ $extsyllplain);
if (ref($info) eq 'HASH') {
$cdom = $info->{'cdom'};
$cnum = $info->{'cnum'};
$title = $info->{'title'};
- $ownerlast = $info->{'ownerlastname'};
+ $ownerlast = $info->{'ownerlastnames'};
$code = $info->{'code'};
$owner = $info->{'owner'};
$seclist = $info->{'seclist'};
@@ -573,30 +1557,87 @@ sub courseinfo_row {
$counts = $info->{'counts'};
$autoenrollment = $info->{'autoenrollment'};
$showsyllabus = $info->{'showsyllabus'};
+ $extsyllplain = $info->{'extsyllplain'};
+ $categories = $info->{'categories'};
} else {
$output = ''.&mt('No information available for [_1].',
$code).' | ';
return $output;
}
- $output .= ''.$code.' | '.
- ''.$seclist.' | '.
+ $output .= ''.$$countref.' | ';
+ if ($env{'form.currcat_0'} eq 'instcode::0') {
+ $output .= ''.$code.' | ';
+ } else {
+ my ($categorylist,@cats);
+ if ($categories ne '') {
+ @cats = split('&',$categories);
+ }
+ if ((ref($trails) eq 'ARRAY') && (ref($allitems) eq 'HASH')) {
+ my @categories = map { $trails->[$allitems->{$_}]; } @cats;
+ $categorylist = join('
',@categories);
+ }
+ if ($categorylist eq '') {
+ $categorylist = ' ';
+ }
+ $output .= ''.$categorylist.' | ';
+ }
+ $output .= ''.$seclist.' | '.
''.$xlist_items.' | '.
''.$title.' ';
if ($showsyllabus) {
- $output .= &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$cnum,$cdom);
+ my $usehttp = 0;
+ if (($ENV{'SERVER_PORT'} == 443) && ($extsyllplain)) {
+ $usehttp = 1;
+ }
+ $output .= ''.&mt('Syllabus').'';
} else {
$output .= ' ';
}
$output .= ' | '.
''.$ownerlast.' | ';
- if (&user_is_known()) {
- if ($env{'form.coursenum'} eq '') {
- $output .= "".&mt('Show more details').' | ';
- } else {
+ if (($knownuser) || ($canviewall && $details)) {
+ if ($details) {
$output .=
- ''.$accessdates.' | '.
- ''.$counts.' | '.
- ''.$autoenrollment.' | ';
+ ''.$accessdates.' | '.
+ ''.$counts.' | ';
+ unless (($env{'form.currcat_0'} eq 'communities::0') || ($env{'form.currcat_0'} eq 'placement::0')) {
+ $output .= ''.$autoenrollment.' | ';
+ }
+ } else {
+ $output .= "".&mt('Show more details').' | ';
+ }
+ }
+ my $selfenroll = &selfenroll_status($info,$course);
+ if ($selfenroll) {
+ $output .= ''.$selfenroll.' | ';
+ } else {
+ $output .= ' | ';
+ }
+ $$countref ++;
+ return $output;
+}
+
+sub selfenroll_status {
+ my ($info,$course) = @_;
+ my $now = time;
+ my $output;
+ if (ref($info) eq 'HASH') {
+ if ($info->{'selfenroll_types'}) {
+ my $showstart = &Apache::lonlocal::locallocaltime($info->{'selfenroll_start'});
+ my $showend = &Apache::lonlocal::locallocaltime($info->{'selfenroll_end'});
+ if (($info->{'selfenroll_end'} > 0) && ($info->{'selfenroll_end'} > $now)) {
+ if (($info->{'selfenroll_start'} > 0) && ($info->{'selfenroll_start'} > $now)) {
+ $output = &mt('Starts: [_1]',''.$showstart.'').'
'.&mt('Ends: [_1]',''.$showend.'');
+ } else {
+ $output = ''.
+ &mt('Enroll in course').'
';
+ if ($info->{'selfenroll_end'} == 0) {
+ $output .= &mt('Available permanently');
+ } elsif ($info->{'selfenroll_end'} > $now) {
+ $output .= &mt('Self-enrollment ends: [_1]',''.$showend.'');
+ }
+ }
+ }
}
}
return $output;
@@ -620,21 +1661,22 @@ sub identify_sections {
}
}
@secnums = sort {$a <=> $b} @secnums;
- my $seclist = join(', ',@secnums);
- return $seclist;
+ $seclist = join(', ',@secnums);
+ my $numsec = @secnums;
+ return ($seclist,$numsec);
}
sub get_valid_classes {
- my ($seclist,$xlist_items,$crscode,$owner,$cdom,$cnum) = @_;
+ my ($seclist,$xlist_items,$crscode,$owners,$cdom,$cnum) = @_;
my $response;
my %validations;
@{$validations{'sections'}} = ();
@{$validations{'xlists'}} = ();
my $totalitems = 0;
if ($seclist) {
- foreach my $sec (split(',',$seclist)) {
+ foreach my $sec (split(/, /,$seclist)) {
my $class = $crscode.$sec;
- if (&Apache::lonnet::auto_validate_class_sec($cdom,$cnum,$owner,
+ if (&Apache::lonnet::auto_validate_class_sec($cdom,$cnum,$owners,
$class) eq 'ok') {
if (!grep(/^\Q$sec$\E/,@{$validations{'sections'}})) {
push(@{$validations{'sections'}},$sec);
@@ -644,8 +1686,8 @@ sub get_valid_classes {
}
}
if ($xlist_items) {
- foreach my $item (split(',',$xlist_items)) {
- if (&Apache::lonnet::auto_validate_class_sec($cdom,$cnum,$owner,
+ foreach my $item (split(/, /,$xlist_items)) {
+ if (&Apache::lonnet::auto_validate_class_sec($cdom,$cnum,$owners,
$item) eq 'ok') {
if (!grep(/^\Q$item$\E/,@{$validations{'xlists'}})) {
push(@{$validations{'xlists'}},$item);
@@ -656,158 +1698,19 @@ sub get_valid_classes {
}
if ($totalitems > 0) {
if (@{$validations{'sections'}}) {
- $response = &mt('Sections: ').
- join(',',@{$validations{'sections'}}).'
';
+ $response = &mt('Sections:').' '.
+ join(', ',@{$validations{'sections'}}).'
';
}
if (@{$validations{'xlists'}}) {
- $response .= &mt('Courses: ').
- join(',',@{$validations{'xlists'}});
+ $response .= &mt('Courses:').' '.
+ join(', ',@{$validations{'xlists'}});
}
}
return $response;
}
-sub javascript_select_filler {
- my ($formname,$scripttext,$codetitles,$longtitles_str,$allidlist) = @_;
- my $output = < -1) {
- document.$formname.Number.options[0] = new Option('All','0',false,false);
- for (var k=0; k -1) {
- for (var i=0; i -1) {
- for (var i=0; i -1) {
- for (var k=0; k{'internal.autoadds'}) && $coursehash->{'internal.autoadds'} == 1) {
my ($autostart,$autoend);
@@ -823,19 +1726,22 @@ sub autoenroll_info {
} else {
my $valid_classes =
&get_valid_classes($seclist,$xlist_items,$code,
- $owner,$cdom,$cnum);
+ $owners,$cdom,$cnum);
if ($valid_classes ne '') {
- $autoenrolldates = &mt('Not enabled
Starts: ').
- $autostart.'
'.$valid_classes; }
+ $autoenrolldates = &mt('Not enabled').'
'
+ .&mt('Starts: [_1]',$autostart)
+ .'
'.$valid_classes;
+ }
}
} else {
if ($coursehash->{'internal.autoend'} && $coursehash->{'internal.autoend'} < $now) {
- $autoenrolldates = &mt('Not enabled
Ended: ').$autoend;
+ $autoenrolldates = &mt('Not enabled').'
'
+ .&mt('Ended: [_1]',$autoend);
} else {
my $valid_classes = &get_valid_classes($seclist,$xlist_items,
- $code,$owner,$cdom,$cnum);
+ $code,$owners,$cdom,$cnum);
if ($valid_classes ne '') {
- $autoenrolldates = &mt('Currently enabled
').
+ $autoenrolldates = &mt('Currently enabled').'
'.
$valid_classes;
}
}