--- loncom/interface/coursecatalog.pm 2008/03/08 04:00:53 1.27 +++ loncom/interface/coursecatalog.pm 2008/05/29 04:29:33 1.28 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler for displaying the course catalog interface # -# $Id: coursecatalog.pm,v 1.27 2008/03/08 04:00:53 raeburn Exp $ +# $Id: coursecatalog.pm,v 1.28 2008/05/29 04:29:33 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -54,7 +54,8 @@ sub handler { &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::default_login_domain(); + + my $codedom = &Apache::lonnet::default_login_domain(); if (($env{'user.domain'} ne '') && ($env{'user.domain'} ne 'public')) { $codedom = $env{'user.domain'}; @@ -63,15 +64,40 @@ sub handler { } } my $formname = 'coursecatalog'; + if ($env{'form.showdom'} ne '') { + if (&Apache::lonnet::domain($env{'form.showdom'}) ne '') { + $codedom = $env{'form.showdom'}; + } + } my $domdesc = &Apache::lonnet::domain($codedom,'description'); - &Apache::lonhtmlcommon::clear_breadcrumbs(); if ($env{'form.coursenum'} ne '' && &user_is_known()) { &course_details($r,$codedom,$formname,$domdesc); } else { - my $numtitles = &course_selector($r,$codedom,$formname,$domdesc); - if ($env{'form.state'} eq 'listing') { - $r->print(&print_course_listing($codedom,$numtitles).'
'); + my $catlinks = &category_breadcrumbs($codedom); + my $catjs = <<"ENDSCRIPT"; + +function setCatDepth(depth) { + document.coursecats.catalog_maxdepth.value = depth; + document.coursecats.submit(); + return; +} + +ENDSCRIPT + my $numtitles; + if ($env{'form.currcat_0'} eq 'instcode::0') { + $numtitles = &instcode_course_selector($r,$codedom,$formname,$domdesc, + $catlinks,$catjs); + if ($env{'form.state'} eq 'listing') { + $r->print(&print_course_listing($codedom,$numtitles)); + } + } else { + my (%add_entries); + $catjs = ''; + &cat_header($r,$codedom,$catjs,\%add_entries,$catlinks); + if ($env{'form.currcat_0'} ne '') { + $r->print(&print_course_listing($codedom)); + } } } $r->print(&Apache::loncommon::end_page()); @@ -100,7 +126,7 @@ sub course_details { {text=>"Course details"}); $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Details')); $r->print('
'.&mt('Detailed course information:').'

'. - '
'. + ''. &print_course_listing($codedom).'

'); $r->print(''. &mt('Back to course listing').''. @@ -109,8 +135,8 @@ sub course_details { '
'); } -sub course_selector { - my ($r,$codedom,$formname,$domdesc) = @_; +sub instcode_course_selector { + my ($r,$codedom,$formname,$domdesc,$catlinks,$catjs) = @_; my %coursecodes = (); my %codes = (); my @codetitles = (); @@ -195,40 +221,21 @@ function setCourseId(caller) { }\n|; } } - my $js = ''; my %add_entries = (topmargin => "0", marginheight => "0",); if (($env{'form.state'} eq 'listing') && ($numtitles > 0)) { $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') { - if ($numtitles > 0) { - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"/adm/coursecatalog", - text=>"Select courses"}, - {text=>"Course listing"}); - } else { - &Apache::lonhtmlcommon::add_breadcrumb - ({text=>"Course listing"}); - } - $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Listing')); - } else { - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"/adm/coursecatalog", - text=>"Select courses"}); - $r->print(&Apache::lonhtmlcommon::breadcrumbs('Select courses')); - } - $r->print('

'.&mt('Display information about official [_1] classes for which LON-CAPA courses have been created:',$domdesc).'

'); - $r->print('
'); + &cat_header($r,$codedom,$js,\%add_entries,$catlinks,$numtitles); + my $cat_maxdepth = $env{'form.catalog_maxdepth'}; + $r->print(''. + ''. + ''. + ''); if ($numtitles > 0) { - $r->print(&mt('Choose which course(s) to list.
')); + $r->print('
'.&mt('Choose which course(s) to list.').'
'); $r->print(''); for (my $k=0; $k<$lasttitle-1; $k++) { my (@items,@unsorted); @@ -281,24 +288,147 @@ function setCourseId(caller) { } $r->print('
'); } - $r->print(''); + $r->print(''); if ($numtitles > 0) { $r->print(''); } $r->print(''); if (($numtitles > 0) && ($env{'form.state'} eq 'listing')) { - $r->print('

'); + $r->print('
'); } } else { - $r->print(&Apache::loncommon::start_page('Course Catalog','', - { - 'no_inline_link' => 1,})); $r->print('
'.&mt('No official courses to display for [_1].',$domdesc)); } return $numtitles; } +sub cat_header { + my ($r,$codedom,$js,$add_entries,$catlinks,$numtitles) = @_; + 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') { + if ($numtitles > 0) { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/coursecatalog", + text=>"Select courses"}, + {text=>"Course listing"}); + } else { + &Apache::lonhtmlcommon::add_breadcrumb + ({text=>"Course listing"}); + } + $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Listing')); + } else { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/coursecatalog", + text=>"Select courses"}); + $r->print(&Apache::lonhtmlcommon::breadcrumbs('Select courses')); + } + $r->print('
'. + ''. + ''. + ''. + $catlinks.'
'.&mt('Domain:').''. + &Apache::loncommon::select_dom_form($codedom,'showdom','',1). + ' 
'); + return; +} + +sub category_breadcrumbs { + my ($dom) = @_; + my %domconfig = + &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom); + my (@cats,@trails,%allitems,%idx,@jsarray); + &Apache::loncommon::extract_categories($domconfig{'coursecategories'},\@cats,\@trails, + \%allitems,\%idx,\@jsarray); + my $currdepth = 0; + my $deeper = 0; + my $currcat_str; + if ($env{'form.catalog_maxdepth'} ne '') { + $currdepth = $env{'form.catalog_maxdepth'}; + $deeper = $currdepth + 1; + } + $currcat_str = ''; + my $catlinks = ''.&mt('Catalog:').''; + for (my $i=0; $i<$deeper; $i++) { + $currcat_str .= ''; + my ($cattitle,$shallower); + if ($i == 0) { + $cattitle = &mt('Main Categories'); + } else { + $shallower = $i-1; + my ($cat,$container,$depth) = map { &unescape($_); } split(/:/,$env{'form.currcat_'.$shallower}); + $cattitle = $cat; + } + $catlinks .= ''; + } + if ($deeper == 0) { + $catlinks .= '
'.$cattitle.'->'.&mt('Main Categories').': '; + if (ref($cats[0]) eq 'ARRAY') { + if ((@{$cats[0]} == 1) && ($cats[0][0] eq 'instcode')) { + $catlinks .= &mt('Official courses (with institutional codes)'). + ''; + $env{'form.currcat_0'} = 'instcode::0'; + } else { + $catlinks .= ''."\n". + ' '; + } + } else { + $catlinks .= &mt('Official courses (with institutional codes)'). + ''; + $env{'form.currcat_0'} = 'instcode::0'; + } + } else { + my ($cat,$container,$depth) = map { &unescape($_); } split(/:/,$env{'form.currcat_'.$currdepth}); + my $deeper = $depth +1; + my $currcat = $cat; + if ($cat eq 'instcode') { + $currcat = &mt('Official courses (with institutional codes)'); + } + $catlinks .= ''.$currcat; + if (ref($cats[$deeper]{$cat}) eq 'ARRAY') { + $catlinks .= ': '."\n". + ' '; + } + } + $catlinks .= $currcat_str.'
'; + return $catlinks; +} + sub user_is_dc { my ($codedom) = @_; if (exists($env{'user.role.dc./'.$codedom.'/'})) { @@ -395,7 +525,7 @@ sub build_javascript { return $output; } -sub search_courselist { +sub search_official_courselist { my ($domain,$numtitles) = @_; my $instcode; if (defined($numtitles) && $numtitles == 0) { @@ -425,6 +555,18 @@ sub search_courselist { return %courses; } +sub search_courselist { + my ($domain) = @_; + my $cat_maxdepth = $env{'form.catalog_maxdepth'}; + my $filter = $env{'form.currcat_'.$cat_maxdepth}; + my %courses; + if ($filter ne '') { + %courses = &Apache::lonnet::courseiddump($domain,'.',1,'.','.','.', + undef,undef,'Course',1, + $env{'form.showselfenroll'},$filter); + } + return %courses; +} sub print_course_listing { my ($domain,$numtitles) = @_; @@ -446,7 +588,11 @@ sub print_course_listing { return $output; } } else { - %courses = &search_courselist($domain,$numtitles); + if ($env{'form.currcat_0'} eq 'instcode::0') { + %courses = &search_official_courselist($domain,$numtitles); + } else { + %courses = &search_courselist($domain); + } if (keys(%courses) == 0) { $output = &mt('No courses match the criteria you selected.'); return $output;