--- loncom/interface/lonpickcourse.pm	2009/11/03 14:32:44	1.89
+++ loncom/interface/lonpickcourse.pm	2009/12/02 18:33:27	1.91
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.89 2009/11/03 14:32:44 raeburn Exp $
+# $Id: lonpickcourse.pm,v 1.91 2009/12/02 18:33:27 bisitz 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') {
@@ -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
@@ -481,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="'.
@@ -502,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'})) {
@@ -581,27 +589,29 @@ sub build_filters {
     $filter->{'sincefilter'} = $env{'form.sincefilter'};
     $filter->{'sincefilter'} =~ s/[^\d-]//g;
     if (!$filter->{'sincefilter'}) { $filter->{'sincefilter'}=-1; }
-    $sincefilterform=&Apache::loncommon::select_form($filter->{'sincefilter'},
-       'sincefilter',('-1'=>'',
-                      '86400' => 'today',
-                      '604800' => 'last week',
-                      '2592000' => 'last month',
-                      '7776000' => 'last three months',
-                      '15552000' => 'last six months',
-                      '31104000' => 'last year',
-                      'select_form_order' =>
-                      ['-1','86400','604800','2592000','7776000',
-                      '15552000','31104000']));
-
-    my %lt = (
-              'cac' => &mt("$type Activity"),
-              'cde' => &mt("$type Title"),
-              'cdo' => &mt("$type Domain"),
-              'ins' => &mt('Institutional Code'),
-              'inc' => &mt('Institutional Categorization'),
-              'cow' => &mt("$type Owner/Co-owner"),
-              'cop' => &mt("$type Personnel Includes"),
-              'cog' => &mt('Type')
+    $sincefilterform=&Apache::loncommon::select_form(
+        $filter->{'sincefilter'},
+        'sincefilter',
+        (      '-1' => '',
+            '86400' => &mt('today'),
+           '604800' => &mt('last week'),
+          '2592000' => &mt('last month'),
+          '7776000' => &mt('last three months'),
+         '15552000' => &mt('last six months'),
+         '31104000' => &mt('last year'),
+         'select_form_order' =>
+            ['-1','86400','604800','2592000','7776000',
+             '15552000','31104000']));
+
+    my %lt = &Apache::lonlocal::texthash(
+                'cac' => "$type Activity",
+                'cde' => "$type Title",
+                'cdo' => "$type Domain",
+                'ins' => 'Institutional Code',
+                'inc' => 'Institutional Categorization',
+                'cow' => "$type Owner/Co-owner",
+                'cop' => "$type Personnel Includes",
+                'cog' => 'Type',
              );
 
     if (($env{'form.form'} eq 'ccrs') || ($env{'form.form'} eq 'requestcrs')) {
@@ -685,6 +695,7 @@ sub build_filters {
 $name_input
 $roleelement
 $multelement
+$typeelement
 |;
         if ($formname eq 'portform') {
             $output .= '<input type="hidden" name="setroles" value="'.$env{'form.setroles'}.'" />'."\n";
@@ -981,13 +992,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) {
@@ -1129,10 +1146,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.