--- loncom/interface/coursecatalog.pm 2014/03/17 18:20:32 1.80 +++ loncom/interface/coursecatalog.pm 2016/10/23 21:21:56 1.88.2.1 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler for displaying the course catalog interface # -# $Id: coursecatalog.pm,v 1.80 2014/03/17 18:20:32 bisitz Exp $ +# $Id: coursecatalog.pm,v 1.88.2.1 2016/10/23 21:21:56 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) = @_; @@ -76,26 +77,153 @@ sub handler { my $domdesc = &Apache::lonnet::domain($codedom,'description'); &Apache::lonhtmlcommon::clear_breadcrumbs(); - if ($env{'form.catalog_maxdepth'} ne '') { - $env{'form.catalog_maxdepth'} =~ s{\D}{}g; - } - my %domconfig = &Apache::lonnet::get_dom('configuration',['coursecategories'],$codedom); - my (@cats,@trails,%allitems,%idx,@jsarray,%subcathash,$cathash); + 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 { $cathash = {}; + $cattype = 'std'; } - my $subcats; + 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'}) { + $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'}) { + $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; } &Apache::loncommon::extract_categories($cathash,\@cats,\@trails,\%allitems, \%idx,\@jsarray,$subcats); my ($numtitles,@codetitles); - if ($env{'form.coursenum'} ne '' && &user_is_known()) { + 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); @@ -123,7 +251,7 @@ function setCourseId(caller) { ENDSCRIPT $catjs .= &courselink_javascript(); - if (&user_is_dc($codedom)) { + if (&user_is_dc($codedom) || $canviewall) { $catjs .= <print(&print_course_listing($codedom,$numtitles,undef,undef,undef, - \@codetitles)); + \@codetitles,$canviewall)); } } else { my (%add_entries); @@ -167,6 +295,7 @@ ENDTOGGJS 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('
'. - &additional_filters($codedom,$has_subcats)."\n"); + &additional_filters($codedom,$has_subcats,$canviewall)."\n"); $r->print(''."\n"); for (my $i=0; $i<$deeper; $i++) { @@ -202,7 +331,8 @@ ENDJS $display_button.'" />


'); } if ($env{'form.state'} eq 'listing') { - $r->print(&print_course_listing($codedom,undef,\@trails,\%allitems,$subcats,\@codetitles)); + $r->print(&print_course_listing($codedom,undef,\@trails,\%allitems,$subcats,\@codetitles, + $canviewall)); } } } @@ -258,6 +388,26 @@ sub course_details { return; } +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 { return <<"END"; @@ -285,7 +435,7 @@ END } sub instcode_course_selector { - my ($r,$codedom,$formname,$domdesc,$catlinks,$catjs,$codetitles) = @_; + my ($r,$codedom,$formname,$domdesc,$catlinks,$catjs,$codetitles,$cattype,$canviewall) = @_; my %coursecodes = (); my %codes = (); my %cat_titles = (); @@ -305,18 +455,18 @@ sub instcode_course_selector { ''; if ($totcodes) { if (($env{'form.state'} eq 'listing') && ($numtitles > 0)) { - $add_entries{'onLoad'} = 'setElements();'; + $add_entries{'onload'} = 'setElements();'; } - if (&user_is_dc($codedom)) { - $add_entries{'onLoad'} .= ' toggleStatuses();toggleWasActive();' + 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)); + &additional_filters($codedom,undef,$canviewall)); if ($numtitles > 0) { $r->print(''.&mt('Choose which course(s) to list.').'
'. &Apache::courseclassifier::build_instcode_selectors($numtitles, @@ -330,8 +480,12 @@ sub instcode_course_selector { '


'); } else { - $js = ''; - &cat_header($r,$codedom,$js,\%add_entries,$catlinks,$numtitles); + $js = ''; + &cat_header($r,$codedom,$js,\%add_entries,$catlinks,$numtitles,$cattype); my $cat_maxdepth = $env{'form.catalog_maxdepth'}; $r->print('
'. ''. @@ -343,7 +497,7 @@ sub instcode_course_selector { } 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/Community Catalog',$js, { 'add_entries' => $add_entries, }); @@ -368,15 +522,17 @@ sub cat_header { text=>"Course/Community Catalog"}); } $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog')); - my $onchange = 'this.form.submit()'; - $r->print(''. - '
'.&mt('Domain:').''. - &Apache::loncommon::select_dom_form($codedom,'showdom','',1,$onchange)); - if (!$onchange) { + 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('
'. - '
print(''. ''.$catlinks.'
'); return; @@ -531,10 +687,10 @@ sub get_depth_values { } sub additional_filters { - my ($codedom,$has_subcats) = @_; + my ($codedom,$has_subcats,$canviewall) = @_; my $is_dc = &user_is_dc($codedom); my $output = '
'; - if ($is_dc) { + if ($is_dc || $canviewall) { $output .= '
'.&mt('Options').''; } $output .= ''."\n". @@ -716,6 +873,22 @@ sub user_is_dc { return; } +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'); @@ -809,12 +982,13 @@ sub search_courselist { } sub print_course_listing { - my ($domain,$numtitles,$trails,$allitems,$subcats,$codetitles) = @_; + my ($domain,$numtitles,$trails,$allitems,$subcats,$codetitles,$canviewall) = @_; 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; } @@ -849,17 +1023,15 @@ sub print_course_listing { $output .= '

'; return $output; } - if (($knownuser) && (!$env{'form.showdetails'}) && (!&user_is_dc($domain))) { + 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,$domain,\%courses,$details,undef, - $now,\%domconfig,$trails,$allitems); + $now,$trails,$allitems,$canviewall); $output .= "\n".''. ''. ''. @@ -868,8 +1040,7 @@ sub print_course_listing { } sub construct_data_table { - my ($knownuser,$domain,$courses,$details,$usersections,$now,$domconfig, - $trails,$allitems) = @_; + my ($knownuser,$domain,$courses,$details,$usersections,$now,$trails,$allitems,$canviewall) = @_; my %sortname; if (($details eq '') || ($env{'form.showdetails'})) { $sortname{'Code'} = 'code'; @@ -901,7 +1072,7 @@ sub construct_data_table { $output .= ''; } my (@fields,%fieldtitles,$wasactiveon); - if ($knownuser) { + if ($knownuser || ($canviewall && $details)) { if ($details) { if ($env{'form.currcat_0'} eq 'communities::0') { $output .= ''. @@ -914,7 +1085,7 @@ sub construct_data_table { } my ($titlesref,$orderref) = &get_statustitles(); my @statuses; - if (&user_is_dc($domain)) { + if (&user_is_dc($domain) || $canviewall) { @statuses = &Apache::loncommon::get_env_multiple('form.showcounts'); if (grep(/^Previous$/,@statuses)) { if ($env{'form.wasactive'} eq 'date') { @@ -961,7 +1132,7 @@ sub construct_data_table { $deftextbook = $domdefaults{'textbookcredits'}; } } - my %courseinfo = &build_courseinfo_hash($courses,$knownuser,$domain,$details, + my %courseinfo = &build_courseinfo_hash($courses,$knownuser,$domain,$canviewall,$details, $usersections,\@fields,\%fieldtitles, $wasactiveon,\%numbers,\%creditsum, $showcredits,$defofficial,$defunofficial,$deftextbook); @@ -995,12 +1166,12 @@ sub construct_data_table { foreach my $course (@{$Sortby{$item}}) { $output.=&Apache::loncommon::start_data_table_row(); $output.=&courseinfo_row($courseinfo{$course},$knownuser,$details, - \$count,$now,$course,$trails,$allitems,\%numbers); + \$count,$now,$course,$trails,$allitems,\%numbers,$canviewall); $output.=&Apache::loncommon::end_data_table_row(); } } - if (($knownuser) && ($count > 1) && $env{'form.showdetails'}) { - if (&user_is_dc($domain)) { + 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', @@ -1059,12 +1230,12 @@ sub construct_data_table { } sub build_courseinfo_hash { - my ($courses,$knownuser,$domain,$details,$usersections,$fields,$fieldtitles, + 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)) && ($details)) { + if ((keys(%{$courses}) > 0) && (&user_is_dc($domain) || $canviewall) && ($details)) { $gettotals = 1; } my (%uniquecodes,$nocodes,$defcreds); @@ -1160,7 +1331,7 @@ sub build_courseinfo_hash { $defcreds = $courseinfo{$course}{'defaultcredits'}; } if (((defined($env{'form.coursenum'}) && ($cnum eq $env{'form.coursenum'}))) || - ($knownuser && ($details == 1))) { + (($knownuser || $canviewall) && ($details == 1))) { my $milestone; if ($wasactiveon eq 'accessend') { if ($coursehash{'default_enrollment_end_date'}) { @@ -1313,7 +1484,7 @@ sub count_students { } sub courseinfo_row { - my ($info,$knownuser,$details,$countref,$now,$course,$trails,$allitems,$numbers) = @_; + 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,$categories); if (ref($info) eq 'HASH') { @@ -1362,7 +1533,7 @@ sub courseinfo_row { } $output .= ''. ''; - if ($knownuser) { + if (($knownuser) || ($canviewall && $details)) { if ($details) { $output .= ''. @@ -1374,29 +1545,39 @@ sub courseinfo_row { $output .= "'; } } - 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 .= ''; - } else { - $output .= ''; + } 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.''); + } } - $output .= ''; } - $selfenroll = 1; } } - if (!$selfenroll) { - $output .= ''; - } - $$countref ++; return $output; }
'; @@ -575,7 +731,7 @@ sub additional_filters { '
'; - if ($is_dc) { + if ($is_dc || $canviewall) { my ($titlesref,$orderref) = &get_statustitles('filters'); my $showdetails_status; if ($env{'form.showdetails'}) { @@ -586,7 +742,6 @@ sub additional_filters { $showhidden_status = 'checked="checked" '; } my @currstatuses = &Apache::loncommon::get_env_multiple('form.showcounts'); - my $dc_title = &Apache::lonnet::plaintext('dc'); my ($details_text,$hidden_text,$statusdisplay,$cellborder); my $wasactivedisplay = 'none'; if ($env{'form.showdetails'}) { @@ -600,17 +755,19 @@ sub additional_filters { $cellborder = 'border-left: 0px'; } if ($env{'form.currcat_0'} eq 'communities::0') { - $details_text = &mt('Show full details for each community ([_1] only)',$dc_title); - $hidden_text = &mt('Include communities set to be hidden from catalog ([_1] only)',$dc_title); + $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)'); } else { - $details_text = &mt('Show full details for each course ([_1] only)',$dc_title); - $hidden_text = &mt('Include courses set to be hidden from catalog ([_1] only)',$dc_title); + $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)'); + } + if ($is_dc) { + $output .= ''. + '
'."\n"; } $output .= ''. - '
'."\n". - ''. '
'.&mt('Default Access Dates for Members').''.$ownerlast.''.$accessdates.'".&mt('Show more details').''.&mt('Starts: [_1]',''.$showstart.'').'
'.&mt('Ends: [_1]',''.$showend.'').'
'.&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.''); + my $selfenroll = &selfenroll_status($info,$course); + if ($selfenroll) { + $output .= '
'.$selfenroll.'