--- loncom/interface/coursecatalog.pm 2006/09/25 00:16:56 1.5 +++ loncom/interface/coursecatalog.pm 2006/12/11 15:13:26 1.12 @@ -28,11 +28,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 +42,66 @@ sub handler { if ($r->header_only) { return OK; } + my %cookies=CGI::Cookie->parse($r->header_in('Cookie')); + my $lonid=$cookies{'lonID'}; + my $lonidsdir=$r->dir_config('lonIDsDir'); + my $handle; + if ($lonid) { + $handle=&LONCAPA::clean_handle($lonid->value); + } + if ((-e "$lonidsdir/$handle.id") && ($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 $formname = 'coursecatalog'; + my $domdesc = $Apache::lonnet::domaindescription{$codedom}; + + &Apache::lonhtmlcommon::clear_breadcrumbs(); + if ($env{'form.coursenum'} ne '' && &user_is_known()) { + &course_details($r,$codedom,$formname,$domdesc); + } else { + &course_selector($r,$codedom,$formname,$domdesc); + 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); + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/coursecatalog", + text=>"Select courses"}, + {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 = (); @@ -55,27 +110,42 @@ 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); + $totcodes = &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,$codedom,$totcodes); 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; } + 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++) { + 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') { + $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); - - my $numtitles = @codetitles; + if ($env{'form.state'} eq 'listing') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/coursecatalog", + text=>"Select courses"}, + {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) { - my $lasttitle = $numtitles; - if ($numtitles > 4) { - $lasttitle = 4; - } - $r->print(''; } - if ($dept != -1) { - $instcode .= $dept; + if (&user_is_known()) { + if ($env{'form.coursenum'} eq '') { + $output .= ''; + } else { + $output .= + ''. + ''. + ''; + } } - if ($coursenum != -1) { - $instcode .= $coursenum; + &Apache::loncommon::end_data_table_header_row(); + my %courseinfo = &build_courseinfo_hash(%courses); + my %Sortby; + 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); + } else { + push(@{$Sortby{$courseinfo{$course}{'title'}}},$course); + } } - 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; + my @sorted_courses; + if (($env{'form.sortby'} eq 'code') || ($env{'form.sortby'} eq 'owner')) { + @sorted_courses = sort(keys(%Sortby)); + } else { + @sorted_courses = sort { lc($a) cmp lc($b) } (keys(%Sortby)); } - $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(). - ''. - ''. - ''. - ''. - ''. - ''. - ''. - ''. - &Apache::loncommon::end_data_table_header_row(); + foreach my $item (@sorted_courses) { + foreach my $course (@{$Sortby{$item}}) { + $output.=&Apache::loncommon::start_data_table_row(); + $output.=&courseinfo_row($courseinfo{$course}); + $output.=&Apache::loncommon::end_data_table_row(); + } + } + $output .= &Apache::loncommon::end_data_table(); + my $echo = &Apache::lonhtmlcommon::echo_form_input(['coursenum','state','catalogfilter','sortby']); + $output .= $echo; + return $output; +} + +sub build_courseinfo_hash { + my (%courses) = @_; my %courseinfo; + my $now = time; foreach my $course (keys(%courses)) { my $descr; if ($courses{$course} =~ m/^([^:]*):/i) { @@ -224,8 +455,9 @@ sub print_course_listing { } my $cleandesc=&HTML::Entities::encode($descr,'<>&"'); $cleandesc=~s/'/\\'/g; + $cleandesc =~ s/^\s+//; my ($cdom,$cnum)=split(/\_/,$course); - + my ($desc,$instcode,$owner,$ttype) = split(/:/,$courses{$course}); $owner = &unescape($owner); my ($ownername,$ownerdom); @@ -246,146 +478,126 @@ sub print_course_listing { $courseinfo{$course}{'code'} = $instcode; $courseinfo{$course}{'ownerlastname'} = $ownernames{'lastname'}; $courseinfo{$course}{'title'} = $cleandesc; - $courseinfo{$course}{'owner'} = $owner; - } - my %Sortby; - 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); - } else { - push(@{$Sortby{$courseinfo{$course}{'title'}}},$course); + $courseinfo{$course}{'owner'} = $owner; + + my %coursehash = &Apache::lonnet::dump('environment',$cdom,$cnum); + my @classids; + my @crosslistings; + my $seclist = &identify_sections($coursehash{'internal.sectionnums'}); + $courseinfo{$course}{'seclist'} = $seclist; + my $xlist_items = &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'})) { + if ($cnum eq $env{'form.coursenum'}) { + $courseinfo{$course}{'counts'} = &count_students($cdom,$cnum); + $courseinfo{$course}{'autoenrollment'} = + &autoenroll_info(\%coursehash,$now,$seclist,$xlist_items, + $instcode,$owner,$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; + } } - } - my @sorted_courses; - if (($env{'form.sortby'} eq 'code') || ($env{'form.sortby'} eq 'owner')) { - @sorted_courses = sort(keys(%Sortby)); - } else { - @sorted_courses = sort { lc($a) cmp lc($b) } (keys(%Sortby)); - } - foreach my $item (@sorted_courses) { - foreach my $course (@{$Sortby{$item}}) { - $output.=&Apache::loncommon::start_data_table_row(); - $output.=&courseinfo_row($courseinfo{$course}); - $output.=&Apache::loncommon::end_data_table_row(); + if ($xlist_items eq '') { + $xlist_items = &mt('No'); } + $courseinfo{$course}{'xlist'} = $xlist_items; } - $output .= &Apache::loncommon::end_data_table(); - return $output; + return %courseinfo; } -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 = ''; - return $output; - } - my %coursehash = &Apache::lonnet::dump('environment',$cdom,$cnum); +sub count_students { + my ($cdom,$cnum) = @_; 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') { + 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) = @_; + 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->{'ownerlastname'}; + $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 = ''; + return $output; } - $output = ''. - ''. - ''. - ''. + ''. + ''. + ''. - ''. - ''. - ''. - ''; + ''; + if (&user_is_known()) { + if ($env{'form.coursenum'} eq '') { + $output .= "'; + } else { + $output .= + ''. + ''. + ''; + } + } return $output; } @@ -454,6 +666,190 @@ sub get_valid_classes { 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, + $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; + } + } + } + } + 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;
'.$codetitles[0].'
'."\n". - ''); + for (my $k=0; $k<$lasttitle-1; $k++) { + my @unsorted = @{$cat_items{$codetitles[$k]}}; + my @items; + &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(''); - for (my $i=1; $i<$numtitles; $i++) { - $r->print('' ); - } $r->print('
'.$codetitles[$k].'
'."\n". + '
'.$codetitles[$i].'
'."\n". - ''."\n". + $r->print('
'.$codetitles[$lasttitle-1].'
'."\n". + ''."\n". '
'); if ($numtitles > 4) { - $r->print('

'.$codetitles[$numtitles].'
'."\n". - ''."\n"); + $r->print('

'.$codetitles[$numtitles-1].'
'."\n". + '
'."\n"); } } - $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; +} + + +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); + } + 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(&Apache::loncommon::end_page()); - return OK; + 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"; + } + } + } + @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 search_courselist { + my ($domain) = @_; + my ($instcode,%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); + return %courses; +} + + 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'}; - my $instcode; - if ($sem != -1) { - $instcode .= $sem; + my %courses; + if ($env{'form.coursenum'} ne '') { + %courses = &Apache::lonnet::courseiddump($domain,'.',1,'.','.', + $env{'form.coursenum'}, + undef,undef,'Course'); + if (keys(%courses) == 0) { + $output .= &mt('The courseID provided does not match a course in this domain.'); + return $output; + } + } else { + %courses = &search_courselist($domain); + if (keys(%courses) == 0) { + $output = &mt('No courses match the criteria you selected.'); + return $output; + } + if (&user_is_known()) { + $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.

'); + } } - if ($year != -1) { - $instcode .= $year; + $output .= &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(); + my @coltitles = ('Code','Sections','Crosslisted','Title','Owner'); + my %sortname; + if ($env{'form.coursenum'} eq '') { + $sortname{'Code'} = 'code'; + $sortname{'Title'} = 'title'; + $sortname{'Owner'} = 'owner'; + } + foreach my $item (@coltitles) { + $output .= '
'; + if (defined($sortname{$item})) { + $output .= ''.&mt($item).''; + } else { + $output .= &mt($item); + } + $output .= ' '.&mt('Default Access Dates for Students').''.&mt('Student Counts').''.&mt('Auto-enrollment of
registered students').'
'.&mt('Code').''.&mt('Sections').''.&mt('Crosslisted').''.&mt('Title').''.&mt('Owner').''.&mt('Student Status').''.&mt('Default Access Dates').''.&mt('Auto-enrollment').''.&mt('No information available for [_1].', - $code).''.&mt('No information available for [_1].', + $code).''.$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.'".&mt('Show more details').''.$accessdates.''.$counts.''.$autoenrollment.'