--- loncom/interface/coursecatalog.pm 2008/01/12 22:32:04 1.25
+++ loncom/interface/coursecatalog.pm 2008/05/29 19:58:32 1.30
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler for displaying the course catalog interface
#
-# $Id: coursecatalog.pm,v 1.25 2008/01/12 22:32:04 raeburn Exp $
+# $Id: coursecatalog.pm,v 1.30 2008/05/29 19:58:32 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -54,7 +54,8 @@ sub handler {
&Apache::lonacc::get_posted_cgi($r);
&Apache::lonlocal::get_language_handle($r);
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['sortby']);
- my $codedom = &Apache::lonnet::default_login_domain();
+
+ my $codedom = &Apache::lonnet::default_login_domain();
if (($env{'user.domain'} ne '') && ($env{'user.domain'} ne 'public')) {
$codedom = $env{'user.domain'};
@@ -63,15 +64,40 @@ sub handler {
}
}
my $formname = 'coursecatalog';
+ if ($env{'form.showdom'} ne '') {
+ if (&Apache::lonnet::domain($env{'form.showdom'}) ne '') {
+ $codedom = $env{'form.showdom'};
+ }
+ }
my $domdesc = &Apache::lonnet::domain($codedom,'description');
-
&Apache::lonhtmlcommon::clear_breadcrumbs();
if ($env{'form.coursenum'} ne '' && &user_is_known()) {
&course_details($r,$codedom,$formname,$domdesc);
} else {
- my $numtitles = &course_selector($r,$codedom,$formname,$domdesc);
- if ($env{'form.state'} eq 'listing') {
- $r->print(&print_course_listing($codedom,$numtitles).'
');
+ my $catlinks = &category_breadcrumbs($codedom);
+ my $catjs = <<"ENDSCRIPT";
+
+function setCatDepth(depth) {
+ document.coursecats.catalog_maxdepth.value = depth;
+ document.coursecats.submit();
+ return;
+}
+
+ENDSCRIPT
+ my $numtitles;
+ if ($env{'form.currcat_0'} eq 'instcode::0') {
+ $numtitles = &instcode_course_selector($r,$codedom,$formname,$domdesc,
+ $catlinks,$catjs);
+ if ($env{'form.state'} eq 'listing') {
+ $r->print(&print_course_listing($codedom,$numtitles));
+ }
+ } else {
+ my (%add_entries);
+ $catjs = '';
+ &cat_header($r,$codedom,$catjs,\%add_entries,$catlinks);
+ if ($env{'form.currcat_0'} ne '') {
+ $r->print(&print_course_listing($codedom));
+ }
}
}
$r->print(&Apache::loncommon::end_page());
@@ -100,7 +126,7 @@ sub course_details {
{text=>"Course details"});
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Details'));
$r->print('
'.&mt('Detailed course information:').'
'.
- '
');
}
-sub course_selector {
- my ($r,$codedom,$formname,$domdesc) = @_;
+sub instcode_course_selector {
+ my ($r,$codedom,$formname,$domdesc,$catlinks,$catjs) = @_;
my %coursecodes = ();
my %codes = ();
my @codetitles = ();
@@ -128,6 +154,9 @@ sub course_selector {
my $totcodes = 0;
my $jscript = '';
my ($numtitles,$lasttitle);
+ my %add_entries = (topmargin => "0",
+ marginheight => "0",);
+ my $js;
$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);
@@ -195,44 +224,25 @@ function setCourseId(caller) {
}\n|;
}
}
- my $js = '';
- my %add_entries = (topmargin => "0",
- marginheight => "0",);
+ $js = '';
if (($env{'form.state'} eq 'listing') && ($numtitles > 0)) {
$add_entries{'onLoad'} = 'setElements()';
}
- my $start_page =
- &Apache::loncommon::start_page('Course Catalog',$js,
- {
- 'add_entries' => \%add_entries,
- 'no_inline_link' => 1,});
- $r->print($start_page);
- if ($env{'form.state'} eq 'listing') {
- if ($numtitles > 0) {
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"/adm/coursecatalog",
- text=>"Select courses"},
- {text=>"Course listing"});
- } else {
- &Apache::lonhtmlcommon::add_breadcrumb
- ({text=>"Course listing"});
- }
- $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Listing'));
- } else {
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"/adm/coursecatalog",
- text=>"Select courses"});
- $r->print(&Apache::lonhtmlcommon::breadcrumbs('Select courses'));
- }
- $r->print(''.&mt('Display information about official [_1] classes for which LON-CAPA courses have been created:',$domdesc).'
');
- $r->print('');
if (($numtitles > 0) && ($env{'form.state'} eq 'listing')) {
- $r->print('
');
+ $r->print('
');
}
} else {
- $r->print(&Apache::loncommon::start_page('Course Catalog','',
- {
- 'no_inline_link' => 1,}));
- $r->print('
'.&mt('No official courses to display for [_1].',$domdesc));
+ &cat_header($r,$codedom,$js,\%add_entries,$catlinks,$numtitles);
+ my $cat_maxdepth = $env{'form.catalog_maxdepth'};
+ $r->print('');
}
return $numtitles;
}
+sub cat_header {
+ my ($r,$codedom,$js,$add_entries,$catlinks,$numtitles) = @_;
+ my $start_page =
+ &Apache::loncommon::start_page('Course Catalog',$js,
+ {
+ 'add_entries' => $add_entries,
+ 'no_inline_link' => 1,});
+ $r->print($start_page);
+ if ($env{'form.state'} eq 'listing') {
+ if ($numtitles > 0) {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"/adm/coursecatalog",
+ text=>"Select courses"},
+ {text=>"Course listing"});
+ } else {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({text=>"Course listing"});
+ }
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Listing'));
+ } else {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"/adm/coursecatalog",
+ text=>"Select courses"});
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Select courses'));
+ }
+ $r->print('');
+ return;
+}
+
+sub category_breadcrumbs {
+ my ($dom) = @_;
+ my %domconfig =
+ &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom);
+ my (@cats,@trails,%allitems,%idx,@jsarray);
+ &Apache::loncommon::extract_categories($domconfig{'coursecategories'},\@cats,\@trails,
+ \%allitems,\%idx,\@jsarray);
+ my $currdepth = 0;
+ my $deeper = 0;
+ my $currcat_str;
+ if ($env{'form.catalog_maxdepth'} ne '') {
+ $currdepth = $env{'form.catalog_maxdepth'};
+ if ($env{'form.currcat_'.$currdepth} eq '') {
+ $deeper = $currdepth;
+ } else {
+ $deeper = $currdepth + 1;
+ }
+ }
+ $currcat_str = '';
+ my $catlinks = ''.&mt('Catalog:').' | ';
+ for (my $i=0; $i<$deeper; $i++) {
+ $currcat_str .= '';
+ my ($cattitle,$shallower);
+ if ($i == 0) {
+ $cattitle = &mt('Main Categories');
+ } else {
+ $shallower = $i-1;
+ my ($cat,$container,$depth) = map { &unescape($_); } split(/:/,$env{'form.currcat_'.$shallower});
+ $cattitle = $cat;
+ }
+ $catlinks .= ''.$cattitle.'-> | ';
+ }
+ if ($deeper == 0) {
+ $catlinks .= ''.&mt('Main Categories').': ';
+ if (ref($cats[0]) eq 'ARRAY') {
+ if ((@{$cats[0]} == 1) && ($cats[0][0] eq 'instcode')) {
+ $catlinks .= &mt('Official courses (with institutional codes)').
+ '';
+ $env{'form.currcat_0'} = 'instcode::0';
+ } else {
+ $catlinks .= ''."\n".
+ ' ';
+ }
+ } else {
+ $catlinks .= &mt('Official courses (with institutional codes)').
+ '';
+ $env{'form.currcat_0'} = 'instcode::0';
+ }
+ } else {
+ my ($cat,$container,$depth);
+ 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 $deeper = $depth +1;
+ my $currcat = $cat;
+ if ($cat eq 'instcode') {
+ $currcat = &mt('Official courses (with institutional codes)');
+ }
+ $catlinks .= ' | '.$currcat;
+ if (ref($cats[$deeper]{$cat}) eq 'ARRAY') {
+ $catlinks .= ': '."\n".
+ ' ';
+ }
+ }
+ $catlinks .= $currcat_str.' |
| ';
+ return $catlinks;
+}
+
sub user_is_dc {
my ($codedom) = @_;
if (exists($env{'user.role.dc./'.$codedom.'/'})) {
@@ -387,7 +542,7 @@ sub build_javascript {
return $output;
}
-sub search_courselist {
+sub search_official_courselist {
my ($domain,$numtitles) = @_;
my $instcode;
if (defined($numtitles) && $numtitles == 0) {
@@ -412,10 +567,27 @@ sub search_courselist {
}
}
my %courses = &Apache::lonnet::courseiddump($domain,'.',1,$instcode,'.','.',
- undef,undef,'Course',1);
+ undef,undef,'Course',1,
+ $env{'form.showselfenroll'});
return %courses;
}
+sub search_courselist {
+ my ($domain) = @_;
+ my $cat_maxdepth = $env{'form.catalog_maxdepth'};
+ my $filter = $env{'form.currcat_'.$cat_maxdepth};
+ if (($filter eq '') && ($cat_maxdepth > 0)) {
+ my $shallower = $cat_maxdepth - 1;
+ $filter = $env{'form.currcat_'.$shallower};
+ }
+ my %courses;
+ if ($filter ne '') {
+ %courses = &Apache::lonnet::courseiddump($domain,'.',1,'.','.','.',
+ undef,undef,'Course',1,
+ $env{'form.showselfenroll'},$filter);
+ }
+ return %courses;
+}
sub print_course_listing {
my ($domain,$numtitles) = @_;
@@ -437,7 +609,11 @@ sub print_course_listing {
return $output;
}
} else {
- %courses = &search_courselist($domain,$numtitles);
+ if ($env{'form.currcat_0'} eq 'instcode::0') {
+ %courses = &search_official_courselist($domain,$numtitles);
+ } else {
+ %courses = &search_courselist($domain);
+ }
if (keys(%courses) == 0) {
$output = &mt('No courses match the criteria you selected.');
return $output;
@@ -446,13 +622,16 @@ sub print_course_listing {
$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.
');
}
}
- $output .= &construct_data_table($knownuser,\%courses,$details);
+ 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']);
return $output;
}
sub construct_data_table {
- my ($knownuser,$courses,$details,$usersections) = @_;
+ my ($knownuser,$courses,$details,$usersections,$now,$domconfig) = @_;
my %sortname;
if (($details eq '') || ($env{'form.showdetails'})) {
$sortname{'Code'} = 'code';
@@ -483,9 +662,10 @@ sub construct_data_table {
''.&mt('Student Counts').' | '.
''.&mt('Auto-enrollment of registered students').' | ';
} else {
- $output .= ' | ';
+ $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);
@@ -514,7 +694,8 @@ sub construct_data_table {
foreach my $item (@sorted_courses) {
foreach my $course (@{$Sortby{$item}}) {
$output.=&Apache::loncommon::start_data_table_row();
- $output.=&courseinfo_row($courseinfo{$course},$knownuser,$details,\$count);
+ $output.=&courseinfo_row($courseinfo{$course},$knownuser,
+ $details,\$count,$now,$course);
$output.=&Apache::loncommon::end_data_table_row();
}
}
@@ -535,12 +716,16 @@ sub build_courseinfo_hash {
$cleandesc=~s/'/\\'/g;
$cleandesc =~ s/^\s+//;
my ($cdom,$cnum)=split(/\_/,$course);
- my ($descr,$instcode,$singleowner,$ttype,@owners,%ownernames);
+ my ($descr,$instcode,$singleowner,$ttype,$selfenroll_types,
+ $selfenroll_start,$selfenroll_end,@owners,%ownernames);
if (ref($courses->{$course}) eq 'HASH') {
$descr = $courses->{$course}{'description'};
$instcode = $courses->{$course}{'inst_code'};
$singleowner = $courses->{$course}{'owner'};
$ttype = $courses->{$course}{'type'};
+ $selfenroll_types = $courses->{$course}{'selfenroll_types'};
+ $selfenroll_start = $courses->{$course}{'selfenroll_start_date'};
+ $selfenroll_end = $courses->{$course}{'selfenroll_end_date'};
push(@owners,$singleowner);
if (ref($courses->{$course}{'co-owners'}) eq 'ARRAY') {
foreach my $item (@{$courses->{$course}{'co-owners'}}) {
@@ -575,6 +760,9 @@ sub build_courseinfo_hash {
$courseinfo{$course}{'ownerlastnames'} = join(', ',sort(@lastnames));
$courseinfo{$course}{'title'} = $cleandesc;
$courseinfo{$course}{'owner'} = $singleowner;
+ $courseinfo{$course}{'selfenroll_types'} = $selfenroll_types;
+ $courseinfo{$course}{'selfenroll_start'} = $selfenroll_start;
+ $courseinfo{$course}{'selfenroll_end'} = $selfenroll_end;
my %coursehash = &Apache::lonnet::dump('environment',$cdom,$cnum);
my @classids;
@@ -658,7 +846,7 @@ sub count_students {
}
sub courseinfo_row {
- my ($info,$knownuser,$details,$countref) = @_;
+ my ($info,$knownuser,$details,$countref,$now,$course) = @_;
my ($cdom,$cnum,$title,$ownerlast,$code,$owner,$seclist,$xlist_items,
$accessdates,$showsyllabus,$counts,$autoenrollment,$output);
if (ref($info) eq 'HASH') {
@@ -701,6 +889,22 @@ sub courseinfo_row {
$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) {
+ $output .= ' | ';
+ }
$$countref ++;
return $output;
}