version 1.62, 2010/06/08 16:37:20
|
version 1.65, 2010/10/07 14:41:49
|
Line 87 sub handler {
|
Line 87 sub handler {
|
} |
} |
&Apache::loncommon::extract_categories($cathash,\@cats,\@trails,\%allitems, |
&Apache::loncommon::extract_categories($cathash,\@cats,\@trails,\%allitems, |
\%idx,\@jsarray,$subcats); |
\%idx,\@jsarray,$subcats); |
|
my ($numtitles,@codetitles); |
if ($env{'form.coursenum'} ne '' && &user_is_known()) { |
if ($env{'form.coursenum'} ne '' && &user_is_known()) { |
&course_details($r,$codedom,$formname,$domdesc,\@trails,\%allitems); |
&course_details($r,$codedom,$formname,$domdesc,\@trails,\%allitems,\@codetitles); |
} else { |
} else { |
my ($catlinks,$has_subcats,$selitem) = &category_breadcrumbs($codedom,@cats); |
my ($catlinks,$has_subcats,$selitem) = &category_breadcrumbs($codedom,@cats); |
my $catjs = <<"ENDSCRIPT"; |
my $catjs = <<"ENDSCRIPT"; |
Line 114 function setCourseId(caller) {
|
Line 115 function setCourseId(caller) {
|
|
|
ENDSCRIPT |
ENDSCRIPT |
$catjs .= &courselink_javascript(); |
$catjs .= &courselink_javascript(); |
my $numtitles; |
|
if ($env{'form.currcat_0'} eq 'instcode::0') { |
if ($env{'form.currcat_0'} eq 'instcode::0') { |
$numtitles = &instcode_course_selector($r,$codedom,$formname,$domdesc, |
$numtitles = &instcode_course_selector($r,$codedom,$formname,$domdesc, |
$catlinks,$catjs); |
$catlinks,$catjs,\@codetitles); |
if ($env{'form.state'} eq 'listing') { |
if ($env{'form.state'} eq 'listing') { |
$r->print(&print_course_listing($codedom,$numtitles)); |
$r->print(&print_course_listing($codedom,$numtitles,undef,undef,undef, |
|
\@codetitles)); |
} |
} |
} else { |
} else { |
my (%add_entries); |
my (%add_entries); |
Line 164 ENDJS
|
Line 165 ENDJS
|
$display_button.'" /></form><br /><br />'); |
$display_button.'" /></form><br /><br />'); |
} |
} |
if ($env{'form.state'} eq 'listing') { |
if ($env{'form.state'} eq 'listing') { |
$r->print(&print_course_listing($codedom,undef,\@trails,\%allitems,$subcats)); |
$r->print(&print_course_listing($codedom,undef,\@trails,\%allitems,$subcats,\@codetitles)); |
} |
} |
} |
} |
} |
} |
Line 173 ENDJS
|
Line 174 ENDJS
|
} |
} |
|
|
sub course_details { |
sub course_details { |
my ($r,$codedom,$formname,$domdesc,$trails,$allitems) = @_; |
my ($r,$codedom,$formname,$domdesc,$trails,$allitems,$codetitles) = @_; |
my $output; |
my $output; |
my %add_entries = (topmargin => "0", |
my %add_entries = (topmargin => "0", |
marginheight => "0",); |
marginheight => "0",); |
Line 206 sub course_details {
|
Line 207 sub course_details {
|
$r->print(&mt('Detailed course information:')); |
$r->print(&mt('Detailed course information:')); |
} |
} |
$r->print('<br /><br />'. |
$r->print('<br /><br />'. |
&print_course_listing($codedom,undef,$trails,$allitems). |
&print_course_listing($codedom,undef,$trails,$allitems,undef,$codetitles). |
'<br /><br />'); |
'<br /><br />'); |
$r->print('<form name="'.$formname.'" method="post" action="/adm/coursecatalog">'. |
$r->print('<form name="'.$formname.'" method="post" action="/adm/coursecatalog">'. |
'<a href = "javascript:document.coursecatalog.submit()">'); |
'<a href = "javascript:document.coursecatalog.submit()">'); |
Line 248 END
|
Line 249 END
|
} |
} |
|
|
sub instcode_course_selector { |
sub instcode_course_selector { |
my ($r,$codedom,$formname,$domdesc,$catlinks,$catjs) = @_; |
my ($r,$codedom,$formname,$domdesc,$catlinks,$catjs,$codetitles) = @_; |
my %coursecodes = (); |
my %coursecodes = (); |
my %codes = (); |
my %codes = (); |
my @codetitles = (); |
|
my %cat_titles = (); |
my %cat_titles = (); |
my %cat_order = (); |
my %cat_order = (); |
my %cat_items; |
my %cat_items; |
Line 261 sub instcode_course_selector {
|
Line 261 sub instcode_course_selector {
|
marginheight => "0",); |
marginheight => "0",); |
my ($jscript,$totcodes,$numtitles,$lasttitle) = |
my ($jscript,$totcodes,$numtitles,$lasttitle) = |
&Apache::courseclassifier::instcode_selectors_data($codedom,$formname, |
&Apache::courseclassifier::instcode_selectors_data($codedom,$formname, |
\%cat_items,\@codetitles,\%cat_titles,\%cat_order); |
\%cat_items,$codetitles,\%cat_titles,\%cat_order); |
my $js = '<script type"text/javascript">'."\n$jscript\n$catjs\n". |
my $js = '<script type"text/javascript">'."\n$jscript\n$catjs\n". |
'</script>'; |
'</script>'; |
if ($totcodes) { |
if ($totcodes) { |
Line 278 sub instcode_course_selector {
|
Line 278 sub instcode_course_selector {
|
if ($numtitles > 0) { |
if ($numtitles > 0) { |
$r->print('<b>'.&mt('Choose which course(s) to list.').'</b><br />'. |
$r->print('<b>'.&mt('Choose which course(s) to list.').'</b><br />'. |
&Apache::courseclassifier::build_instcode_selectors($numtitles, |
&Apache::courseclassifier::build_instcode_selectors($numtitles, |
$lasttitle,\%cat_items,\@codetitles,\%cat_titles,\%cat_order)); |
$lasttitle,\%cat_items,$codetitles,\%cat_titles,\%cat_order)); |
} |
} |
$r->print('<input type="hidden" name="coursenum" value="" />'."\n". |
$r->print('<input type="hidden" name="coursenum" value="" />'."\n". |
'<input type="hidden" name="sortby" value="" />'."\n". |
'<input type="hidden" name="sortby" value="" />'."\n". |
Line 395 sub category_breadcrumbs {
|
Line 395 sub category_breadcrumbs {
|
$catlinks .= '<option value="">'.&mt('De-select').'</option>'; |
$catlinks .= '<option value="">'.&mt('De-select').'</option>'; |
for (my $j=0; $j<@{$cats[$shallower]{$container}}; $j++) { |
for (my $j=0; $j<@{$cats[$shallower]{$container}}; $j++) { |
my $name = $cats[$shallower]{$container}[$j]; |
my $name = $cats[$shallower]{$container}[$j]; |
my $item = &escape($name).':'.$container.':'.$shallower; |
my $item = &escape($name).':'.&escape($container).':'.$shallower; |
my $selected = ''; |
my $selected = ''; |
if ($item eq $env{'form.currcat_'.$shallower}) { |
if ($item eq $env{'form.currcat_'.$shallower}) { |
$selected = ' selected="selected"'; |
$selected = ' selected="selected"'; |
Line 575 sub user_is_dc {
|
Line 575 sub user_is_dc {
|
} |
} |
|
|
sub search_official_courselist { |
sub search_official_courselist { |
my ($domain,$numtitles) = @_; |
my ($domain,$numtitles,$codetitles) = @_; |
my $instcode = &Apache::courseclassifier::instcode_search_str($domain,$numtitles); |
my $instcode = &Apache::courseclassifier::instcode_search_str($domain,$numtitles,$codetitles); |
my $showhidden; |
my $showhidden; |
if (&user_is_dc($domain)) { |
if (&user_is_dc($domain)) { |
$showhidden = $env{'form.showhidden'}; |
$showhidden = $env{'form.showhidden'}; |
Line 633 sub search_courselist {
|
Line 633 sub search_courselist {
|
} |
} |
|
|
sub print_course_listing { |
sub print_course_listing { |
my ($domain,$numtitles,$trails,$allitems,$subcats) = @_; |
my ($domain,$numtitles,$trails,$allitems,$subcats,$codetitles) = @_; |
my $output; |
my $output; |
my %courses; |
my %courses; |
my $knownuser = &user_is_known(); |
my $knownuser = &user_is_known(); |
Line 657 sub print_course_listing {
|
Line 657 sub print_course_listing {
|
} |
} |
} else { |
} else { |
if ($env{'form.currcat_0'} eq 'instcode::0') { |
if ($env{'form.currcat_0'} eq 'instcode::0') { |
%courses = &search_official_courselist($domain,$numtitles); |
%courses = &search_official_courselist($domain,$numtitles,$codetitles); |
} else { |
} else { |
%courses = &search_courselist($domain,$subcats); |
%courses = &search_courselist($domain,$subcats); |
} |
} |