--- loncom/interface/coursecatalog.pm 2006/10/12 23:15:33 1.6
+++ loncom/interface/coursecatalog.pm 2008/03/08 04:00:53 1.27
@@ -1,3 +1,7 @@
+# The LearningOnline Network with CAPA
+# Handler for displaying the course catalog interface
+#
+# $Id: coursecatalog.pm,v 1.27 2008/03/08 04:00:53 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -28,11 +32,11 @@ use strict;
use lib qw(/home/httpd/lib/perl);
use Apache::Constants qw(:common);
use Apache::loncommon;
+use Apache::lonhtmlcommon;
use Apache::lonnet;
use Apache::lonlocal;
use Apache::courseclassifier;
use Apache::lonacc;
-use lib '/home/httpd/lib/perl/';
use LONCAPA;
sub handler {
@@ -42,10 +46,71 @@ sub handler {
if ($r->header_only) {
return OK;
}
+ my $handle = &Apache::lonnet::check_for_valid_session($r);
+ my $lonidsdir=$r->dir_config('lonIDsDir');
+ if ($handle ne '') {
+ &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
+ }
&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::perlvar{'lonDefDomain'};
+ my $codedom = &Apache::lonnet::default_login_domain();
+
+ if (($env{'user.domain'} ne '') && ($env{'user.domain'} ne 'public')) {
+ $codedom = $env{'user.domain'};
+ if ($env{'request.role.domain'} ne '') {
+ $codedom = $env{'request.role.domain'};
+ }
+ }
+ my $formname = 'coursecatalog';
+ 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).' ');
+ }
+ }
+ $r->print(&Apache::loncommon::end_page());
+ return OK;
+}
+
+sub course_details {
+ my ($r,$codedom,$formname,$domdesc) = @_;
+ my $output;
+ my %add_entries = (topmargin => "0",
+ marginheight => "0",);
+ my $start_page =
+ &Apache::loncommon::start_page('Course Catalog','',
+ {
+ 'add_entries' => \%add_entries,
+ 'no_inline_link' => 1,});
+ $r->print($start_page);
+ if ($env{'form.numtitles'} > 0) {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"/adm/coursecatalog",
+ text=>"Select courses"});
+ }
+ &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:').'
'.
+ '
');
+}
+
+sub course_selector {
+ my ($r,$codedom,$formname,$domdesc) = @_;
my %coursecodes = ();
my %codes = ();
my @codetitles = ();
@@ -63,9 +128,7 @@ sub handler {
my $totcodes = 0;
my $jscript = '';
my ($numtitles,$lasttitle);
- my $formname = 'coursecatalog';
- my $domdesc = $Apache::lonnet::domaindescription{$codedom};
- $totcodes = &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,$codedom,$totcodes);
+ $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') {
@@ -79,66 +142,99 @@ sub handler {
if ($numtitles > 4) {
$lasttitle = 4;
}
- 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 .= '
+ 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 (my $i=0; $i<@codetitles-1; $i++) {
+ if ($env{'form.'.$codetitles[$i]} != -1) {
+ $jscript .= '
for (var j=0; j'."\n$jscript\n".
'';
my %add_entries = (topmargin => "0",
- marginheight => "0",
- onLoad =>"setElements()",);
+ marginheight => "0",);
+ if (($env{'form.state'} eq 'listing') && ($numtitles > 0)) {
+ $add_entries{'onLoad'} = 'setElements()';
+ }
my $start_page =
&Apache::loncommon::start_page('Course Catalog',$js,
- {
+ {
'add_entries' => \%add_entries,
'no_inline_link' => 1,});
$r->print($start_page);
-
+ if ($env{'form.state'} eq 'listing') {
+ if ($numtitles > 0) {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"/adm/coursecatalog",
+ text=>"Select courses"},
+ {text=>"Course listing"});
+ } else {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({text=>"Course listing"});
+ }
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Listing'));
+ } else {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"/adm/coursecatalog",
+ text=>"Select courses"});
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Select courses'));
+ }
$r->print('
'.&mt('Display information about official [_1] classes for which LON-CAPA courses have been created:',$domdesc).'
');
- $r->print(&mt('Choose which course(s) to list. '));
- $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));
}
- if ($env{'form.state'} eq 'listing') {
- $r->print('
'.&print_course_listing($codedom).' ');
+ return $numtitles;
+}
+
+sub user_is_dc {
+ my ($codedom) = @_;
+ if (exists($env{'user.role.dc./'.$codedom.'/'})) {
+ my $livedc = 1;
+ my $now = time;
+ my ($start,$end)=split(/\./,$env{'user.role.dc./'.$codedom.'/'});
+ if ($start && $start>$now) { $livedc = 0; }
+ if ($end && $end <$now) { $livedc = 0; }
+ return $livedc;
}
- $r->print(&Apache::loncommon::end_page());
- return OK;
+ return;
}
sub recurse_options {
@@ -268,93 +395,126 @@ sub build_javascript {
return $output;
}
-
-sub print_course_listing {
- my ($domain) = @_;
- my $output;
- my $year = $env{'form.Year'};
- my $sem = $env{'form.Semester'};
- my $dept = $env{'form.Department'};
- my $coursenum = $env{'form.Number'};
+sub search_courselist {
+ my ($domain,$numtitles) = @_;
my $instcode;
- if ($sem eq '0' ) {
- $instcode .= '^[sfu]s';
+ if (defined($numtitles) && $numtitles == 0) {
+ $instcode = '.+';
} else {
- $instcode .= '^'.$sem;
+ 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 = '.';
+ }
}
- if ($year eq '0') {
- $instcode .= '\d{2}';
- } else {
- $instcode .= $year;
+ my %courses = &Apache::lonnet::courseiddump($domain,'.',1,$instcode,'.','.',
+ undef,undef,'Course',1,
+ $env{'form.showselfenroll'});
+ return %courses;
+}
+
+
+sub print_course_listing {
+ my ($domain,$numtitles) = @_;
+ my $output;
+ my %courses;
+ my $knownuser = &user_is_known();
+ my $details = $env{'form.coursenum'};
+ if (&user_is_dc($domain)) {
+ if ($env{'form.showdetails'}) {
+ $details = 1;
+ }
}
- if ($dept eq '0') {
- $instcode .= '\w{2,3}';
+ if ($env{'form.coursenum'} ne '') {
+ %courses = &Apache::lonnet::courseiddump($domain,'.',1,'.','.',
+ $env{'form.coursenum'},
+ undef,undef,'Course',1);
+ if (keys(%courses) == 0) {
+ $output .= &mt('The courseID provided does not match a course in this domain.');
+ return $output;
+ }
} else {
- $instcode .= $dept;
- }
- if ($coursenum ne '0' && $coursenum != -1) {
- $instcode .= $coursenum.'$';
- }
- my %courses = &Apache::lonnet::courseiddump($domain,'.',1,$instcode,'.','.',
- undef,undef,'Course',1);
- if (keys(%courses) == 0) {
- $output = &mt('No courses match the criteria you selected.');
- return $output;
+ %courses = &search_courselist($domain,$numtitles);
+ if (keys(%courses) == 0) {
+ $output = &mt('No courses match the criteria you selected.');
+ 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.
');
+ }
}
- $output = &mt('Note for students: If you are officially enrolled in a course but there is no student role for the course in your LON-CAPA roles screen, check the default access dates and/or auto-enrollment settings for the course below. Your roles screen displays only currently accessible roles.