--- loncom/interface/lonpickcourse.pm 2005/02/17 08:29:43 1.26 +++ loncom/interface/lonpickcourse.pm 2006/01/10 21:36:45 1.37 @@ -1,7 +1,7 @@ # The LearningOnline Network # Pick a course # -# $Id: lonpickcourse.pm,v 1.26 2005/02/17 08:29:43 albertel Exp $ +# $Id: lonpickcourse.pm,v 1.37 2006/01/10 21:36:45 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -54,27 +54,40 @@ ENDDOCUMENT ($ENV{'QUERY_STRING'},['domainfilter','descriptfilter', 'sincefilter','form','cnumelement', 'cdomelement','cnameelement','roleelement', - 'pickedcourse','instcodefilter','ownerfilter']); + 'pickedcourse','instcodefilter', + 'ownerfilter','coursefilter','multiple']); # domain filter and selection - my $domainfilter=$ENV{'form.domainfilter'}; + my $domainfilter=$env{'form.domainfilter'}; $domainfilter=~s/\W//g; unless ($domainfilter) { $domainfilter=''; } my $domainselectform=&Apache::loncommon::select_dom_form($domainfilter, 'domainfilter',1); # description filter - my $descriptfilter=$ENV{'form.descriptfilter'}; + my $descriptfilter=$env{'form.descriptfilter'}; unless ($descriptfilter) { $descriptfilter=''; } my $listdescript=&HTML::Entities::encode($descriptfilter,'<>&"'); # institutional code filter - my $instcodefilter=$ENV{'form.instcodefilter'}; + my $instcodefilter=$env{'form.instcodefilter'}; unless ($instcodefilter) { $instcodefilter=''; } my $listinstcode=&HTML::Entities::encode($instcodefilter,'<>&"'); # course owner filter - my $ownerfilter=$ENV{'form.ownerfilter'}; + my $ownerfilter=$env{'form.ownerfilter'}; unless ($ownerfilter) { $ownerfilter=''; } my $listowner=&HTML::Entities::encode($ownerfilter,'<>&"'); +# course ID filter for DCs only + my ($courseidtag,$coursefilter); + if ($env{'user.adv'} && $domainfilter && exists($env{'user.role.dc./'. + $domainfilter.'/'})) { + $coursefilter=$env{'form.coursefilter'}; + unless ($coursefilter) { $coursefilter=''; } + my $listcourseid=&HTML::Entities::encode($coursefilter,'<>&"'); + $courseidtag = &mt('LON-CAPA course ID'); + $courseidtag .= qq|: +
+ |; + } # last course activity filter and selection - my $sincefilter=$ENV{'form.sincefilter'}; + my $sincefilter=$env{'form.sincefilter'}; $sincefilter=~s/[^\d-]//g; unless ($sincefilter) { $sincefilter=-1; } my $sincefilterform=&Apache::loncommon::select_form($sincefilter, @@ -91,18 +104,28 @@ ENDDOCUMENT # if called from loncreateuser, report sections, then close my ($loaditem,$seclist); my $num_sections = 0; - if ($ENV{'form.form'} eq 'cu' && $ENV{'form.pickedcourse'}) { + if ($env{'form.form'} eq 'cu' && $env{'form.pickedcourse'}) { $loaditem = 'onLoad="setSections()"'; - my ($cdom,$cnum) = split/_/,$ENV{'form.pickedcourse'}; + my ($cdom,$cnum) = split/_/,$env{'form.pickedcourse'}; my %sections_count = (); $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)); + my $jscript; + my $title = 'Selecting a course'; +# Setup for multiple course selections, if flag for multiples set. + my $multiple = $env{'form.multiple'}; + my $multelement; + if ($multiple) { + $title = 'Selecting course(s)'; + $jscript = &Apache::loncommon::check_uncheck_jscript(); + $multelement = ''; + } + $r->print(&Apache::loncommon::bodytag($title,undef,$loaditem,undef,undef,undef,undef,1)); my %lt=&Apache::lonlocal::texthash( 'cac' => 'Course Activity', 'cde' => 'Course Description', @@ -110,39 +133,79 @@ ENDDOCUMENT 'cin' => 'Course Institutional Code', 'cow' => "Course Owner's usename"); my ($name_code,$name_input); - if (defined($ENV{'form.cnameelement'}) && $ENV{'form.cnameelement'} ne '') { - $name_code = "opener.document.$ENV{'form.form'}.$ENV{'form.cnameelement'}.value=cdesc;"; + if (defined($env{'form.cnameelement'}) && $env{'form.cnameelement'} ne '') { + $name_code = "opener.document.$env{'form.form'}.$env{'form.cnameelement'}.value=cdesc;"; $name_input =''; + $env{'form.cnameelement'}.'" />'; } my $submitopener = ''; my $autosubmit = ''; my $roleelement = ''; my $lastaction = 'self.close()'; - if ($ENV{'form.form'} eq 'cu') { + if ($env{'form.form'} eq 'cu') { $lastaction = 'document.courselist.pickedcourse.value = cdom+"_"+cname;'."\n". 'document.courselist.submit();'; } - my $roledom = $ENV{'form.roleelement'}; + my $roledom = $env{'form.roleelement'}; if ($roledom) { $roleelement = ''; - $submitopener = &Apache::lonroles::processpick($roledom); + $submitopener = &Apache::lonroles::processpick(); $autosubmit = 'process_pick("'.$roledom.'")'; } $r->print(< -function gochoose(cname,cdom,cdesc) { - $name_code - 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; - } - else { - var slct=opener.document.$ENV{'form.form'}.$ENV{'form.cdomelement'}; - var i; - for (i=0;i 0) { + courses = courses.substr(0,courses.length-2); + opener.document.$env{'form.form'}.courselist.value = courses; + } + } else { + $name_code + opener.document.$env{'form.form'}.$env{'form.cnumelement'}.value=cname; + var slct=opener.document.$env{'form.form'}.$env{'form.cdomelement'}; + if (slct.options == undefined) { + opener.document.$env{'form.form'}.$env{'form.cdomelement'}.value=cdom; + } + else { + var i; + for (i=0;i $submitopener -
- - + + + $name_input - + $roleelement +$multelement $lt{'cac'}: $sincefilterform
$lt{'cdo'}: $domainselectform @@ -200,6 +263,7 @@ $lt{'cin'}: $lt{'cow'}:
+$courseidtag $lt{'cde'}:

@@ -207,19 +271,21 @@ $lt{'cde'}:
ENDSCRIPT # ---------------------------------------------------------------- Get the data - if ($ENV{'form.gosearch'}) { + if ($env{'form.gosearch'}) { $r->print(&mt('Searching').' ...
 
'); $r->rflush(); unless ($descriptfilter) { $descriptfilter='.'; } unless ($instcodefilter) { $instcodefilter='.'; } unless ($ownerfilter) { $ownerfilter='.'; } + unless ($coursefilter) { $coursefilter='.'; } my $timefilter=($sincefilter==-1?1:time-$sincefilter); my %courses= &Apache::lonnet::courseiddump - ($domainfilter,$descriptfilter,$timefilter,$instcodefilter,$ownerfilter); + ($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); @@ -229,14 +295,20 @@ ENDSCRIPT my $description = lc($descr); push (@{$by_descrip{$description}}, $course); } + if ($numcourses > 1 && $multiple) { + $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($multiple,$cdom,$cnum,$cleandesc)); + $r->print($description.'('. ($Apache::lonnet::domaindescription{$cdom}? $Apache::lonnet::domaindescription{$cdom}:$cdom).")"); unless ($instcode eq '') { @@ -245,19 +317,39 @@ ENDSCRIPT unless ($owner eq '') { $r->print(", owner - ".&Apache::lonnet::unescape($owner)); } + if ($multiple) { $r->print("\n"); } $r->print("
\n"); } } - if (!%courses) { $r->print(&mt('None found')); } - $r->print(''."\n". + if (!%courses) { + $r->print(&mt('None found')); + } elsif ($multiple) { + $r->print(''); + } + $r->print(''."\n". ''."\n". - ''."\n". - ''."\n". - '
'); + ''."\n". + ''."\n"); + if ((exists($env{'form.roleelement'})) && ($env{'form.form'} eq 'rolechoice')) { + $r->print(''."\n"); + } + $r->print("\n"); } $r->print(''); return OK; } +sub course_chooser { + my ($multiple,$cdom,$cnum,$cleandesc) = @_; + my $output; + if ($multiple) { + $output = '