--- loncom/interface/lonpickcourse.pm 2004/03/31 05:24:00 1.14 +++ loncom/interface/lonpickcourse.pm 2005/11/15 20:46:40 1.35 @@ -1,7 +1,7 @@ # The LearningOnline Network # Pick a course # -# $Id: lonpickcourse.pm,v 1.14 2004/03/31 05:24:00 albertel Exp $ +# $Id: lonpickcourse.pm,v 1.35 2005/11/15 20:46:40 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -42,8 +42,9 @@ sub handler { return OK if $r->header_only; # ------------------------------------------------------------ Print the screen + my $html=&Apache::lonxml::xmlbegin(); $r->print(< +$html The LearningOnline Network with CAPA @@ -52,20 +53,41 @@ ENDDOCUMENT &Apache::loncommon::get_unprocessed_cgi ($ENV{'QUERY_STRING'},['domainfilter','descriptfilter', 'sincefilter','form','cnumelement', - 'cdomelement','cnameelement']); + 'cdomelement','cnameelement','roleelement', + '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'}; - $descriptfilter=~s/[^\w\s]//g; + my $descriptfilter=$env{'form.descriptfilter'}; unless ($descriptfilter) { $descriptfilter=''; } - + my $listdescript=&HTML::Entities::encode($descriptfilter,'<>&"'); +# institutional code filter + my $instcodefilter=$env{'form.instcodefilter'}; + unless ($instcodefilter) { $instcodefilter=''; } + my $listinstcode=&HTML::Entities::encode($instcodefilter,'<>&"'); +# course owner filter + 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, @@ -79,77 +101,251 @@ ENDDOCUMENT 'select_form_order' => ['-1','86400','604800','2592000','7776000', '15552000','31104000'])); - - $r->print(&Apache::loncommon::bodytag("Selecting a Course")); +# if called from loncreateuser, report sections, then close + my ($loaditem,$seclist); + my $num_sections = 0; + if ($env{'form.form'} eq 'cu' && $env{'form.pickedcourse'}) { + $loaditem = 'onLoad="setSections()"'; + 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)); + $seclist = join('","',@sections); + } + } + 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', - 'cdo' => 'Course Domain'); + 'cdo' => 'Course Domain', + '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') { + $lastaction = 'document.courselist.pickedcourse.value = cdom+"_"+cname;'."\n". + 'document.courselist.submit();'; + } + my $roledom = $env{'form.roleelement'}; + if ($roledom) { + $roleelement = ''; + $submitopener = &Apache::lonroles::processpick($roledom); + $autosubmit = 'process_pick("'.$roledom.'")'; } $r->print(< -function gochoose(cname,cdom,cdesc) { - $name_code - opener.document.$ENV{"form.form"}.$ENV{'form.cnumelement'}.value=cname; - 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
+$lt{'cin'}: + +
+$lt{'cow'}: + +
+$courseidtag $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); - $r->print('
'); + ($domainfilter,$descriptfilter,$timefilter,$instcodefilter,$ownerfilter,$coursefilter); + $r->print(''); my %by_descrip; - foreach my $course (keys %courses) { - $by_descrip{lc($courses{$course})}=$course; + my $numcourses = keys(%courses); + foreach my $course (keys(%courses)) { + my $descr; + if ($courses{$course} =~ m/^([^:]*):/) { + $descr = &Apache::lonnet::unescape($1); + } else { + $descr = &Apache::lonnet::unescape($courses{$course}); + } + my $description = lc($descr); + push (@{$by_descrip{$description}}, $course); } + if ($numcourses > 1 && $multiple) { + $r->print('    +

'); + } foreach my $description (sort(keys(%by_descrip))) { - my $course=$by_descrip{$description}; - my $cleandesc=&HTML::Entities::encode($courses{$course},'<>&"'); - $cleandesc=~s/'/\\'/g; - my ($cdom,$cnum)=split(/\_/,$course); - $r->print(' '.$courses{$course}.' ('. - ($Apache::lonnet::domaindescription{$cdom}? - $Apache::lonnet::domaindescription{$cdom}:$cdom). - ")
\n"); + 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(&course_chooser($multiple,$cdom,$cnum,$cleandesc)); + $r->print($description.'('. + ($Apache::lonnet::domaindescription{$cdom}? + $Apache::lonnet::domaindescription{$cdom}:$cdom).")"); + unless ($instcode eq '') { + $r->print(" - ".&Apache::lonnet::unescape($instcode)); + } + 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('
'); + if (!%courses) { + $r->print(&mt('None found')); + } elsif ($multiple) { + $r->print(''); + } + $r->print(''."\n". + ''."\n". + ''."\n". + ''."\n". + ''); } $r->print(''); return OK; +} + +sub course_chooser { + my ($multiple,$cdom,$cnum,$cleandesc) = @_; + my $output; + if ($multiple) { + $output = '