--- loncom/interface/lonpickcourse.pm	2004/11/12 23:29:56	1.18
+++ loncom/interface/lonpickcourse.pm	2005/01/28 19:26:54	1.25
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.18 2004/11/12 23:29:56 raeburn Exp $
+# $Id: lonpickcourse.pm,v 1.25 2005/01/28 19:26:54 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -52,7 +52,8 @@ ENDDOCUMENT
     &Apache::loncommon::get_unprocessed_cgi
         ($ENV{'QUERY_STRING'},['domainfilter','descriptfilter',
 			       'sincefilter','form','cnumelement',
-			       'cdomelement','cnameelement','roleelement']);
+			       'cdomelement','cnameelement','roleelement',
+                               'pickedcourse','instcodefilter','ownerfilter']);
 # domain filter and selection
     my $domainfilter=$ENV{'form.domainfilter'};
     $domainfilter=~s/\W//g;
@@ -63,6 +64,14 @@ ENDDOCUMENT
     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,'<>&"');
 # last course activity filter and selection
     my $sincefilter=$ENV{'form.sincefilter'};
     $sincefilter=~s/[^\d-]//g;
@@ -78,12 +87,27 @@ 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;";
@@ -93,6 +117,11 @@ ENDDOCUMENT
     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 = '<input type="hidden" name="roleelement" value="'.$roledom.'" />';
@@ -103,14 +132,54 @@ ENDDOCUMENT
 <script>
 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<slct.length;i++) {
-        if (slct.options[i].value==cdom) { slct.selectedIndex=i; }
+    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<slct.length;i++) {
+            if (slct.options[i].value==cdom) { slct.selectedIndex=i; }
+        }
     }
     $autosubmit
-    self.close();
+    $lastaction
+}
+
+function setSections() {
+    var numSections = $num_sections
+    var sectionsArray = new Array("$seclist")
+    opener.document.$ENV{"form.form"}.currsec.length = 0
+    if (numSections == 0) {
+        opener.document.$ENV{"form.form"}.currsec.multiple=false
+        opener.document.$ENV{"form.form"}.currsec.size=1;
+        opener.document.$ENV{"form.form"}.currsec.options[0] = new Option('No existing sections','',false,false)
+    }
+    else {
+        if (numSections == 1) {
+            opener.document.$ENV{"form.form"}.currsec.multiple=false;
+            opener.document.$ENV{"form.form"}.currsec.size=1;
+            opener.document.$ENV{"form.form"}.currsec.options[0] = new Option('Select','',true,true);
+            opener.document.$ENV{"form.form"}.currsec.options[1] = new Option('No section','',false,false) 
+            opener.document.$ENV{"form.form"}.currsec.options[2] = new Option(sectionsArray[0],sectionsArray[0],false,false);
+        }
+        else {
+            for (var i=0; i<numSections; i++) {
+                opener.document.$ENV{"form.form"}.currsec.options[i] = new Option(sectionsArray[i],sectionsArray[i],false,false)
+            }
+            opener.document.$ENV{"form.form"}.currsec.multiple=true
+            if (numSections < 3) {
+                opener.document.$ENV{"form.form"}.currsec.size=numSections;
+            }
+            else {
+                opener.document.$ENV{"form.form"}.currsec.size=3;
+            }
+            opener.document.$ENV{"form.form"}.currsec.options[0].selected = false
+        }
+    }
+    self.close()
 }
 </script>
 $submitopener
@@ -124,6 +193,12 @@ $lt{'cac'}: $sincefilterform
 <br />
 $lt{'cdo'}: $domainselectform
 <br />
+$lt{'cin'}:
+<input type="text" name="instcodefilter" size="10" value="$listinstcode" />
+<br />
+$lt{'cow'}:
+<input type="text" name="ownerfilter" size="10" value="$listowner" />
+<br />
 $lt{'cde'}:
 <input type="text" name="descriptfilter" size="40" value="$listdescript" />
 <p><input type="submit" name="gosearch" value="Search" /></p>
@@ -135,11 +210,13 @@ ENDSCRIPT
         $r->print(&mt('Searching').' ...<br />&nbsp;<br />');
         $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('<form>');
+	    ($domainfilter,$descriptfilter,$timefilter,$instcodefilter,$ownerfilter);
+	$r->print('<form name="courselist">');
 	my %by_descrip;
 	foreach my $course (keys %courses) {
             my $descr;
@@ -148,21 +225,34 @@ ENDSCRIPT
             } else {
                 $descr = &Apache::lonnet::unescape($courses{$course});
             }
-            $by_descrip{lc($descr)}=$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($description,'<>&"');
-	    $cleandesc=~s/'/\\'/g;
-	    my ($cdom,$cnum)=split(/\_/,$course);
-	    $r->print('<input type="button" value="Select" onClick="gochoose('.
-		  "'".$cnum."','".$cdom."','".$cleandesc."')".'" /> '.$description.' ('.
-		  ($Apache::lonnet::domaindescription{$cdom}?
-                   $Apache::lonnet::domaindescription{$cdom}:$cdom).
-                 ")<br />\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('<input type="button" value="Select" onClick="gochoose('.
+		      "'".$cnum."','".$cdom."','".$cleandesc."')".'" /> '.$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("<br />\n");
+            }
 	}
 	if (!%courses) { $r->print(&mt('None found')); }
-        $r->print('</form>');
+        $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".
+                   '</form>');
     }
     $r->print('</body></html>');
     return OK;