--- loncom/interface/lonpickcourse.pm	2009/07/31 03:01:31	1.85
+++ loncom/interface/lonpickcourse.pm	2009/11/04 14:12:19	1.90
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.85 2009/07/31 03:01:31 raeburn Exp $
+# $Id: lonpickcourse.pm,v 1.90 2009/11/04 14:12:19 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,7 +51,7 @@ sub handler {
         ($ENV{'QUERY_STRING'},['domainfilter','form','cnumelement',
 			       'cdomelement','cnameelement','roleelement',
                                'multiple','type','setroles','fixeddom','cloner']);
-    my ($type,$title,$jscript,$multelement,$multiple,$roleelement,
+    my ($type,$title,$jscript,$multelement,$multiple,$roleelement,$typeelement,
         $lastaction,$autosubmit,$submitopener,$cloneruname,$clonerudom);
 
     # Get course type - Course or Community.
@@ -75,6 +75,9 @@ sub handler {
         $submitopener = &processpick();
         $autosubmit = 'process_pick("'.$roledom.'")';
     }
+    if ($env{'form.typeelement'} ne '') {
+        $typeelement = '<input type="hidden" name="typeelement" value="'.$env{'form.typeelement'}.'" />';
+    }
 
     # if called when a DC is creating a course
     if ($env{'form.form'} eq 'ccrs') {
@@ -102,7 +105,7 @@ sub handler {
 
     if ((($env{'form.form'} eq 'cu') || ($env{'form.form'} eq 'studentform')) && 
         ($env{'form.pickedcourse'})) {
-            $loaditem{'onload'} .= 'setSections()';
+        $loaditem{'onload'} .= 'setRoles();setSections();';
     }
     my $js = &js_changer();
     $r->print(&Apache::loncommon::start_page($title,$js,
@@ -165,7 +168,7 @@ sub handler {
 
         $r->print(&build_filters($filterlist,$type,$roleelement,$multelement,
                                  $filter,$action,\$numtitles,undef,$cloneruname,
-                                 $clonerudom));
+                                 $clonerudom,$typeelement));
     }
 
 # ---------------------------------------------------------------- Get the data
@@ -220,7 +223,12 @@ ENDONE
         $process_pick .= <<"ENDTWO";
     if (pickedDomain == dom) {
         if (pickedCourse != '') {
-            var courseTarget = "cc./"+pickedDomain+"/"+pickedCourse
+            var ccrole = "cc";
+            var pickedType = "$env{'form.type'}";
+            if (pickedType == "Community") {
+                ccrole = "co";
+            }
+            var courseTarget = ccrole+"./"+pickedDomain+"/"+pickedCourse
             opener.document.title='Role selected. Please stand by.';
             opener.status='Role selected. Please stand by.';
             opener.document.rolechoice.newrole.value=courseTarget
@@ -252,7 +260,12 @@ sub create_user_javascript {
     my $output;
     #javascript for reporting sections and groups then closing
     if ($env{'form.pickedcourse'}) {
-        my ($cdom,$cnum) = split/_/,$env{'form.pickedcourse'};
+        my %coursedescription = 
+            &Apache::lonnet::coursedescription($env{'form.pickedcourse'},
+                                               {'one_time' => '1'});
+        my $cdom = $coursedescription{'domain'};
+        my $cnum = $coursedescription{'num'};
+        my $crstype = $coursedescription{'type'};
         my $sec_element = 'currsec';
         my $grplist_element = 'groups';
         my ($sections,$groups) =
@@ -266,7 +279,10 @@ sub create_user_javascript {
 function setSections() {
     opener.document.$env{"form.form"}.$grplist_element.value='$groupslist';
     window.opener.setSect('$seclist');
-    self.close()
+    self.close();
+}
+function setRoles() {
+    window.opener.setRole('$crstype');
 }
 </script>
 |;
@@ -284,7 +300,11 @@ sub display_matched_courses {
     $r->print('<form name="courselist" method="post" action="'.$action.'">');
     if ($env{'form.form'} eq 'modifycourse') {
         if ($numcourses > 0) {
-            my $cctitle = &Apache::lonnet::plaintext('cc',$type);
+            my $ccrole = 'cc';
+            if ($type eq 'Community') {
+                $ccrole = 'co';
+            }
+            my $cctitle = &Apache::lonnet::plaintext($ccrole,$type);
             my $dctitle = &Apache::lonnet::plaintext('dc');
             my $ccrolechk = ' checked="checked" ';
             my $menuchk = ' ';
@@ -297,12 +317,21 @@ sub display_matched_courses {
                .'<legend>'.&mt('Action').'</legend>'
                .'<div class="LC_nobreak"><label>'
                .'<input type="radio" name="phase" value="ccrole"'.$ccrolechk.'/>'
-               .'&nbsp;'.&mt('Enter the course with the role of [_1].',$cctitle)
-               .'</label></div>'
+               .'&nbsp;');
+            if ($type eq 'Community') {
+                $r->print(&mt('Enter the community with the role of [_1].',$cctitle));
+            } else {
+                $r->print(&mt('Enter the course with the role of [_1].',$cctitle));
+            }
+            $r->print('</label></div>'
                .'<div class="LC_nobreak"><label>'
-               .'<input type="radio" name="phase" value="menu"'.$menuchk.'/>&nbsp;'
-               .&mt('View or modify course settings which only a [_1] may modify.',$dctitle)
-               .'</label></div>'
+               .'<input type="radio" name="phase" value="menu"'.$menuchk.'/>&nbsp;');
+            if ($type eq 'Community') {
+                $r->print(&mt('View or modify community settings which only a [_1] may modify.',$dctitle));
+            } else {
+                $r->print(&mt('View or modify course settings which only a [_1] may modify.',$dctitle));
+            }
+            $r->print('</label></div>'
                .'</fieldset>'
                .'<br />'
             );
@@ -333,13 +362,17 @@ sub display_matched_courses {
     if (%courses) {
         $r->print(&Apache::loncommon::start_data_table());
         $r->print(&Apache::loncommon::start_data_table_header_row());
+        my $titlehdr = &mt('Course Title');
+        if ($type eq 'Community') {
+            $titlehdr = &mt('Community Title');
+        }
         $r->print('<th>'.&mt('Select').'</th>'
-                 .'<th>'.&mt('Course Title').'</th>'
-                 .'<th>'.&mt('Domain').'</th>'
-                 .'<th>'.&mt('Course Code').'</th>'
-                 .'<th>'.&mt('Owner/Co-owner(s)').'</th>'
-                 .'<th>'.&mt('Type').'</th>'
-                 );
+                 .'<th>'.$titlehdr.'</th>'
+                 .'<th>'.&mt('Domain').'</th>');
+        unless ($type eq 'Community') {
+            $r->print('<th>'.&mt('Course Code').'</th>');
+        }
+        $r->print('<th>'.&mt('Owner/Co-owner(s)').'</th>');
         if ($showroles) {
             $r->print('<th>'.&mt("Role(s) for [_1]",
                 &Apache::loncommon::plainname($env{'form.personfilter'},
@@ -391,21 +424,16 @@ sub display_matched_courses {
             $r->print(&Apache::lonnet::domain($cdom,'description')?
                       $cdom.' ('.&Apache::lonnet::domain($cdom,'description').')':$cdom);
             $r->print('</td>');
-            $r->print('<td>');
-            if ($instcode ne '') {
-                $r->print(&unescape($instcode));
-            } else {
-                $r->print('&nbsp;');
+            unless ($type eq 'Community') { 
+                $r->print('<td>');
+                if ($instcode ne '') {
+                    $r->print(&unescape($instcode));
+                } else {
+                    $r->print('&nbsp;');
+                }
+                $r->print('</td>');
             }
-            $r->print('</td>');
             $r->print('<td>'.$ownerstr.'</td>');
-            $r->print('<td>');
-            if ($ttype ne '') {
-                $r->print(&mt(&unescape($ttype)));
-            } else {
-                $r->print('&nbsp;');
-            }
-            $r->print('</td>');
             if ($showroles) {
                 $r->print('<td>');
                 my $rolestr;
@@ -416,7 +444,7 @@ sub display_matched_courses {
                             my (undef,$crdom,$crname,$crtitle) = split('/',$role);
                             $rolestr .= $crtitle.', ';
                         } else {
-                            $rolestr .= &Apache::lonnet::plaintext($role,$ttype).', ';
+                            $rolestr .= &Apache::lonnet::plaintext($role,$type).', ';
                         }
                     }
                     $rolestr =~ s/\, $//;
@@ -456,6 +484,11 @@ sub display_matched_courses {
                   $env{'form.cnumelement'}.'" />'."\n".  
                   '<input type="hidden" name="cdomelement" value="'.
                   $env{'form.cdomelement'}.'" />'."\n");
+        if ($env{'form.typeelement'} ne '') {
+            $r->print('<input type="hidden" name="typeelement" value="'.
+                      $env{'form.typeelement'}.'" />'."\n");
+
+        }
     }
     if ((exists($env{'form.fixeddom'})) && ($env{'form.form'} eq 'rules')) {
         $r->print('<input type="hidden" name="fixeddom" value="'.
@@ -477,7 +510,7 @@ sub multiples_tag {
 
 sub build_filters {
     my ($filterlist,$type,$roleelement,$multelement,$filter,$action,
-        $numtitlesref,$caller,$cloneruname,$clonerudom) = @_;
+        $numtitlesref,$caller,$cloneruname,$clonerudom,$typeelement) = @_;
     my ($list,$formname,$fixeddom,$codedom,$jscript);
     $codedom = $env{'request.role.domain'};
     if (defined($env{'form.form'})) {
@@ -579,11 +612,24 @@ sub build_filters {
               'cog' => &mt('Type')
              );
 
-    $typeselectform =  '<select name="type" size="1"';
-    if ($onchange) {
-        $typeselectform .= 'onchange="'.$onchange.'"';
+    if (($env{'form.form'} eq 'ccrs') || ($env{'form.form'} eq 'requestcrs')) {
+        my $typeval = 'Course';
+        if ($type eq 'Community') {
+            $typeval = 'Community';
+        }
+        $typeselectform = '<input type="hidden" name="type" value="'.$typeval.'" />';
+    } else {
+        $typeselectform =  '<select name="type" size="1"';
+        if ($onchange) {
+            $typeselectform .= 'onchange="'.$onchange.'"';
+        }
+        $typeselectform .= '>'."\n";
+        foreach my $posstype ('Course','Community') {
+            $typeselectform.='<option value="'.$posstype.'"'.
+                ($posstype eq $type ? ' selected="selected" ' : ''). ">".&mt($posstype)."</option>\n";
+        }
+        $typeselectform.="</select>";
     }
-    $typeselectform .= '>'."\n";
     
     my ($cloneableonlyform,$cloneabletitle);
     if (exists($filter->{'cloneableonly'})) {
@@ -593,7 +639,7 @@ sub build_filters {
             $cloneableon = $cloneableoff;
             $cloneableoff = '';
         }
-        $cloneableonlyform = '<span class="LC_nobreak"><label><input type="radio" name="cloneableonly" value="1" '.$cloneableon.'/>&nbsp;'.&mt('Yes').'</label>'.('&nbsp;'x3).'<label><input type="radio" name="cloneableonly" value="" '.$cloneableoff.' />&nbsp;'.&mt('No').'</label></span>';
+        $cloneableonlyform = '<span class="LC_nobreak"><label><input type="radio" name="cloneableonly" value="1" '.$cloneableon.'/>&nbsp;'.&mt('Required').'</label>'.('&nbsp;'x3).'<label><input type="radio" name="cloneableonly" value="" '.$cloneableoff.' />&nbsp;'.&mt('No restriction').'</label></span>';
         if ($env{'form.form'} eq 'ccrs') {
             $cloneabletitle = &mt('Cloneable for').' '.$cloneruname.':'.$clonerudom;
         } else {
@@ -627,11 +673,6 @@ sub build_filters {
         }
     }
 
-    foreach my $posstype ('Course','Community') {
-        $typeselectform.='<option value="'.$posstype.'"'.
-            ($posstype eq $type ? ' selected="selected" ' : ''). ">".&mt($posstype)."</option>\n";
-    }
-    $typeselectform.="</select>";
     my $output = qq|
 <form method="post" name="filterpicker" action="$action">
 <input type="hidden" name="form" value="$formname" />
@@ -652,6 +693,7 @@ sub build_filters {
 $name_input
 $roleelement
 $multelement
+$typeelement
 |;
         if ($formname eq 'portform') {
             $output .= '<input type="hidden" name="setroles" value="'.$env{'form.setroles'}.'" />'."\n";
@@ -672,9 +714,13 @@ $multelement
                   .&Apache::lonhtmlcommon::row_closure();
     } 
     if ($typeselectform) {
-        $output .= &Apache::lonhtmlcommon::row_title($lt{'cog'})
-                  .$typeselectform
-                  .&Apache::lonhtmlcommon::row_closure();
+        if (($env{'form.form'} eq 'ccrs') || ($env{'form.form'} eq 'requestcrs')) {
+            $output .= $typeselectform;
+        } else {
+            $output .= &Apache::lonhtmlcommon::row_title($lt{'cog'})
+                      .$typeselectform
+                      .&Apache::lonhtmlcommon::row_closure();
+        }
     }
     if ($instcodeform) {
         $output .= &Apache::lonhtmlcommon::row_title($instcodetitle)
@@ -722,11 +768,17 @@ $multelement
             $warning = '<div class="LC_error">'.&mt('Intended course owner does not exist').
                        '</div>';
         } else {
+            my $ccrole;
+            if ($type eq 'Community') {
+                $ccrole = 'co';
+            } elsif ($type eq 'Course') {
+                $ccrole = 'cc';
+            }
             if ($env{'form.form'} eq 'ccrs') {
                 $output .= '<input type="hidden" name="cloner" value="'.$env{'form.cloner'}.'" />'."\n";
             }
             my %ccroles = &Apache::lonnet::get_my_roles($cloneruname,$clonerudom,
-                                                        'userroles',['active'], ['cc']);
+                                                        'userroles',['active'], [$ccrole]);
             foreach my $key (sort(keys(%ccroles))) {
                 my ($cnum,$cdom,$role) = split(':',$key);
                 $cc_clone .= $cdom.':'.$cnum.'&';
@@ -772,7 +824,12 @@ sub instcode_selectors {
 
 sub search_courses {
     my ($r,$type,$onlyown,$filter,$numtitles,$cloneruname,$clonerudom) = @_;
-    my (%courses,%showcourses,$cloner);
+    my (%courses,%showcourses,$cloner,$ccrole);
+    if ($type eq 'Community') {
+        $ccrole = 'co';
+    } else {
+        $ccrole = 'cc';
+    }
     if (!$onlyown) {
         $r->print(&mt('Searching ...').'<br />&nbsp;<br />');
         $r->rflush();
@@ -823,7 +880,7 @@ sub search_courses {
             my %rolehash = &Apache::lonnet::get_my_roles($filter->{'personfilter'},
                                                          $filter->{'persondomfilter'},
                                                          'userroles',undef,
-                                                         ['cc','in','ad','ep','ta','cr'],
+                                                         [$ccrole,'in','ad','ep','ta','cr'],
                                                          $filter->{'domainfilter'});
             foreach my $role (keys(%rolehash)) {
                 my ($cnum,$cdom,$courserole) = split(':',$role);
@@ -880,9 +937,9 @@ sub gochoose_javascript {
                                  list  => 'courselist',
                                  },
                      'Community' => {
-                                 name  => 'grouppick',
-                                 total => 'grouptotal',
-                                 list  => 'grouplist',
+                                 name  => 'coursepick',
+                                 total => 'coursetotal',
+                                 list  => 'courselist',
                               },
                     );
     my $output .= qq|
@@ -933,13 +990,19 @@ function gochoose(cname,cdom,cdesc) {
     }
 ENDSCRIPT
     } else {
-        my $name_code;
+        my ($name_code,$type_code);
         if ($env{'form.cnameelement'} ne '') {
             $name_code = 'opener.document.'.$env{'form.form'}.'.'.
                           $env{'form.cnameelement'}.'.value=cdesc;';
         }
+        if ($env{'form.typeelement'} ne '') {
+            $type_code = 'opener.document.'.$env{'form.form'}.'.'.
+                          $env{'form.typeelement'}.'.value=document.courselist.type;';
+        }
+
         $output .= qq|
         $name_code
+        $type_code
         opener.document.$env{'form.form'}.$env{'form.cnumelement'}.value=cname;
         var slct=opener.document.$env{'form.form'}.$env{'form.cdomelement'};
         if (slct.options == undefined) {
@@ -1081,10 +1144,10 @@ Side Effects: None
 
 =item *
 X<build_filters()>
-B<build_filters($filterlist,$type,$roleelement,$multelement,$filter,$action,$numfiltersref,$caller,$cloneruname,$clonerudom)>:
+B<build_filters($filterlist,$type,$roleelement,$multelement,$filter,$action,$numfiltersref,$caller,$cloneruname,$clonerudom,$typeelem)>:
 
 
-Input: 7 - anonymous array of search criteria; course type; $roleelement ; $multelement ; anonymous hash of criteria and their values; form action; ref to scalar (count of number of elements in institutional codes -- e.g., 4 for year, semester, department, and number); caller context (e.g., set to 'modifycourse' when routine is called from lonmodifycourse.pm).
+Input: 11 - anonymous array of search criteria; course type; $roleelement ; $multelement ; anonymous hash of criteria and their values; form action; ref to scalar (count of number of elements in institutional codes -- e.g., 4 for year, semester, department, and number); caller context (e.g., set to 'modifycourse' when routine is called from lonmodifycourse.pm), username and domain of new course owner who wants to clone, $tyepelem 
 
 Output: 1 - $output - HTML for display of search criteria, and hidden form elements.