--- loncom/interface/lonnotify.pm 2006/07/07 13:43:20 1.20
+++ loncom/interface/lonnotify.pm 2006/10/12 22:47:31 1.24
@@ -27,7 +27,7 @@ package Apache::lonnotify;
use strict;
use Apache::lonnet;
use Apache::loncommon;
-use Apache::lonsupportreq;
+use Apache::courseclassifier;
use LONCAPA::Enrollment;
use Apache::Constants qw(:common :http);
use Apache::lonlocal;
@@ -265,7 +265,6 @@ ENDSCRIPT
}
$output .= &Apache::loncommon::start_data_table();
if ($msgcount > 0) {
- my $rowNum = 0;
$output .= &Apache::loncommon::start_data_table_header_row().
'
Date | '.
'Subject | '.
@@ -380,13 +379,18 @@ sub print_selection_form {
&Apache::lonhtmlcommon::add_breadcrumb
({text=>"Select Audience"});
- $totcodes = &Apache::lonsupportreq::retrieve_instcodes(\%coursecodes,$cdom,$totcodes);
+ $totcodes = &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,$cdom,$totcodes);
if ($totcodes > 0) {
$format_reply = &Apache::lonnet::auto_instcode_format($caller,$cdom,\%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);
+ &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]};
+ $jscript .= &Apache::courseclassifier::courseset_js_start($formname,$longtitles_str,$allidlist);
+ $jscript .= $scripttext;
+ $jscript .= &Apache::courseclassifier::javascript_code_selections($formname,@codetitles);
}
}
@@ -499,7 +503,8 @@ function goBack(target) {
my $coursefilter = $env{'form.coursepick'};
my %courses = ();
if ($coursefilter eq 'all') {
- %courses = &Apache::lonnet::courseiddump($cdom,'.','.','.','.','.');
+ %courses = &Apache::lonnet::courseiddump($cdom,'.','.','.','.','.',
+ undef,undef,'Course');
} elsif ($coursefilter eq 'category') {
my $instcode = '';
my @cats = ('Semester','Year','Department','Number');
@@ -513,7 +518,8 @@ function goBack(target) {
if ($instcode eq '') {
$instcode = '.';
}
- %courses = &Apache::lonnet::courseiddump($cdom,'.','.',$instcode,'.','.');
+ %courses = &Apache::lonnet::courseiddump($cdom,'.','.',$instcode,'.','.',
+ undef,undef,'Course');
} elsif ($coursefilter eq 'specific') {
if ($env{'form.coursetotal'} > 1) {
my @course_ids = split(/&&/,$env{'form.courselist'});
@@ -606,14 +612,14 @@ function goBack(target) {
$output .= &Apache::loncommon::start_data_table();
if (keys(%recipients) > 0) {
$output .= &Apache::loncommon::start_data_table_header_row();
- $output .= ' | username:domain | | '.$lt{'emad'}.' | ';
+ $output .= ' | username:domain | '.$lt{'emad'}.' | ';
$output .= &Apache::loncommon::end_data_table_header_row();
}
foreach my $username (sort(keys(%recipients))) {
$output .= &Apache::loncommon::start_data_table_row();
if ($recipients{$username} =~ /\@/) {
my $value=&escape($username).':'.&escape($recipients{$username});
- $output .= ' | '.$username.' | | '.$recipients{$username}.' | ';
+ $output .= ' | '.$username.' | '.$recipients{$username}.' | ';
}
$output .= &Apache::loncommon::end_data_table_row();
}