Diff for /loncom/interface/lonpickcourse.pm between versions 1.35 and 1.42

version 1.35, 2005/11/15 20:46:40 version 1.42, 2006/04/10 21:40:09
Line 42  sub handler { Line 42  sub handler {
     return OK if $r->header_only;      return OK if $r->header_only;
   
 # ------------------------------------------------------------ Print the screen  # ------------------------------------------------------------ Print the screen
     my $html=&Apache::lonxml::xmlbegin();  
     $r->print(<<ENDDOCUMENT);  
 $html  
 <head>  
 <title>The LearningOnline Network with CAPA</title>  
 </head>  
 ENDDOCUMENT  
 # Get parameters from query string  # Get parameters from query string
     &Apache::loncommon::get_unprocessed_cgi      &Apache::loncommon::get_unprocessed_cgi
         ($ENV{'QUERY_STRING'},['domainfilter','descriptfilter',          ($ENV{'QUERY_STRING'},['domainfilter','descriptfilter',
Line 82  ENDDOCUMENT Line 76  ENDDOCUMENT
         unless ($coursefilter) { $coursefilter=''; }          unless ($coursefilter) { $coursefilter=''; }
         my $listcourseid=&HTML::Entities::encode($coursefilter,'<>&"');          my $listcourseid=&HTML::Entities::encode($coursefilter,'<>&"');
         $courseidtag = &mt('LON-CAPA course ID');          $courseidtag = &mt('LON-CAPA course ID');
         $courseidtag .= qq|<input type="text" name="coursefilter" size="25" value="$listcourseid" />          $courseidtag .= qq|: <input type="text" name="coursefilter" size="25" value="$listcourseid" />
         <br />          <br />
         |;          |;
     }      }
Line 102  ENDDOCUMENT Line 96  ENDDOCUMENT
                       ['-1','86400','604800','2592000','7776000',                        ['-1','86400','604800','2592000','7776000',
       '15552000','31104000']));        '15552000','31104000']));
 # if called from loncreateuser, report sections, then close  # if called from loncreateuser, report sections, then close
     my ($loaditem,$seclist);      my (%loaditem,$seclist);
     my $num_sections = 0;      my $num_sections = 0;
     if ($env{'form.form'} eq 'cu' && $env{'form.pickedcourse'}) {      if ($env{'form.form'} eq 'cu' && $env{'form.pickedcourse'}) {
         $loaditem = 'onLoad="setSections()"';          $loaditem{'onload'} ="setSections()";
         my ($cdom,$cnum) = split/_/,$env{'form.pickedcourse'};          my ($cdom,$cnum) = split/_/,$env{'form.pickedcourse'};
         my %sections_count = ();          my %sections_count = ();
         $num_sections = &Apache::loncommon::get_sections($cdom,$cnum,\%sections_count);          $num_sections = &Apache::loncommon::get_sections($cdom,$cnum,\%sections_count);
Line 125  ENDDOCUMENT Line 119  ENDDOCUMENT
         $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::bodytag($title,undef,$loaditem,undef,undef,undef,undef,1));      $r->print(&Apache::loncommon::start_page($title,undef,
        {'add_entries' => \%loaditem,
         'no_nav_bar'  => 1, }));
     my %lt=&Apache::lonlocal::texthash(      my %lt=&Apache::lonlocal::texthash(
        'cac' => 'Course Activity',         'cac' => 'Course Activity',
        'cde' => 'Course Description',         'cde' => 'Course Description',
        'cdo' => 'Course Domain',         'cdo' => 'Course Domain',
                                        'cin' => 'Course Institutional Code',                                         'cin' => 'Course Institutional Code',
                                        'cow' => "Course Owner's usename");                                         'cow' => "Course Owner's Username");
     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 149  ENDDOCUMENT Line 145  ENDDOCUMENT
     my $roledom = $env{'form.roleelement'};      my $roledom = $env{'form.roleelement'};
     if ($roledom) {      if ($roledom) {
         $roleelement = '<input type="hidden" name="roleelement" value="'.$roledom.'" />';          $roleelement = '<input type="hidden" name="roleelement" value="'.$roledom.'" />';
         $submitopener = &Apache::lonroles::processpick($roledom);          $submitopener = &Apache::lonroles::processpick();
         $autosubmit = 'process_pick("'.$roledom.'")';          $autosubmit = 'process_pick("'.$roledom.'")';
     }      }
     $r->print(<<ENDSCRIPT);      $r->print(<<ENDSCRIPT);
Line 287  ENDSCRIPT Line 283  ENDSCRIPT
         my $numcourses = keys(%courses);          my $numcourses = keys(%courses);
  foreach my $course (keys(%courses)) {   foreach my $course (keys(%courses)) {
             my $descr;              my $descr;
             if ($courses{$course} =~ m/^([^:]*):/) {              if ($courses{$course} =~ m/^([^:]*):/i) {
                 $descr = &Apache::lonnet::unescape($1);                  $descr = &Apache::lonnet::unescape($1);
             } else {              } else {
                 $descr = &Apache::lonnet::unescape($courses{$course});                  $descr = &Apache::lonnet::unescape($courses{$course});
             }              }
             my $description = lc($descr);              my $description = $descr;
             push (@{$by_descrip{$description}}, $course);              push (@{$by_descrip{$description}}, $course);
  }   }
         if ($numcourses > 1 && $multiple) {          if ($numcourses > 1 && $multiple) {
Line 301  ENDSCRIPT Line 297  ENDSCRIPT
                     onclick="javascript:uncheckAll(document.courselist.course_id)" />                      onclick="javascript:uncheckAll(document.courselist.course_id)" />
                     <br /><br />');                      <br /><br />');
         }          }
  foreach my $description (sort(keys(%by_descrip))) {   foreach my $description (sort 
    { lc($a) cmp lc($b) } (keys(%by_descrip))) {
             foreach my $course (@{$by_descrip{$description}}) {              foreach my $course (@{$by_descrip{$description}}) {
         my $cleandesc=&HTML::Entities::encode($description,'<>&"');          my $cleandesc=&HTML::Entities::encode($description,'<>&"');
         $cleandesc=~s/'/\\'/g;          $cleandesc=~s/'/\\'/g;
Line 329  ENDSCRIPT Line 326  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");
                    '</form>');          if ((exists($env{'form.roleelement'})) && ($env{'form.form'} eq 'rolechoice')) {
              $r->print('<input type="hidden" name="roleelement" value="'.$env{'form.roleelement'}.'" />'."\n");
           }
           $r->print("</form>\n");
     }      }
     $r->print('</body></html>');      $r->print(&Apache::loncommon::end_page());
     return OK;      return OK;
 }  }
   

Removed from v.1.35  
changed lines
  Added in v.1.42


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