Diff for /loncom/interface/lonpickcourse.pm between versions 1.47 and 1.48

version 1.47, 2006/05/30 12:46:09 version 1.48, 2006/05/30 20:12:15
Line 52  sub handler { Line 52  sub handler {
        'sincefilter','form','cnumelement',         'sincefilter','form','cnumelement',
        'cdomelement','cnameelement','roleelement',         'cdomelement','cnameelement','roleelement',
                                'pickedcourse','instcodefilter',                                 'pickedcourse','instcodefilter',
                                'ownerfilter','coursefilter','multiple']);                                 'ownerfilter','coursefilter','multiple',
                                  'type']);
 # domain filter and selection  # domain filter and selection
     my $domainfilter=$env{'form.domainfilter'};      my $domainfilter=$env{'form.domainfilter'};
     $domainfilter=~s/\W//g;      $domainfilter=~s/\W//g;
Line 108  sub handler { Line 109  sub handler {
         my %sections_count = &Apache::loncommon::get_sections($cdom,$cnum);          my %sections_count = &Apache::loncommon::get_sections($cdom,$cnum);
         my @sections =  (sort {$a <=> $b} keys(%sections_count));          my @sections =  (sort {$a <=> $b} keys(%sections_count));
  $seclist = join('","',@sections);   $seclist = join('","',@sections);
           $num_sections = scalar(@sections);
         my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);          my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
  $groupslist = join(',',sort(keys(%curr_groups)));   $groupslist = join(',',sort(keys(%curr_groups)));
     }      }
     my $jscript;      my $jscript;
     my $title = 'Selecting a course';      my $type = $env{'form.type'};
       if (!defined($env{'form.type'})) {
           $type = 'Course';
       }
       my $typeselectform =  '<select name="type" size="1"';
       if (!$type) {
           $typeselectform .= ' selected="selected"';
       }
       $typeselectform .= ">\n";
       foreach my $posstype ('Course','Group') { 
           $typeselectform.='<option value="'.$posstype.'" "'.
               ($posstype eq $type ? 'selected="selected" ' : ''). ">$posstype</option>\n";
       }
       $typeselectform.="</select>";
       my $title = &mt('Selecting a [_1]',$type);
 # Setup for multiple course selections, if flag for multiples set.  # Setup for multiple course selections, if flag for multiples set.
     my $multiple = $env{'form.multiple'};      my $multiple = $env{'form.multiple'};
     my $multelement;      my $multelement;
     if ($multiple) {      if ($multiple) {
         $title = 'Selecting course(s)';          $title = &mt('Selecting [_1](s)',lc($type));
         $jscript = &Apache::loncommon::check_uncheck_jscript();          $jscript = &Apache::loncommon::check_uncheck_jscript();
         $multelement = '<input type="hidden" name="multiple" value="'.$multiple.'" />';          $multelement = '<input type="hidden" name="multiple" value="'.$multiple.'" />';
     }      }
     $r->print(&Apache::loncommon::start_page($title,undef,      $r->print(&Apache::loncommon::start_page($title,undef,
      {'add_entries' => \%loaditem,       {'add_entries' => \%loaditem,
       'no_nav_bar'  => 1, }));        'no_nav_bar'  => 1, }));
     my %lt=&Apache::lonlocal::texthash(      my %lt = (
        'cac' => 'Course Activity',        'cac' => &mt('[_1] Activity',$type),
        'cde' => 'Course Description',        'cde' => &mt('[_1] Description',$type),
        'cdo' => 'Course Domain',        'cdo' => &mt('[_1] Domain',$type),
                                        'cin' => 'Course Institutional Code',                'cin' => &mt('Course Institutional Code'),
                                        'cow' => "Course Owner's Username");                'cow' => &mt("[_1] Owner's Username",$type),
                 'cog' => &mt('Course or Group')
                );
      
     my ($name_code,$name_input);      my ($name_code,$name_input);
     if (defined($env{'form.cnameelement'}) && $env{'form.cnameelement'} ne '') {      if (defined($env{'form.cnameelement'}) && $env{'form.cnameelement'} ne '') {
  $name_code = "opener.document.$env{'form.form'}.$env{'form.cnameelement'}.value=cdesc;";   $name_code = "opener.document.$env{'form.form'}.$env{'form.cnameelement'}.value=cdesc;";
Line 151  sub handler { Line 169  sub handler {
         $submitopener = &Apache::lonroles::processpick();          $submitopener = &Apache::lonroles::processpick();
         $autosubmit = 'process_pick("'.$roledom.'")';          $autosubmit = 'process_pick("'.$roledom.'")';
     }      }
       my $instcodeform;
       if ($type eq 'Course') {
           $instcodeform = $lt{'cin'}.':<input type="text" name="instcodefilter" 
    size="10" value="'.$listinstcode.'" /><br />';
       }
   
       my %elements = (
                        Course => {
                                    name  => 'coursepick',
                                    total => 'coursetotal',
                                    list  => 'courselist',
                                  },
                        Group => {
                                    name  => 'grouppick',
                                    total => 'grouptotal',
                                    list  => 'grouplist',
                                },
                       );
   
     $r->print(<<ENDSCRIPT);      $r->print(<<ENDSCRIPT);
 <script>  <script>
 function gochoose(cname,cdom,cdesc,multiple,caller) {  function gochoose(cname,cdom,cdesc,multiple,caller) {
Line 172  function gochoose(cname,cdom,cdesc,multi Line 209  function gochoose(cname,cdom,cdesc,multi
  }   }
     }      }
  }    } 
         opener.document.$env{'form.form'}.coursetotal.value = courseCount;          opener.document.$env{'form.form'}.$elements{$type}{'total'}.value = courseCount;
  if (typeof(opener.document.$env{'form.form'}.coursepick.length) ==   if (typeof(opener.document.$env{'form.form'}.$elements{$type}{'name'}.length) ==
     'undefined') {      'undefined') {
     if (opener.document.$env{'form.form'}.coursepick.value == 'specific') {        if (opener.document.$env{'form.form'}.$elements{$type}{'name'}.value == 'specific') {  
  opener.document.$env{'form.form'}.coursepick.checked = true;   opener.document.$env{'form.form'}.$elements{$type}{'name'}.checked = true;
     } else {      } else {
  opener.document.$env{'form.form'}.coursepick.checked = false;   opener.document.$env{'form.form'}.$elements{$type}{'name'}.checked = false;
     }      }
  } else {   } else {
     for (var j=0; j<opener.document.$env{'form.form'}.coursepick.length; j++) {       for (var j=0; j<opener.document.$env{'form.form'}.$elements{$type}{'name'}.length; j++) { 
  if (opener.document.$env{'form.form'}.coursepick[j].value == 'specific') {     if (opener.document.$env{'form.form'}.$elements{$type}{'name'}\[j].value == 'specific') {  
     opener.document.$env{'form.form'}.coursepick[j].checked = true;      opener.document.$env{'form.form'}.$elements{$type}{'name'}\[j].checked = true;
  } else {   } else {
     opener.document.$env{'form.form'}.coursepick[j].checked = false;      opener.document.$env{'form.form'}.$elements{$type}{'name'}\[j].checked = false;
  }   }
     }      }
  }   }
  if (courseCount > 0) {   if (courseCount > 0) {
     courses = courses.substr(0,courses.length-2);      courses = courses.substr(0,courses.length-2);
     opener.document.$env{'form.form'}.courselist.value = courses;      opener.document.$env{'form.form'}.$elements{$type}{'list'}.value = courses;
  }   }
     } else {      } else {
         $name_code          $name_code
Line 246  function setSections() { Line 283  function setSections() {
 $jscript  $jscript
 </script>  </script>
 $submitopener  $submitopener
 <form method="post" name="filterpicker">  <form method="post" name="filterpicker" action="/adm/pickcourse">
 <input type="hidden" name="cnumelement" value="$env{'form.cnumelement'}" />  <input type="hidden" name="cnumelement" value="$env{'form.cnumelement'}" />
 <input type="hidden" name="cdomelement" value="$env{'form.cdomelement'}" />  <input type="hidden" name="cdomelement" value="$env{'form.cdomelement'}" />
 $name_input  $name_input
Line 257  $lt{'cac'}: $sincefilterform Line 294  $lt{'cac'}: $sincefilterform
 <br />  <br />
 $lt{'cdo'}: $domainselectform  $lt{'cdo'}: $domainselectform
 <br />  <br />
 $lt{'cin'}:  $lt{'cog'}: $typeselectform
 <input type="text" name="instcodefilter" size="10" value="$listinstcode" />  
 <br />  <br />
   $instcodeform
 $lt{'cow'}:  $lt{'cow'}:
 <input type="text" name="ownerfilter" size="10" value="$listowner" />  <input type="text" name="ownerfilter" size="10" value="$listowner" />
 <br />  <br />
Line 278  ENDSCRIPT Line 315  ENDSCRIPT
         unless ($instcodefilter) { $instcodefilter='.'; }          unless ($instcodefilter) { $instcodefilter='.'; }
         unless ($ownerfilter) { $ownerfilter='.'; }          unless ($ownerfilter) { $ownerfilter='.'; }
         unless ($coursefilter) { $coursefilter='.'; }          unless ($coursefilter) { $coursefilter='.'; }
           unless ($type) { $type = '.'; }
         my $timefilter=($sincefilter==-1?1:time-$sincefilter);          my $timefilter=($sincefilter==-1?1:time-$sincefilter);
  my %courses=   my %courses=
     &Apache::lonnet::courseiddump      &Apache::lonnet::courseiddump
     ($domainfilter,$descriptfilter,$timefilter,$instcodefilter,$ownerfilter,$coursefilter);      ($domainfilter,$descriptfilter,$timefilter,$instcodefilter,$ownerfilter,$coursefilter,undef,undef,$type);
  $r->print('<form name="courselist">');   $r->print('<form name="courselist" method="post" action="/adm/pickcourse">');
  my %by_descrip;   my %by_descrip;
         my $numcourses = keys(%courses);          my $numcourses = keys(%courses);
  foreach my $course (keys(%courses)) {   foreach my $course (keys(%courses)) {
Line 307  ENDSCRIPT Line 345  ENDSCRIPT
         my $cleandesc=&HTML::Entities::encode($description,'<>&"');          my $cleandesc=&HTML::Entities::encode($description,'<>&"');
         $cleandesc=~s/'/\\'/g;          $cleandesc=~s/'/\\'/g;
         my ($cdom,$cnum)=split(/\_/,$course);          my ($cdom,$cnum)=split(/\_/,$course);
                 my ($descr,$instcode,$owner) = split/:/,$courses{$course};                  my ($descr,$instcode,$owner,$ttype) = split/:/,$courses{$course};
                 $r->print(&course_chooser($multiple,$cdom,$cnum,$cleandesc));                  $r->print(&course_chooser($multiple,$cdom,$cnum,$cleandesc));
         $r->print($description.'('.          $r->print($description.'('.
       ($Apache::lonnet::domaindescription{$cdom}?        ($Apache::lonnet::domaindescription{$cdom}?
Line 318  ENDSCRIPT Line 356  ENDSCRIPT
                 unless ($owner eq '') {                  unless ($owner eq '') {
                     $r->print(", owner - ".&unescape($owner));                      $r->print(", owner - ".&unescape($owner));
                 }                  }
                   unless ($ttype eq '') {
                       $r->print('('.&Apache::lonnet::unescape($ttype).')');
                   }
  if ($multiple) { $r->print("</label>\n"); }   if ($multiple) { $r->print("</label>\n"); }
                 $r->print("<br />\n");                  $r->print("<br />\n");
             }              }
Line 330  ENDSCRIPT Line 371  ENDSCRIPT
         $r->print('<input type="hidden" name="form" value="'.$env{'form.form'}.'" />'."\n".          $r->print('<input type="hidden" name="form" value="'.$env{'form.form'}.'" />'."\n".
                    '<input type="hidden" name="pickedcourse" value="" />'."\n".                     '<input type="hidden" name="pickedcourse" value="" />'."\n".
                    '<input type="hidden" name="cnumelement" value="'.$env{'form.cnumelement'}.'" />'."\n".                     '<input type="hidden" name="cnumelement" value="'.$env{'form.cnumelement'}.'" />'."\n".
                    '<input type="hidden" name="cdomelement" value="'.$env{'form.cdomelement'}.'" />'."\n");                     '<input type="hidden" name="cdomelement" value="'.$env{'form.cdomelement'}.'" />'."\n".
                      '<input type="hidden" name="type" value="'.$type.'" />'."\n");
         if ((exists($env{'form.roleelement'})) && ($env{'form.form'} eq 'rolechoice')) {          if ((exists($env{'form.roleelement'})) && ($env{'form.form'} eq 'rolechoice')) {
            $r->print('<input type="hidden" name="roleelement" value="'.$env{'form.roleelement'}.'" />'."\n");             $r->print('<input type="hidden" name="roleelement" value="'.$env{'form.roleelement'}.'" />'."\n");
         }          }

Removed from v.1.47  
changed lines
  Added in v.1.48


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