--- loncom/interface/lonpickcourse.pm	2006/12/11 22:20:20	1.61
+++ loncom/interface/lonpickcourse.pm	2007/10/22 22:16:38	1.66
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.61 2006/12/11 22:20:20 albertel Exp $
+# $Id: lonpickcourse.pm,v 1.66 2007/10/22 22:16:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -72,7 +72,7 @@ sub handler {
     my $roledom = $env{'form.roleelement'};
     if ($roledom) {
         $roleelement = '<input type="hidden" name="roleelement" value="'.$roledom.'" />';
-        $submitopener = &Apache::lonroles::processpick();
+        $submitopener = &processpick();
         $autosubmit = 'process_pick("'.$roledom.'")';
     }
 
@@ -83,7 +83,8 @@ sub handler {
     }
 
     my %loaditem;
-    if ($env{'form.form'} eq 'cu' && $env{'form.pickedcourse'}) {
+    if ((($env{'form.form'} eq 'cu') || ($env{'form.form'} eq 'studentform')) && 
+        ($env{'form.pickedcourse'})) {
         $loaditem{'onload'} ="setSections()";
     }
     $r->print(&Apache::loncommon::start_page($title,undef,
@@ -92,7 +93,7 @@ sub handler {
 
     if ($env{'form.form'} eq 'portform') {
         $lastaction = 'document.courselist.submit()';
-    } elsif ($env{'form.form'} eq 'cu') {
+    } elsif ($env{'form.form'} eq 'cu' || $env{'form.form'} eq 'studentform') {
         $lastaction = 
              'document.courselist.pickedcourse.value = cdom+"_"+cname;'."\n".
              'document.courselist.submit();';
@@ -101,7 +102,7 @@ sub handler {
     }
 
     # if called to assign a role in a course to a user via CUSR
-    if ($env{'form.form'} eq 'cu') {
+    if ($env{'form.form'} eq 'cu' || $env{'form.form'} eq 'studentform') {
         $r->print(&create_user_javascript($type)); 
     }
 
@@ -137,6 +138,49 @@ sub handler {
     return OK;
 }
 
+sub processpick {
+    my $openerform = 'rolechoice';
+    if ($env{'form.form'} eq 'studentform') {
+        $openerform = $env{'form.form'};
+    }
+    my $process_pick = <<"ENDONE";
+<script type="text/javascript">
+function process_pick(dom) {
+    var pickedCourse=opener.document.$openerform.$env{'form.cnumelement'}.value;
+    var pickedDomain=opener.document.$openerform.$env{'form.cdomelement'}.value;
+    var okDomain = 0;
+ENDONE
+    if ($openerform eq 'rolechoice') {
+        $process_pick .= <<"ENDTWO";
+    if (pickedDomain == dom) {
+        if (pickedCourse != '') {
+            var courseTarget = "cc./"+pickedDomain+"/"+pickedCourse
+            opener.document.title='Role selected. Please stand by.';
+            opener.status='Role selected. Please stand by.';
+            opener.document.rolechoice.newrole.value=courseTarget
+            opener.document.rolechoice.submit();
+        }
+    } 
+    else {
+        alert("You may only use this screen to select courses in the current domain: "+dom+"\\nPlease return to the roles page window and click the 'Select Course' link for domain: "+pickedDomain+",\\n if you are a Domain Coordinator in that domain, and wish to become a Course Coordinator in a course in the domain");
+    }
+ENDTWO
+    } else {
+        $process_pick .= <<"ENDTHREE";
+    if (pickedDomain != dom) {
+        alert("You may only use this screen to select courses in the current domain: "+dom+"\\nPlease return to the roles page window and click the 'Select Course' link for domain: "+pickedDomain+",\\n if you are a Domain Coordinator in that domain, and wish to become a Course Coordinator in a course in the domain");
+        return;
+    }
+ENDTHREE
+    }
+    $process_pick .= "
+}
+
+</script>
+";
+    return $process_pick;
+}
+
 sub create_user_javascript {
     my ($type) = @_;
     my $output;
@@ -175,7 +219,9 @@ sub display_matched_courses {
     my $numcourses = keys(%courses);
     foreach my $course (keys(%courses)) {
         my $descr;
-        if ($courses{$course} =~ m/^([^:]*):/i) {
+        if (ref($courses{$course}) eq 'HASH') {
+            $descr = $courses{$course}{'description'};
+        } elsif ($courses{$course} =~ m/^([^:]*):/i) {
             $descr = &unescape($1);
         } else {
             $descr = &unescape($courses{$course});
@@ -195,18 +241,36 @@ sub display_matched_courses {
             my $cleandesc=&HTML::Entities::encode($description,'<>&"');
             $cleandesc=~s/'/\\'/g;
             my ($cdom,$cnum)=split(/\_/,$course);
-            my ($descr,$instcode,$owner,$ttype) = split/:/,$courses{$course};
+            my ($descr,$instcode,$ttype,@owners);
+            if (ref($courses{$course}) eq 'HASH') {
+                $descr = $courses{$course}{'description'};
+                $instcode =  $courses{$course}{'inst_code'};
+                $ttype =  $courses{$course}{'type'};
+                push(@owners,&unescape($courses{$course}{'owner'}));
+                if (ref($courses{$course}{'co-owners'}) eq 'ARRAY') {
+                    foreach my $item (@{$courses{$course}{'co-owners'}}) {
+                        push(@owners,&unescape($item));
+                    }
+                }
+            } else {
+                my $singleowner; 
+                ($descr,$instcode,$singleowner,$ttype)=split(/:/,$courses{$course});
+                push(@owners,&unescape($singleowner));
+            }
+            my $owner = join(', ',@owners);
             $r->print(&course_chooser($multiple,$cdom,$cnum,$cleandesc));
             $r->print($description.'('.
-                      ($Apache::lonnet::domaindescription{$cdom}?
-                       $Apache::lonnet::domaindescription{$cdom}:$cdom).")");
-            unless ($instcode eq '') {
+                      (&Apache::lonnet::domain($cdom,'description')?
+                       &Apache::lonnet::domain($cdom,'description'):$cdom).")");
+            if ($instcode ne '') {
                 $r->print(" - ".&unescape($instcode));
             }
-            unless ($owner eq '') {
-                $r->print(", owner - ".&unescape($owner));
+            if (@owners > 1) {
+                $r->print(', '.&mt('owners').' - ',join(', ',@owners)); 
+            } elsif (@owners == 1) {
+                $r->print(', '.&mt('owner').' - '.$owner);
             }
-            unless ($ttype eq '') {
+            if ($ttype ne '') {
                 $r->print('('.&unescape($ttype).')');
             }
             if ($multiple) { $r->print("</label>\n"); }
@@ -279,8 +343,15 @@ sub build_filters {
             }
         }
         if ($item eq 'domainfilter') {
+	    my $allow_blank = 1;
+	    if ($formname eq 'portform') {
+		$filter->{$item} ||= $env{'user.domain'};
+		$allow_blank=0;
+	    }
             $domainselectform =
-     &Apache::loncommon::select_dom_form($filter->{$item},'domainfilter',1);
+		&Apache::loncommon::select_dom_form($filter->{$item},
+						    'domainfilter',
+						    $allow_blank);
         } elsif ($item eq 'ownerdomfilter') {
             $ownerdomselectform =
      &Apache::loncommon::select_dom_form($filter->{$item},'ownerdomfilter',1);
@@ -315,8 +386,7 @@ sub build_filters {
               'cog' => &mt('Course Type')
              );
 
-    $typeselectform =  '<select name="type" size="1"';
-    $typeselectform .= ">\n";
+    $typeselectform =  '<select name="type" size="1">'."\n";
     if ($type eq 'Course') {
         $instcodeform = 
                 '<input type="text" name="instcodefilter" size="10" value="'.
@@ -418,7 +488,7 @@ sub search_courses {
         $r->print('<br />');
         my %coursehash = &Apache::loncommon::findallcourses(); 
         foreach my $cid (sort(keys(%coursehash))) {
-            $courses{$cid} = $env{'course.'.$cid.'.description'};
+            $courses{$cid}{'description'} = $env{'course.'.$cid.'.description'};
         }
     }
     return %courses;
@@ -682,7 +752,7 @@ Side Effects: None
 X<gochoose_javascript()>
 B<gochoose_javascript($type,$multiple,$autosubmit,$lastaction)>:
 
-Input: 4 - course type; single (0) or multiple courses (1); in context of DC selecting a CC role in a course: javascript code from Apache::lonroles::processpick(); final action to take after user chooses course(s):  either close window, or submit form for display of next page etc.
+Input: 4 - course type; single (0) or multiple courses (1); in context of DC selecting a CC role in a course: javascript code from &processpick(); final action to take after user chooses course(s):  either close window, or submit form for display of next page etc.
 
 Output: 1  $output - javascript wrapped in E<lt>scriptE<gt>E<lt>/scriptE<gt> tags