[BACK]Return to lonpickcourse.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonpickcourse.pm between versions 1.89 and 1.91

version 1.89, 2009/11/03 14:32:44 version 1.91, 2009/12/02 18:33:27
Line 51  sub handler { Line 51  sub handler {
         ($ENV{'QUERY_STRING'},['domainfilter','form','cnumelement',          ($ENV{'QUERY_STRING'},['domainfilter','form','cnumelement',
        'cdomelement','cnameelement','roleelement',         'cdomelement','cnameelement','roleelement',
                                'multiple','type','setroles','fixeddom','cloner']);                                 '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);          $lastaction,$autosubmit,$submitopener,$cloneruname,$clonerudom);
   
     # Get course type - Course or Community.      # Get course type - Course or Community.
Line 75  sub handler { Line 75  sub handler {
         $submitopener = &processpick();          $submitopener = &processpick();
         $autosubmit = 'process_pick("'.$roledom.'")';          $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 called when a DC is creating a course
     if ($env{'form.form'} eq 'ccrs') {      if ($env{'form.form'} eq 'ccrs') {
Line 165  sub handler { Line 168  sub handler {
   
         $r->print(&build_filters($filterlist,$type,$roleelement,$multelement,          $r->print(&build_filters($filterlist,$type,$roleelement,$multelement,
                                  $filter,$action,\$numtitles,undef,$cloneruname,                                   $filter,$action,\$numtitles,undef,$cloneruname,
                                  $clonerudom));                                   $clonerudom,$typeelement));
     }      }
   
 # ---------------------------------------------------------------- Get the data  # ---------------------------------------------------------------- Get the data
Line 481  sub display_matched_courses { Line 484  sub display_matched_courses {
                   $env{'form.cnumelement'}.'" />'."\n".                      $env{'form.cnumelement'}.'" />'."\n".  
                   '<input type="hidden" name="cdomelement" value="'.                    '<input type="hidden" name="cdomelement" value="'.
                   $env{'form.cdomelement'}.'" />'."\n");                    $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')) {      if ((exists($env{'form.fixeddom'})) && ($env{'form.form'} eq 'rules')) {
         $r->print('<input type="hidden" name="fixeddom" value="'.          $r->print('<input type="hidden" name="fixeddom" value="'.
Line 502  sub multiples_tag { Line 510  sub multiples_tag {
   
 sub build_filters {  sub build_filters {
     my ($filterlist,$type,$roleelement,$multelement,$filter,$action,      my ($filterlist,$type,$roleelement,$multelement,$filter,$action,
         $numtitlesref,$caller,$cloneruname,$clonerudom) = @_;          $numtitlesref,$caller,$cloneruname,$clonerudom,$typeelement) = @_;
     my ($list,$formname,$fixeddom,$codedom,$jscript);      my ($list,$formname,$fixeddom,$codedom,$jscript);
     $codedom = $env{'request.role.domain'};      $codedom = $env{'request.role.domain'};
     if (defined($env{'form.form'})) {      if (defined($env{'form.form'})) {
Line 581  sub build_filters { Line 589  sub build_filters {
     $filter->{'sincefilter'} = $env{'form.sincefilter'};      $filter->{'sincefilter'} = $env{'form.sincefilter'};
     $filter->{'sincefilter'} =~ s/[^\d-]//g;      $filter->{'sincefilter'} =~ s/[^\d-]//g;
     if (!$filter->{'sincefilter'}) { $filter->{'sincefilter'}=-1; }      if (!$filter->{'sincefilter'}) { $filter->{'sincefilter'}=-1; }
     $sincefilterform=&Apache::loncommon::select_form($filter->{'sincefilter'},      $sincefilterform=&Apache::loncommon::select_form(
        'sincefilter',('-1'=>'',          $filter->{'sincefilter'},
                       '86400' => 'today',          'sincefilter',
                       '604800' => 'last week',          (      '-1' => '',
                       '2592000' => 'last month',              '86400' => &mt('today'),
                       '7776000' => 'last three months',             '604800' => &mt('last week'),
                       '15552000' => 'last six months',            '2592000' => &mt('last month'),
                       '31104000' => 'last year',            '7776000' => &mt('last three months'),
                       'select_form_order' =>           '15552000' => &mt('last six months'),
                       ['-1','86400','604800','2592000','7776000',           '31104000' => &mt('last year'),
                       '15552000','31104000']));           'select_form_order' =>
               ['-1','86400','604800','2592000','7776000',
     my %lt = (               '15552000','31104000']));
               'cac' => &mt("$type Activity"),  
               'cde' => &mt("$type Title"),      my %lt = &Apache::lonlocal::texthash(
               'cdo' => &mt("$type Domain"),                  'cac' => "$type Activity",
               'ins' => &mt('Institutional Code'),                  'cde' => "$type Title",
               'inc' => &mt('Institutional Categorization'),                  'cdo' => "$type Domain",
               'cow' => &mt("$type Owner/Co-owner"),                  'ins' => 'Institutional Code',
               'cop' => &mt("$type Personnel Includes"),                  'inc' => 'Institutional Categorization',
               'cog' => &mt('Type')                  'cow' => "$type Owner/Co-owner",
                   'cop' => "$type Personnel Includes",
                   'cog' => 'Type',
              );               );
   
     if (($env{'form.form'} eq 'ccrs') || ($env{'form.form'} eq 'requestcrs')) {      if (($env{'form.form'} eq 'ccrs') || ($env{'form.form'} eq 'requestcrs')) {
Line 685  sub build_filters { Line 695  sub build_filters {
 $name_input  $name_input
 $roleelement  $roleelement
 $multelement  $multelement
   $typeelement
 |;  |;
         if ($formname eq 'portform') {          if ($formname eq 'portform') {
             $output .= '<input type="hidden" name="setroles" value="'.$env{'form.setroles'}.'" />'."\n";              $output .= '<input type="hidden" name="setroles" value="'.$env{'form.setroles'}.'" />'."\n";
Line 981  function gochoose(cname,cdom,cdesc) { Line 992  function gochoose(cname,cdom,cdesc) {
     }      }
 ENDSCRIPT  ENDSCRIPT
     } else {      } else {
         my $name_code;          my ($name_code,$type_code);
         if ($env{'form.cnameelement'} ne '') {          if ($env{'form.cnameelement'} ne '') {
             $name_code = 'opener.document.'.$env{'form.form'}.'.'.              $name_code = 'opener.document.'.$env{'form.form'}.'.'.
                           $env{'form.cnameelement'}.'.value=cdesc;';                            $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|          $output .= qq|
         $name_code          $name_code
           $type_code
         opener.document.$env{'form.form'}.$env{'form.cnumelement'}.value=cname;          opener.document.$env{'form.form'}.$env{'form.cnumelement'}.value=cname;
         var slct=opener.document.$env{'form.form'}.$env{'form.cdomelement'};          var slct=opener.document.$env{'form.form'}.$env{'form.cdomelement'};
         if (slct.options == undefined) {          if (slct.options == undefined) {
Line 1129  Side Effects: None Line 1146  Side Effects: None
   
 =item *  =item *
 X<build_filters()>  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.   Output: 1 - $output - HTML for display of search criteria, and hidden form elements. 
   
Removed from v.1.89  
changed lines
  Added in v.1.91

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>