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

Diff for /loncom/interface/lonstatistics.pm between versions 1.115 and 1.118

version 1.115, 2005/02/25 02:37:49 version 1.118, 2005/03/01 22:25:59
Line 500  sub get_selected_maps { Line 500  sub get_selected_maps {
     } else {      } else {
         @selected_maps = ('all');          @selected_maps = ('all');
     }      }
       foreach my $map (@selected_maps) {
           if ($map eq 'all') {
               @selected_maps = ('all');
               last;
           }
       }
     return @selected_maps;      return @selected_maps;
 }  }
   
Line 509  sub get_selected_maps { Line 515  sub get_selected_maps {
   
 =pod  =pod
   
 =item &sequences_with_assessments  =item &selected_sequences_with_assessments
   
 Retrieve the sequences which were selected by the user to show.    Retrieve the sequences which were selected by the user to show.  
   
Line 523  Returns: an array containing a navmap ob Line 529  Returns: an array containing a navmap ob
   
 #######################################################  #######################################################
 #######################################################  #######################################################
 sub sequences_with_assessments {  sub selected_sequences_with_assessments {
     my ($mode) = @_;      my ($mode) = @_;
     $mode = 'selected' if (! defined($mode));      $mode = 'selected' if (! defined($mode));
     my $navmap = Apache::lonnavmaps::navmap->new();      my $navmap = Apache::lonnavmaps::navmap->new();
Line 545  sub sequences_with_assessments { Line 551  sub sequences_with_assessments {
         if ($mode eq 'all') {          if ($mode eq 'all') {
             push (@sequences_to_show,$sequence);              push (@sequences_to_show,$sequence);
         } elsif ($mode eq 'selected') {          } elsif ($mode eq 'selected') {
             foreach my $map_symb (&get_selected_maps()) {              foreach my $map_symb (&get_selected_maps('Maps')) {
                 if ($sequence->symb eq $map_symb || $map_symb eq 'all'){                  if ($sequence->symb eq $map_symb || $map_symb eq 'all'){
                     push (@sequences_to_show,$sequence);                      push (@sequences_to_show,$sequence);
                     last; # Only put it in once                      last; # Only put it in once
Line 599  sub map_select { Line 605  sub map_select {
     }      }
     $form .= 'size="'.$numvisible.'" >'."\n";      $form .= 'size="'.$numvisible.'" >'."\n";
     #      #
     # Deal with 'all'  
     foreach (@selected_maps) {  
         if ($_ eq 'all') {  
             @selected_maps = ('all');  
             last;  
         }  
     }  
     #  
     # Put in option for 'all'      # Put in option for 'all'
     $form .= '    <option value="all" ';      $form .= '    <option value="all" ';
     foreach (@selected_maps) {      if ($selected_maps[0] eq 'all') {
         if ($_ eq 'all') {          $form .= 'selected ';
             $form .= 'selected ';  
             last;  
         }  
     }      }
     $form .= ">all</option>\n";      $form .= ">all</option>\n";
     #      #
     # Loop through the sequences      # Loop through the sequences
     my @sequences = &sequences_with_assessments();      my @sequences = &selected_sequences_with_assessments('all');
     my $navmap;      my $navmap;
     if (!ref($sequences[0])) {      if (!ref($sequences[0])) {
         return $sequences[0];          return $sequences[0];
Removed from v.1.115  
changed lines
  Added in v.1.118

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