--- loncom/interface/coursecatalog.pm 2006/08/29 21:03:11 1.1 +++ loncom/interface/coursecatalog.pm 2006/10/12 23:15:33 1.6 @@ -30,7 +30,7 @@ use Apache::Constants qw(:common); use Apache::loncommon; use Apache::lonnet; use Apache::lonlocal; -use Apache::lonsupportreq; +use Apache::courseclassifier; use Apache::lonacc; use lib '/home/httpd/lib/perl/'; use LONCAPA; @@ -46,7 +46,6 @@ sub handler { &Apache::lonlocal::get_language_handle($r); &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['sortby']); my $codedom = $Apache::lonnet::perlvar{'lonDefDomain'}; - my $ccode = ''; my %coursecodes = (); my %codes = (); my @codetitles = (); @@ -55,26 +54,44 @@ 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 ($numtitles,$lasttitle); my $formname = 'coursecatalog'; - $totcodes = &Apache::lonsupportreq::retrieve_instcodes(\%coursecodes,$codedom,$totcodes); + my $domdesc = $Apache::lonnet::domaindescription{$codedom}; + $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 1,}); $r->print($start_page); - my $numtitles = @codetitles; - my $domdesc = $Apache::lonnet::domaindescription{$codedom}; - $r->print('

'.&mt('Display information about official [_1] courses in LON-CAPA:',$domdesc).'

'); + $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) { - my $lasttitle = $numtitles; - if ($numtitles > 4) { - $lasttitle = 4; - } - $r->print(''. ''. + ''. ''. ''. - ''. + ''. ''. - ''. + ''. &Apache::loncommon::end_data_table_header_row(); my %courseinfo; foreach my $course (keys(%courses)) { @@ -218,7 +324,8 @@ sub print_course_listing { my $cleandesc=&HTML::Entities::encode($descr,'<>&"'); $cleandesc=~s/'/\\'/g; my ($cdom,$cnum)=split(/\_/,$course); - my ($desc,$instcode,$owner,$ttype) = split/:/,$courses{$course}; + + my ($desc,$instcode,$owner,$ttype) = split(/:/,$courses{$course}); $owner = &unescape($owner); my ($ownername,$ownerdom); if ($owner =~ /:/) { @@ -238,6 +345,7 @@ 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))) { @@ -268,21 +376,26 @@ sub print_course_listing { sub courseinfo_row { my ($info) = @_; - my ($cdom,$cnum,$title,$owner,$output); + my ($cdom,$cnum,$title,$ownerlast,$code,$owner,$output); if (ref($info) eq 'HASH') { $cdom = $info->{'cdom'}; $cnum = $info->{'cnum'}; $title = $info->{'title'}; - $owner = $info->{'ownerlastname'}; + $ownerlast = $info->{'ownerlastname'}; + $code = $info->{'code'}; + $owner = $info->{'owner'}; } else { - $output = ''; + $output = ''; return $output; } my %coursehash = &Apache::lonnet::dump('environment',$cdom,$cnum); my $classlist = &Apache::loncoursedata::get_classlist($cdom,$cnum); my %idx; + my @classids; + my @crosslistings; $idx{'status'} = &Apache::loncoursedata::CL_STATUS(); - my %status_title = &Apache::lonlocal::texthash ( + my %status_title = &Apache::lonlocal::texthash( Expired => 'Previous access', Active => 'Current access', Future => 'Future access', @@ -292,14 +405,16 @@ sub courseinfo_row { Active => 0, Future => 0, ); - while (my ($student,$data) = each %$classlist) { + 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 ($accessdates,$autoenrolldates); + my $now; + my ($accessdates,$autoenrolldates,$showsyllabus); if ( defined($coursehash{'default_enrollment_start_date'}) ) { $startaccess = &Apache::lonlocal::locallocaltime($coursehash{'default_enrollment_start_date'}); } @@ -315,42 +430,61 @@ sub courseinfo_row { if ($endaccess) { $accessdates .= &mt('To: ').$endaccess.'
'; } - if (!defined($coursehash{'internal.autoadds'}) || $coursehash{'internal.autoadds'} == 0) { - $autoenrolldates = &mt('Not enabled'); - } else { + $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.autoend'} == 0) { - $autoend = "No ending date"; - } - } - if ($autostart) { - $autoenrolldates .= &mt('Starts: ').$startaccess.'
'; - } - if ($autoend) { - $autoenrolldates .= &mt('Ends: ').$endaccess.'
'; } - if ($autoenrolldates eq '') { - $autoenrolldates = &mt('No start or end date set'); + 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') { $countslist .= ''.$status_title{$status}.': '. $student_count{$status}.'
'; } + if ($xlist_items eq '') { + $xlist_items = &mt('No'); + } $output = ''. ''. - ''. - ''. - ''. - ''. - ''; + ''. + ''. + ''. + ''. + ''. + ''; return $output; } @@ -358,7 +492,7 @@ sub identify_sections { my ($seclist) = @_; my @secnums; if ($seclist =~ /,/) { - my @sections = split/,/,$seclist; + my @sections = split(/,/,$seclist); foreach my $sec (@sections) { $sec =~ s/:[^:]*$//; push(@secnums,$sec); @@ -366,8 +500,8 @@ sub identify_sections { } else { if ($seclist =~ m/^([^:]+):/) { my $sec = $1; - if (!grep/^$sec$/,@secnums) { - push (@secnums,$sec); + if (!grep(/^\Q$sec\E$/,@secnums)) { + push(@secnums,$sec); } } } @@ -376,7 +510,181 @@ sub identify_sections { return $seclist; } +sub get_valid_classes { + my ($seclist,$xlist_items,$crscode,$owner,$cdom,$cnum) = @_; + my $response; + my %validations; + @{$validations{'sections'}} = (); + @{$validations{'xlists'}} = (); + my $totalitems = 0; + if ($seclist) { + foreach my $sec (split(',',$seclist)) { + my $class = $crscode.$sec; + if (&Apache::lonnet::auto_validate_class_sec($cdom,$cnum,$owner, + $class) eq 'ok') { + if (!grep(/^\Q$sec$\E/,@{$validations{'sections'}})) { + push(@{$validations{'sections'}},$sec); + $totalitems ++; + } + } + } + } + if ($xlist_items) { + foreach my $item (split(',',$xlist_items)) { + if (&Apache::lonnet::auto_validate_class_sec($cdom,$cnum,$owner, + $item) eq 'ok') { + if (!grep(/^\Q$item$\E/,@{$validations{'xlists'}})) { + push(@{$validations{'xlists'}},$item); + $totalitems ++; + } + } + } + } + if ($totalitems > 0) { + if (@{$validations{'sections'}}) { + $response = &mt('Sections: '). + join(',',@{$validations{'sections'}}).'
'; + } + if (@{$validations{'xlists'}}) { + $response .= &mt('Courses: '). + 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
'.$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(''); } - for (my $i=0; $i<@items; $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('
'); + } 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)); + $r->print('

'.&print_course_listing($codedom).'
'); } $r->print(&Apache::loncommon::end_page()); + return OK; +} + +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); + } + + } + } + } + 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 print_course_listing { my ($domain) = @_; my $output; @@ -178,34 +277,41 @@ sub print_course_listing { my $dept = $env{'form.Department'}; my $coursenum = $env{'form.Number'}; my $instcode; - if ($sem != -1) { - $instcode .= $sem; + if ($sem eq '0' ) { + $instcode .= '^[sfu]s'; + } else { + $instcode .= '^'.$sem; } - if ($year != -1) { + if ($year eq '0') { + $instcode .= '\d{2}'; + } else { $instcode .= $year; } - if ($dept != -1) { + if ($dept eq '0') { + $instcode .= '\w{2,3}'; + } else { $instcode .= $dept; } - if ($coursenum != -1) { - $instcode .= $coursenum; + if ($coursenum ne '0' && $coursenum != -1) { + $instcode .= $coursenum.'$'; } my %courses = &Apache::lonnet::courseiddump($domain,'.',1,$instcode,'.','.', - undef,undef,'Course'); + undef,undef,'Course',1); if (keys(%courses) == 0) { - $output = &mt('No courses match the criteria you selected'); + $output = &mt('No courses match the criteria you selected.'); return $output; } - $output = &mt('Note for students: If STUINFO shows you as enrolled in a course, but there is no student role for the course in your LON-CAPA roles screen, please check the default access dates and/or auto-enrollment dates for the course listed below. Your roles screen will only display currently accessible roles.

'); + $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('Students').''.&mt('Student Status').''.&mt('Default Access Dates').''.&mt('Auto-enrollment Dates').''.&mt('Auto-enrollment').''.&mt('No information available').''.&mt('No information available for [_1].', + $code).''.$coursehash{'internal.coursecode'}.''.$seclist.''.$title.' '. - &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$cnum,$cdom). - ''.$owner.''.$countslist.''.$accessdates.''.$autoenrolldates.''.$xlist_items.''.$title.' '; + if ($showsyllabus) { + $output .= &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$cnum,$cdom); + } + $output .= ''.$ownerlast.''.$countslist.''.$accessdates.''.$autoenrolldates.'