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

Diff for /loncom/interface/lonnavdisplay.pm between versions 1.20 and 1.21

version 1.20, 2011/12/25 20:41:53 version 1.21, 2011/12/28 04:11:05
Line 113  sub real_handler { Line 113  sub real_handler {
         return OK;          return OK;
     }      }
   
     # See if there's only one map in the top-level, if we don't      my @resources = $navmap->retrieveResources();
     # already have a filter... if so, automatically display it      my $sequenceCount = 0;
     # (older code; should use retrieveResources)      my $problemCount = 0;
     if ($ENV{QUERY_STRING} !~ /filter/) {      my $notaprobCount = 0;
         my $iterator = $navmap->getIterator(undef, undef, undef, 0);      my $sequenceId;
         my $curRes;      my $notools;
         my $sequenceCount = 0;      foreach my $curRes (@resources) {
         my $sequenceId;          if (ref($curRes)) {
         while ($curRes = $iterator->next()) {              if ($curRes->is_sequence()) {
             if (ref($curRes) && $curRes->is_sequence()) {  
                 $sequenceCount++;                  $sequenceCount++;
                 $sequenceId = $curRes->map_pc();                  $sequenceId = $curRes->map_pc();
               } elsif ($curRes->is_problem()) {
                   $problemCount ++;
               } else {
                   $notaprobCount ++;
             }              }
         }          }
               }
       if (($sequenceCount == 1) && (!$problemCount) && ($notaprobCount <= 1)) {
           $notools = 1;
       }
   
       # If there's only one map in the top-level and we don't
       # already have a filter, automatically display it
       if ($ENV{QUERY_STRING} !~ /filter/) {
         if ($sequenceCount == 1) {          if ($sequenceCount == 1) {
             # The automatic iterator creation in the render call               # The automatic iterator creation in the render call 
             # will pick this up. We know the condition because              # will pick this up. We know the condition because
Line 183  sub real_handler { Line 193  sub real_handler {
         if ($env{'form.register'}) {          if ($env{'form.register'}) {
             $link .= '&amp;register='.$env{'form.register'};               $link .= '&amp;register='.$env{'form.register'}; 
         }          }
  &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'firsthomework',          unless ($notools) {
   'location.href="'.$link.'"',      &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'firsthomework',
   "Show my first due problem");        'location.href="'.$link.'"',
         "Show my first due problem");
           }
     }      }
   
     my $suppressEmptySequences = 0;      my $suppressEmptySequences = 0;
Line 216  sub real_handler { Line 228  sub real_handler {
         if ($env{'form.register'}) {          if ($env{'form.register'}) {
             $link .= '&amp;register='.$env{'form.register'};              $link .= '&amp;register='.$env{'form.register'};
         }          }
  &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'uncompleted',          unless ($notools) {
   'location.href="'.$link.'"',      &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'uncompleted',
   'Show only uncompleted problems');        'location.href="'.$link.'"',
         'Show only uncompleted problems');
           }
     }      }
   
     my %selected=($env{'form.sort'} => ' selected="selected"');      my %selected=($env{'form.sort'} => ' selected="selected"');
     my $sort_html=('<form name="sortForm" action="">      my $sort_html;
       unless ($notools) {
           $sort_html=(
                 '<form name="sortForm" action="">
                  <span class="LC_nobreak">                   <span class="LC_nobreak">
                     <input type="hidden" name="showOnlyHomework" value="'.$env{'form.showOnlyHomework'}.'" />                      <input type="hidden" name="showOnlyHomework" value="'.$env{'form.showOnlyHomework'}.'" />
                     '.&mt('Sort by:').'                      '.&mt('Sort by:').'
Line 235  sub real_handler { Line 252  sub real_handler {
                     <input type="hidden" name="register" value="'.$env{'form.register'}.'" />                      <input type="hidden" name="register" value="'.$env{'form.register'}.'" />
                  </span>                   </span>
                </form>');                 </form>');
       }
     # renderer call      # renderer call
     my $renderArgs = { 'cols' => [0,1,2,3],      my $renderArgs = { 'cols' => [0,1,2,3],
        'sort' => $env{'form.sort'},         'sort' => $env{'form.sort'},
Line 247  sub real_handler { Line 265  sub real_handler {
        'sort_html'=> $sort_html,         'sort_html'=> $sort_html,
                        'r' => $r,                         'r' => $r,
                        'caller' => 'navmapsdisplay',                         'caller' => 'navmapsdisplay',
                        'linkitems' => \%toplinkitems};                         'linkitems' => \%toplinkitems,
                          'notools' => $notools};
                         
     my $render = &Apache::lonnavmaps::render($renderArgs);      my $render = &Apache::lonnavmaps::render($renderArgs);
   
     # If no resources were printed, print a reassuring message so the      # If no resources were printed, print a reassuring message so the
Removed from v.1.20  
changed lines
  Added in v.1.21

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