version 1.85, 2014/05/17 23:14:41
|
version 1.86, 2015/05/04 15:43:48
|
Line 38 use Apache::lonlocal;
|
Line 38 use Apache::lonlocal;
|
use Apache::courseclassifier; |
use Apache::courseclassifier; |
use Apache::lonacc; |
use Apache::lonacc; |
use LONCAPA; |
use LONCAPA; |
|
use LONCAPA::lonauthcgi; |
|
|
sub handler { |
sub handler { |
my ($r) = @_; |
my ($r) = @_; |
Line 79 sub handler {
|
Line 80 sub handler {
|
my %domconfig = |
my %domconfig = |
&Apache::lonnet::get_dom('configuration',['coursecategories'],$codedom); |
&Apache::lonnet::get_dom('configuration',['coursecategories'],$codedom); |
my $knownuser = &user_is_known(); |
my $knownuser = &user_is_known(); |
|
my $canviewall = &canview_all(); |
|
|
my ($cathash,$cattype); |
my ($cathash,$cattype); |
if (ref($domconfig{'coursecategories'}) eq 'HASH') { |
if (ref($domconfig{'coursecategories'}) eq 'HASH') { |
$cathash = $domconfig{'coursecategories'}{'cats'}; |
$cathash = $domconfig{'coursecategories'}{'cats'}; |
if ($knownuser) { |
if ($knownuser || $canviewall) { |
$cattype = $domconfig{'coursecategories'}{'auth'}; |
$cattype = $domconfig{'coursecategories'}{'auth'}; |
} else { |
} else { |
$cattype = $domconfig{'coursecategories'}{'unauth'}; |
$cattype = $domconfig{'coursecategories'}{'unauth'}; |
Line 101 sub handler {
|
Line 103 sub handler {
|
({href=>"/adm/coursecatalog", |
({href=>"/adm/coursecatalog", |
text=>"Course/Community Catalog"}); |
text=>"Course/Community Catalog"}); |
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog')); |
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog')); |
if ($knownuser) { |
if ($knownuser || $canviewall) { |
$r->print('<div>'.&mt('No catalog of LON-CAPA courses/communities is provided for: [_1]',$domdesc).'</div>'); |
$r->print('<div>'.&mt('No catalog of LON-CAPA courses/communities is provided for: [_1]',$domdesc).'</div>'); |
} else { |
} else { |
if ($domconfig{'coursecategories'}{'auth'} eq 'none') { |
if ($domconfig{'coursecategories'}{'auth'} eq 'none') { |
Line 149 sub handler {
|
Line 151 sub handler {
|
my %courses = &Apache::lonnet::courseiddump($codedom,'.',1,'.','.', |
my %courses = &Apache::lonnet::courseiddump($codedom,'.',1,'.','.', |
$cnum,undef,undef,'.',1); |
$cnum,undef,undef,'.',1); |
if (keys(%courses)) { |
if (keys(%courses)) { |
$env{'form.coursenum'} = $cnum; |
$env{'form.coursenum'} = $cnum; |
my %courseinfo = &build_courseinfo_hash(\%courses,$knownuser,$codedom); |
my %courseinfo = &build_courseinfo_hash(\%courses,$knownuser,$codedom,$canviewall); |
undef($env{'form.coursenum'}); |
undef($env{'form.coursenum'}); |
if (ref($courseinfo{$codedom.'_'.$cnum}) eq 'HASH') { |
if (ref($courseinfo{$codedom.'_'.$cnum}) eq 'HASH') { |
$r->print(&Apache::lonhtmlcommon::start_pick_box()); |
$r->print(&Apache::lonhtmlcommon::start_pick_box()); |
Line 249 function setCourseId(caller) {
|
Line 251 function setCourseId(caller) {
|
|
|
ENDSCRIPT |
ENDSCRIPT |
$catjs .= &courselink_javascript(); |
$catjs .= &courselink_javascript(); |
if (&user_is_dc($codedom)) { |
if (&user_is_dc($codedom) || $canviewall) { |
$catjs .= <<ENDTOGGJS |
$catjs .= <<ENDTOGGJS |
|
|
function toggleStatuses() { |
function toggleStatuses() { |
Line 280 ENDTOGGJS
|
Line 282 ENDTOGGJS
|
} |
} |
if ($env{'form.currcat_0'} eq 'instcode::0') { |
if ($env{'form.currcat_0'} eq 'instcode::0') { |
$numtitles = &instcode_course_selector($r,$codedom,$formname,$domdesc, |
$numtitles = &instcode_course_selector($r,$codedom,$formname,$domdesc, |
$catlinks,$catjs,\@codetitles,$cattype); |
$catlinks,$catjs,\@codetitles,$cattype,$canviewall); |
if ($env{'form.state'} eq 'listing') { |
if ($env{'form.state'} eq 'listing') { |
$r->print(&print_course_listing($codedom,$numtitles,undef,undef,undef, |
$r->print(&print_course_listing($codedom,$numtitles,undef,undef,undef, |
\@codetitles)); |
\@codetitles,$canviewall)); |
} |
} |
} else { |
} else { |
my (%add_entries); |
my (%add_entries); |
Line 307 ENDJS
|
Line 309 ENDJS
|
if ($env{'form.currcat_0'} ne '') { |
if ($env{'form.currcat_0'} ne '') { |
$r->print('<form name="'.$formname. |
$r->print('<form name="'.$formname. |
'" method="post" action="/adm/coursecatalog">'. |
'" method="post" action="/adm/coursecatalog">'. |
&additional_filters($codedom,$has_subcats)."\n"); |
&additional_filters($codedom,$has_subcats,$canviewall)."\n"); |
$r->print('<input type="hidden" name="catalog_maxdepth" value="'. |
$r->print('<input type="hidden" name="catalog_maxdepth" value="'. |
$deeper.'" />'."\n"); |
$deeper.'" />'."\n"); |
for (my $i=0; $i<$deeper; $i++) { |
for (my $i=0; $i<$deeper; $i++) { |
Line 328 ENDJS
|
Line 330 ENDJS
|
$display_button.'" /></form><br /><br />'); |
$display_button.'" /></form><br /><br />'); |
} |
} |
if ($env{'form.state'} eq 'listing') { |
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)); |
} |
} |
} |
} |
} |
} |
Line 431 END
|
Line 434 END
|
} |
} |
|
|
sub instcode_course_selector { |
sub instcode_course_selector { |
my ($r,$codedom,$formname,$domdesc,$catlinks,$catjs,$codetitles,$cattype) = @_; |
my ($r,$codedom,$formname,$domdesc,$catlinks,$catjs,$codetitles,$cattype,$canviewall) = @_; |
my %coursecodes = (); |
my %coursecodes = (); |
my %codes = (); |
my %codes = (); |
my %cat_titles = (); |
my %cat_titles = (); |
Line 453 sub instcode_course_selector {
|
Line 456 sub instcode_course_selector {
|
if (($env{'form.state'} eq 'listing') && ($numtitles > 0)) { |
if (($env{'form.state'} eq 'listing') && ($numtitles > 0)) { |
$add_entries{'onLoad'} = 'setElements();'; |
$add_entries{'onLoad'} = 'setElements();'; |
} |
} |
if (&user_is_dc($codedom)) { |
if (&user_is_dc($codedom) || $canviewall) { |
$add_entries{'onLoad'} .= ' toggleStatuses();toggleWasActive();' |
$add_entries{'onLoad'} .= ' toggleStatuses();toggleWasActive();' |
} |
} |
&cat_header($r,$codedom,$js,\%add_entries,$catlinks,$numtitles,$cattype); |
&cat_header($r,$codedom,$js,\%add_entries,$catlinks,$numtitles,$cattype); |
Line 462 sub instcode_course_selector {
|
Line 465 sub instcode_course_selector {
|
'<input type="hidden" name="catalog_maxdepth" value="'.$cat_maxdepth.'" />'."\n". |
'<input type="hidden" name="catalog_maxdepth" value="'.$cat_maxdepth.'" />'."\n". |
'<input type="hidden" name="showdom" value="'.$env{'form.showdom'}.'" />'."\n". |
'<input type="hidden" name="showdom" value="'.$env{'form.showdom'}.'" />'."\n". |
'<input type="hidden" name="currcat_0" value="instcode::0" />'. |
'<input type="hidden" name="currcat_0" value="instcode::0" />'. |
&additional_filters($codedom)); |
&additional_filters($codedom,undef,$canviewall)); |
if ($numtitles > 0) { |
if ($numtitles > 0) { |
$r->print('<b>'.&mt('Choose which course(s) to list.').'</b><br />'. |
$r->print('<b>'.&mt('Choose which course(s) to list.').'</b><br />'. |
&Apache::courseclassifier::build_instcode_selectors($numtitles, |
&Apache::courseclassifier::build_instcode_selectors($numtitles, |
Line 683 sub get_depth_values {
|
Line 686 sub get_depth_values {
|
} |
} |
|
|
sub additional_filters { |
sub additional_filters { |
my ($codedom,$has_subcats) = @_; |
my ($codedom,$has_subcats,$canviewall) = @_; |
my $is_dc = &user_is_dc($codedom); |
my $is_dc = &user_is_dc($codedom); |
my $output = '<div class="LC_left_float">'; |
my $output = '<div class="LC_left_float">'; |
if ($is_dc) { |
if ($is_dc || $canviewall) { |
$output .= '<fieldset><legend>'.&mt('Options').'</legend>'; |
$output .= '<fieldset><legend>'.&mt('Options').'</legend>'; |
} |
} |
$output .= '<table><tr><td valign="top">'; |
$output .= '<table><tr><td valign="top">'; |
Line 727 sub additional_filters {
|
Line 730 sub additional_filters {
|
'<label><input type="checkbox" name="showselfenroll" value="1" '. |
'<label><input type="checkbox" name="showselfenroll" value="1" '. |
$show_selfenroll_status.'/>'.$selfenroll_text. |
$show_selfenroll_status.'/>'.$selfenroll_text. |
'</label></span><br />'; |
'</label></span><br />'; |
if ($is_dc) { |
if ($is_dc || $canviewall) { |
my ($titlesref,$orderref) = &get_statustitles('filters'); |
my ($titlesref,$orderref) = &get_statustitles('filters'); |
my $showdetails_status; |
my $showdetails_status; |
if ($env{'form.showdetails'}) { |
if ($env{'form.showdetails'}) { |
Line 758 sub additional_filters {
|
Line 761 sub additional_filters {
|
$details_text = &mt('Show full details for each course ([_1] only)',$dc_title); |
$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); |
$hidden_text = &mt('Include courses set to be hidden from catalog ([_1] only)',$dc_title); |
} |
} |
|
if ($is_dc) { |
|
$output .= '<span class="LC_nobreak">'. |
|
'<label><input type="checkbox" name="showhidden" value="1" '. |
|
$showhidden_status.'/>'.$hidden_text. |
|
'</label></span><br />'."\n"; |
|
} |
$output .= '<span class="LC_nobreak">'. |
$output .= '<span class="LC_nobreak">'. |
'<label><input type="checkbox" name="showhidden" value="1" '. |
|
$showhidden_status.'/>'.$hidden_text. |
|
'</label></span><br />'."\n". |
|
'<span class="LC_nobreak">'. |
|
'<label><input type="checkbox" name="showdetails" value="1" '. |
'<label><input type="checkbox" name="showdetails" value="1" '. |
$showdetails_status.'onclick="toggleStatuses();" />'. |
$showdetails_status.'onclick="toggleStatuses();" />'. |
$details_text.'</label></span></td>'."\n". |
$details_text.'</label></span></td>'."\n". |
Line 868 sub user_is_dc {
|
Line 873 sub user_is_dc {
|
return; |
return; |
} |
} |
|
|
|
sub canview_all { |
|
my $canviewall = 0; |
|
my $page = 'coursecatalog'; |
|
if (&LONCAPA::lonauthcgi::can_view($page)) { |
|
$canviewall = 1; |
|
} elsif (&LONCAPA::lonauthcgi::check_ipbased_access($page)) { |
|
$canviewall= 1; |
|
} |
|
return $canviewall; |
|
} |
|
|
sub get_statustitles { |
sub get_statustitles { |
my ($caller) = @_; |
my ($caller) = @_; |
my @status_order = ('Active','Future','Previous'); |
my @status_order = ('Active','Future','Previous'); |
Line 961 sub search_courselist {
|
Line 977 sub search_courselist {
|
} |
} |
|
|
sub print_course_listing { |
sub print_course_listing { |
my ($domain,$numtitles,$trails,$allitems,$subcats,$codetitles) = @_; |
my ($domain,$numtitles,$trails,$allitems,$subcats,$codetitles,$canviewall) = @_; |
my $output; |
my $output; |
my %courses; |
my %courses; |
my $knownuser = &user_is_known(); |
my $knownuser = &user_is_known(); |
|
my $canviewall = &canview_all(); |
my $details = $env{'form.coursenum'}; |
my $details = $env{'form.coursenum'}; |
if (&user_is_dc($domain)) { |
if (&user_is_dc($domain) || $canviewall) { |
if ($env{'form.showdetails'}) { |
if ($env{'form.showdetails'}) { |
$details = 1; |
$details = 1; |
} |
} |
Line 1001 sub print_course_listing {
|
Line 1018 sub print_course_listing {
|
$output .= '</p>'; |
$output .= '</p>'; |
return $output; |
return $output; |
} |
} |
if (($knownuser) && (!$env{'form.showdetails'}) && (!&user_is_dc($domain))) { |
if (($knownuser) && (!$env{'form.showdetails'}) && (!&user_is_dc($domain)) && (!$canviewall)) { |
$output = '<b>'.&mt('Note for students:').'</b> ' |
$output = '<b>'.&mt('Note for students:').'</b> ' |
.&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.') |
.&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.') |
.'<br /><br />'; |
.'<br /><br />'; |
Line 1009 sub print_course_listing {
|
Line 1026 sub print_course_listing {
|
} |
} |
my $now = time; |
my $now = time; |
$output .= &construct_data_table($knownuser,$domain,\%courses,$details,undef, |
$output .= &construct_data_table($knownuser,$domain,\%courses,$details,undef, |
$now,$trails,$allitems); |
$now,$trails,$allitems,$canviewall); |
$output .= "\n".'<form name="linklaunch" method="post" action="">'. |
$output .= "\n".'<form name="linklaunch" method="post" action="">'. |
'<input type="hidden" name="backto" value="coursecatalog" />'. |
'<input type="hidden" name="backto" value="coursecatalog" />'. |
'<input type="hidden" name="courseid" value="" />'. |
'<input type="hidden" name="courseid" value="" />'. |
Line 1018 sub print_course_listing {
|
Line 1035 sub print_course_listing {
|
} |
} |
|
|
sub construct_data_table { |
sub construct_data_table { |
my ($knownuser,$domain,$courses,$details,$usersections,$now,$trails,$allitems) = @_; |
my ($knownuser,$domain,$courses,$details,$usersections,$now,$trails,$allitems,$canviewall) = @_; |
my %sortname; |
my %sortname; |
if (($details eq '') || ($env{'form.showdetails'})) { |
if (($details eq '') || ($env{'form.showdetails'})) { |
$sortname{'Code'} = 'code'; |
$sortname{'Code'} = 'code'; |
Line 1050 sub construct_data_table {
|
Line 1067 sub construct_data_table {
|
$output .= '</th>'; |
$output .= '</th>'; |
} |
} |
my (@fields,%fieldtitles,$wasactiveon); |
my (@fields,%fieldtitles,$wasactiveon); |
if ($knownuser) { |
if ($knownuser || ($canviewall && $details)) { |
if ($details) { |
if ($details) { |
if ($env{'form.currcat_0'} eq 'communities::0') { |
if ($env{'form.currcat_0'} eq 'communities::0') { |
$output .= '<th>'.&mt('Default Access Dates for Members').'</th>'. |
$output .= '<th>'.&mt('Default Access Dates for Members').'</th>'. |
Line 1063 sub construct_data_table {
|
Line 1080 sub construct_data_table {
|
} |
} |
my ($titlesref,$orderref) = &get_statustitles(); |
my ($titlesref,$orderref) = &get_statustitles(); |
my @statuses; |
my @statuses; |
if (&user_is_dc($domain)) { |
if (&user_is_dc($domain) || $canviewall) { |
@statuses = &Apache::loncommon::get_env_multiple('form.showcounts'); |
@statuses = &Apache::loncommon::get_env_multiple('form.showcounts'); |
if (grep(/^Previous$/,@statuses)) { |
if (grep(/^Previous$/,@statuses)) { |
if ($env{'form.wasactive'} eq 'date') { |
if ($env{'form.wasactive'} eq 'date') { |
Line 1110 sub construct_data_table {
|
Line 1127 sub construct_data_table {
|
$deftextbook = $domdefaults{'textbookcredits'}; |
$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, |
$usersections,\@fields,\%fieldtitles, |
$wasactiveon,\%numbers,\%creditsum, |
$wasactiveon,\%numbers,\%creditsum, |
$showcredits,$defofficial,$defunofficial,$deftextbook); |
$showcredits,$defofficial,$defunofficial,$deftextbook); |
Line 1144 sub construct_data_table {
|
Line 1161 sub construct_data_table {
|
foreach my $course (@{$Sortby{$item}}) { |
foreach my $course (@{$Sortby{$item}}) { |
$output.=&Apache::loncommon::start_data_table_row(); |
$output.=&Apache::loncommon::start_data_table_row(); |
$output.=&courseinfo_row($courseinfo{$course},$knownuser,$details, |
$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(); |
$output.=&Apache::loncommon::end_data_table_row(); |
} |
} |
} |
} |
if (($knownuser) && ($count > 1) && $env{'form.showdetails'}) { |
if (($knownuser || $canviewall) && ($count > 1) && $env{'form.showdetails'}) { |
if (&user_is_dc($domain)) { |
if (&user_is_dc($domain) || $canviewall) { |
my %lt = &Apache::lonlocal::texthash ( |
my %lt = &Apache::lonlocal::texthash ( |
'Active' => 'Total current students', |
'Active' => 'Total current students', |
'Future' => 'Total future students', |
'Future' => 'Total future students', |
Line 1208 sub construct_data_table {
|
Line 1225 sub construct_data_table {
|
} |
} |
|
|
sub build_courseinfo_hash { |
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) = @_; |
$wasactiveon,$numbers,$creditsum,$showcredits,$defofficial,$defunofficial) = @_; |
my %courseinfo; |
my %courseinfo; |
my $now = time; |
my $now = time; |
my $gettotals; |
my $gettotals; |
if ((keys(%{$courses}) > 0) && (&user_is_dc($domain)) && ($details)) { |
if ((keys(%{$courses}) > 0) && (&user_is_dc($domain) || $canviewall) && ($details)) { |
$gettotals = 1; |
$gettotals = 1; |
} |
} |
my (%uniquecodes,$nocodes,$defcreds); |
my (%uniquecodes,$nocodes,$defcreds); |
Line 1309 sub build_courseinfo_hash {
|
Line 1326 sub build_courseinfo_hash {
|
$defcreds = $courseinfo{$course}{'defaultcredits'}; |
$defcreds = $courseinfo{$course}{'defaultcredits'}; |
} |
} |
if (((defined($env{'form.coursenum'}) && ($cnum eq $env{'form.coursenum'}))) || |
if (((defined($env{'form.coursenum'}) && ($cnum eq $env{'form.coursenum'}))) || |
($knownuser && ($details == 1))) { |
(($knownuser || $canviewall) && ($details == 1))) { |
my $milestone; |
my $milestone; |
if ($wasactiveon eq 'accessend') { |
if ($wasactiveon eq 'accessend') { |
if ($coursehash{'default_enrollment_end_date'}) { |
if ($coursehash{'default_enrollment_end_date'}) { |
Line 1462 sub count_students {
|
Line 1479 sub count_students {
|
} |
} |
|
|
sub courseinfo_row { |
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, |
my ($cdom,$cnum,$title,$ownerlast,$code,$owner,$seclist,$xlist_items, |
$accessdates,$showsyllabus,$counts,$autoenrollment,$output,$categories); |
$accessdates,$showsyllabus,$counts,$autoenrollment,$output,$categories); |
if (ref($info) eq 'HASH') { |
if (ref($info) eq 'HASH') { |
Line 1511 sub courseinfo_row {
|
Line 1528 sub courseinfo_row {
|
} |
} |
$output .= '</font></td>'. |
$output .= '</font></td>'. |
'<td>'.$ownerlast.'</td>'; |
'<td>'.$ownerlast.'</td>'; |
if ($knownuser) { |
if (($knownuser) || ($canviewall && $details)) { |
if ($details) { |
if ($details) { |
$output .= |
$output .= |
'<td>'.$accessdates.'</td>'. |
'<td>'.$accessdates.'</td>'. |