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

Diff for /loncom/interface/lonpickcourse.pm between versions 1.26 and 1.29

version 1.26, 2005/02/17 08:29:43 version 1.29, 2005/09/14 20:42:36
Line 54  ENDDOCUMENT Line 54  ENDDOCUMENT
         ($ENV{'QUERY_STRING'},['domainfilter','descriptfilter',          ($ENV{'QUERY_STRING'},['domainfilter','descriptfilter',
        'sincefilter','form','cnumelement',         'sincefilter','form','cnumelement',
        'cdomelement','cnameelement','roleelement',         'cdomelement','cnameelement','roleelement',
                                'pickedcourse','instcodefilter','ownerfilter']);                                 'pickedcourse','instcodefilter',
                                  'ownerfilter','coursefilter']);
 # 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;
     unless ($domainfilter) { $domainfilter=''; }      unless ($domainfilter) { $domainfilter=''; }
     my $domainselectform=&Apache::loncommon::select_dom_form($domainfilter,      my $domainselectform=&Apache::loncommon::select_dom_form($domainfilter,
                                                           'domainfilter',1);                                                            'domainfilter',1);
 # description filter  # description filter
     my $descriptfilter=$ENV{'form.descriptfilter'};      my $descriptfilter=$env{'form.descriptfilter'};
     unless ($descriptfilter) { $descriptfilter=''; }      unless ($descriptfilter) { $descriptfilter=''; }
     my $listdescript=&HTML::Entities::encode($descriptfilter,'<>&"');      my $listdescript=&HTML::Entities::encode($descriptfilter,'<>&"');
 # institutional code filter  # institutional code filter
     my $instcodefilter=$ENV{'form.instcodefilter'};      my $instcodefilter=$env{'form.instcodefilter'};
     unless ($instcodefilter) { $instcodefilter=''; }      unless ($instcodefilter) { $instcodefilter=''; }
     my $listinstcode=&HTML::Entities::encode($instcodefilter,'<>&"');      my $listinstcode=&HTML::Entities::encode($instcodefilter,'<>&"');
 # course owner filter  # course owner filter
     my $ownerfilter=$ENV{'form.ownerfilter'};      my $ownerfilter=$env{'form.ownerfilter'};
     unless ($ownerfilter) { $ownerfilter=''; }      unless ($ownerfilter) { $ownerfilter=''; }
     my $listowner=&HTML::Entities::encode($ownerfilter,'<>&"');      my $listowner=&HTML::Entities::encode($ownerfilter,'<>&"');
   # course ID filter for DCs only
       my ($courseidtag,$coursefilter);
       if ($env{'user.adv'} && $domainfilter && exists($env{'user.role.dc./'.
                           $domainfilter.'/'})) {
           $coursefilter=$env{'form.coursefilter'};
           unless ($coursefilter) { $coursefilter=''; }
           my $listcourseid=&HTML::Entities::encode($coursefilter,'<>&"');
           $courseidtag = &mt('LON-CAPA course ID');
           $courseidtag .= qq|<input type="text" name="coursefilter" size="25" value="$listcourseid" />
           <br />
           |;
       }
 # 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;
     unless ($sincefilter) { $sincefilter=-1; }      unless ($sincefilter) { $sincefilter=-1; }
     my $sincefilterform=&Apache::loncommon::select_form($sincefilter,      my $sincefilterform=&Apache::loncommon::select_form($sincefilter,
Line 91  ENDDOCUMENT Line 104  ENDDOCUMENT
 # 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);
         my @sections = ();          my @sections = ();
Line 102  ENDDOCUMENT Line 115  ENDDOCUMENT
             $seclist = join('","',@sections);              $seclist = join('","',@sections);
         }          }
     }      }
     $r->print(&Apache::loncommon::bodytag("Selecting a Course",undef,$loaditem));      $r->print(&Apache::loncommon::bodytag("Selecting a Course",undef,$loaditem,undef,undef,undef,undef,1));
     my %lt=&Apache::lonlocal::texthash(      my %lt=&Apache::lonlocal::texthash(
        'cac' => 'Course Activity',         'cac' => 'Course Activity',
        'cde' => 'Course Description',         'cde' => 'Course Description',
Line 110  ENDDOCUMENT Line 123  ENDDOCUMENT
                                        'cin' => 'Course Institutional Code',                                         'cin' => 'Course Institutional Code',
                                        'cow' => "Course Owner's usename");                                         'cow' => "Course Owner's usename");
     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;";
  $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 $submitopener = '';
     my $autosubmit = '';      my $autosubmit = '';
     my $roleelement = '';      my $roleelement = '';
     my $lastaction = 'self.close()';      my $lastaction = 'self.close()';
     if ($ENV{'form.form'} eq 'cu') {      if ($env{'form.form'} eq 'cu') {
         $lastaction = 'document.courselist.pickedcourse.value = cdom+"_"+cname;'."\n".          $lastaction = 'document.courselist.pickedcourse.value = cdom+"_"+cname;'."\n".
                       'document.courselist.submit();';                        'document.courselist.submit();';
     }      }
     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($roledom);
Line 133  ENDDOCUMENT Line 146  ENDDOCUMENT
 <script>  <script>
 function gochoose(cname,cdom,cdesc) {  function gochoose(cname,cdom,cdesc) {
     $name_code      $name_code
     var openerForm = "$ENV{'form.form'}";      var openerForm = "$env{'form.form'}";
     opener.document.$ENV{'form.form'}.$ENV{'form.cnumelement'}.value=cname;      opener.document.$env{'form.form'}.$env{'form.cnumelement'}.value=cname;
     if (openerForm == 'cu' || openerForm == 'rolechoice') {      if (openerForm == 'cu' || openerForm == 'rolechoice') {
          opener.document.$ENV{'form.form'}.$ENV{'form.cdomelement'}.value=cdom;           opener.document.$env{'form.form'}.$env{'form.cdomelement'}.value=cdom;
     }      }
     else {      else {
         var slct=opener.document.$ENV{'form.form'}.$ENV{'form.cdomelement'};          var slct=opener.document.$env{'form.form'}.$env{'form.cdomelement'};
         var i;          var i;
         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; }
Line 152  function gochoose(cname,cdom,cdesc) { Line 165  function gochoose(cname,cdom,cdesc) {
 function setSections() {  function setSections() {
     var numSections = $num_sections      var numSections = $num_sections
     var sectionsArray = new Array("$seclist")      var sectionsArray = new Array("$seclist")
     opener.document.$ENV{"form.form"}.currsec.length = 0      opener.document.$env{"form.form"}.currsec.length = 0
     if (numSections == 0) {      if (numSections == 0) {
         opener.document.$ENV{"form.form"}.currsec.multiple=false          opener.document.$env{"form.form"}.currsec.multiple=false
         opener.document.$ENV{"form.form"}.currsec.size=1;          opener.document.$env{"form.form"}.currsec.size=1;
         opener.document.$ENV{"form.form"}.currsec.options[0] = new Option('No existing sections','',false,false)          opener.document.$env{"form.form"}.currsec.options[0] = new Option('No existing sections','',false,false)
     }      }
     else {      else {
         if (numSections == 1) {          if (numSections == 1) {
             opener.document.$ENV{"form.form"}.currsec.multiple=false;              opener.document.$env{"form.form"}.currsec.multiple=false;
             opener.document.$ENV{"form.form"}.currsec.size=1;              opener.document.$env{"form.form"}.currsec.size=1;
             opener.document.$ENV{"form.form"}.currsec.options[0] = new Option('Select','',true,true);              opener.document.$env{"form.form"}.currsec.options[0] = new Option('Select','',true,true);
             opener.document.$ENV{"form.form"}.currsec.options[1] = new Option('No section','',false,false)               opener.document.$env{"form.form"}.currsec.options[1] = new Option('No section','',false,false) 
             opener.document.$ENV{"form.form"}.currsec.options[2] = new Option(sectionsArray[0],sectionsArray[0],false,false);              opener.document.$env{"form.form"}.currsec.options[2] = new Option(sectionsArray[0],sectionsArray[0],false,false);
         }          }
         else {          else {
             for (var i=0; i<numSections; i++) {              for (var i=0; i<numSections; i++) {
                 opener.document.$ENV{"form.form"}.currsec.options[i] = new Option(sectionsArray[i],sectionsArray[i],false,false)                  opener.document.$env{"form.form"}.currsec.options[i] = new Option(sectionsArray[i],sectionsArray[i],false,false)
             }              }
             opener.document.$ENV{"form.form"}.currsec.multiple=true              opener.document.$env{"form.form"}.currsec.multiple=true
             if (numSections < 3) {              if (numSections < 3) {
                 opener.document.$ENV{"form.form"}.currsec.size=numSections;                  opener.document.$env{"form.form"}.currsec.size=numSections;
             }              }
             else {              else {
                 opener.document.$ENV{"form.form"}.currsec.size=3;                  opener.document.$env{"form.form"}.currsec.size=3;
             }              }
             opener.document.$ENV{"form.form"}.currsec.options[0].selected = false              opener.document.$env{"form.form"}.currsec.options[0].selected = false
         }          }
     }      }
     self.close()      self.close()
Line 185  function setSections() { Line 198  function setSections() {
 </script>  </script>
 $submitopener  $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  $roleelement
 $lt{'cac'}: $sincefilterform  $lt{'cac'}: $sincefilterform
 <br />  <br />
Line 200  $lt{'cin'}: Line 213  $lt{'cin'}:
 $lt{'cow'}:  $lt{'cow'}:
 <input type="text" name="ownerfilter" size="10" value="$listowner" />  <input type="text" name="ownerfilter" size="10" value="$listowner" />
 <br />  <br />
   $courseidtag
 $lt{'cde'}:  $lt{'cde'}:
 <input type="text" name="descriptfilter" size="40" value="$listdescript" />  <input type="text" name="descriptfilter" size="40" value="$listdescript" />
 <p><input type="submit" name="gosearch" value="Search" /></p>  <p><input type="submit" name="gosearch" value="Search" /></p>
Line 207  $lt{'cde'}: Line 221  $lt{'cde'}:
 <hr />  <hr />
 ENDSCRIPT  ENDSCRIPT
 # ---------------------------------------------------------------- Get the data  # ---------------------------------------------------------------- Get the data
     if ($ENV{'form.gosearch'}) {      if ($env{'form.gosearch'}) {
         $r->print(&mt('Searching').' ...<br />&nbsp;<br />');          $r->print(&mt('Searching').' ...<br />&nbsp;<br />');
         $r->rflush();          $r->rflush();
  unless ($descriptfilter) { $descriptfilter='.'; }   unless ($descriptfilter) { $descriptfilter='.'; }
         unless ($instcodefilter) { $instcodefilter='.'; }          unless ($instcodefilter) { $instcodefilter='.'; }
         unless ($ownerfilter) { $ownerfilter='.'; }          unless ($ownerfilter) { $ownerfilter='.'; }
           unless ($coursefilter) { $coursefilter='.'; }
         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);      ($domainfilter,$descriptfilter,$timefilter,$instcodefilter,$ownerfilter,$coursefilter);
  $r->print('<form name="courselist">');   $r->print('<form name="courselist">');
  my %by_descrip;   my %by_descrip;
  foreach my $course (keys %courses) {   foreach my $course (keys %courses) {
Line 249  ENDSCRIPT Line 264  ENDSCRIPT
             }              }
  }   }
  if (!%courses) { $r->print(&mt('None found')); }   if (!%courses) { $r->print(&mt('None found')); }
         $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>');                     '</form>');
     }      }
     $r->print('</body></html>');      $r->print('</body></html>');
Removed from v.1.26  
changed lines
  Added in v.1.29

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