Diff for /loncom/interface/lonpickcourse.pm between versions 1.15 and 1.18

version 1.15, 2004/05/07 17:53:01 version 1.18, 2004/11/12 23:29:56
Line 52  ENDDOCUMENT Line 52  ENDDOCUMENT
     &Apache::loncommon::get_unprocessed_cgi      &Apache::loncommon::get_unprocessed_cgi
         ($ENV{'QUERY_STRING'},['domainfilter','descriptfilter',          ($ENV{'QUERY_STRING'},['domainfilter','descriptfilter',
        'sincefilter','form','cnumelement',         'sincefilter','form','cnumelement',
        'cdomelement','cnameelement']);         'cdomelement','cnameelement','roleelement']);
 # 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 62  ENDDOCUMENT Line 62  ENDDOCUMENT
 # description filter  # description filter
     my $descriptfilter=$ENV{'form.descriptfilter'};      my $descriptfilter=$ENV{'form.descriptfilter'};
     unless ($descriptfilter) { $descriptfilter=''; }      unless ($descriptfilter) { $descriptfilter=''; }
     my $listdescript=$descriptfilter;      my $listdescript=&HTML::Entities::encode($descriptfilter,'<>&"');
     $listdescript=~s/\"/\&quot\;/g;  
 # last course activity filter and selection  # last course activity filter and selection
     my $sincefilter=$ENV{'form.sincefilter'};      my $sincefilter=$ENV{'form.sincefilter'};
     $sincefilter=~s/[^\d-]//g;      $sincefilter=~s/[^\d-]//g;
Line 91  ENDDOCUMENT Line 90  ENDDOCUMENT
  $name_input ='<input type="hidden" name="cnameelement" value="'.   $name_input ='<input type="hidden" name="cnameelement" value="'.
     $ENV{'form.cnameelement'}.'" />';      $ENV{'form.cnameelement'}.'" />';
     }      }
       my $submitopener = '';
       my $autosubmit = '';
       my $roleelement = '';
       my $roledom = $ENV{'form.roleelement'};
       if ($roledom) {
           $roleelement = '<input type="hidden" name="roleelement" value="'.$roledom.'" />';
           $submitopener = &Apache::lonroles::processpick($roledom);
           $autosubmit = 'process_pick("'.$roledom.'")';
       }
     $r->print(<<ENDSCRIPT);      $r->print(<<ENDSCRIPT);
 <script>  <script>
 function gochoose(cname,cdom,cdesc) {  function gochoose(cname,cdom,cdesc) {
Line 101  function gochoose(cname,cdom,cdesc) { Line 109  function gochoose(cname,cdom,cdesc) {
     for (i=0;i<slct.length;i++) {      for (i=0;i<slct.length;i++) {
         if (slct.options[i].value==cdom) { slct.selectedIndex=i; }          if (slct.options[i].value==cdom) { slct.selectedIndex=i; }
     }      }
       $autosubmit
     self.close();      self.close();
 }  }
 </script>  </script>
   $submitopener
 <form method="post">  <form method="post">
 <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
 <input type="hidden" name="form" value="$ENV{'form.form'}" />  <input type="hidden" name="form" value="$ENV{'form.form'}" />
   $roleelement
 $lt{'cac'}: $sincefilterform  $lt{'cac'}: $sincefilterform
 <br />  <br />
 $lt{'cdo'}: $domainselectform  $lt{'cdo'}: $domainselectform
Line 132  ENDSCRIPT Line 142  ENDSCRIPT
  $r->print('<form>');   $r->print('<form>');
  my %by_descrip;   my %by_descrip;
  foreach my $course (keys %courses) {   foreach my $course (keys %courses) {
     $by_descrip{lc($courses{$course})}=$course;              my $descr;
               if ($courses{$course} =~ m/^([^:]*):/) {
                   $descr = &Apache::lonnet::unescape($1);
               } else {
                   $descr = &Apache::lonnet::unescape($courses{$course});
               }
               $by_descrip{lc($descr)}=$course;
  }   }
  foreach my $description (sort(keys(%by_descrip))) {   foreach my $description (sort(keys(%by_descrip))) {
     my $course=$by_descrip{$description};      my $course=$by_descrip{$description};
     my $cleandesc=&HTML::Entities::encode($courses{$course},'<>&"');      my $cleandesc=&HTML::Entities::encode($description,'<>&"');
     $cleandesc=~s/'/\\'/g;      $cleandesc=~s/'/\\'/g;
     my ($cdom,$cnum)=split(/\_/,$course);      my ($cdom,$cnum)=split(/\_/,$course);
     $r->print('<input type="button" value="Select" onClick="gochoose('.      $r->print('<input type="button" value="Select" onClick="gochoose('.
   "'".$cnum."','".$cdom."','".$cleandesc."')".'" /> '.$courses{$course}.' ('.    "'".$cnum."','".$cdom."','".$cleandesc."')".'" /> '.$description.' ('.
   ($Apache::lonnet::domaindescription{$cdom}?    ($Apache::lonnet::domaindescription{$cdom}?
                    $Apache::lonnet::domaindescription{$cdom}:$cdom).                     $Apache::lonnet::domaindescription{$cdom}:$cdom).
                  ")<br />\n");                   ")<br />\n");
Line 150  ENDSCRIPT Line 166  ENDSCRIPT
     }      }
     $r->print('</body></html>');      $r->print('</body></html>');
     return OK;      return OK;
 }   }
   
 1;  1;
 __END__  __END__

Removed from v.1.15  
changed lines
  Added in v.1.18


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