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

Diff for /loncom/interface/lonpickcourse.pm between versions 1.79 and 1.84

version 1.79, 2009/05/04 13:24:12 version 1.84, 2009/07/29 22:32:44
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']);                                 'multiple','type','setroles','fixeddom']);
   
     my ($type,$title,$jscript,$multelement,$multiple,$roleelement,      my ($type,$title,$jscript,$multelement,$multiple,$roleelement,
         $lastaction,$autosubmit,$submitopener);          $lastaction,$autosubmit,$submitopener);
   
     # Get course type - Course or Non-standard Course.      # Get course type - Course or Community.
     $type = $env{'form.type'};      $type = $env{'form.type'};
     if (!defined($env{'form.type'})) {      if (!defined($env{'form.type'})) {
         $type = 'Course';          $type = 'Course';
     }      }
     $title = &mt('Selecting a [_1]',$type);      $title = 'Selecting a '.$type;
   
     # Setup for multiple course selections, if flag for multiples set.      # Setup for multiple course selections, if flag for multiples set.
     $multiple = $env{'form.multiple'};      $multiple = $env{'form.multiple'};
     if ($multiple) {      if ($multiple) {
         ($jscript,$multelement) = &multiples_tag();          ($jscript,$multelement) = &multiples_tag();
         $title = &mt('Selecting [_1](s)',lc($type));          $title = 'Selecting '.$type.'(s)';
     }      }
   
     # if called when a DC is selecting a course       # if called when a DC is selecting a course 
Line 84  sub handler { Line 83  sub handler {
     }      }
   
     my %loaditem;      my %loaditem;
     if ($env{'form.numtitles'}) {      if (($env{'form.type'} eq 'Course') && ($env{'form.numtitles'})) {
         $loaditem{'onload'} = 'setElements(); ';          if (($env{'form.official'} eq 'on') && ($env{'form.state'} eq 'listing')) {
               $loaditem{'onload'} = 'setElements(document.filterpicker); ';
           }
     }      }
   
     if ((($env{'form.form'} eq 'cu') || ($env{'form.form'} eq 'studentform')) &&       if ((($env{'form.form'} eq 'cu') || ($env{'form.form'} eq 'studentform')) && 
Line 113  sub handler { Line 114  sub handler {
     }      }
   
     # print javascript functions for choosing a course       # print javascript functions for choosing a course 
     if ($env{'form.gosearch'} || $onlyown) {      if (($env{'form.command'} eq 'gosearch') || $onlyown) {
         $r->print(&gochoose_javascript($type,$multiple,$autosubmit,$lastaction));          $r->print(&gochoose_javascript($type,$multiple,$autosubmit,$lastaction));
     }      }
     $r->print('<script type="text/javascript" language="Javascript">'.$jscript.      $r->print('<script type="text/javascript" language="Javascript">'.$jscript.
Line 150  sub handler { Line 151  sub handler {
     }      }
   
 # ---------------------------------------------------------------- Get the data  # ---------------------------------------------------------------- Get the data
     if ($env{'form.gosearch'} || $onlyown) {      if (($env{'form.command'} eq 'gosearch') || $onlyown) {
         my %courses = &search_courses($r,$type,$onlyown,$filter,$numtitles);          my %courses = &search_courses($r,$type,$onlyown,$filter,$numtitles);
         if ($nohost) {          if ($nohost) {
             $r->print ('<span class="LC_warning">'.              $r->print ('<span class="LC_warning">'.
Line 396  sub display_matched_courses { Line 397  sub display_matched_courses {
         $r->print('<input type="hidden" name="setroles" value="'.$env{'form.setroles'}.'" />');          $r->print('<input type="hidden" name="setroles" value="'.$env{'form.setroles'}.'" />');
         $r->print('<input type="hidden" name="action" value="rolepicker" />');          $r->print('<input type="hidden" name="action" value="rolepicker" />');
     } elsif ($env{'form.form'} eq 'modifycourse') {      } elsif ($env{'form.form'} eq 'modifycourse') {
         $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','pickedcourse','type','form','numtitles','state']));          $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','pickedcourse','type','form','numtitles','state','command']));
     } else {      } else {
         $r->print('<input type="hidden" name="cnumelement" value="'.          $r->print('<input type="hidden" name="cnumelement" value="'.
                   $env{'form.cnumelement'}.'" />'."\n".                      $env{'form.cnumelement'}.'" />'."\n".  
Line 423  sub multiples_tag { Line 424  sub multiples_tag {
   
 sub build_filters {  sub build_filters {
     my ($filterlist,$type,$roleelement,$multelement,$filter,$action,      my ($filterlist,$type,$roleelement,$multelement,$filter,$action,
         $numtitlesref) = @_;          $numtitlesref,$caller) = @_;
     my $list;      my $list;
     my $formname;      my $formname;
     my ($fixeddom,$codedom,$jscript);      my ($fixeddom,$codedom,$jscript);
     if (defined($env{'form.form'})) {      if (defined($env{'form.form'})) {
          $formname = $env{'form.form'};          $formname = $env{'form.form'};
       } else {
           $formname = $caller;
       }
       my $onchange;
       unless ($env{'form.interface'} eq 'textual') {
           $onchange = 1;
     }      }
     my ($domainselectform,$sincefilterform,$ownerdomselectform,$persondomselectform,      my ($domainselectform,$sincefilterform,$ownerdomselectform,$persondomselectform,
         $instcodeform,$typeselectform,$instcodetitle);          $instcodeform,$typeselectform,$instcodetitle);
Line 449  sub build_filters { Line 456  sub build_filters {
             } elsif ($item eq 'personfilter') {              } elsif ($item eq 'personfilter') {
                 $filter->{$item} = &LONCAPA::clean_username($filter->{$item});                  $filter->{$item} = &LONCAPA::clean_username($filter->{$item});
                 if ($env{'form.persondomfilter'} eq '') {                  if ($env{'form.persondomfilter'} eq '') {
                     unless ($env{'form.gosearch'}) {                      unless ($env{'form.command'} eq 'gosearch') {
                         $filter->{'persondomfilter'} = $env{'request.role.domain'};                          $filter->{'persondomfilter'} = $env{'request.role.domain'};
                     }                      }
                 } else {                  } else {
Line 485  sub build_filters { Line 492  sub build_filters {
                 $domainselectform =                  $domainselectform =
     &Apache::loncommon::select_dom_form($filter->{$item},      &Apache::loncommon::select_dom_form($filter->{$item},
             'domainfilter',              'domainfilter',
         $allow_blank);          $allow_blank,'',$onchange);
                 $codedom = $filter->{'domainfilter'};                  $codedom = $filter->{'domainfilter'};
             }              }
         } else {          } else {
Line 517  sub build_filters { Line 524  sub build_filters {
               'inc' => &mt('Institutional Categorization'),                'inc' => &mt('Institutional Categorization'),
               'cow' => &mt("$type Owner/Co-owner"),                'cow' => &mt("$type Owner/Co-owner"),
               'cop' => &mt("$type Personnel Includes"),                'cop' => &mt("$type Personnel Includes"),
               'cog' => &mt('Course Type')                'cog' => &mt('Type')
              );               );
   
     $typeselectform =  '<select name="type" size="1">'."\n";      $typeselectform =  '<select name="type" size="1"';
       if ($onchange) {
           $typeselectform .= 'onchange=" javascript:submit()"';
       }
       $typeselectform .= '>'."\n";
       my $officialjs;
     if ($type eq 'Course') {      if ($type eq 'Course') {
         if ($env{'form.fixeddom'}) {          if (($env{'form.fixeddom'}) || ($env{'form.form'} eq 'requestcrs')) {
               $officialjs = 1;
             ($instcodeform,$jscript,$$numtitlesref) =               ($instcodeform,$jscript,$$numtitlesref) = 
                 &instcode_selectors($codedom,'filterpicker');                  &instcode_selectors($codedom,'filterpicker',$officialjs);
         }          }
         if ($instcodeform eq '') {          if ($instcodeform eq '') {
             $instcodeform =               $instcodeform = 
Line 537  sub build_filters { Line 550  sub build_filters {
         if ($env{'form.fixeddom'}) {          if ($env{'form.fixeddom'}) {
             $instcodetitle .= '<br />('.$codedom.')';              $instcodetitle .= '<br />('.$codedom.')';
         }          }
         if ($jscript ne '') {  
             $jscript = '<script type="text/javascript" language="Javascript">'.$jscript.  
                        '</script>'."\n";  
         }  
     }      }
     foreach my $posstype ('Course','Non-standard Course') {      $jscript .= <<"END_JS";
   
   function setCommand() {
       document.filterpicker.command.value = 'gosearch';
       return;
   }
   
   END_JS
   
       $jscript = '<script type="text/javascript" language="Javascript">'.$jscript.
                  '</script>'."\n";
   
       foreach my $posstype ('Course','Community') {
         $typeselectform.='<option value="'.$posstype.'"'.          $typeselectform.='<option value="'.$posstype.'"'.
             ($posstype eq $type ? ' selected="selected" ' : ''). ">".&mt($posstype)."</option>\n";              ($posstype eq $type ? ' selected="selected" ' : ''). ">".&mt($posstype)."</option>\n";
     }      }
     $typeselectform.="</select>";      $typeselectform.="</select>";
     my $output = qq|      my $output = qq|
 <form method="post" name="filterpicker" action="$action">  <form method="post" name="filterpicker" action="$action" onsubmit="setCommand()">
 <input type="hidden" name="form" value="$formname" />  <input type="hidden" name="form" value="$formname" />
 |;  |;
     if ($formname eq 'modifycourse') {      if ($formname eq 'modifycourse') {
Line 625  $multelement Line 646  $multelement
                   .&Apache::lonhtmlcommon::row_closure(1);                    .&Apache::lonhtmlcommon::row_closure(1);
     }      }
     $output .= &Apache::lonhtmlcommon::end_pick_box();      $output .= &Apache::lonhtmlcommon::end_pick_box();
     $output .= '<p><input type="submit" name="gosearch" value="'.       $output .= '<p><input type="hidden" name="command" value="">'."\n".
                  '<input type="submit" name="gosearch" value="'. 
                &mt('Search').'" /></p>'."\n".'</form>'."\n".'<hr />'."\n";                 &mt('Search').'" /></p>'."\n".'</form>'."\n".'<hr />'."\n";
     return $jscript.$output;      return $jscript.$output;
 }  }
   
 sub instcode_selectors {  sub instcode_selectors {
     my ($codedom,$formname) = @_;      my ($codedom,$formname,$officialjs) = @_;
     my ($output,@codetitles,%cat_titles,%cat_order,%cat_items);      my ($output,@codetitles,%cat_titles,%cat_order,%cat_items);
     my ($jscript,$totcodes,$numtitles,$lasttitle) =      my ($jscript,$totcodes,$numtitles,$lasttitle) =
         &Apache::courseclassifier::instcode_selectors_data($codedom,$formname,          &Apache::courseclassifier::instcode_selectors_data($codedom,$formname,
                            \%cat_items,\@codetitles,\%cat_titles,\%cat_order);                             \%cat_items,\@codetitles,\%cat_titles,\%cat_order,$officialjs);
     if ($numtitles > 0) {      if ($numtitles > 0) {
         $output = &Apache::courseclassifier::build_instcode_selectors($numtitles,          my $official = ' checked="checked" ';
                   $lasttitle,\%cat_items,\@codetitles,\%cat_titles,\%cat_order)."\n".          my $unofficial = '';
                   '<input type="hidden" name="numtitles" value="'.$numtitles.'" />'."\n".          if ($env{'form.official'} eq 'off') {
                   '<input type="hidden" name="state" value="listing" />'."\n";              $unofficial = $official;
               $official = '';
           }
           $output .= '<span class="LC_nobreak">'.&mt('Official course:').'&nbsp;<label>'.
                      '<input type="radio" name="official" value="on"'.$official.' />'.
                      &mt('Yes').'</label>'.('&nbsp;'x3).'<label>'.
                      '<input type="radio" name="official" value="off"'.$unofficial.
                      ' onclick="toggleOfficial();" />'.&mt('No').'</label></span><br />'.
                      &Apache::courseclassifier::build_instcode_selectors($numtitles,
                      $lasttitle,\%cat_items,\@codetitles,\%cat_titles,\%cat_order)."\n".
                      '<input type="hidden" name="numtitles" value="'.$numtitles.'" />'."\n".
                      '<input type="hidden" name="state" value="listing" />'."\n";
     
     }      }
     return ($output,$jscript,$numtitles);      return ($output,$jscript,$numtitles);
Line 657  sub search_courses { Line 690  sub search_courses {
             $filter->{'combownerfilter'} = $filter->{'ownerfilter'}.':'.              $filter->{'combownerfilter'} = $filter->{'ownerfilter'}.':'.
                                            $filter->{'ownerdomfilter'};                                             $filter->{'ownerdomfilter'};
         }          }
         foreach my $item ('descriptfilter','instcodefilter','coursefilter',          foreach my $item ('descriptfilter','coursefilter','combownerfilter') {
                           'combownerfilter') {  
             if (!$filter->{$item}) {              if (!$filter->{$item}) {
                 $filter->{$item}='.';                  $filter->{$item}='.';
             }              }
         }          }
         if ($type eq '') { $type = '.'; }  
         my $timefilter =           my $timefilter = 
            ($filter->{'sincefilter'}==-1?1:time-$filter->{'sincefilter'});             ($filter->{'sincefilter'}==-1?1:time-$filter->{'sincefilter'});
         my ($instcodefilter,$regexpok);          my ($instcodefilter,$regexpok);
         if ($numtitles) {          if ($numtitles) {
             $instcodefilter =               if ($env{'form.official'} eq 'on') {
                 &Apache::courseclassifier::instcode_search_str($filter->{'domainfilter'},                  $instcodefilter = 
                                                                $numtitles);                      &Apache::courseclassifier::instcode_search_str($filter->{'domainfilter'},$numtitles);
             $regexpok = 1;                  $regexpok = 1;
               } elsif ($env{'form.official'} eq 'off') {
                   $instcodefilter = &Apache::courseclassifier::instcode_search_str($filter->{'domainfilter'},$numtitles);
                   unless ($instcodefilter eq '') {
                       $regexpok = -1;
                   }
               }
         } else {          } else {
             $instcodefilter = $filter->{'instcodefilter'};              $instcodefilter = $filter->{'instcodefilter'};
         }          }
           if ($instcodefilter eq '') { $instcodefilter = '.'; }
           if ($type eq '') { $type = '.'; }
         %courses =           %courses = 
             &Apache::lonnet::courseiddump($filter->{'domainfilter'},              &Apache::lonnet::courseiddump($filter->{'domainfilter'},
                                           $filter->{'descriptfilter'},                                            $filter->{'descriptfilter'},
Line 737  sub gochoose_javascript { Line 776  sub gochoose_javascript {
                                  total => 'coursetotal',                                   total => 'coursetotal',
                                  list  => 'courselist',                                   list  => 'courselist',
                                  },                                   },
                      'Non-standard Course' => {                       'Community' => {
                                  name  => 'grouppick',                                   name  => 'grouppick',
                                  total => 'grouptotal',                                   total => 'grouptotal',
                                  list  => 'grouplist',                                   list  => 'grouplist',
Line 854  Course Activity - how recently was cours Line 893  Course Activity - how recently was cours
 Course Domain - the domain of the course  Course Domain - the domain of the course
   
 =item *  =item *
 Course Type - Course or Non-standard Course  Type - Course or Community
   
 =item *  =item *
 Course Institutional Code - the institutional identifier assigned to the course  Course Institutional Code - the institutional identifier assigned to the course
Line 907  Following selection, and/or submission, Line 946  Following selection, and/or submission,
 X<create_user_javascript()>  X<create_user_javascript()>
 B<create_user_javascript($type)>:  B<create_user_javascript($type)>:
   
 Input: 1 - $type  - the course type - Course or Non-standard Course  Input: 1 - $type  - the course type - Course or Community
   
 Output: 1 - $output - javascript wrapped in E<lt>scriptE<gt>E<lt>/scriptE<gt> tags   Output: 1 - $output - javascript wrapped in E<lt>scriptE<gt>E<lt>/scriptE<gt> tags 
   
Line 939  Side Effects: None Line 978  Side Effects: None
   
 =item *  =item *
 X<build_filters()>  X<build_filters()>
 B<build_filters($filterlist,$type,$roleelement,$multelement,$filter,$action,$numfiltersref)>:  B<build_filters($filterlist,$type,$roleelement,$multelement,$filter,$action,$numfiltersref,$caller)>:
   
   
 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).    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).
   
 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. 
   
Line 1015  javascript functions used when user sele Line 1054  javascript functions used when user sele
   
 (g) Scantron Operator uploading a scantron file to a course - course number is written to visible form element in opener window. Child window closes.  (g) Scantron Operator uploading a scantron file to a course - course number is written to visible form element in opener window. Child window closes.
   
   =item
   
   (h) User requesting creation of a course, and selecting a course to clone - course number and domain written to visible form elements in opener window. Child window closes.
   
 =back  =back
             
 =cut  =cut
Removed from v.1.79  
changed lines
  Added in v.1.84

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