');
} else {
&cat_header($r,$codedom,$js,\%add_entries,$catlinks,$numtitles);
my $cat_maxdepth = $env{'form.catalog_maxdepth'};
@@ -351,20 +365,11 @@ sub cat_header {
}
sub category_breadcrumbs {
- my ($dom) = @_;
- my %domconfig =
- &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom);
- my (@cats,@trails,%allitems,%idx,@jsarray,$cathash);
- if (ref($domconfig{'coursecategories'}) eq 'HASH') {
- $cathash = $domconfig{'coursecategories'}{'cats'};
- } else {
- $cathash = {};
- }
- &Apache::loncommon::extract_categories($cathash,\@cats,\@trails,\%allitems,\%idx,
- \@jsarray);
+ my ($dom,@cats) = @_;
my ($currdepth,$deeper) = &get_depth_values();
my $currcat_str = '';
my $catlinks = '
'.&mt('Catalog:').'
';
+ my $has_subcats;
for (my $i=0; $i<$deeper; $i++) {
$currcat_str .= '';
my ($cattitle,$shallower);
@@ -385,22 +390,19 @@ sub category_breadcrumbs {
'';
$env{'form.currcat_0'} = 'instcode::0';
} else {
+ $has_subcats = 1;
$catlinks .= '
';
- return $catlinks;
+ return ($catlinks,$has_subcats);
}
sub get_depth_values {
@@ -461,12 +466,40 @@ sub get_depth_values {
}
sub additional_filters {
- my ($codedom) = @_;
+ my ($codedom,$has_subcats) = @_;
my $output = '
';
+ if (($env{'form.currcat_0'} ne 'instcode::0') &&
+ ($env{'form.currcat_0'} ne '') && ($has_subcats)) {
+ my $include_subcat_status;
+ if ($env{'form.withsubcats'}) {
+ $include_subcat_status = 'checked="checked" ';
+ }
+ my $counter = $env{'form.catalog_maxdepth'};
+ if ($counter > 0) {
+ if ($env{'form.state'} eq 'listing') {
+ $counter --;
+ } elsif ($env{'form.currcat_'.$counter} eq '') {
+ $counter --;
+ }
+ }
+ my ($catname) = split(/:/,$env{'form.currcat_'.$counter});
+ if ($catname ne '') {
+ $output .= '
';
+ }
+ }
my $show_selfenroll_status;
if ($env{'form.showselfenroll'}) {
$show_selfenroll_status = 'checked="checked" ';
}
+ $output .= '
'.
+ '
';
if (&user_is_dc($codedom)) {
my $showdetails_status;
if ($env{'form.showdetails'}) {
@@ -479,7 +512,7 @@ sub additional_filters {
my $dc_title = &Apache::lonnet::plaintext('dc');
$output .= '
'."\n".
''."\n".'
'.
'
';
}
- $output .= '
'.
- '
';
+ $output .= ' ';
return $output;
}
@@ -627,7 +656,7 @@ sub search_official_courselist {
}
sub search_courselist {
- my ($domain) = @_;
+ my ($domain,$subcats) = @_;
my $cat_maxdepth = $env{'form.catalog_maxdepth'};
my $filter = $env{'form.currcat_'.$cat_maxdepth};
if (($filter eq '') && ($cat_maxdepth > 0)) {
@@ -635,7 +664,24 @@ sub search_courselist {
$filter = $env{'form.currcat_'.$shallower};
}
my %courses;
+ my $filterstr;
if ($filter ne '') {
+ if ($env{'form.withsubcats'}) {
+ if (ref($subcats) eq 'HASH') {
+ if (ref($subcats->{$filter}) eq 'ARRAY') {
+ $filterstr = join('&',@{$subcats->{$filter}});
+ if ($filterstr ne '') {
+ $filterstr = $filter.'&'.$filterstr;
+ }
+ } else {
+ $filterstr = $filter;
+ }
+ } else {
+ $filterstr = $filter;
+ }
+ } else {
+ $filterstr = $filter;
+ }
my $showhidden;
if (&user_is_dc($domain)) {
$showhidden = $env{'form.showhidden'};
@@ -643,13 +689,13 @@ sub search_courselist {
%courses =
&Apache::lonnet::courseiddump($domain,'.',1,'.','.','.',undef,undef,
'.',1,$env{'form.showselfenroll'},
- $filter,$showhidden,'coursecatalog');
+ $filterstr,$showhidden,'coursecatalog');
}
return %courses;
}
sub print_course_listing {
- my ($domain,$numtitles) = @_;
+ my ($domain,$numtitles,$trails,$allitems,$subcats) = @_;
my $output;
my %courses;
my $knownuser = &user_is_known();
@@ -671,7 +717,7 @@ sub print_course_listing {
if ($env{'form.currcat_0'} eq 'instcode::0') {
%courses = &search_official_courselist($domain,$numtitles);
} else {
- %courses = &search_courselist($domain);
+ %courses = &search_courselist($domain,$subcats);
}
if (keys(%courses) == 0) {
$output = &mt('No courses match the criteria you selected.');
@@ -686,22 +732,32 @@ sub print_course_listing {
my $now = time;
my %domconfig =
&Apache::lonnet::get_dom('configuration',['usercreation'],$domain);
- $output .= &construct_data_table($knownuser,\%courses,$details,undef,$now,\%domconfig);
- $output .= &Apache::lonhtmlcommon::echo_form_input(['coursenum','state','catalogfilter','sortby','showdetails']);
+ $output .= &construct_data_table($knownuser,\%courses,$details,undef,$now,\%domconfig,$trails,$allitems);
+ if ($env{'form.coursenum'} ne '') {
+ $output .= &Apache::lonhtmlcommon::echo_form_input(['coursenum','state','catalogfilter','sortby','showdetails']);
+ }
return $output;
}
sub construct_data_table {
- my ($knownuser,$courses,$details,$usersections,$now,$domconfig) = @_;
+ my ($knownuser,$courses,$details,$usersections,$now,$domconfig,$trails,
+ $allitems) = @_;
my %sortname;
if (($details eq '') || ($env{'form.showdetails'})) {
$sortname{'Code'} = 'code';
+ $sortname{'Categories'} = 'cats';
$sortname{'Title'} = 'title';
$sortname{'Owner(s)'} = 'owner';
}
my $output = &Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_header_row();
- my @coltitles = ('Count','Code','Sections','Crosslisted','Title','Owner(s)');
+ my @coltitles = ('Count');
+ if ($env{'form.currcat_0'} eq 'instcode::0') {
+ push(@coltitles,'Code');
+ } else {
+ push(@coltitles,'Categories');
+ }
+ push(@coltitles,('Sections','Crosslisted','Title','Owner(s)'));
if (ref($usersections) eq 'HASH') {
$coltitles[1] = 'Your Section';
}
@@ -734,6 +790,8 @@ sub construct_data_table {
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}{'ownerlastnames'}}},$course);
} else {
@@ -746,7 +804,8 @@ sub construct_data_table {
}
}
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));
@@ -755,8 +814,8 @@ sub construct_data_table {
foreach my $item (@sorted_courses) {
foreach my $course (@{$Sortby{$item}}) {
$output.=&Apache::loncommon::start_data_table_row();
- $output.=&courseinfo_row($courseinfo{$course},$knownuser,
- $details,\$count,$now,$course);
+ $output.=&courseinfo_row($courseinfo{$course},$knownuser,$details,
+ \$count,$now,$course,$trails,$allitems);
$output.=&Apache::loncommon::end_data_table_row();
}
}
@@ -778,7 +837,7 @@ sub build_courseinfo_hash {
$cleandesc =~ s/^\s+//;
my ($cdom,$cnum)=split(/\_/,$course);
my ($descr,$instcode,$singleowner,$ttype,$selfenroll_types,
- $selfenroll_start,$selfenroll_end,@owners,%ownernames);
+ $selfenroll_start,$selfenroll_end,@owners,%ownernames,$categories);
if (ref($courses->{$course}) eq 'HASH') {
$descr = $courses->{$course}{'description'};
$instcode = $courses->{$course}{'inst_code'};
@@ -787,6 +846,7 @@ sub build_courseinfo_hash {
$selfenroll_types = $courses->{$course}{'selfenroll_types'};
$selfenroll_start = $courses->{$course}{'selfenroll_start_date'};
$selfenroll_end = $courses->{$course}{'selfenroll_end_date'};
+ $categories = $courses->{$course}{'categories'};
push(@owners,$singleowner);
if (ref($courses->{$course}{'co-owners'}) eq 'ARRAY') {
foreach my $item (@{$courses->{$course}{'co-owners'}}) {
@@ -824,6 +884,7 @@ sub build_courseinfo_hash {
$courseinfo{$course}{'selfenroll_types'} = $selfenroll_types;
$courseinfo{$course}{'selfenroll_start'} = $selfenroll_start;
$courseinfo{$course}{'selfenroll_end'} = $selfenroll_end;
+ $courseinfo{$course}{'categories'} = $categories;
my %coursehash = &Apache::lonnet::dump('environment',$cdom,$cnum);
my @classids;
@@ -934,9 +995,9 @@ sub count_students {
}
sub courseinfo_row {
- my ($info,$knownuser,$details,$countref,$now,$course) = @_;
+ my ($info,$knownuser,$details,$countref,$now,$course,$trails,$allitems) = @_;
my ($cdom,$cnum,$title,$ownerlast,$code,$owner,$seclist,$xlist_items,
- $accessdates,$showsyllabus,$counts,$autoenrollment,$output);
+ $accessdates,$showsyllabus,$counts,$autoenrollment,$output,$categories);
if (ref($info) eq 'HASH') {
$cdom = $info->{'cdom'};
$cnum = $info->{'cnum'};
@@ -950,14 +1011,30 @@ sub courseinfo_row {
$counts = $info->{'counts'};
$autoenrollment = $info->{'autoenrollment'};
$showsyllabus = $info->{'showsyllabus'};
+ $categories = $info->{'categories'};
} else {
$output = '
'.&mt('No information available for [_1].',
$code).'