--- loncom/interface/coursecatalog.pm 2008/05/29 06:18:07 1.29 +++ loncom/interface/coursecatalog.pm 2021/04/30 18:19:41 1.104 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler for displaying the course catalog interface # -# $Id: coursecatalog.pm,v 1.29 2008/05/29 06:18:07 raeburn Exp $ +# $Id: coursecatalog.pm,v 1.104 2021/04/30 18:19:41 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,6 +38,7 @@ use Apache::lonlocal; use Apache::courseclassifier; use Apache::lonacc; use LONCAPA; +use LONCAPA::lonauthcgi; sub handler { my ($r) = @_; @@ -53,9 +54,12 @@ sub handler { } &Apache::lonacc::get_posted_cgi($r); &Apache::lonlocal::get_language_handle($r); - &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['sortby']); + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['sortby','showdom']); - my $codedom = &Apache::lonnet::default_login_domain(); + my $serverdefdom = &Apache::lonnet::default_login_domain(); + my $codedom = $serverdefdom; + my $hostname = $r->hostname(); if (($env{'user.domain'} ne '') && ($env{'user.domain'} ne 'public')) { $codedom = $env{'user.domain'}; @@ -65,289 +69,945 @@ sub handler { } 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($codedom,'description'); + 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 $crscats = &Apache::lonnet::get_dom_cats($codedom); + my %domdefaults = &Apache::lonnet::get_domain_defaults($codedom); + my $knownuser = &user_is_known(); + my $canviewall = &canview_all($knownuser,$codedom); + + my ($cathash,$cattype); + if (ref($crscats) eq 'HASH') { + %{$cathash} = %{$crscats}; + } else { + $cathash = {}; + } + if ($knownuser || $canviewall) { + $cattype = $domdefaults{'catauth'}; } else { - my $catlinks = &category_breadcrumbs($codedom); + $cattype = $domdefaults{'catunauth'}; + } + if ($cattype eq '') { + $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 ($domdefaults{'catauth'} 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'})) { + unless ((&Apache::lonnet::uses_sts()) || + (&Apache::lonnet::waf_allssl($hostname))) { + $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". + ''."\n". + ''."\n". + '
'."\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'} ne '') { + if ($env{'form.coursenum'} =~ /^$LONCAPA::match_courseid$/) { + $cnum = $env{'form.coursenum'}; + } else { + delete($env{'form.coursenum'}); + } + } + } + + my (@cats,@trails,%allitems,%idx,@jsarray,%subcathash,$subcats,%maxd, + $toplevelstr,$maxdepthstr); + if ($env{'form.withsubcats'}) { + $subcats = \%subcathash; + } + &Apache::loncommon::extract_categories($cathash,\@cats,\@trails,\%allitems, + \%idx,\@jsarray,$subcats,\%maxd); + if (ref($cats[0]) eq 'ARRAY') { + foreach my $item (@{$cats[0]}) { + $toplevelstr .= "'".&js_escape($item)."::0',"; + $maxdepthstr .= "'$maxd{$item}',"; + } + $toplevelstr =~ s/,$//; + $maxdepthstr =~ s/,$//; + } + &validate_input($codedom,\@cats,\%maxd,$cathash); + my ($numtitles,@codetitles); + if (($env{'form.coursenum'} ne '') && ($knownuser)) { + &course_details($r,$codedom,$formname,$domdesc,$hostname,\@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; + var depth = parseInt(depth); + if (depth !== NaN) { + if (depth > 0) { + var possmaxd = 0; + var toplevel = new Array($toplevelstr); + var maxdepths = new Array($maxdepthstr); + if (toplevel.length) { + for (var i=0; i possmaxd) { + depth = possmaxd; + } + } + document.coursecats.catalog_maxdepth.value = depth; + } else { + document.coursecats.currcat_0.value = ''; + document.coursecats.catalog_maxdepth.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 - my $numtitles; + $catjs .= &courselink_javascript($hostname); + if (&user_is_dc($codedom) || $canviewall) { + $catjs .= <print(&print_course_listing($codedom,$numtitles)); + $r->print(&print_course_listing($codedom,$numtitles,undef,undef,undef, + \@codetitles,$canviewall,$hostname)); } } 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 .= <'; - &cat_header($r,$codedom,$catjs,\%add_entries,$catlinks); + &cat_header($r,$codedom,$catjs,\%add_entries,$catlinks,undef,$cattype); if ($env{'form.currcat_0'} ne '') { - $r->print(&print_course_listing($codedom)); + $r->print('
'. + &additional_filters($codedom,$has_subcats,$canviewall)."\n"); + $r->print(''."\n"); + for (my $i=0; $i<$deeper; $i++) { + $r->print(''."\n"); + } + my $display_button; + if ($env{'form.currcat_0'} eq 'communities::0') { + $display_button = &mt('Display communities'); + } elsif ($env{'form.currcat_0'} eq 'placement::0') { + $display_button = &mt('Display placement tests'); + } else { + $display_button = &mt('Display courses'); + } + $r->print(''."\n". + ''."\n". + ''."\n". + ''. + '


'); + } + if ($env{'form.state'} eq 'listing') { + $r->print(&print_course_listing($codedom,undef,\@trails,\%allitems,$subcats,\@codetitles, + $canviewall,$hostname)); } } } - $r->print(&Apache::loncommon::end_page()); + $r->print('
'.&Apache::loncommon::end_page()); return OK; } +sub validate_input { + my ($codedom,$cats,$maxd,$crscatsref) = @_; + my $currcat = ''; + my $depth = 0; + if ($env{'form.catalog_maxdepth'} ne '') { + $env{'form.catalog_maxdepth'} =~ s{\D}{}g; + } + if ((ref($cats) eq 'ARRAY') && (ref($maxd) eq 'HASH')) { + if (ref($cats->[0]) eq 'ARRAY') { + if (@{$cats->[0]} == 1) { + if ($cats->[0][0] eq 'instcode') { + $currcat = 'instcode::0'; + } elsif ($cats->[0][0] eq 'communities') { + $currcat = 'communities::0'; + } elsif ($cats->[0][0] eq 'placement') { + $currcat = 'placement::0'; + } else { + my $name = $cats->[0][0]; + $currcat = &escape($name).'::0'; + } + if (exists($maxd->{$cats->[0][0]})) { + if ($env{'form.catalog_maxdepth'} <= $maxd->{$cats->[0][0]}) { + $depth = $env{'form.catalog_maxdepth'}; + } else { + $depth = $maxd->{$cats->[0][0]}; + } + } + } elsif ((@{$cats->[0]} > 1) && ($env{'form.currcat_0'} ne '')) { + my ($escname) = ($env{'form.currcat_0'} =~ /^([^:]+)\:\:0$/); + if ($escname =~ /^instcode|communities|placement$/) { + $currcat = $env{'form.currcat_0'}; + if (exists($maxd->{$escname})) { + if ($env{'form.catalog_maxdepth'} <= $maxd->{$escname}) { + $depth = $env{'form.catalog_maxdepth'}; + } else { + $depth = $maxd->{$escname}; + } + } else { + $depth = 1; + } + } elsif ($escname ne '') { + my $name = &unescape($escname); + if (grep(/^\Q$name\E$/,@{$cats->[0]})) { + $currcat = $env{'form.currcat_0'}; + if (exists($maxd->{$name})) { + if ($env{'form.catalog_maxdepth'} <= $maxd->{$name}) { + $depth = $env{'form.catalog_maxdepth'}; + } else { + $depth = $maxd->{$name}; + } + } + } + } + } + } + } + $env{'form.currcat_0'} = $currcat; + $env{'form.catalog_maxdepth'} = $depth; + + my %possibles = ( + backto => 1, + catalogfilter => 1, + catalog_maxdepth => 1, + courseid => 1, + coursenum => 1, + currcat_0 => 1, + numtitles => 1, + Year => 1, + Semester => 1, + Department => 1, + Number => 1, + showdom => 1, + sortby => 1, + showcounts => 1, + showdetails => 1, + showhidden => 1, + showselfenroll => 1, + state => 1, + uniquecode => 1, + wasactive => 1, + wasactiveon_day => 1, + wasactiveon_month => 1, + wasactiveon_year => 1, + withsubcats => 1, + ); + my %currcats; + if ($env{'form.catalog_maxdepth'} > 0) { + for (my $i=1; $i<=$env{'form.catalog_maxdepth'}; $i++) { + $currcats{'currcat_'.$i} = 1; + $possibles{'currcat_'.$i} = 1; + } + } + + foreach my $key (sort(keys(%env))) { + if ($key =~ /^form\.(.+)$/) { + unless ($possibles{$1}) { + delete($env{$key}); + } + } + } + if (exists($env{'form.backto'})) { + unless ($env{'form.backto'} eq 'coursecatalog') { + delete($env{'form.backto'}); + } + } + if (exists($env{'form.catalogfilter'})) { + unless (($env{'form.catalogfilter'} eq &mt('Display courses')) || + ($env{'form.catalogfilter'} eq &mt('Display communities')) || + ($env{'form.catalogfilter'} eq &mt('Display placement tests'))) { + delete($env{'form.catalogfilter'}); + } + } + if (exists($env{'form.courseid'})) { + if ($env{'form.courseid'} ne '') { + unless ($env{'form.courseid'} =~ /^\Q$codedom\E_$LONCAPA::match_courseid$/) { + $env{'form.courseid'} = ''; + } + } + } + if (exists($env{'form.coursenum'})) { + unless ($env{'form.coursenum'} =~ /^$LONCAPA::match_courseid$/) { + $env{'form.coursenum'} = ''; + } + } + if (exists($env{'form.currcat_0'})) { + unless ($env{'form.currcat_0'} =~ /^(instcode|communities|placement)\Q::0\E$/) { + if ($env{'form.currcat_0'} =~ /^.+\Q::0\E$/) { + if (ref($crscatsref) eq 'HASH') { + unless (exists($crscatsref->{$env{'form.currcat_0'}})) { + delete($env{'form.currcat_0'}); + } + } else { + delete($env{'form.currcat_0'}); + } + } else { + delete($env{'form.currcat_0'}); + } + } + } + if (exists($env{'form.numtitles'})) { + unless ($env{'form.numtitles'} =~ /^\d+$/) { + delete($env{'form.numtitles'}); + } + } + my ($gotcodes,%possvals); + foreach my $item ('Year','Semester','Department','Number') { + if (exists($env{'form.'.$item})) { + unless ($env{'form.'.$item} eq '0') { + unless ($gotcodes) { + $gotcodes = &get_instcode_allowable($codedom,\%possvals); + } + if (ref($possvals{$item}) eq 'HASH') { + unless (exists($possvals{$item}{$env{'form.'.$item}})) { + delete($env{'form.'.$item}); + } + } else { + delete($env{'form.'.$item}); + } + } + } + } + if (exists($env{'form.showdom'})) { + unless ($env{'form.showdom'} =~ /^$LONCAPA::match_domain$/) { + delete($env{'form.showdom'}); + } + } + if (exists($env{'form.sortby'})) { + unless ($env{'form.sortby'} =~ /^(title|code|owner|cats)$/) { + delete($env{'form.sortby'}); + } + } + if (exists($env{'form.showcounts'})) { + if (ref($env{'form.showcounts'}) eq 'ARRAY') { + foreach my $item (@{$env{'form.showcounts'}}) { + unless ($item =~ /^(Active|Future|Previous)$/) { + delete($env{'form.showcounts'}); + last; + } + } + } else { + unless ($env{'form.showcounts'} =~ /^(Active|Future|Previous)$/) { + delete($env{'form.showcounts'}); + } + } + } + foreach my $item ('showhidden','showdetails','showselfenroll','withsubcats') { + if (exists($env{'form.'.$item})) { + unless ($env{'form.'.$item} eq '1') { + delete($env{'form.'.$item}); + } + } + } + if (exists($env{'form.state'})) { + unless ($env{'form.state'} eq 'listing') { + delete($env{'form.state'}); + } + } + if (exists($env{'form.uniquecode'})) { + unless ($env{'form.uniquecode'} =~ /^\w{6}$/) { + delete($env{'form.uniquecode'}); + } + } + if (exists($env{'form.wasactive'})) { + unless (($env{'form.wasactive'} eq 'accessend') || ($env{'form.wasactive'} eq 'enrollend')) { + delete($env{'form.wasactive'}); + } + } + if (exists($env{'form.wasactiveon_day'})) { + my $tmpday = $env{'form.wasactiveon_day'}; + unless (($tmpday =~ /^\d+$/) && ($tmpday > 0) && ($tmpday < 32)) { + delete($env{'form.wasactiveon_day'}); + } + } + if (exists($env{'form.wasactiveon_month'})) { + my $tmpmonth = $env{'form.wasactiveon_month'}; + unless (($tmpmonth =~ /^\d+$/) && ($tmpmonth > 0) && ($tmpmonth < 13)) { + delete($env{'form.wasactiveon_month'}); + } + } + if (exists($env{'form.wasactiveon_year'})) { + my $tmpyear = $env{'form.wasactiveon_year'}; + unless (($tmpyear =~ /^\d+$/) && ($tmpyear >= 1970)) { + delete($env{'form.wasactiveon_year'}); + } + } + if (keys(%currcats)) { + foreach my $key (keys(%currcats)) { + if ($env{'form.'.$key} eq '') { + delete($env{'form.'.$key}); + } elsif (ref($crscatsref) eq 'HASH') { + unless (exists($crscatsref->{$env{'form.'.$key}})) { + delete($env{'form.'.$key}); + } + } else { + delete($env{'form.'.$key}); + } + } + } + return; +} + +sub get_instcode_allowable { + my ($codedom,$possvalref) = @_; + return 1 unless (ref($possvalref) eq 'HASH'); + my $instcats = &Apache::lonnet::get_dom_instcats($codedom); + if (ref($instcats) eq 'HASH') { + if ((ref($instcats->{'codetitles'}) eq 'ARRAY') && (ref($instcats->{'codes'}) eq 'HASH')) { + my %codes = %{$instcats->{'codes'}}; + my @codetitles = @{$instcats->{'codetitles'}}; + my @standardnames = &Apache::loncommon::get_standard_codeitems(); + my %local_to_standard; + for (my $i=0; $i<@codetitles; $i++) { + $local_to_standard{$codetitles[$i]} = $standardnames[$i]; + $possvalref->{$standardnames[$i]} = {}; + } + foreach my $cid (sort(keys(%codes))) { + if (ref($codes{$cid}) eq 'HASH') { + foreach my $item (keys(%{$codes{$cid}})) { + $possvalref->{$local_to_standard{$item}}{$codes{$cid}{$item}} = 1; + } + } + } + } + } + return 1; +} + sub course_details { - my ($r,$codedom,$formname,$domdesc) = @_; + my ($r,$codedom,$formname,$domdesc,$hostname,$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=>"Select courses"}); + 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=>"javascript:document.$formname.submit()", - text=>"Course listing"}, - {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').''. - ''. - '
'); + text=>$brtextone}, + {text=>$brtexttwo}); + $r->print( + &Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog'). + '

'.$textthree.'

'. + &print_course_listing($codedom,undef,$trails,$allitems,undef,$codetitles,undef,$hostname). + '
'. + '
'. + &Apache::lonhtmlcommon::actionbox([ + ''.$textfour.'']). + &Apache::lonhtmlcommon::echo_form_input(['coursenum','catalogfilter', + 'showdetails','courseid']). + '
'); + return; } -sub instcode_course_selector { - my ($r,$codedom,$formname,$domdesc,$catlinks,$catjs) = @_; - 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); - 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; - } - if ($numtitles == 0) { - if (!defined($env{'form.state'})) { - $env{'form.state'} = 'listing'; - } - } else { - 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 '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 ($hostname) = @_; + return <<"END"; + +function ToSyllabus(cdom,cnum,usehttp) { + if (cdom == '' || cdom == null) { + return; } -'; - } - } - $jscript .= ' courseSet()'."\n"; - if ($env{'form.'.$codetitles[-1]} != -1) { - $jscript .= ' - for (var j=0; j'; - my %add_entries = (topmargin => "0", - marginheight => "0",); + +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 %cat_titles = (); + my %cat_order = (); + my %cat_items = (); + my %add_entries = (topmargin => "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()'; + $add_entries{'onload'} = 'setElements();'; + } + if (&user_is_dc($codedom) || $canviewall) { + $add_entries{'onload'} .= ' toggleStatuses();toggleWasActive();' } - &cat_header($r,$codedom,$js,\%add_entries,$catlinks,$numtitles); + &cat_header($r,$codedom,$js,\%add_entries,$catlinks,$numtitles,$cattype); + my $cat_maxdepth = $env{'form.catalog_maxdepth'}; + $r->print('
'. + ''."\n". + ''."\n". + ''. + &additional_filters($codedom,undef,$canviewall)); + if ($numtitles > 0) { + $r->print(''.&mt('Choose which course(s) to list.').'
'. + &Apache::courseclassifier::build_instcode_selectors($numtitles, + $lasttitle,\%cat_items,$codetitles,\%cat_titles,\%cat_order)); + } + $r->print(''."\n". + ''."\n". + ''."\n". + ''. + '


'); + } else { + $js = ''; + &cat_header($r,$codedom,$js,\%add_entries,$catlinks,$numtitles,$cattype); my $cat_maxdepth = $env{'form.catalog_maxdepth'}; $r->print('
'. ''. ''. ''); - if ($numtitles > 0) { - $r->print('
'.&mt('Choose which course(s) to list.').'
'); - $r->print(''); - for (my $k=0; $k<$lasttitle-1; $k++) { - my (@items,@unsorted); - if (ref($cat_items{$codetitles[$k]}) eq 'ARRAY') { - @unsorted = @{$cat_items{$codetitles[$k]}}; - } - &Apache::courseclassifier::sort_cats($k,\%cat_order,\@codetitles,\@unsorted,\@items); - my @longitems; - if (defined($cat_titles{$codetitles[$k]})) { - foreach my $item (@items) { - push(@longitems,$cat_titles{$codetitles[$k]}{$item}); - } - } else { - @longitems = @items; - } - $r->print(''); - } - $r->print('' - ); - my $show_selfenroll_status; - if ($env{'form.showselfenroll'}) { - $show_selfenroll_status = 'checked="checked" '; - } - if (&user_is_dc($codedom)) { - my $showdetails_status; - if ($env{'form.showdetails'}) { - $showdetails_status = 'checked="checked" '; - } - $r->print(''); - } else { - $r->print(''); - } - $r->print('
'.$codetitles[$k].'
'."\n". - '		'.$codetitles[$lasttitle-1].'
'."\n". - ''."\n". - '

'); - if ($numtitles > 4) { - $r->print('

'.$codetitles[$numtitles-1].'
'."\n". - '
'."\n"); - } - $r->print('
'); - } - $r->print(''); - if ($numtitles > 0) { - $r->print(''); - } - $r->print('
'); - if (($numtitles > 0) && ($env{'form.state'} eq 'listing')) { - $r->print('
'); - } - } else { - $r->print('
'.&mt('No official courses to display for [_1].',$domdesc)); + $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 ($r,$codedom,$js,$add_entries,$catlinks,$numtitles,$cattype) = @_; my $start_page = - &Apache::loncommon::start_page('Course Catalog',$js, - { - 'add_entries' => $add_entries, - 'no_inline_link' => 1,}); + &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"}); + text=>"Course/Community Catalog"}, + {text=>$brtext}); } else { &Apache::lonhtmlcommon::add_breadcrumb - ({text=>"Course listing"}); + ({text=>$brtext}); } - $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')); + text=>"Course/Community Catalog"}); } - $r->print(''. - ''. - ''. - ''. - $catlinks.'
'.&mt('Domain:').''. - &Apache::loncommon::select_dom_form($codedom,'showdom','',1). - ' 
'); + $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog')); + if ($cattype eq 'std') { + my $onchange = 'this.form.submit()'; + $r->print('
'. + '
'.&mt('Domain:').''. + &Apache::loncommon::select_dom_form($codedom,'showdom','',1,$onchange)); + if (!$onchange) { + $r->print(' '); + } + $r->print('
'); + } + $r->print('
'. + ''.$catlinks.'
'); 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 ($dom,@cats) = @_; + my $crumbsymbol = ' ▶ '; + my ($currdepth,$deeper) = &get_depth_values(); + my $currcat_str = + ''. + ''; + my $catlinks = ''.&mt('Catalog:').'
'; + my $has_subcats; + my $selitem; + if (ref($cats[0]) eq 'ARRAY') { + if (@{$cats[0]} == 0) { + $catlinks .= &mt('No categories defined in this domain'); + } elsif (@{$cats[0]} == 1) { + if ($cats[0][0] eq 'instcode') { + $catlinks .= &mt('Official courses (with institutional codes)'); + $env{'form.currcat_0'} = 'instcode::0'; + } elsif ($cats[0][0] eq 'communities') { + $catlinks .= &mt('Communities'); + $env{'form.currcat_0'} = 'communities::0'; + } elsif ($cats[0][0] eq 'placement') { + $catlinks .= &mt('Placement Tests'); + $env{'form.currcat_0'} = 'placement::0'; + } else { + my $name = $cats[0][0]; + my $item = &escape($name).'::0'; + $catlinks .= $name; + $env{'form.currcat_0'} = $item; + } + $currcat_str .= ''; + } else { + $catlinks .= &main_category_selector(@cats); + if (($env{'form.currcat_0'} ne '') && + ($env{'form.currcat_0'} ne 'instcode::0')) { + $catlinks .= $crumbsymbol; + } + } + } else { + $catlinks .= &mt('Official courses (with institutional codes)'); + $env{'form.currcat_0'} = 'instcode::0'; + $currcat_str .= ''; + } + if ($deeper) { + for (my $i=1; $i<=$deeper; $i++) { + my $shallower = $i-1; + next if ($shallower == 0); + my ($cat,$container,$depth) = map { &unescape($_); } split(/:/,$env{'form.currcat_'.$shallower}); + if ($cat ne '') { + $catlinks .= ''. + ''; + } + unless ($i == $deeper) { + $catlinks .= $crumbsymbol; + } + } + my ($cat,$container,$depth); + if ($env{'form.currcat_'.$currdepth} eq '') { + my $shallower = $currdepth - 1; + ($cat,$container,$depth) = map { &unescape($_); } split(/:/,$env{'form.currcat_'.$shallower}); + } else { + ($cat,$container,$depth) = map { &unescape($_); } split(/:/,$env{'form.currcat_'.$currdepth}); + } + my $deeperlevel = $depth +1; + if (ref($cats[$deeperlevel]{$cat}) eq 'ARRAY') { + $has_subcats = 1; + my $buttontext = &mt('Show subcategories'); + my $selitem = 'currcat_'.$deeperlevel; + $catlinks .= ' '."\n"; + } elsif ($cat ne 'instcode') { + $catlinks .= ' '.&mt('(No subcategories)'); + } + } else { + $selitem = 'currcat_0'; + } + $catlinks .= $currcat_str.'
'; + return ($catlinks,$has_subcats,$selitem); +} + +sub main_category_selector { + my (@cats) = @_; + my $maincatlinks = ''."\n"; + } + return $maincatlinks; +} + +sub get_depth_values { my $currdepth = 0; my $deeper = 0; - my $currcat_str; if ($env{'form.catalog_maxdepth'} ne '') { $currdepth = $env{'form.catalog_maxdepth'}; if ($env{'form.currcat_'.$currdepth} eq '') { @@ -356,87 +1016,186 @@ sub category_breadcrumbs { $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; + return ($currdepth,$deeper); +} + +sub additional_filters { + my ($codedom,$has_subcats,$canviewall) = @_; + my $is_dc = &user_is_dc($codedom); + my $output = '
'; + if ($is_dc || $canviewall) { + $output .= '
'.&mt('Options').''; + } + $output .= '
'; + 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" '; + } + my $selfenroll_text; + if ($env{'form.currcat_0'} eq 'communities::0') { + $selfenroll_text = &mt('Only show communities which currently allow self-enrollment (or will allow it in the future)'); + } elsif ($env{'form.currcat_0'} eq 'placement::0') { + $selfenroll_text = &mt('Only show placement tests which currently allow self-enrollment (or will allow it in the future)'); + } else { + $selfenroll_text = &mt('Only show courses which currently allow self-enrollment (or will allow it in the future)'); } - if ($deeper == 0) { - $catlinks .= ''."\n". + ''; + } else { + $output .= ''; } - $catlinks .= $currcat_str.'
'; + 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" '; } - $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". - ' '; + $output .= ''. + '
'; + if ($is_dc || $canviewall) { + my ($titlesref,$orderref) = &get_statustitles('filters'); + my $showdetails_status; + if ($env{'form.showdetails'}) { + $showdetails_status = 'checked="checked" '; + } + my $showhidden_status; + if ($env{'form.showhidden'}) { + $showhidden_status = 'checked="checked" '; + } + my @currstatuses = &Apache::loncommon::get_env_multiple('form.showcounts'); + my ($details_text,$hidden_text,$statusdisplay,$cellborder); + my $wasactivedisplay = 'none'; + if ($env{'form.showdetails'}) { + $statusdisplay = 'block'; + $cellborder = 'border-left: 1px solid;'; + if (grep(/^Previous$/,@currstatuses)) { + $wasactivedisplay = 'block'; } } else { - $catlinks .= &mt('Official courses (with institutional codes)'). - ''; - $env{'form.currcat_0'} = 'instcode::0'; + $statusdisplay = 'none'; + $cellborder = 'border-left: 0px'; } - } else { - my ($cat,$container,$depth); - if ($env{'form.currcat_'.$currdepth} eq '') { - my $shallower = $currdepth - 1; - ($cat,$container,$depth) = map { &unescape($_); } split(/:/,$env{'form.currcat_'.$shallower}); + if ($env{'form.currcat_0'} eq 'communities::0') { + $details_text = &mt('Show full details for each community (domain staff only)'); + $hidden_text = &mt('Include communities set to be hidden from catalog (domain staff only)'); + } elsif ($env{'form.currcat_0'} eq 'placement::0') { + $details_text = &mt('Show full details for each placement test (domain staff only)'); + $hidden_text = &mt('Include placement tests set to be hidden from catalog (domain staff only)'); } else { - ($cat,$container,$depth) = map { &unescape($_); } split(/:/,$env{'form.currcat_'.$currdepth}); + $details_text = &mt('Show full details for each course (domain staff only)'); + $hidden_text = &mt('Include courses set to be hidden from catalog (domain staff only)'); } - 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 .= ': '.$hidden_text. + '
'."\n"; + } + $output .= ''. + '		'. + '
'; + if (ref($orderref) eq 'ARRAY') { + if (@{$orderref} > 0) { + foreach my $type (@{$orderref}) { + my $checked; + if (grep(/^\Q$type\E$/,@currstatuses)) { + $checked = ' checked="checked"'; + } + my $title; + if (ref($titlesref) eq 'HASH') { + $title = $titlesref->{$type}; + } + unless ($title) { + $title = &mt($type); + } + my $onclick; + if ($type eq 'Previous') { + $onclick = ' onclick="toggleWasActive();"'; + } + $output .= ''. + ''; + if ($type eq 'Previous') { + my %milestonetext = &Apache::lonlocal::texthash ( + accessend => 'immediately prior to default end access date', + enrollend => 'immediately prior to end date for auto-enrollment', + date => 'immediately prior to specific date:', + ); + my @statuses = &Apache::loncommon::get_env_multiple('form.showcounts'); + $output .= ''; + if ($checked) { + $output .= &get_wasactive_text(); + } + $output .= ''. + '
'. + ''; + my @milestones = ('accessend'); + if (&Apache::lonnet::auto_run(undef,$codedom)) { + push(@milestones,'enrollend'); + } + push(@milestones,'date'); + foreach my $item (@milestones) { + my $checked; + if ($env{'form.state'} eq 'listing') { + if ($env{'form.wasactive'} eq $item) { + $checked = ' checked="checked"'; + } + } elsif ($item eq 'accessend') { + $checked = ' checked="checked"'; + } + $output .= + ''; + } + $output .= '
 '. + ''; + if ($item eq 'date') { + my $wasactiveon; + if (grep(/^Previous$/,@currstatuses)) { + $wasactiveon = + &Apache::lonhtmlcommon::get_date_from_form('wasactiveon'); + } else { + $wasactiveon = 'now'; + } + $output .= ' '. + &Apache::lonhtmlcommon::date_setter('coursecatalog', + 'wasactiveon', + $wasactiveon, + '','','',1,'', + '','',1); + } + $output .= '
'; + } + $output .= '
'; + } } - $catlinks .= ''."\n". - ' '; } + $output .= '
'; - return $catlinks; + $output .= ''. + '
'; + return $output; } sub user_is_dc { @@ -452,121 +1211,72 @@ sub user_is_dc { return; } -sub recurse_options { - my ($currkey,$currlist,$level,$cat,$cat_options,$data,$by_year,$by_sem,$by_dept) = @_; - if (ref($currlist) eq 'HASH') { - $level ++; - foreach my $key (sort(keys(%{$currlist}))) { - $$data[$level-1]= $key; - &recurse_options($key,$currlist->{$key},$level,$cat,$cat_options,$data,$by_year,$by_sem,$by_dept); - } - } else { - $level --; - my @contents = split(/","/,$currlist); - foreach my $item (@contents) { - if (!grep(/^\Q$item\E$/,@{$cat_options->{$cat}})) { - push(@{$cat_options->{$cat}},$item); - } - if ($level == 3) { - if (!grep/^\Q$item\E$/,@{$by_year->{$data->[1]}->{$currkey}}) { - push(@{$by_year->{$data->[1]}->{$currkey}},$item); - } - if (!grep/^\Q$item\E$/,@{$by_sem->{$data->[2]}->{$currkey}}) { - push(@{$by_sem->{$data->[2]}->{$currkey}},$item); - } - if (!grep/^\Q$item\E$/,@{$by_dept->{$currkey}}) { - push(@{$by_dept->{$currkey}},$item); - } - - } - } +sub canview_all { + my ($knownuser,$codedom) = @_; + my $canviewall = 0; + my $page = 'coursecatalog'; + if (&LONCAPA::lonauthcgi::can_view($page)) { + $canviewall = 1; + } elsif (&LONCAPA::lonauthcgi::check_ipbased_access($page)) { + $canviewall= 1; + } elsif (($knownuser) && ($codedom ne '')) { + if (&Apache::lonnet::allowed('dcd',$codedom)) { + $canviewall = 1; + } + } + return $canviewall; +} + +sub get_statustitles { + my ($caller) = @_; + my @status_order = ('Active','Future','Previous'); + my %status_title; + if ($caller eq 'filters') { + %status_title = &Apache::lonlocal::texthash( + Previous => 'Show count for past access', + Active => 'Show count for current student access', + Future => 'Show count for future student access', + ); + if ($env{'form.currcat_0'} eq 'communities::0') { + $status_title{'Active'} = 'Show count for current member access'; + $status_title{'Future'} = 'Show count for future member access'; + } + } else { + %status_title = &Apache::lonlocal::texthash( + Previous => 'Previous access', + Active => 'Current access', + Future => 'Future access', + ); } - return $level; -} - -sub build_javascript { - my ($by_year,$by_sem,$by_dept,$cat_order,$codetitles) = @_; - my @unsorted = keys(%{$by_year}); - my @sorted_yrs; - &Apache::courseclassifier::sort_cats('0',$cat_order,$codetitles,\@unsorted,\@sorted_yrs); - my $output = 'var idcse_by_yr_year = new Array("'.join('","',@sorted_yrs).'");'."\n". - 'var idcse_by_yr_dept = new Array('.scalar(@sorted_yrs).');'."\n". - 'var idcse_by_yr_num = new Array('.scalar(@sorted_yrs).');'."\n"; - for (my $i=0; $i<@sorted_yrs; $i++) { - my $numkeys = keys(%{$by_year->{$sorted_yrs[$i]}}); - $output .= " idcse_by_yr_num[$i] = new Array($numkeys);\n"; - if (ref($by_year->{$sorted_yrs[$i]}) eq 'HASH') { - @unsorted = keys(%{$by_year->{$sorted_yrs[$i]}}); - my @sorted_depts; - &Apache::courseclassifier::sort_cats('2',$cat_order,$codetitles,\@unsorted,\@sorted_depts); - $output .= qq| idcse_by_yr_dept[$i] = new Array ("|.join('","',@sorted_depts).'");'."\n"; - for (my $j=0; $j<@sorted_depts; $j++) { - $output .= qq| idcse_by_yr_num[$i][$j] = new Array ("|; - $output .= join('","',sort(@{$by_year->{$sorted_yrs[$i]}->{$sorted_depts[$j]}})).'");'."\n"; - } - } - } - @unsorted = keys(%{$by_sem}); - my @sorted_sems; - &Apache::courseclassifier::sort_cats('1',$cat_order,$codetitles,\@unsorted,\@sorted_sems); - $output .= 'idcse_by_sem_sems = new Array("'.join('","',@sorted_sems).'");'."\n". - 'idcse_by_sem_dept = new Array('.scalar(@sorted_sems).');'."\n". - 'idcse_by_sem_num = new Array('.scalar(@sorted_sems).');'."\n"; - for (my $i=0; $i<@sorted_sems; $i++) { - my $numkeys = keys(%{$by_sem->{$sorted_sems[$i]}}); - $output .= " idcse_by_sem_num[$i] = new Array($numkeys);\n"; - if (ref($by_sem->{$sorted_sems[$i]}) eq 'HASH') { - @unsorted = keys(%{$by_sem->{$sorted_sems[$i]}}); - my @sorted_depts; - &Apache::courseclassifier::sort_cats('2',$cat_order,$codetitles,\@unsorted,\@sorted_depts); - $output .= qq| idcse_by_sem_dept[$i] = new Array("|.join('","',@sorted_depts).'");'."\n"; - for (my $j=0; $j<@sorted_depts; $j++) { - $output .= qq| idcse_by_sem_num[$i][$j] = new Array ("|.join('","',sort(@{$by_sem->{$sorted_sems[$i]}->{$sorted_depts[$j]}})).'");'."\n"; - } - } - } - @unsorted = keys(%{$by_dept}); - my @sorted_deps; - &Apache::courseclassifier::sort_cats('2',$cat_order,$codetitles,\@unsorted,\@sorted_deps); - $output .= 'idcse_by_dep = new Array('.scalar(@sorted_deps).');'."\n"; - for (my $k=0; $k<@sorted_deps; $k++) { - $output .= qq| idcse_by_dep[$k] = new Array ("|.join('","',sort(@{$by_dept->{$sorted_deps[$k]}})).'");'."\n"; + return (\%status_title,\@status_order); +} + +sub get_wasactive_text { + my $wasacctext = ' -- '; + if ($env{'form.currcat_0'} eq 'communities::0') { + $wasacctext .= &mt('where member access status was current ...'); + } else { + $wasacctext .= &mt('where student access status was current ...'); } - return $output; + return $wasacctext; } sub search_official_courselist { - my ($domain,$numtitles) = @_; - my $instcode; - if (defined($numtitles) && $numtitles == 0) { - $instcode = '.+'; - } else { - my (%codedefaults,@code_order); - my $defaults_result = - &Apache::lonnet::auto_instcode_defaults($domain,\%codedefaults, - \@code_order); - if ($defaults_result eq 'ok') { - $instcode ='^'; - foreach my $item (@code_order) { - if ($env{'form.'.$item} eq '0' ) { - $instcode .= $codedefaults{$item}; - } else { - $instcode .= $env{'form.'.$item}; - } - } - $instcode .= '$'; - } else { - $instcode = '.'; - } + my ($domain,$numtitles,$codetitles) = @_; + my $instcode = &Apache::courseclassifier::instcode_search_str($domain,$numtitles,$codetitles); + my $showhidden; + if (&user_is_dc($domain)) { + $showhidden = $env{'form.showhidden'}; } - my %courses = &Apache::lonnet::courseiddump($domain,'.',1,$instcode,'.','.', - undef,undef,'Course',1, - $env{'form.showselfenroll'}); + my %courses = + &Apache::lonnet::courseiddump($domain,'.',1,$instcode,'.','.',undef,undef, + 'Course',1,$env{'form.showselfenroll'},undef, + $showhidden,'coursecatalog'); return %courses; } 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)) { @@ -574,21 +1284,51 @@ sub search_courselist { $filter = $env{'form.currcat_'.$shallower}; } my %courses; + my $filterstr; if ($filter ne '') { - %courses = &Apache::lonnet::courseiddump($domain,'.',1,'.','.','.', - undef,undef,'Course',1, - $env{'form.showselfenroll'},$filter); + 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,$typefilter); + if (&user_is_dc($domain)) { + $showhidden = $env{'form.showhidden'}; + } + if ($env{'form.currcat_0'} eq 'communities::0') { + $typefilter = 'Community'; + } elsif ($env{'form.currcat_0'} eq 'placement::0') { + $typefilter = 'Placement'; + } else { + $typefilter = '.'; + } + %courses = + &Apache::lonnet::courseiddump($domain,'.',1,'.','.','.',undef,undef, + $typefilter,1,$env{'form.showselfenroll'}, + $filterstr,$showhidden,'coursecatalog'); } return %courses; } sub print_course_listing { - my ($domain,$numtitles) = @_; + my ($domain,$numtitles,$trails,$allitems,$subcats,$codetitles,$canviewall,$hostname) = @_; my $output; my %courses; my $knownuser = &user_is_known(); + my $canviewall = &canview_all(); my $details = $env{'form.coursenum'}; - if (&user_is_dc($domain)) { + if (&user_is_dc($domain) || $canviewall) { if ($env{'form.showdetails'}) { $details = 1; } @@ -596,44 +1336,72 @@ sub print_course_listing { if ($env{'form.coursenum'} ne '') { %courses = &Apache::lonnet::courseiddump($domain,'.',1,'.','.', $env{'form.coursenum'}, - undef,undef,'Course',1); + undef,undef,'.',1); if (keys(%courses) == 0) { - $output .= &mt('The courseID provided does not match a course in this domain.'); + $output = '

'; + if ($env{'form.currcat_0'} eq 'communities::0') { + $output .= &mt('The courseID provided does not match a community in this domain.'); + } elsif ($env{'form.currcat_0'} eq 'placement::0') { + $output .= &mt('The courseID provided does not match a placement test in this domain.'); + } else { + $output .= &mt('The courseID provided does not match a course in this domain.'); + } + $output .= '

'; return $output; } } else { if ($env{'form.currcat_0'} eq 'instcode::0') { - %courses = &search_official_courselist($domain,$numtitles); + %courses = &search_official_courselist($domain,$numtitles,$codetitles); } else { - %courses = &search_courselist($domain); + %courses = &search_courselist($domain,$subcats); } if (keys(%courses) == 0) { - $output = &mt('No courses match the criteria you selected.'); + $output = '

'; + if ($env{'form.currcat_0'} eq 'communities::0') { + $output .= &mt('No communities match the criteria you selected.'); + } elsif ($env{'form.currcat_0'} eq 'placement::0') { + $output .= &mt('No placement tests match the criteria you selected.'); + } else { + $output .= &mt('No courses match the criteria you selected.'); + } + $output .= '

'; return $output; } - if ($knownuser && !$env{'form.showdetails'}) { - $output = &mt('Note for students: If you are officially enrolled in a course but the course is not listed in your LON-CAPA courses, click the "Show more details" link for the specific course and check the default access dates and/or automated enrollment settings.

'); + if (($knownuser) && (!$env{'form.showdetails'}) && (!&user_is_dc($domain)) && (!$canviewall)) { + $output = ''.&mt('Note for students:').' ' + .&mt('If you are officially enrolled in a course but the course is not listed in your LON-CAPA courses, click the "Show more details" link for the specific course and check the default access dates and/or automated enrollment settings.') + .'

'; } } 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,$domain,\%courses,$details,undef, + $now,$trails,$allitems,$canviewall,$hostname); + $output .= "\n".'
'. + ''. + ''. + &Apache::lonhtmlcommon::echo_form_input(['catalogfilter','courseid']).'
'; return $output; } sub construct_data_table { - my ($knownuser,$courses,$details,$usersections,$now,$domconfig) = @_; + my ($knownuser,$domain,$courses,$details,$usersections,$now, + $trails,$allitems,$canviewall,$hostname) = @_; my %sortname; if (($details eq '') || ($env{'form.showdetails'})) { $sortname{'Code'} = 'code'; + $sortname{'Categories'} = 'cats'; $sortname{'Title'} = 'title'; - $sortname{'Owner(s)'} = 'owner'; + $sortname{'Owner & Co-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 & Co-owner(s)')); if (ref($usersections) eq 'HASH') { $coltitles[1] = 'Your Section'; } @@ -648,24 +1416,81 @@ sub construct_data_table { } $output .= ''; } - if ($knownuser) { + my (@fields,%fieldtitles,$wasactiveon); + if ($knownuser || ($canviewall && $details)) { if ($details) { - $output .= - ''.&mt('Default Access Dates for Students').''. - ''.&mt('Student Counts').''. - ''.&mt('Auto-enrollment of
registered students').''; + 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('Details').''; } } $output .= ''.&mt('Self-enroll (if permitted)').''; &Apache::loncommon::end_data_table_header_row(); - my %courseinfo = &build_courseinfo_hash($courses,$knownuser,$details, - $usersections); + 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}))) { 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 { @@ -678,28 +1503,94 @@ 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)); } 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},$knownuser, - $details,\$count,$now,$course); + $output.=&courseinfo_row($courseinfo{$course},$knownuser,$details, + \$count,$now,$course,$trails,$allitems, + \%numbers,$canviewall,$hostname); $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 .= ''. + ' '. + ''. + ''; + foreach my $item ('courses','sections','xlists') { + $output .= ''. + ''. + ''. + ''."\n"; + } + if (@fields > 0) { + foreach my $status (@fields) { + $output .= ''. + ''. + ''. + ''."\n"; + } + } + $output .= '
'.$lt{$item}.' '.$numbers{$item}.'
'.$lt{$status}.' '.$numbers{$status}.'
'; + if ($showcredits) { + $output .= ''; + foreach my $status (@fields) { + $output .= ''. + ''. + ''; + } + $output .= '
'.$lt{'cr_'.$status}.' '.$creditsum{$status}.'
'; + } + } + } $output .= &Apache::loncommon::end_data_table(); return $output; } sub build_courseinfo_hash { - my ($courses,$knownuser,$details,$usersections) = @_; + my ($courses,$knownuser,$domain,$canviewall,$details,$usersections,$fields,$fieldtitles, + $wasactiveon,$numbers,$creditsum,$showcredits,$defofficial,$defunofficial) = @_; my %courseinfo; my $now = time; + 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 (ref($courses->{$course}) eq 'HASH') { @@ -709,8 +1600,8 @@ sub build_courseinfo_hash { $cleandesc=~s/'/\\'/g; $cleandesc =~ s/^\s+//; my ($cdom,$cnum)=split(/\_/,$course); - my ($descr,$instcode,$singleowner,$ttype,$selfenroll_types, - $selfenroll_start,$selfenroll_end,@owners,%ownernames); + 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'}; @@ -719,15 +1610,22 @@ 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'}; + $extsyllplain = $courses->{$course}{'extsyllplain'}; push(@owners,$singleowner); - if (ref($courses->{$course}{'co-owners'}) eq 'ARRAY') { - foreach my $item (@{$courses->{$course}{'co-owners'}}) { + if ($courses->{$course}{'co-owners'} ne '') { + foreach my $item (split(/,/,$courses->{$course}{'co-owners'})) { push(@owners,$item); } } } + if ($instcode ne '') { + $uniquecodes{$instcode} = 1; + } else { + $nocodes ++; + } foreach my $owner (@owners) { - my ($ownername,$ownerdom) = @_; + my ($ownername,$ownerdom); if ($owner =~ /:/) { ($ownername,$ownerdom) = split(/:/,$owner); } else { @@ -756,32 +1654,62 @@ 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; + $courseinfo{$course}{'extsyllplain'} = $extsyllplain; my %coursehash = &Apache::lonnet::dump('environment',$cdom,$cnum); my @classids; my @crosslistings; my ($seclist,$numsec) = &identify_sections($coursehash{'internal.sectionnums'}); - if (ref($usersections) eq 'HASH') { - if (ref($usersections->{$course}) eq 'ARRAY') { - $seclist = join(', ',@{$usersections->{$course}}); - } - } $courseinfo{$course}{'seclist'} = $seclist; 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 ($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 && ($details == 1))) { - $courseinfo{$course}{'counts'} = &count_students($cdom,$cnum,$numsec); - $courseinfo{$course}{'autoenrollment'} = - &autoenroll_info(\%coursehash,$now,$seclist,$xlist_items, - $instcode,\@owners,$cdom,$cnum); - + (($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,\@owners,$cdom,$cnum); + } my $startaccess = ''; my $endaccess = ''; my $accessdates; @@ -791,14 +1719,41 @@ sub build_courseinfo_hash { 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"; + $endaccess = &mt('No ending date'); } } if ($startaccess) { - $accessdates .= &mt('From: ').$startaccess.'
'; + $accessdates .= ''.&mt('From:[_1]',' '.$startaccess).'
'; } if ($endaccess) { - $accessdates .= &mt('To: ').$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; } @@ -807,41 +1762,87 @@ sub build_courseinfo_hash { } $courseinfo{$course}{'xlist'} = $xlist_items; } + if (ref($numbers) eq 'HASH') { + $numbers->{'courses'} = $nocodes + scalar(keys(%uniquecodes)); + } return %courseinfo; } sub count_students { - my ($cdom,$cnum,$numsec) = @_; + 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 = &mt('[quant,_1,section]',$numsec).':
'; - 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,$knownuser,$details,$countref,$now,$course) = @_; + my ($info,$knownuser,$details,$countref,$now,$course,$trails,$allitems, + $numbers,$canviewall,$hostname) = @_; 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'}; @@ -855,53 +1856,95 @@ 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 .= ''.$$countref.''. - ''.$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)) { + unless ((&Apache::lonnet::uses_sts()) || + (&Apache::lonnet::waf_allssl($hostname))) { + $usehttp = 1; + } + } + $output .= ''.&mt('Syllabus').''; } else { $output .= ' '; } $output .= ''. ''.$ownerlast.''; - if ($knownuser) { + 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; - 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').''; - } - $selfenroll = 1; - } - } - if (!$selfenroll) { + 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; +} + sub identify_sections { my ($seclist) = @_; my @secnums; @@ -920,7 +1963,7 @@ sub identify_sections { } } @secnums = sort {$a <=> $b} @secnums; - my $seclist = join(', ',@secnums); + $seclist = join(', ',@secnums); my $numsec = @secnums; return ($seclist,$numsec); } @@ -928,27 +1971,32 @@ sub identify_sections { sub get_valid_classes { my ($seclist,$xlist_items,$crscode,$owners,$cdom,$cnum) = @_; my $response; - my %validations; + my (@sections,@xlists,%possclasses,%okclasses,%validations); @{$validations{'sections'}} = (); @{$validations{'xlists'}} = (); my $totalitems = 0; if ($seclist) { - foreach my $sec (split(/, /,$seclist)) { - my $class = $crscode.$sec; - if (&Apache::lonnet::auto_validate_class_sec($cdom,$cnum,$owners, - $class) eq 'ok') { + @sections = split(/,\s+/,$seclist); + map { $possclasses{$crscode.$_} = 1; } @sections; + } + if ($xlist_items) { + @xlists = split(/,\s+/,$xlist_items); + map { $possclasses{$_} = 1; } @xlists; + } + my %okclasses = &Apache::lonnet::auto_validate_instclasses($cdom,$cnum,$owners, + \%possclasses); + if (keys(%okclasses)) { + foreach my $sec (@sections) { + if ($okclasses{$crscode.$sec}) { if (!grep(/^\Q$sec$\E/,@{$validations{'sections'}})) { push(@{$validations{'sections'}},$sec); $totalitems ++; } } } - } - if ($xlist_items) { - 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'}})) { + foreach my $item (@xlists) { + if ($okclasses{$item}) { + if (!grep(/^\Q$item\E$/,@{$validations{'xlists'}})) { push(@{$validations{'xlists'}},$item); $totalitems ++; } @@ -957,156 +2005,17 @@ sub get_valid_classes { } if ($totalitems > 0) { if (@{$validations{'sections'}}) { - $response = &mt('Sections: '). + $response = &mt('Sections:').' '. join(', ',@{$validations{'sections'}}).'
'; } if (@{$validations{'xlists'}}) { - $response .= &mt('Courses: '). + $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; kStarts: '). - $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,$owners,$cdom,$cnum); if ($valid_classes ne '') { - $autoenrolldates = &mt('Currently enabled
'). + $autoenrolldates = &mt('Currently enabled').'
'. $valid_classes; } }