--- loncom/interface/lonpickcourse.pm 2006/02/02 17:57:40 1.39 +++ loncom/interface/lonpickcourse.pm 2006/05/08 21:40:20 1.43 @@ -1,7 +1,7 @@ # The LearningOnline Network # Pick a course # -# $Id: lonpickcourse.pm,v 1.39 2006/02/02 17:57:40 albertel Exp $ +# $Id: lonpickcourse.pm,v 1.43 2006/05/08 21:40:20 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -42,13 +42,7 @@ sub handler { return OK if $r->header_only; # ------------------------------------------------------------ Print the screen - my $html=&Apache::lonxml::xmlbegin(); - $r->print(< -The LearningOnline Network with CAPA - -ENDDOCUMENT + # Get parameters from query string &Apache::loncommon::get_unprocessed_cgi ($ENV{'QUERY_STRING'},['domainfilter','descriptfilter', @@ -102,10 +96,10 @@ ENDDOCUMENT ['-1','86400','604800','2592000','7776000', '15552000','31104000'])); # if called from loncreateuser, report sections, then close - my ($loaditem,$seclist); + my (%loaditem,$seclist,$groupslist); my $num_sections = 0; if ($env{'form.form'} eq 'cu' && $env{'form.pickedcourse'}) { - $loaditem = 'onLoad="setSections()"'; + $loaditem{'onload'} ="setSections()"; my ($cdom,$cnum) = split/_/,$env{'form.pickedcourse'}; my %sections_count = (); $num_sections = &Apache::loncommon::get_sections($cdom,$cnum,\%sections_count); @@ -114,6 +108,12 @@ ENDDOCUMENT @sections = (sort {$a <=> $b} keys(%sections_count)); $seclist = join('","',@sections); } + my (%curr_groups,$numgroups); + $numgroups = &Apache::loncommon::coursegroups(\%curr_groups,$cdom, + $cnum); + if ($numgroups > 0) { + $groupslist = join(',',sort(keys(%curr_groups))); + } } my $jscript; my $title = 'Selecting a course'; @@ -125,7 +125,9 @@ ENDDOCUMENT $jscript = &Apache::loncommon::check_uncheck_jscript(); $multelement = ''; } - $r->print(&Apache::loncommon::bodytag($title,undef,$loaditem,undef,undef,undef,undef,1)); + $r->print(&Apache::loncommon::start_page($title,undef, + {'add_entries' => \%loaditem, + 'no_nav_bar' => 1, })); my %lt=&Apache::lonlocal::texthash( 'cac' => 'Course Activity', 'cde' => 'Course Description', @@ -240,6 +242,7 @@ function setSections() { opener.document.$env{"form.form"}.currsec.options[0].selected = false } } + opener.document.$env{"form.form"}.groups.value='$groupslist'; self.close() } @@ -336,7 +339,7 @@ ENDSCRIPT } $r->print("\n"); } - $r->print(''); + $r->print(&Apache::loncommon::end_page()); return OK; }