--- loncom/interface/coursecatalog.pm 2006/09/25 00:16:56 1.5 +++ loncom/interface/coursecatalog.pm 2008/07/04 15:40:04 1.34 @@ -1,3 +1,7 @@ +# The LearningOnline Network with CAPA +# Handler for displaying the course catalog interface +# +# $Id: coursecatalog.pm,v 1.34 2008/07/04 15:40:04 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::lonsupportreq; +use Apache::courseclassifier; use Apache::lonacc; -use lib '/home/httpd/lib/perl/'; use LONCAPA; sub handler { @@ -42,11 +46,126 @@ 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 $ccode = ''; + + 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'; + 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 $catlinks = &category_breadcrumbs($codedom); + my $catjs = <<"ENDSCRIPT"; + +function setCatDepth(depth) { + document.coursecats.catalog_maxdepth.value = depth; + document.coursecats.submit(); + return; +} + +ENDSCRIPT + if ($env{'form.state'} eq 'listing') { + $catjs .= qq| +function changeSort(caller) { + document.$formname.sortby.value = caller; + document.$formname.submit(); +} +function setCourseId(caller) { + document.$formname.coursenum.value = caller; + document.$formname.submit(); +}\n|; + } + 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('
'. + &additional_filters($codedom)."\n"); + my ($currdepth,$deeper) = &get_depth_values(); + $r->print(''."\n"); + for (my $i=0; $i<$deeper; $i++) { + $r->print(''."\n"); + } + $r->print(''."\n". + ''."\n". + ''."\n". + ''. + '


'); + } + if ($env{'form.state'} eq 'listing') { + $r->print(&print_course_listing($codedom)); + } + } + } + $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 instcode_course_selector { + my ($r,$codedom,$formname,$domdesc,$catlinks,$catjs) = @_; my %coursecodes = (); my %codes = (); my @codetitles = (); @@ -55,207 +174,575 @@ sub handler { my %idlist = (); my %idnums = (); my %idlist_titles = (); + my %by_year; + my %by_sem; + my %by_dept; + my %cat_items; my $caller = 'global'; my $format_reply; my $totcodes = 0; my $jscript = ''; - my $formname = 'coursecatalog'; - my $domdesc = $Apache::lonnet::domaindescription{$codedom}; - $totcodes = &Apache::lonsupportreq::retrieve_instcodes(\%coursecodes,$codedom,$totcodes); + my ($numtitles,$lasttitle); + my %add_entries = (topmargin => "0", + marginheight => "0",); + my $js; + $totcodes = &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,$codedom); if ($totcodes > 0) { - if ($ccode eq '') { - $format_reply = &Apache::lonnet::auto_instcode_format($caller,$codedom,\%coursecodes,\%codes,\@codetitles,\%cat_titles,\%cat_order); - if ($format_reply eq 'ok') { - my $numtypes = @codetitles; - &Apache::lonsupportreq::build_code_selections(\%codes,\@codetitles,\%cat_titles,\%cat_order,\%idlist,\%idnums,\%idlist_titles); - &Apache::lonsupportreq::javascript_code_selections($formname,$numtypes,\%cat_titles,\$jscript,\%idlist,\%idnums,\%idlist_titles,\@codetitles); + $format_reply = &Apache::lonnet::auto_instcode_format($caller,$codedom,\%coursecodes,\%codes,\@codetitles,\%cat_titles,\%cat_order); + if ($format_reply eq 'ok') { + my $numtypes = @codetitles; + &Apache::courseclassifier::build_code_selections(\%codes,\@codetitles,\%cat_titles,\%cat_order,\%idlist,\%idnums,\%idlist_titles); + my ($scripttext,$longtitles) = &Apache::courseclassifier::javascript_definitions(\@codetitles,\%idlist,\%idlist_titles,\%idnums,\%cat_titles); + my $longtitles_str = join('","',@{$longtitles}); + my $allidlist = $idlist{$codetitles[0]}; + $numtitles = @codetitles; + $lasttitle = $numtitles; + if ($numtitles > 4) { + $lasttitle = 4; } - } - 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; $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()",); - my $start_page = - &Apache::loncommon::start_page('Course Catalog',$js, - { - 'add_entries' => \%add_entries, - 'no_inline_link' => 1,}); - $r->print($start_page); - - my $numtitles = @codetitles; - $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('
'); + $js = ''; + if (($env{'form.state'} eq 'listing') && ($numtitles > 0)) { + $add_entries{'onLoad'} = 'setElements()'; + } + &cat_header($r,$codedom,$js,\%add_entries,$catlinks,$numtitles); + my $cat_maxdepth = $env{'form.catalog_maxdepth'}; + $r->print(''. + ''."\n". + ''."\n". + ''. + &additional_filters($codedom)); if ($numtitles > 0) { - my $lasttitle = $numtitles; - if ($numtitles > 4) { - $lasttitle = 4; - } - $r->print(''; + return $catlinks; +} + +sub get_depth_values { + my $currdepth = 0; + my $deeper = 0; + if ($env{'form.catalog_maxdepth'} ne '') { + $currdepth = $env{'form.catalog_maxdepth'}; + if ($env{'form.currcat_'.$currdepth} eq '') { + $deeper = $currdepth; + } else { + $deeper = $currdepth + 1; + } + } + return ($currdepth,$deeper); +} + +sub additional_filters { + my ($codedom) = @_; + my $output = '
'.$codetitles[0].'
'."\n". - ''); + for (my $k=0; $k<$lasttitle-1; $k++) { + my (@items,@unsorted); + if (ref($cat_items{$codetitles[$k]}) eq 'ARRAY') { + @unsorted = @{$cat_items{$codetitles[$k]}}; + } + &Apache::courseclassifier::sort_cats($k,\%cat_order,\@codetitles,\@unsorted,\@items); + my @longitems; + if (defined($cat_titles{$codetitles[$k]})) { + foreach my $item (@items) { + push(@longitems,$cat_titles{$codetitles[$k]}{$item}); + } } else { - $longitems[0] = $idlist_titles{$codetitles[0]}; + @longitems = @items; } - for (my $i=0; $i<@longitems; $i++) { + $r->print(''); + } + $r->print('
'.$codetitles[$k].'
'."\n". + '		'.$codetitles[$lasttitle-1].'
'."\n". + ''."\n". + '
'."\n"); + if ($numtitles > 4) { + $r->print('

'.$codetitles[$numtitles-1].'
'."\n". + '
'."\n"); + } + $r->print('
'); + } + $r->print(''."\n". + ''."\n". + ''."\n". + ''."\n". + ''. + ''); + if (($numtitles > 0) && ($env{'form.state'} eq 'listing')) { + $r->print('
'); + } + } else { + &cat_header($r,$codedom,$js,\%add_entries,$catlinks,$numtitles); + my $cat_maxdepth = $env{'form.catalog_maxdepth'}; + $r->print('
'. + ''. + ''. + ''); + $r->print('
'.&mt('No official courses to display for [_1].',$domdesc).'
'); + } + 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('
'. + '
'.&mt('Domain:').''. + &Apache::loncommon::select_dom_form($codedom,'showdom','',1). + ' 
'. + '
'. + ''.$catlinks.'
'); + return; +} + +sub category_breadcrumbs { + my ($dom) = @_; + my %domconfig = + &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom); + my (@cats,@trails,%allitems,%idx,@jsarray,$cathash); + if (ref($domconfig{'coursecategories'}) eq 'HASH') { + $cathash = $domconfig{'coursecategories'}{'cats'}; + } else { + $cathash = {}; + } + &Apache::loncommon::extract_categories($cathash,\@cats,\@trails,\%allitems,\%idx, + \@jsarray); + my ($currdepth,$deeper) = &get_depth_values(); + my $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 .= ''; + } + if ($deeper == 0) { + $catlinks .= ''); - for (my $i=1; $i<$numtitles; $i++) { - $r->print('' - ); + $catlinks .= ''."\n". + ' '; + } + } + $catlinks .= $currcat_str.'
'.$cattitle.'->'.&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 { - @longitems = @items; + $catlinks .= ''."\n". + ' '; } - for (my $i=0; $i<@items; $i++) { - $r->print(' '); + } 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 .= ': '.$codetitles[$i].'
'."\n". - ''."\n". - '
'; + my $show_selfenroll_status; + if ($env{'form.showselfenroll'}) { + $show_selfenroll_status = 'checked="checked" '; + } + if (&user_is_dc($codedom)) { + my $showdetails_status; + if ($env{'form.showdetails'}) { + $showdetails_status = 'checked="checked" '; + } + my $showhidden_status; + if ($env{'form.showhidden'}) { + $showhidden_status = 'checked="checked" '; + } + my $dc_title = &Apache::lonnet::plaintext('dc'); + $output .= ''; + } + $output .= '
'."\n". + ''."\n".'
'. + ''."\n".'
'. + '

'; + return $output; +} + +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; + } + return; +} + +sub recurse_options { + my ($currkey,$currlist,$level,$cat,$cat_options,$data,$by_year,$by_sem,$by_dept) = @_; + if (ref($currlist) eq 'HASH') { + $level ++; + foreach my $key (sort(keys(%{$currlist}))) { + $$data[$level-1]= $key; + &recurse_options($key,$currlist->{$key},$level,$cat,$cat_options,$data,$by_year,$by_sem,$by_dept); + } + } else { + $level --; + my @contents = split(/","/,$currlist); + foreach my $item (@contents) { + if (!grep(/^\Q$item\E$/,@{$cat_options->{$cat}})) { + push(@{$cat_options->{$cat}},$item); } - $r->print(''); - if ($numtitles > 4) { - $r->print('

'.$codetitles[$numtitles].'
'."\n". - ''."\n"); + if ($level == 3) { + if (!grep/^\Q$item\E$/,@{$by_year->{$data->[1]}->{$currkey}}) { + push(@{$by_year->{$data->[1]}->{$currkey}},$item); + } + if (!grep/^\Q$item\E$/,@{$by_sem->{$data->[2]}->{$currkey}}) { + push(@{$by_sem->{$data->[2]}->{$currkey}},$item); + } + if (!grep/^\Q$item\E$/,@{$by_dept->{$currkey}}) { + push(@{$by_dept->{$currkey}},$item); + } + } } - $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 $level; +} + +sub build_javascript { + my ($by_year,$by_sem,$by_dept,$cat_order,$codetitles) = @_; + my @unsorted = keys(%{$by_year}); + my @sorted_yrs; + &Apache::courseclassifier::sort_cats('0',$cat_order,$codetitles,\@unsorted,\@sorted_yrs); + my $output = 'var idcse_by_yr_year = new Array("'.join('","',@sorted_yrs).'");'."\n". + 'var idcse_by_yr_dept = new Array('.scalar(@sorted_yrs).');'."\n". + 'var idcse_by_yr_num = new Array('.scalar(@sorted_yrs).');'."\n"; + for (my $i=0; $i<@sorted_yrs; $i++) { + my $numkeys = keys(%{$by_year->{$sorted_yrs[$i]}}); + $output .= " idcse_by_yr_num[$i] = new Array($numkeys);\n"; + if (ref($by_year->{$sorted_yrs[$i]}) eq 'HASH') { + @unsorted = keys(%{$by_year->{$sorted_yrs[$i]}}); + my @sorted_depts; + &Apache::courseclassifier::sort_cats('2',$cat_order,$codetitles,\@unsorted,\@sorted_depts); + $output .= qq| idcse_by_yr_dept[$i] = new Array ("|.join('","',@sorted_depts).'");'."\n"; + for (my $j=0; $j<@sorted_depts; $j++) { + $output .= qq| idcse_by_yr_num[$i][$j] = new Array ("|; + $output .= join('","',sort(@{$by_year->{$sorted_yrs[$i]}->{$sorted_depts[$j]}})).'");'."\n"; + } + } } - $r->print(&Apache::loncommon::end_page()); - return OK; + @unsorted = keys(%{$by_sem}); + my @sorted_sems; + &Apache::courseclassifier::sort_cats('1',$cat_order,$codetitles,\@unsorted,\@sorted_sems); + $output .= 'idcse_by_sem_sems = new Array("'.join('","',@sorted_sems).'");'."\n". + 'idcse_by_sem_dept = new Array('.scalar(@sorted_sems).');'."\n". + 'idcse_by_sem_num = new Array('.scalar(@sorted_sems).');'."\n"; + for (my $i=0; $i<@sorted_sems; $i++) { + my $numkeys = keys(%{$by_sem->{$sorted_sems[$i]}}); + $output .= " idcse_by_sem_num[$i] = new Array($numkeys);\n"; + if (ref($by_sem->{$sorted_sems[$i]}) eq 'HASH') { + @unsorted = keys(%{$by_sem->{$sorted_sems[$i]}}); + my @sorted_depts; + &Apache::courseclassifier::sort_cats('2',$cat_order,$codetitles,\@unsorted,\@sorted_depts); + $output .= qq| idcse_by_sem_dept[$i] = new Array("|.join('","',@sorted_depts).'");'."\n"; + for (my $j=0; $j<@sorted_depts; $j++) { + $output .= qq| idcse_by_sem_num[$i][$j] = new Array ("|.join('","',sort(@{$by_sem->{$sorted_sems[$i]}->{$sorted_depts[$j]}})).'");'."\n"; + } + } + } + @unsorted = keys(%{$by_dept}); + my @sorted_deps; + &Apache::courseclassifier::sort_cats('2',$cat_order,$codetitles,\@unsorted,\@sorted_deps); + $output .= 'idcse_by_dep = new Array('.scalar(@sorted_deps).');'."\n"; + for (my $k=0; $k<@sorted_deps; $k++) { + $output .= qq| idcse_by_dep[$k] = new Array ("|.join('","',sort(@{$by_dept->{$sorted_deps[$k]}})).'");'."\n"; + } + 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_official_courselist { + my ($domain,$numtitles) = @_; my $instcode; - if ($sem != -1) { - $instcode .= $sem; - } - if ($year != -1) { - $instcode .= $year; + if (defined($numtitles) && $numtitles == 0) { + $instcode = '.+'; + } else { + 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 ($dept != -1) { - $instcode .= $dept; + my $showhidden; + if (&user_is_dc($domain)) { + $showhidden = $env{'form.showhidden'}; + } + my %courses = + &Apache::lonnet::courseiddump($domain,'.',1,$instcode,'.','.',undef,undef, + 'Course',1,$env{'form.showselfenroll'},undef, + $showhidden,'coursecatalog'); + 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 '') { + my $showhidden; + if (&user_is_dc($domain)) { + $showhidden = $env{'form.showhidden'}; + } + %courses = + &Apache::lonnet::courseiddump($domain,'.',1,'.','.','.',undef,undef, + '.',1,$env{'form.showselfenroll'}, + $filter,$showhidden,'coursecatalog'); } - if ($coursenum != -1) { - $instcode .= $coursenum; - } - my %courses = &Apache::lonnet::courseiddump($domain,'.',1,$instcode,'.','.', - undef,undef,'Course'); - 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); + if ($env{'form.coursenum'} ne '') { + %courses = &Apache::lonnet::courseiddump($domain,'.',1,'.','.', + $env{'form.coursenum'}, + undef,undef,'.',1); + if (keys(%courses) == 0) { + $output .= &mt('The courseID provided does not match a course in this domain.'); + return $output; + } + } else { + if ($env{'form.currcat_0'} eq 'instcode::0') { + %courses = &search_official_courselist($domain,$numtitles); } else { - $descr = &unescape($courses{$course}); + %courses = &search_courselist($domain); } - 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 { - $ownername = $owner; - if ($owner ne '') { - $ownerdom = $cdom; - } + if (keys(%courses) == 0) { + $output = &mt('No courses match the criteria you selected.'); + return $output; } - my %ownernames; - if ($ownername ne '' && $ownerdom ne '') { - %ownernames = &Apache::loncommon::getnames($ownername,$ownerdom); + if (($knownuser) && (!$env{'form.showdetails'}) && (!&user_is_dc($domain))) { + $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.') + .'

'; } - $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; } + 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,$now,$domconfig) = @_; + 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 = ('Count','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).''; + } elsif ($item eq 'Count') { + $output .= '  '; + } else { + $output .= &mt($item); + } + $output .= ''; + } + if ($knownuser) { + if ($details) { + $output .= + ''.&mt('Default Access Dates for Students').''. + ''.&mt('Student Counts').''. + ''.&mt('Auto-enrollment of
registered students').''; + } else { + $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); 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); + my $clean_title = $courseinfo{$course}{'title'}; + $clean_title =~ s/\W+//g; + if ($clean_title eq '') { + $clean_title = $courseinfo{$course}{'title'}; + } + push(@{$Sortby{$clean_title}},$course); } } my @sorted_courses; @@ -264,10 +751,12 @@ sub print_course_listing { } else { @sorted_courses = sort { lc($a) cmp lc($b) } (keys(%Sortby)); } + my $count = 1; 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,\$count,$now,$course); $output.=&Apache::loncommon::end_data_table_row(); } } @@ -275,117 +764,236 @@ 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'}; + } + my $cleandesc=&HTML::Entities::encode($descr,'<>&"'); + $cleandesc=~s/'/\\'/g; + $cleandesc =~ s/^\s+//; + my ($cdom,$cnum)=split(/\_/,$course); + 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'}}) { + push(@owners,$item); + } + } + } + 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; + $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; + 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 = &mt('No ending date'); + } + } + if ($startaccess) { + $accessdates .= &mt('From: ').$startaccess.'
'; + } + if ($endaccess) { + $accessdates .= &mt('To: ').$endaccess.'
'; + } + if (($selfenroll_types ne '') && + ($selfenroll_end > 0 && $selfenroll_end > $now)) { + my ($selfenroll_start_access,$selfenroll_end_access); + if (($coursehash{'default_enrollment_start_date'} ne + $coursehash{'internal.selfenroll_start_access'}) || + ($coursehash{'default_enrollment_end_date'} ne + $coursehash{'internal.selfenroll_end_access'})) { + if ( defined($coursehash{'internal.selfenroll_start_access'}) ) { + $selfenroll_start_access = &Apache::lonlocal::locallocaltime($coursehash{'internal.selfenroll_start_access'}); + } + if ( defined($coursehash{'default_enrollment_end_date'}) ) { + $selfenroll_end_access = &Apache::lonlocal::locallocaltime($coursehash{'internal.selfenroll_end_access'}); + if ($coursehash{'internal.selfenroll_end_access'} == 0) { + $selfenroll_end_access = &mt('No ending date'); + } + } + if ($selfenroll_start_access || $selfenroll_end_access) { + $accessdates .= '

'.&mt('Self-enrollers:').'
'; + if ($selfenroll_start_access) { + $accessdates .= &mt('From: ').$selfenroll_start_access.'
'; + } + if ($selfenroll_end_access) { + $accessdates .= &mt('To: ').$selfenroll_end_access.'
'; + } + } + } + } + $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,$countref,$now,$course) = @_; + 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 .= ''.$$countref.''. + ''.$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').''; + } + } + 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; } @@ -408,20 +1016,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); @@ -431,8 +1040,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); @@ -444,16 +1053,200 @@ 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; } +sub javascript_select_filler { + my ($formname,$scripttext,$codetitles,$longtitles_str,$allidlist) = @_; + my $output = < -1) { + document.$formname.Number.options[0] = new Option('All','0',false,false); + for (var k=0; k -1) { + for (var i=0; i -1) { + for (var i=0; i -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;