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

Diff for /loncom/interface/lonstatistics.pm between versions 1.68 and 1.73

version 1.68, 2003/05/12 22:07:17 version 1.73, 2003/05/29 21:44:53
Line 206  upon the calling context. Line 206  upon the calling context.
 #######################################################  #######################################################
 #######################################################  #######################################################
 sub PrepareClasslist {  sub PrepareClasslist {
     my $r = shift;  
     my %Sections;      my %Sections;
     &clear_classlist_variables();      &clear_classlist_variables();
     #      #
Line 230  sub PrepareClasslist { Line 229  sub PrepareClasslist {
         }          }
     }      }
     #      #
       # Deal with instructors with restricted section access
       if ($ENV{'request.course.sec'} !~ /^\s*$/) {
           @SelectedSections = ($ENV{'request.course.sec'});
       }
       #
     # Set up %StudentData      # Set up %StudentData
     @StudentDataOrder = qw/fullname username domain id section status/;      @StudentDataOrder = qw/fullname username domain id section status/;
     foreach my $field (@StudentDataOrder) {      foreach my $field (@StudentDataOrder) {
Line 238  sub PrepareClasslist { Line 242  sub PrepareClasslist {
         $StudentData{$field}->{'width'} =           $StudentData{$field}->{'width'} = 
                                $StudentData{$field}->{'base_width'};                                 $StudentData{$field}->{'base_width'};
     }      }
   
     #      #
     # get the status requested      # get the status requested
     my $requested_status = 'Active';      my $requested_status = 'Active';
Line 282  sub PrepareClasslist { Line 285  sub PrepareClasslist {
     }      }
     #      #
     # Put the consolidated section data in the right place      # Put the consolidated section data in the right place
     @Sections = sort {$a cmp $b} keys(%Sections);      if ($ENV{'request.course.sec'} !~ /^\s*$/) {
     unshift(@Sections,'all'); # Put 'all' at the front of the list          @Sections = ($ENV{'request.course.sec'});
       } else {
           @Sections = sort {$a cmp $b} keys(%Sections);
           unshift(@Sections,'all'); # Put 'all' at the front of the list
       }
     #      #
     # Sort the Students      # Sort the Students
     my $sortby = 'fullname';      my $sortby = 'fullname';
Line 293  sub PrepareClasslist { Line 300  sub PrepareClasslist {
     @Students = @TmpStudents;      @Students = @TmpStudents;
     #       # 
     # Now deal with that current student thing....      # Now deal with that current student thing....
     if (exists($ENV{'form.StudentAssessmentStudent'})) {      $curr_student = undef;
       if (exists($ENV{'form.SelectedStudent'})) {
         my ($current_uname,$current_dom) =           my ($current_uname,$current_dom) = 
             split(':',$ENV{'form.StudentAssessmentStudent'});              split(':',$ENV{'form.SelectedStudent'});
         my $i;          my $i;
         for ($i = 0; $i<=$#Students; $i++) {          for ($i = 0; $i<=$#Students; $i++) {
             next if (($Students[$i]->{'username'} ne $current_uname) ||               next if (($Students[$i]->{'username'} ne $current_uname) || 
Line 303  sub PrepareClasslist { Line 311  sub PrepareClasslist {
             $curr_student = $Students[$i];              $curr_student = $Students[$i];
             last; # If we get here, we have our student.              last; # If we get here, we have our student.
         }          }
         if ($i == 0) {          if (defined($curr_student)) {
             $prev_student = 'none';              if ($i == 0) {
         } else {                  $prev_student = undef;
             $prev_student = $Students[$i-1];              } else {
         }                  $prev_student = $Students[$i-1];
         if ($i == $#Students) {              }
             $next_student = 'none';              if ($i == $#Students) {
         } else {                  $next_student = undef;
             $next_student = $Students[$i+1];              } else {
                   $next_student = $Students[$i+1];
               }
         }          }
     }      }
     #      #
Line 322  sub PrepareClasslist { Line 332  sub PrepareClasslist {
             @SelectedStudentData = ($ENV{'form.StudentData'});              @SelectedStudentData = ($ENV{'form.StudentData'});
         }          }
     } else {      } else {
         @SelectedStudentData = ('fullname');          @SelectedStudentData = ('username');
     }      }
     foreach (@SelectedStudentData) {      foreach (@SelectedStudentData) {
         if ($_ eq 'all') {          if ($_ eq 'all') {
Line 334  sub PrepareClasslist { Line 344  sub PrepareClasslist {
     return;      return;
 }  }
   
   
   #######################################################
   #######################################################
   
   =pod
   
   =item get_students
   
   Returns a list of the selected students
   
   =cut
   
   #######################################################
   #######################################################
   sub get_students {
       if (! @Students) {
           &PrepareClasslist()
       }
       return @Students;
   }
   
 #######################################################  #######################################################
 #######################################################  #######################################################
   
Line 349  selected student. Line 380  selected student.
 #######################################################  #######################################################
 #######################################################  #######################################################
 sub current_student {   sub current_student { 
     if (defined($curr_student)) {      return $curr_student;
         return $curr_student;  
     } else {  
         return 'All Students';  
     }  
 }  }
   
 #######################################################  #######################################################
Line 371  in the list of students.  Or something. Line 398  in the list of students.  Or something.
 #######################################################  #######################################################
 #######################################################  #######################################################
 sub previous_student {   sub previous_student { 
     if (defined($prev_student)) {      return $prev_student;
         return $prev_student;  
     } else {  
         return 'No Student Selected';  
     }  
 }  }
   
 #######################################################  #######################################################
Line 393  to be viewed. Line 416  to be viewed.
 #######################################################  #######################################################
 #######################################################  #######################################################
 sub next_student {   sub next_student { 
     if (defined($next_student)) {      return $next_student;
         return $next_student;  
     } else {  
         return 'No Student Selected';  
     }  
 }  }
   
 #######################################################  #######################################################
Line 731  sub MapSelect { Line 750  sub MapSelect {
 Returns html for a selection box allowing the user to choose one (or more)   Returns html for a selection box allowing the user to choose one (or more) 
 of the sections in the course.    of the sections in the course.  
   
   Uses the package variables @Sections and @SelectedSections
 =over 4  =over 4
   
 =item $elementname The name of the HTML form element  =item $elementname The name of the HTML form element
Line 739  of the sections in the course. Line 759  of the sections in the course.
   
 =item $numvisible The number of options to be visible  =item $numvisible The number of options to be visible
   
 =item $selected Array ref to the names of the already selected sections.  
 If undef, $ENV{'form.'.$elementname} is used.    
 If $ENV{'form.'.$elementname} is also empty, none will be selected.  
   
 =item $restriction Code reference to subroutine which returns true or   
 false.  The code must expect a reference to a sequence data structure.  
   
 =back  =back
   
 =cut  =cut
Line 758  sub SectionSelect { Line 771  sub SectionSelect {
         return;          return;
     }      }
     #      #
       # Make sure we have the data we need to continue
       if (! @Sections) {
           &PrepareClasslist()
       }
       #
     # Build the form element      # Build the form element
     my $Str = "\n";      my $Str = "\n";
     $Str .= '<select name="'.$elementname.'" ';      $Str .= '<select name="'.$elementname.'" ';
Line 812  sub DisplayClasslist { Line 830  sub DisplayClasslist {
             if ($field eq 'fullname') {              if ($field eq 'fullname') {
                 $Str .= '<a href="/adm/statistics?reportSelected=';                  $Str .= '<a href="/adm/statistics?reportSelected=';
                 $Str .= &Apache::lonnet::escape('student_assessment');                  $Str .= &Apache::lonnet::escape('student_assessment');
                 $Str .= '&StudentAssessmentStudent=';                  $Str .= '&sort='.&Apache::lonnet::escape($ENV{'form.sort'});
                   $Str .= '&SelectedStudent=';
                 $Str .= &Apache::lonnet::escape($sname).'">';                  $Str .= &Apache::lonnet::escape($sname).'">';
                 $Str .= $student->{$field}.'&nbsp';                  $Str .= $student->{$field}.'&nbsp';
                 $Str .= '</a>';                  $Str .= '</a>';
Line 840  sub CreateMainMenu { Line 859  sub CreateMainMenu {
     #      #
     $Str .= '<table border="0"><tbody><tr>'."\n";      $Str .= '<table border="0"><tbody><tr>'."\n";
     $Str .= '<td></td>'."\n";      $Str .= '<td></td>'."\n";
     $Str .= '<td></td>'."\n";  
     $Str .= '<td align="center"><b>Select a Report</b></td>'."\n";      $Str .= '<td align="center"><b>Select a Report</b></td>'."\n";
       $Str .= '<td></td>'."\n";
       $Str .= '<td></td>'."\n";
     $Str .= '<tr>'."\n";      $Str .= '<tr>'."\n";
     #      #
     $Str .= '<td align="center">'.      $Str .= '<td align="center">'.
         '<input type="submit" name="Refresh" value="Update Display" />'.          '<input type="submit" name="Refresh" value="Update Display" />'.
             "</td>\n";              "</td>\n";
     $Str .= '<td align="center">'.  
         '<input type="submit" name="ClearCache" value="Clear Caches" />'.  
             "</td>\n";  
     #      #
     $Str .= '<td align="center">';      $Str .= '<td align="center">';
     $Str .= '<select name="reportSelected" >'."\n";      $Str .= '<select name="reportSelected" >'."\n";
Line 862  sub CreateMainMenu { Line 879  sub CreateMainMenu {
     }      }
     $Str .= '</select></td>'."\n";      $Str .= '</select></td>'."\n";
     #      #
       $Str .= '<td>'.('&nbsp;'x30).'</td>';
       $Str .= '<td align="center">'.
           '<input type="submit" name="ClearCache" value="Clear Caches" />'.
               "</td>\n";
     $Str .= '</tr></tbody></table>'."\n";      $Str .= '</tr></tbody></table>'."\n";
     $Str .= '<hr>'."\n";      $Str .= '<hr>'."\n";
     #      #
Line 883  sub handler { Line 904  sub handler {
     if ($loaderror) { return $loaderror; }      if ($loaderror) { return $loaderror; }
     #      #
     # Check for access      # Check for access
     unless(&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) {      if (! &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) {
         $ENV{'user.error.msg'}=          $ENV{'user.error.msg'}=
         $r->uri.":vgr:0:0:Cannot view grades for complete course";              $r->uri.":vgr:0:0:Cannot view grades for complete course";
         return HTTP_NOT_ACCEPTABLE;          if (! &Apache::lonnet::allowed('vgr',
                         $ENV{'request.course.id'}.'/'.$ENV{'request.course.sec'})) {
               $ENV{'user.error.msg'}=
                   $r->uri.":vgr:0:0:Cannot view grades with given role";
               return HTTP_NOT_ACCEPTABLE;
           }
     }      }
     #      #
     # Set document type for header only      # Set document type for header only
Line 908  sub handler { Line 934  sub handler {
     # Extract form elements from query string      # Extract form elements from query string
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['sort','reportSelected',                                              ['sort','reportSelected',
                                              'StudentAssessmentStudent']);                                               'SelectedStudent']);
     if (! exists($ENV{'form.reportSelected'})) {      if (! exists($ENV{'form.reportSelected'})) {
         $ENV{'form.reportSelected'} = 'student_assessment';          $ENV{'form.reportSelected'} = 'student_assessment';
     }      }
Line 939  END Line 965  END
     }      }
     #      #
     # Set up the statistics and chart environment      # Set up the statistics and chart environment
     &PrepareClasslist($r);      &PrepareClasslist();
     &PrepareCourseData($r);      &PrepareCourseData($r);
     #      #
     # Begin form output      # Begin form output
Removed from v.1.68  
changed lines
  Added in v.1.73

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