--- loncom/interface/lonpickcourse.pm	2005/10/03 23:53:25	1.30
+++ loncom/interface/lonpickcourse.pm	2006/01/10 21:36:45	1.37
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.30 2005/10/03 23:53:25 raeburn Exp $
+# $Id: lonpickcourse.pm,v 1.37 2006/01/10 21:36:45 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -55,7 +55,7 @@ ENDDOCUMENT
 			       'sincefilter','form','cnumelement',
 			       'cdomelement','cnameelement','roleelement',
                                'pickedcourse','instcodefilter',
-                               'ownerfilter','coursefilter']);
+                               'ownerfilter','coursefilter','multiple']);
 # domain filter and selection
     my $domainfilter=$env{'form.domainfilter'};
     $domainfilter=~s/\W//g;
@@ -82,7 +82,7 @@ ENDDOCUMENT
         unless ($coursefilter) { $coursefilter=''; }
         my $listcourseid=&HTML::Entities::encode($coursefilter,'<>&"');
         $courseidtag = &mt('LON-CAPA course ID');
-        $courseidtag .= qq|<input type="text" name="coursefilter" size="25" value="$listcourseid" />
+        $courseidtag .= qq|: <input type="text" name="coursefilter" size="25" value="$listcourseid" />
         <br />
         |;
     }
@@ -111,20 +111,19 @@ ENDDOCUMENT
         $num_sections = &Apache::loncommon::get_sections($cdom,$cnum,\%sections_count);
         my @sections = ();
         if ($num_sections > 0) {
-            @sections = (sort {$a <=> $b} keys %sections_count);
+            @sections = (sort {$a <=> $b} keys(%sections_count));
             $seclist = join('","',@sections);
         }
     }
-# if called from rolefilter, setup for multiple course selections.
-    my $multflag = 0;
     my $jscript;
     my $title = 'Selecting a course';
-    if ($env{'form.form'} eq 'rolefilter') {
-        $multflag = 1;
+# Setup for multiple course selections, if flag for multiples set.
+    my $multiple = $env{'form.multiple'};
+    my $multelement;
+    if ($multiple) {
         $title = 'Selecting course(s)';
-    }
-    if ($multflag) {
         $jscript = &Apache::loncommon::check_uncheck_jscript();
+        $multelement = '<input type="hidden" name="multiple" value="'.$multiple.'" />';
     }
     $r->print(&Apache::loncommon::bodytag($title,undef,$loaditem,undef,undef,undef,undef,1));
     my %lt=&Apache::lonlocal::texthash(
@@ -150,44 +149,59 @@ ENDDOCUMENT
     my $roledom = $env{'form.roleelement'};
     if ($roledom) {
         $roleelement = '<input type="hidden" name="roleelement" value="'.$roledom.'" />';
-        $submitopener = &Apache::lonroles::processpick($roledom);
+        $submitopener = &Apache::lonroles::processpick();
         $autosubmit = 'process_pick("'.$roledom.'")';
     }
     $r->print(<<ENDSCRIPT);
 <script>
-function gochoose(cname,cdom,cdesc,multflag,caller) {
+function gochoose(cname,cdom,cdesc,multiple,caller) {
     var openerForm = "$env{'form.form'}";
     courseCount = 0;
     var courses = '';
-    if (multflag) {
-        for (var j=0; j<document.courselist.course_id.length; j++) {
-            if (document.courselist.course_id[j].checked) {
-                courses = courses + document.courselist.course_id[j].value + "&&";
-                courseCount ++;
-            }
-        }
+    if (multiple) {
+	if (typeof(document.courselist.course_id.length) == 'undefined') {
+	    // only 1 course checkbox was created
+	    if (document.courselist.course_id.checked) {
+		courses = courses + document.courselist.course_id.value + "&&";
+		courseCount ++;
+	    }
+	} else {
+	    for (var j=0; j<document.courselist.course_id.length; j++) {
+		if (document.courselist.course_id[j].checked) {
+		    courses = courses + document.courselist.course_id[j].value + "&&";
+		    courseCount ++;
+		}
+	    }
+	} 
         opener.document.$env{'form.form'}.coursetotal.value = courseCount;
-        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;
-            }
-            else {
-                opener.document.$env{'form.form'}.coursepick[j].checked = false;
-            }
-        }
-        if (courseCount > 0) {
-            courses = courses.substr(0,courses.length-2);
-            opener.document.$env{'form.form'}.courselist.value = courses
-        }
-    }
-    else {
+	if (typeof(opener.document.$env{'form.form'}.coursepick.length) ==
+	    'undefined') {
+	    if (opener.document.$env{'form.form'}.coursepick.value == 'specific') {  
+		opener.document.$env{'form.form'}.coursepick.checked = true;
+	    } else {
+		opener.document.$env{'form.form'}.coursepick.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;
+		} else {
+		    opener.document.$env{'form.form'}.coursepick[j].checked = false;
+		}
+	    }
+	}
+	if (courseCount > 0) {
+	    courses = courses.substr(0,courses.length-2);
+	    opener.document.$env{'form.form'}.courselist.value = courses;
+	}
+    } else {
         $name_code
         opener.document.$env{'form.form'}.$env{'form.cnumelement'}.value=cname;
-        if (openerForm == 'cu') {
+        var slct=opener.document.$env{'form.form'}.$env{'form.cdomelement'};
+        if (slct.options == undefined) {
             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; }
@@ -206,24 +220,21 @@ function setSections() {
         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 {
+    } 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 {
+        } 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 {
+            } else {
                 opener.document.$env{"form.form"}.currsec.size=3;
             }
             opener.document.$env{"form.form"}.currsec.options[0].selected = false
@@ -241,6 +252,7 @@ $submitopener
 $name_input
 <input type="hidden" name="form" value="$env{'form.form'}" />
 $roleelement
+$multelement
 $lt{'cac'}: $sincefilterform
 <br />
 $lt{'cdo'}: $domainselectform
@@ -272,8 +284,8 @@ ENDSCRIPT
 	    ($domainfilter,$descriptfilter,$timefilter,$instcodefilter,$ownerfilter,$coursefilter);
 	$r->print('<form name="courselist">');
 	my %by_descrip;
-        my $numcourses = keys %courses;
-	foreach my $course (keys %courses) {
+        my $numcourses = keys(%courses);
+	foreach my $course (keys(%courses)) {
             my $descr;
             if ($courses{$course} =~ m/^([^:]*):/) {
                 $descr = &Apache::lonnet::unescape($1);
@@ -283,7 +295,7 @@ ENDSCRIPT
             my $description = lc($descr);
             push (@{$by_descrip{$description}}, $course);
 	}
-        if ($numcourses > 1 && $multflag) {
+        if ($numcourses > 1 && $multiple) {
             $r->print('<input type="button" value="check all"
                     onclick="javascript:checkAll(document.courselist.course_id)" />                    &nbsp;&nbsp;<input type="button" value="uncheck all"
                     onclick="javascript:uncheckAll(document.courselist.course_id)" />
@@ -295,7 +307,7 @@ ENDSCRIPT
 	        $cleandesc=~s/'/\\'/g;
 	        my ($cdom,$cnum)=split(/\_/,$course);
                 my ($descr,$instcode,$owner) = split/:/,$courses{$course};
-                $r->print(&course_chooser($multflag,$cdom,$cnum,$cleandesc));
+                $r->print(&course_chooser($multiple,$cdom,$cnum,$cleandesc));
 	        $r->print($description.'('.
 		      ($Apache::lonnet::domaindescription{$cdom}?
                        $Apache::lonnet::domaindescription{$cdom}:$cdom).")");
@@ -305,29 +317,33 @@ ENDSCRIPT
                 unless ($owner eq '') {
                     $r->print(", owner - ".&Apache::lonnet::unescape($owner));
                 }
+		if ($multiple) { $r->print("</label>\n"); }
                 $r->print("<br />\n");
             }
 	}
 	if (!%courses) { 
             $r->print(&mt('None found'));
-        } elsif ($multflag) {
+        } elsif ($multiple) {
             $r->print('<input type="button" value="Submit" onClick="gochoose('."'','','',1)".'" />');
         }
         $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>');
+                   '<input type="hidden" name="cdomelement" value="'.$env{'form.cdomelement'}.'" />'."\n");
+        if ((exists($env{'form.roleelement'})) && ($env{'form.form'} eq 'rolechoice')) {
+           $r->print('<input type="hidden" name="roleelement" value="'.$env{'form.roleelement'}.'" />'."\n");
+        }
+        $r->print("</form>\n");
     }
     $r->print('</body></html>');
     return OK;
 }
 
 sub course_chooser {
-    my ($multflag,$cdom,$cnum,$cleandesc) = @_;
+    my ($multiple,$cdom,$cnum,$cleandesc) = @_;
     my $output; 
-    if ($multflag) {
-        $output = '<input type="checkbox" name="course_id" value="'.$cdom.'_'.$cnum.'" />'."\n";
+    if ($multiple) {
+        $output = '<label><input type="checkbox" name="course_id" value="'.$cdom.'_'.$cnum.'" />'."\n";
     } else {
         $output = '<input type="button" value="Select" onClick="gochoose('.
                   "'".$cnum."','".$cdom."','".$cleandesc."')".'" />'."\n";