--- loncom/interface/lonpickcourse.pm 2005/09/14 20:42:36 1.29 +++ loncom/interface/lonpickcourse.pm 2005/10/14 18:43:13 1.33 @@ -1,7 +1,7 @@ # The LearningOnline Network # Pick a course # -# $Id: lonpickcourse.pm,v 1.29 2005/09/14 20:42:36 raeburn Exp $ +# $Id: lonpickcourse.pm,v 1.33 2005/10/14 18:43:13 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -111,11 +111,22 @@ ENDDOCUMENT $num_sections = &Apache::loncommon::get_sections($cdom,$cnum,\%sections_count); my @sections = (); if ($num_sections > 0) { - @sections = (sort {$a <=> $b} keys %sections_count); + @sections = (sort {$a <=> $b} keys(%sections_count)); $seclist = join('","',@sections); } } - $r->print(&Apache::loncommon::bodytag("Selecting a Course",undef,$loaditem,undef,undef,undef,undef,1)); +# if called from rolefilter, setup for multiple course selections. + my $multflag = 0; + my $jscript; + my $title = 'Selecting a course'; + if ($env{'form.form'} eq 'rolefilter') { + $multflag = 1; + $title = 'Selecting course(s)'; + } + if ($multflag) { + $jscript = &Apache::loncommon::check_uncheck_jscript(); + } + $r->print(&Apache::loncommon::bodytag($title,undef,$loaditem,undef,undef,undef,undef,1)); my %lt=&Apache::lonlocal::texthash( 'cac' => 'Course Activity', 'cde' => 'Course Description', @@ -144,18 +155,60 @@ ENDDOCUMENT } $r->print(< -function gochoose(cname,cdom,cdesc) { - $name_code +function gochoose(cname,cdom,cdesc,multflag,caller) { var openerForm = "$env{'form.form'}"; - opener.document.$env{'form.form'}.$env{'form.cnumelement'}.value=cname; - if (openerForm == 'cu' || openerForm == 'rolechoice') { - opener.document.$env{'form.form'}.$env{'form.cdomelement'}.value=cdom; + courseCount = 0; + var courses = ''; + if (multflag) { + if (typeof(document.courselist.course_id.length) == 'undefined') { + // only 1 course checkbox was created + if (document.courselist.course_id.checked) { + courses = courses + document.courselist.course_id.value + "&&"; + courseCount ++; + } + } else { + for (var j=0; j 0) { + courses = courses.substr(0,courses.length-2); + opener.document.$env{'form.form'}.courselist.value = courses; + } } else { - var slct=opener.document.$env{'form.form'}.$env{'form.cdomelement'}; - var i; - for (i=0;i $submitopener -
+ $name_input @@ -234,7 +289,8 @@ ENDSCRIPT ($domainfilter,$descriptfilter,$timefilter,$instcodefilter,$ownerfilter,$coursefilter); $r->print(''); my %by_descrip; - foreach my $course (keys %courses) { + my $numcourses = keys(%courses); + foreach my $course (keys(%courses)) { my $descr; if ($courses{$course} =~ m/^([^:]*):/) { $descr = &Apache::lonnet::unescape($1); @@ -244,14 +300,20 @@ ENDSCRIPT my $description = lc($descr); push (@{$by_descrip{$description}}, $course); } + if ($numcourses > 1 && $multflag) { + $r->print('    +

'); + } foreach my $description (sort(keys(%by_descrip))) { foreach my $course (@{$by_descrip{$description}}) { my $cleandesc=&HTML::Entities::encode($description,'<>&"'); $cleandesc=~s/'/\\'/g; my ($cdom,$cnum)=split(/\_/,$course); my ($descr,$instcode,$owner) = split/:/,$courses{$course}; - $r->print(' '.$description.' ('. + $r->print(&course_chooser($multflag,$cdom,$cnum,$cleandesc)); + $r->print($description.'('. ($Apache::lonnet::domaindescription{$cdom}? $Apache::lonnet::domaindescription{$cdom}:$cdom).")"); unless ($instcode eq '') { @@ -260,10 +322,15 @@ ENDSCRIPT unless ($owner eq '') { $r->print(", owner - ".&Apache::lonnet::unescape($owner)); } + if ($multflag) { $r->print("\n"); } $r->print("
\n"); } } - if (!%courses) { $r->print(&mt('None found')); } + if (!%courses) { + $r->print(&mt('None found')); + } elsif ($multflag) { + $r->print(''); + } $r->print(''."\n". ''."\n". ''."\n". @@ -274,5 +341,17 @@ ENDSCRIPT return OK; } +sub course_chooser { + my ($multflag,$cdom,$cnum,$cleandesc) = @_; + my $output; + if ($multflag) { + $output = '