--- loncom/interface/lonpickcourse.pm	2003/09/22 00:48:32	1.8
+++ loncom/interface/lonpickcourse.pm	2004/03/19 03:47:09	1.13
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.8 2003/09/22 00:48:32 www Exp $
+# $Id: lonpickcourse.pm,v 1.13 2004/03/19 03:47:09 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,7 +51,8 @@ ENDDOCUMENT
 # Get parameters from query string
     &Apache::loncommon::get_unprocessed_cgi
         ($ENV{'QUERY_STRING'},['domainfilter','descriptfilter',
-                 'sincefilter','form','cnumelement','cdomelement']);
+			       'sincefilter','form','cnumelement',
+			       'cdomelement','cnameelement']);
 # domain filter and selection
     my $domainfilter=$ENV{'form.domainfilter'};
     $domainfilter=~s/\W//g;
@@ -74,17 +75,27 @@ ENDDOCUMENT
                       '2592000' => 'last month',
                       '7776000' => 'last three months',
                       '15552000' => 'last six months',
-                      '31104000' => 'last year'));
+                      '31104000' => 'last year',
+                      'select_form_order' =>
+                      ['-1','86400','604800','2592000','7776000',
+		      '15552000','31104000']));
        
     $r->print(&Apache::loncommon::bodytag("Selecting a Course"));
     my %lt=&Apache::lonlocal::texthash(
 				       'cac' => 'Course Activity',
 				       'cde' => 'Course Description',
 				       'cdo' => 'Course Domain');
+    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 ='<input type="hidden" name="cnameelement" value="'.
+	    $ENV{'form.cnameelement'}.'" />';
+    }
     $r->print(<<ENDSCRIPT);
 <script>
-function gochoose(cname,cdom) {
-    opener.document.$ENV{'form.form'}.$ENV{'form.cnumelement'}.value=cname;
+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++) {
@@ -96,6 +107,7 @@ function gochoose(cname,cdom) {
 <form method="post">
 <input type="hidden" name="cnumelement" value="$ENV{'form.cnumelement'}" />
 <input type="hidden" name="cdomelement" value="$ENV{'form.cdomelement'}" />
+$name_input
 <input type="hidden" name="form" value="$ENV{'form.form'}" />
 
 $lt{'cac'}: $sincefilterform
@@ -118,14 +130,22 @@ ENDSCRIPT
 	    &Apache::lonnet::courseiddump
 	    ($domainfilter,$descriptfilter,$timefilter);
 	$r->print('<form>');
-	foreach (keys %courses) {
-	    my ($cdom,$cnum)=split(/\_/,$_);
+	my %by_descrip;
+	foreach my $course (keys %courses) {
+	    $by_descrip{lc($courses{$course})}=$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('<input type="button" value="Select" onClick="gochoose('.
-		  "'".$cnum."','".$cdom."')".'" /> '.$courses{$_}.' ('.
+		  "'".$cnum."','".$cdom."','".$cleandesc."')".'" /> '.$courses{$course}.' ('.
 		  ($Apache::lonnet::domaindescription{$cdom}?
                    $Apache::lonnet::domaindescription{$cdom}:$cdom).
                  ")<br />\n");
 	}
+	if (!%courses) { $r->print(&mt('None found')); }
         $r->print('</form>');
     }
     $r->print('</body></html>');