--- loncom/interface/lonpickcourse.pm	2006/05/08 21:40:20	1.43
+++ loncom/interface/lonpickcourse.pm	2006/05/30 20:12:15	1.48
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.43 2006/05/08 21:40:20 raeburn Exp $
+# $Id: lonpickcourse.pm,v 1.48 2006/05/30 20:12:15 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,6 +34,9 @@ use Apache::loncommon;
 use Apache::loncoursedata;
 use Apache::lonnet;
 use Apache::lonlocal;
+use Apache::longroup;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
 
 sub handler {
     my $r = shift;
@@ -49,7 +52,8 @@ sub handler {
 			       'sincefilter','form','cnumelement',
 			       'cdomelement','cnameelement','roleelement',
                                'pickedcourse','instcodefilter',
-                               'ownerfilter','coursefilter','multiple']);
+                               'ownerfilter','coursefilter','multiple',
+                               'type']);
 # domain filter and selection
     my $domainfilter=$env{'form.domainfilter'};
     $domainfilter=~s/\W//g;
@@ -101,39 +105,50 @@ sub handler {
     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 (%curr_groups,$numgroups);
-        $numgroups = &Apache::loncommon::coursegroups(\%curr_groups,$cdom,
-                                                         $cnum);
-        if ($numgroups > 0) {
-            $groupslist = join(',',sort(keys(%curr_groups)));
-        }
+
+        my %sections_count = &Apache::loncommon::get_sections($cdom,$cnum);
+        my @sections =  (sort {$a <=> $b} keys(%sections_count));
+	$seclist = join('","',@sections);
+        $num_sections = scalar(@sections);
+        my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
+	$groupslist = join(',',sort(keys(%curr_groups)));
     }
     my $jscript;
-    my $title = 'Selecting a course';
+    my $type = $env{'form.type'};
+    if (!defined($env{'form.type'})) {
+        $type = 'Course';
+    }
+    my $typeselectform =  '<select name="type" size="1"';
+    if (!$type) {
+        $typeselectform .= ' selected="selected"';
+    }
+    $typeselectform .= ">\n";
+    foreach my $posstype ('Course','Group') { 
+        $typeselectform.='<option value="'.$posstype.'" "'.
+            ($posstype eq $type ? 'selected="selected" ' : ''). ">$posstype</option>\n";
+    }
+    $typeselectform.="</select>";
+    my $title = &mt('Selecting a [_1]',$type);
 # Setup for multiple course selections, if flag for multiples set.
     my $multiple = $env{'form.multiple'};
     my $multelement;
     if ($multiple) {
-        $title = 'Selecting course(s)';
+        $title = &mt('Selecting [_1](s)',lc($type));
         $jscript = &Apache::loncommon::check_uncheck_jscript();
         $multelement = '<input type="hidden" name="multiple" value="'.$multiple.'" />';
     }
     $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',
-				       'cdo' => 'Course Domain',
-                                       'cin' => 'Course Institutional Code',
-                                       'cow' => "Course Owner's Username");
+    my %lt = (
+	      'cac' => &mt('[_1] Activity',$type),
+	      'cde' => &mt('[_1] Description',$type),
+	      'cdo' => &mt('[_1] Domain',$type),
+              'cin' => &mt('Course Institutional Code'),
+              'cow' => &mt("[_1] Owner's Username",$type),
+              'cog' => &mt('Course or Group')
+             );
+   
     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;";
@@ -154,6 +169,25 @@ sub handler {
         $submitopener = &Apache::lonroles::processpick();
         $autosubmit = 'process_pick("'.$roledom.'")';
     }
+    my $instcodeform;
+    if ($type eq 'Course') {
+        $instcodeform = $lt{'cin'}.':<input type="text" name="instcodefilter" 
+ size="10" value="'.$listinstcode.'" /><br />';
+    }
+
+    my %elements = (
+                     Course => {
+                                 name  => 'coursepick',
+                                 total => 'coursetotal',
+                                 list  => 'courselist',
+                               },
+                     Group => {
+                                 name  => 'grouppick',
+                                 total => 'grouptotal',
+                                 list  => 'grouplist',
+                             },
+                    );
+
     $r->print(<<ENDSCRIPT);
 <script>
 function gochoose(cname,cdom,cdesc,multiple,caller) {
@@ -175,26 +209,26 @@ function gochoose(cname,cdom,cdesc,multi
 		}
 	    }
 	} 
-        opener.document.$env{'form.form'}.coursetotal.value = courseCount;
-	if (typeof(opener.document.$env{'form.form'}.coursepick.length) ==
+        opener.document.$env{'form.form'}.$elements{$type}{'total'}.value = courseCount;
+	if (typeof(opener.document.$env{'form.form'}.$elements{$type}{'name'}.length) ==
 	    'undefined') {
-	    if (opener.document.$env{'form.form'}.coursepick.value == 'specific') {  
-		opener.document.$env{'form.form'}.coursepick.checked = true;
+	    if (opener.document.$env{'form.form'}.$elements{$type}{'name'}.value == 'specific') {  
+		opener.document.$env{'form.form'}.$elements{$type}{'name'}.checked = true;
 	    } else {
-		opener.document.$env{'form.form'}.coursepick.checked = false;
+		opener.document.$env{'form.form'}.$elements{$type}{'name'}.checked = false;
 	    }
 	} else {
-	    for (var j=0; j<opener.document.$env{'form.form'}.coursepick.length; j++) { 
-		if (opener.document.$env{'form.form'}.coursepick[j].value == 'specific') {  
-		    opener.document.$env{'form.form'}.coursepick[j].checked = true;
+	    for (var j=0; j<opener.document.$env{'form.form'}.$elements{$type}{'name'}.length; j++) { 
+		if (opener.document.$env{'form.form'}.$elements{$type}{'name'}\[j].value == 'specific') {  
+		    opener.document.$env{'form.form'}.$elements{$type}{'name'}\[j].checked = true;
 		} else {
-		    opener.document.$env{'form.form'}.coursepick[j].checked = false;
+		    opener.document.$env{'form.form'}.$elements{$type}{'name'}\[j].checked = false;
 		}
 	    }
 	}
 	if (courseCount > 0) {
 	    courses = courses.substr(0,courses.length-2);
-	    opener.document.$env{'form.form'}.courselist.value = courses;
+	    opener.document.$env{'form.form'}.$elements{$type}{'list'}.value = courses;
 	}
     } else {
         $name_code
@@ -249,7 +283,7 @@ function setSections() {
 $jscript
 </script>
 $submitopener
-<form method="post" name="filterpicker">
+<form method="post" name="filterpicker" action="/adm/pickcourse">
 <input type="hidden" name="cnumelement" value="$env{'form.cnumelement'}" />
 <input type="hidden" name="cdomelement" value="$env{'form.cdomelement'}" />
 $name_input
@@ -260,9 +294,9 @@ $lt{'cac'}: $sincefilterform
 <br />
 $lt{'cdo'}: $domainselectform
 <br />
-$lt{'cin'}:
-<input type="text" name="instcodefilter" size="10" value="$listinstcode" />
+$lt{'cog'}: $typeselectform
 <br />
+$instcodeform
 $lt{'cow'}:
 <input type="text" name="ownerfilter" size="10" value="$listowner" />
 <br />
@@ -281,19 +315,20 @@ ENDSCRIPT
         unless ($instcodefilter) { $instcodefilter='.'; }
         unless ($ownerfilter) { $ownerfilter='.'; }
         unless ($coursefilter) { $coursefilter='.'; }
+        unless ($type) { $type = '.'; }
         my $timefilter=($sincefilter==-1?1:time-$sincefilter);
 	my %courses=
 	    &Apache::lonnet::courseiddump
-	    ($domainfilter,$descriptfilter,$timefilter,$instcodefilter,$ownerfilter,$coursefilter);
-	$r->print('<form name="courselist">');
+	    ($domainfilter,$descriptfilter,$timefilter,$instcodefilter,$ownerfilter,$coursefilter,undef,undef,$type);
+	$r->print('<form name="courselist" method="post" action="/adm/pickcourse">');
 	my %by_descrip;
         my $numcourses = keys(%courses);
 	foreach my $course (keys(%courses)) {
             my $descr;
             if ($courses{$course} =~ m/^([^:]*):/i) {
-                $descr = &Apache::lonnet::unescape($1);
+                $descr = &unescape($1);
             } else {
-                $descr = &Apache::lonnet::unescape($courses{$course});
+                $descr = &unescape($courses{$course});
             }
             my $description = $descr;
             push (@{$by_descrip{$description}}, $course);
@@ -310,16 +345,19 @@ ENDSCRIPT
 	        my $cleandesc=&HTML::Entities::encode($description,'<>&"');
 	        $cleandesc=~s/'/\\'/g;
 	        my ($cdom,$cnum)=split(/\_/,$course);
-                my ($descr,$instcode,$owner) = split/:/,$courses{$course};
+                my ($descr,$instcode,$owner,$ttype) = 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));
+                    $r->print(" - ".&unescape($instcode));
                 }
                 unless ($owner eq '') {
-                    $r->print(", owner - ".&Apache::lonnet::unescape($owner));
+                    $r->print(", owner - ".&unescape($owner));
+                }
+                unless ($ttype eq '') {
+                    $r->print('('.&Apache::lonnet::unescape($ttype).')');
                 }
 		if ($multiple) { $r->print("</label>\n"); }
                 $r->print("<br />\n");
@@ -333,7 +371,8 @@ ENDSCRIPT
         $r->print('<input type="hidden" name="form" value="'.$env{'form.form'}.'" />'."\n".
                    '<input type="hidden" name="pickedcourse" value="" />'."\n".
                    '<input type="hidden" name="cnumelement" value="'.$env{'form.cnumelement'}.'" />'."\n".
-                   '<input type="hidden" name="cdomelement" value="'.$env{'form.cdomelement'}.'" />'."\n");
+                   '<input type="hidden" name="cdomelement" value="'.$env{'form.cdomelement'}.'" />'."\n".
+                   '<input type="hidden" name="type" value="'.$type.'" />'."\n");
         if ((exists($env{'form.roleelement'})) && ($env{'form.form'} eq 'rolechoice')) {
            $r->print('<input type="hidden" name="roleelement" value="'.$env{'form.roleelement'}.'" />'."\n");
         }