--- loncom/interface/coursecatalog.pm 2006/10/12 23:15:33 1.6 +++ loncom/interface/coursecatalog.pm 2007/10/03 19:57:29 1.22 @@ -1,3 +1,7 @@ +# The LearningOnline Network with CAPA +# Handler for displaying the course catalog interface +# +# $Id: coursecatalog.pm,v 1.22 2007/10/03 19:57:29 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:').'

'. + '
'. + &print_course_listing($codedom).'

'); + $r->print(''. + &mt('Back to course listing').''. + ''. + '
'); +} + +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,62 +142,93 @@ 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'; 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('
'); + $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 @unsorted = @{$cat_items{$codetitles[$k]}}; @@ -165,24 +259,49 @@ function changeSort(caller) { ''."\n".''."\n". '' ); + if (&user_is_dc($codedom)) { + my $showdetails_status; + if ($env{'form.showdetails'}) { + $showdetails_status = 'checked="checked" '; + } + $r->print(''); + } $r->print('
'.&mt('Show full details for each course (DC only)').'
'); 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('

'); } - $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,91 +387,112 @@ 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; - } - if ($year eq '0') { - $instcode .= '\d{2}'; - } else { - $instcode .= $year; - } - if ($dept eq '0') { - $instcode .= '\w{2,3}'; - } else { - $instcode .= $dept; - } - if ($coursenum ne '0' && $coursenum != -1) { - $instcode .= $coursenum.'$'; + 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 %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; + 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; + } } - $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.

'); - $output .= &Apache::loncommon::start_data_table(). - &Apache::loncommon::start_data_table_header_row(). - ''.&mt('Code').''. - ''.&mt('Sections').''. - ''.&mt('Crosslisted').''. - ''.&mt('Title').''. - ''.&mt('Owner').''. - ''.&mt('Student Status').''. - ''.&mt('Default Access Dates').''. - ''.&mt('Auto-enrollment').''. - &Apache::loncommon::end_data_table_header_row(); - my %courseinfo; - foreach my $course (keys(%courses)) { - my $descr; - if ($courses{$course} =~ m/^([^:]*):/i) { - $descr = &unescape($1); - } else { - $descr = &unescape($courses{$course}); + 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; } - my $cleandesc=&HTML::Entities::encode($descr,'<>&"'); - $cleandesc=~s/'/\\'/g; - my ($cdom,$cnum)=split(/\_/,$course); - - my ($desc,$instcode,$owner,$ttype) = split(/:/,$courses{$course}); - $owner = &unescape($owner); - my ($ownername,$ownerdom); - if ($owner =~ /:/) { - ($ownername,$ownerdom) = split(/:/,$owner); + } else { + %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 .= &construct_data_table($knownuser,\%courses,$details); + $output .= &Apache::lonhtmlcommon::echo_form_input(['coursenum','state','catalogfilter','sortby','showdetails']); + return $output; +} + +sub construct_data_table { + my ($knownuser,$courses,$details,$usersections) = @_; + my %sortname; + if (($details eq '') || ($env{'form.showdetails'})) { + $sortname{'Code'} = 'code'; + $sortname{'Title'} = 'title'; + $sortname{'Owner(s)'} = 'owner'; + } + my $output = &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(); + my @coltitles = ('Code','Sections','Crosslisted','Title','Owner(s)'); + if (ref($usersections) eq 'HASH') { + $coltitles[1] = 'Your Section'; + } + foreach my $item (@coltitles) { + $output .= ''; + if (defined($sortname{$item})) { + $output .= ''.&mt($item).''; } else { - $ownername = $owner; - if ($owner ne '') { - $ownerdom = $cdom; - } + $output .= &mt($item); } - my %ownernames; - if ($ownername ne '' && $ownerdom ne '') { - %ownernames = &Apache::loncommon::getnames($ownername,$ownerdom); + $output .= ''; + } + if ($knownuser) { + if ($details) { + $output .= + ''.&mt('Default Access Dates for Students').''. + ''.&mt('Student Counts').''. + ''.&mt('Auto-enrollment of
registered students').''; + } else { + $output .= ' '; } - $courseinfo{$course}{'cdom'} = $cdom; - $courseinfo{$course}{'cnum'} = $cnum; - $courseinfo{$course}{'code'} = $instcode; - $courseinfo{$course}{'ownerlastname'} = $ownernames{'lastname'}; - $courseinfo{$course}{'title'} = $cleandesc; - $courseinfo{$course}{'owner'} = $owner; } + &Apache::loncommon::end_data_table_header_row(); + my %courseinfo = &build_courseinfo_hash($courses,$knownuser,$details, + $usersections); my %Sortby; - foreach my $course (sort(keys(%courses))) { + foreach my $course (sort(keys(%{$courses}))) { if ($env{'form.sortby'} eq 'code') { push(@{$Sortby{$courseinfo{$course}{'code'}}},$course); } elsif ($env{'form.sortby'} eq 'owner') { - push(@{$Sortby{$courseinfo{$course}{'ownerlastname'}}},$course); + push(@{$Sortby{$courseinfo{$course}{'ownerlastnames'}}},$course); } else { push(@{$Sortby{$courseinfo{$course}{'title'}}},$course); } @@ -366,7 +506,7 @@ sub print_course_listing { foreach my $item (@sorted_courses) { foreach my $course (@{$Sortby{$item}}) { $output.=&Apache::loncommon::start_data_table_row(); - $output.=&courseinfo_row($courseinfo{$course}); + $output.=&courseinfo_row($courseinfo{$course},$knownuser,$details); $output.=&Apache::loncommon::end_data_table_row(); } } @@ -374,117 +514,192 @@ sub print_course_listing { return $output; } -sub courseinfo_row { - my ($info) = @_; - my ($cdom,$cnum,$title,$ownerlast,$code,$owner,$output); - if (ref($info) eq 'HASH') { - $cdom = $info->{'cdom'}; - $cnum = $info->{'cnum'}; - $title = $info->{'title'}; - $ownerlast = $info->{'ownerlastname'}; - $code = $info->{'code'}; - $owner = $info->{'owner'}; - } else { - $output = ''.&mt('No information available for [_1].', - $code).''; - return $output; +sub build_courseinfo_hash { + my ($courses,$knownuser,$details,$usersections) = @_; + my %courseinfo; + my $now = time; + foreach my $course (keys(%{$courses})) { + my $descr; + if (ref($courses->{$course}) eq 'HASH') { + $descr = $courses->{$course}{'description'}; + } elsif ($courses->{$course} =~ m/^([^:]*):/i) { + $descr = &unescape($1); + } else { + $descr = &unescape($courses->{$course}); + } + my $cleandesc=&HTML::Entities::encode($descr,'<>&"'); + $cleandesc=~s/'/\\'/g; + $cleandesc =~ s/^\s+//; + my ($cdom,$cnum)=split(/\_/,$course); + my ($descr,$instcode,$singleowner,$ttype,@owners,%ownernames); + if (ref($courses->{$course}) eq 'HASH') { + $descr = $courses->{$course}{'description'}; + $instcode = $courses->{$course}{'instcode'}; + $singleowner = $courses->{$course}{'owner'}; + $ttype = $courses->{$course}{'type'}; + push(@owners,$singleowner); + if (ref($courses->{$course}{'co-owners'}) eq 'ARRAY') { + foreach my $item (@{$courses->{$course}{'co-owners'}}) { + push(@owners,$item); + } + } + } else { + ($descr,$instcode,$singleowner,$ttype) = + split(/:/,$courses->{$course}); + push(@owners,$singleowner); + } + foreach my $owner (@owners) { + my ($ownername,$ownerdom) = @_; + if ($owner =~ /:/) { + ($ownername,$ownerdom) = split(/:/,$owner); + } else { + $ownername = $owner; + if ($owner ne '') { + $ownerdom = $cdom; + } + } + if ($ownername ne '' && $ownerdom ne '') { + my %namehash=&Apache::loncommon::getnames($ownername,$ownerdom); + $ownernames{$ownername.':'.$ownerdom} = \%namehash; + } + } + $courseinfo{$course}{'cdom'} = $cdom; + $courseinfo{$course}{'cnum'} = $cnum; + $courseinfo{$course}{'code'} = $instcode; + my @lastnames; + foreach my $owner (keys(%ownernames)) { + if (ref($ownernames{$owner}) eq 'HASH') { + push(@lastnames,$ownernames{$owner}{'lastname'}); + } + } + $courseinfo{$course}{'ownerlastnames'} = join(', ',sort(@lastnames)); + $courseinfo{$course}{'title'} = $cleandesc; + $courseinfo{$course}{'owner'} = $singleowner; + + 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'}); + my $showsyllabus = 1; # default is to include a syllabus link + if (defined($coursehash{'showsyllabus'})) { + $showsyllabus = $coursehash{'showsyllabus'}; + } + $courseinfo{$course}{'showsyllabus'} = $showsyllabus; + 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); + + my $startaccess = ''; + my $endaccess = ''; + my $accessdates; + if ( defined($coursehash{'default_enrollment_start_date'}) ) { + $startaccess = &Apache::lonlocal::locallocaltime($coursehash{'default_enrollment_start_date'}); + } + 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"; + } + } + if ($startaccess) { + $accessdates .= &mt('From: ').$startaccess.'
'; + } + if ($endaccess) { + $accessdates .= &mt('To: ').$endaccess.'
'; + } + $courseinfo{$course}{'access'} = $accessdates; + } + if ($xlist_items eq '') { + $xlist_items = &mt('No'); + } + $courseinfo{$course}{'xlist'} = $xlist_items; } - my %coursehash = &Apache::lonnet::dump('environment',$cdom,$cnum); + return %courseinfo; +} + +sub count_students { + my ($cdom,$cnum,$numsec) = @_; my $classlist = &Apache::loncoursedata::get_classlist($cdom,$cnum); + my %student_count = ( + Active => 0, + Future => 0, + Expired => 0, + ); my %idx; - my @classids; - my @crosslistings; $idx{'status'} = &Apache::loncoursedata::CL_STATUS(); my %status_title = &Apache::lonlocal::texthash( Expired => 'Previous access', Active => 'Current access', Future => 'Future access', ); - my %student_count = ( - Expired => 0, - Active => 0, - Future => 0, - ); + while (my ($student,$data) = each(%$classlist)) { $student_count{$data->[$idx{'status'}]} ++; } - my $seclist = &identify_sections($coursehash{'internal.sectionnums'}); - my $xlist_items = &identify_sections($coursehash{'internal.crosslistings'}); - my $countslist; - my $startaccess = ''; - my $endaccess = ''; - my $now; - my ($accessdates,$autoenrolldates,$showsyllabus); - if ( defined($coursehash{'default_enrollment_start_date'}) ) { - $startaccess = &Apache::lonlocal::locallocaltime($coursehash{'default_enrollment_start_date'}); - } - 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"; - } - } - if ($startaccess) { - $accessdates .= &mt('From: ').$startaccess.'
'; - } - if ($endaccess) { - $accessdates .= &mt('To: ').$endaccess.'
'; - } - $autoenrolldates = &mt('Not enabled'); - if (defined($coursehash{'internal.autoadds'}) && $coursehash{'internal.autoadds'} == 1) { - my ($autostart,$autoend); - if ( defined($coursehash{'internal.autostart'}) ) { - $autostart = &Apache::lonlocal::locallocaltime($coursehash{'internal.autostart'}); - } - if ( defined($coursehash{'internal.autoend'}) ) { - $autoend = &Apache::lonlocal::locallocaltime($coursehash{'internal.autoend'}); - } - if ($coursehash{'internal.autostart'} > $now) { - if ($coursehash{'internal.autoend'} && $coursehash{'internal.autoend'} < $now) { - $autoenrolldates = &mt('Not enabled'); - } else { - my $valid_classes = &get_valid_classes($seclist,$xlist_items, - $code,$owner,$cdom,$cnum); - if ($valid_classes ne '') { - $autoenrolldates = &mt('Not enabled
Starts: '). - $autostart.'
'.$valid_classes; - } - } - } else { - if ($coursehash{'internal.autoend'} && $coursehash{'internal.autoend'} < $now) { - $autoenrolldates = &mt('Not enabled
Ended: ').$autoend; - } else { - my $valid_classes = &get_valid_classes($seclist,$xlist_items, - $code,$owner,$cdom,$cnum); - if ($valid_classes ne '') { - $autoenrolldates = &mt('Currently enabled
'). - $valid_classes; - } - } - } - } - if (defined($coursehash{'showsyllabus'})) { - $showsyllabus = $coursehash{'showsyllabus'}; - } - foreach my $status ('Active','Future','Expired') { + + my $countslist = &mt('[quant,_1,section]',$numsec).':
'; + foreach my $status ('Active','Future') { $countslist .= ''.$status_title{$status}.': '. $student_count{$status}.'
'; } - if ($xlist_items eq '') { - $xlist_items = &mt('No'); + return $countslist; +} + +sub courseinfo_row { + my ($info,$knownuser,$details) = @_; + my ($cdom,$cnum,$title,$ownerlast,$code,$owner,$seclist,$xlist_items, + $accessdates,$showsyllabus,$counts,$autoenrollment,$output); + if (ref($info) eq 'HASH') { + $cdom = $info->{'cdom'}; + $cnum = $info->{'cnum'}; + $title = $info->{'title'}; + $ownerlast = $info->{'ownerlastnames'}; + $code = $info->{'code'}; + $owner = $info->{'owner'}; + $seclist = $info->{'seclist'}; + $xlist_items = $info->{'xlist'}; + $accessdates = $info->{'access'}; + $counts = $info->{'counts'}; + $autoenrollment = $info->{'autoenrollment'}; + $showsyllabus = $info->{'showsyllabus'}; + } else { + $output = ''.&mt('No information available for [_1].', + $code).''; + return $output; } - $output = ''.$coursehash{'internal.coursecode'}.''. - ''.$seclist.''. - ''.$xlist_items.''. - ''.$title.' '; + $output .= ''.$code.''. + ''.$seclist.''. + ''.$xlist_items.''. + ''.$title.' '; if ($showsyllabus) { $output .= &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$cnum,$cdom); + } else { + $output .= ' '; } $output .= ''. - ''.$ownerlast.''. - ''.$countslist.''. - ''.$accessdates.''. - ''.$autoenrolldates.''; + ''.$ownerlast.''; + if ($knownuser) { + if ($details) { + $output .= + ''.$accessdates.''. + ''.$counts.''. + ''.$autoenrollment.''; + } else { + $output .= "".&mt('Show more details').''; + } + } return $output; } @@ -507,20 +722,21 @@ sub identify_sections { } @secnums = sort {$a <=> $b} @secnums; my $seclist = join(', ',@secnums); - return $seclist; + my $numsec = @secnums; + return ($seclist,$numsec); } sub get_valid_classes { - my ($seclist,$xlist_items,$crscode,$owner,$cdom,$cnum) = @_; + my ($seclist,$xlist_items,$crscode,$owners,$cdom,$cnum) = @_; my $response; my %validations; @{$validations{'sections'}} = (); @{$validations{'xlists'}} = (); my $totalitems = 0; if ($seclist) { - foreach my $sec (split(',',$seclist)) { + foreach my $sec (split(/, /,$seclist)) { my $class = $crscode.$sec; - if (&Apache::lonnet::auto_validate_class_sec($cdom,$cnum,$owner, + if (&Apache::lonnet::auto_validate_class_sec($cdom,$cnum,$owners, $class) eq 'ok') { if (!grep(/^\Q$sec$\E/,@{$validations{'sections'}})) { push(@{$validations{'sections'}},$sec); @@ -530,8 +746,8 @@ sub get_valid_classes { } } if ($xlist_items) { - foreach my $item (split(',',$xlist_items)) { - if (&Apache::lonnet::auto_validate_class_sec($cdom,$cnum,$owner, + 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'}})) { push(@{$validations{'xlists'}},$item); @@ -543,11 +759,11 @@ sub get_valid_classes { if ($totalitems > 0) { if (@{$validations{'sections'}}) { $response = &mt('Sections: '). - join(',',@{$validations{'sections'}}).'
'; + join(', ',@{$validations{'sections'}}).'
'; } if (@{$validations{'xlists'}}) { $response .= &mt('Courses: '). - join(',',@{$validations{'xlists'}}); + join(', ',@{$validations{'xlists'}}); } } return $response; @@ -645,39 +861,44 @@ function courseSet() { } } else { - for (var k=0; k -1) { + for (var k=0; k{'internal.autoadds'}) && $coursehash->{'internal.autoadds'} == 1) { + my ($autostart,$autoend); + if ( defined($coursehash->{'internal.autostart'}) ) { + $autostart = &Apache::lonlocal::locallocaltime($coursehash->{'internal.autostart'}); + } + if ( defined($coursehash->{'internal.autoend'}) ) { + $autoend = &Apache::lonlocal::locallocaltime($coursehash->{'internal.autoend'}); + } + if ($coursehash->{'internal.autostart'} > $now) { + if ($coursehash->{'internal.autoend'} && $coursehash->{'internal.autoend'} < $now) { + $autoenrolldates = &mt('Not enabled'); + } else { + my $valid_classes = + &get_valid_classes($seclist,$xlist_items,$code, + $owners,$cdom,$cnum); + if ($valid_classes ne '') { + $autoenrolldates = &mt('Not enabled
Starts: '). + $autostart.'
'.$valid_classes; } + } + } else { + if ($coursehash->{'internal.autoend'} && $coursehash->{'internal.autoend'} < $now) { + $autoenrolldates = &mt('Not enabled
Ended: ').$autoend; + } else { + my $valid_classes = &get_valid_classes($seclist,$xlist_items, + $code,$owners,$cdom,$cnum); + if ($valid_classes ne '') { + $autoenrolldates = &mt('Currently enabled
'). + $valid_classes; + } + } + } + } + return $autoenrolldates; +} + +sub user_is_known { + my $known = 0; + if ($env{'user.name'} ne '' && $env{'user.name'} ne 'public' + && $env{'user.domain'} ne '' && $env{'user.domain'} ne 'public') { + $known = 1; + } + return $known; +} + 1;