--- loncom/interface/lonpickcourse.pm 2004/03/19 03:47:09 1.13 +++ loncom/interface/lonpickcourse.pm 2005/02/17 08:29:43 1.26 @@ -1,7 +1,7 @@ # The LearningOnline Network # Pick a course # -# $Id: lonpickcourse.pm,v 1.13 2004/03/19 03:47:09 albertel Exp $ +# $Id: lonpickcourse.pm,v 1.26 2005/02/17 08:29:43 albertel 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,7 +53,8 @@ ENDDOCUMENT &Apache::loncommon::get_unprocessed_cgi ($ENV{'QUERY_STRING'},['domainfilter','descriptfilter', 'sincefilter','form','cnumelement', - 'cdomelement','cnameelement']); + 'cdomelement','cnameelement','roleelement', + 'pickedcourse','instcodefilter','ownerfilter']); # domain filter and selection my $domainfilter=$ENV{'form.domainfilter'}; $domainfilter=~s/\W//g; @@ -61,9 +63,16 @@ ENDDOCUMENT 'domainfilter',1); # description filter my $descriptfilter=$ENV{'form.descriptfilter'}; - $descriptfilter=~s/[^\w\s]//g; 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,'<>&"'); # last course activity filter and selection my $sincefilter=$ENV{'form.sincefilter'}; $sincefilter=~s/[^\d-]//g; @@ -79,43 +88,120 @@ 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); + } + } + $r->print(&Apache::loncommon::bodytag("Selecting a Course",undef,$loaditem)); 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;"; $name_input =''; } + 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 +$submitopener
$name_input - +$roleelement $lt{'cac'}: $sincefilterform
$lt{'cdo'}: $domainselectform
+$lt{'cin'}: + +
+$lt{'cow'}: + +
$lt{'cde'}: - +

@@ -125,32 +211,53 @@ ENDSCRIPT $r->print(&mt('Searching').' ...
 
'); $r->rflush(); unless ($descriptfilter) { $descriptfilter='.'; } + unless ($instcodefilter) { $instcodefilter='.'; } + unless ($ownerfilter) { $ownerfilter='.'; } my $timefilter=($sincefilter==-1?1:time-$sincefilter); my %courses= &Apache::lonnet::courseiddump - ($domainfilter,$descriptfilter,$timefilter); - $r->print('
'); + ($domainfilter,$descriptfilter,$timefilter,$instcodefilter,$ownerfilter); + $r->print(''); my %by_descrip; foreach my $course (keys %courses) { - $by_descrip{lc($courses{$course})}=$course; + 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); } 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(' '.$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)); + } + $r->print("
\n"); + } } if (!%courses) { $r->print(&mt('None found')); } - $r->print('
'); + $r->print(''."\n". + ''."\n". + ''."\n". + ''."\n". + ''); } $r->print(''); return OK; -} +} 1; __END__