Diff for /loncom/interface/lonstatistics.pm between versions 1.123 and 1.128

version 1.123, 2005/04/07 06:56:23 version 1.128, 2006/02/14 16:05:37
Line 73  use Apache::lonstudentassessment(); Line 73  use Apache::lonstudentassessment();
 use Apache::lonpercentage;  use Apache::lonpercentage;
 use Apache::lonstudentsubmissions();  use Apache::lonstudentsubmissions();
 use Apache::lonsurveyreports();  use Apache::lonsurveyreports();
   use Apache::longradinganalysis();
   
 #######################################################  #######################################################
 #######################################################  #######################################################
Line 197  sub PrepareClasslist { Line 198  sub PrepareClasslist {
     my $cid  = $env{'request.course.id'};      my $cid  = $env{'request.course.id'};
     my $cdom = $env{'course.'.$cid.'.domain'};      my $cdom = $env{'course.'.$cid.'.domain'};
     my $cnum = $env{'course.'.$cid.'.num'};      my $cnum = $env{'course.'.$cid.'.num'};
     my ($classlist,$field_names) = &Apache::loncoursedata::get_classlist($cid,      my ($classlist,$field_names) = &Apache::loncoursedata::get_classlist($cdom,
                                                                   $cdom,$cnum);   $cnum);
     my @selected_sections = &get_selected_sections();      my @selected_sections = &get_selected_sections();
     #      #
     # Deal with instructors with restricted section access      # Deal with instructors with restricted section access
Line 267  sub PrepareClasslist { Line 268  sub PrepareClasslist {
     # Sort the Students      # Sort the Students
     my $sortby = 'fullname';      my $sortby = 'fullname';
     $sortby = $env{'form.sort'} if (exists($env{'form.sort'}));      $sortby = $env{'form.sort'} if (exists($env{'form.sort'}));
     my @TmpStudents = sort { $a->{$sortby} cmp $b->{$sortby} ||      my @TmpStudents = sort { lc($a->{$sortby}) cmp lc($b->{$sortby}) ||
                              $a->{'fullname'} cmp $b->{'fullname'} } @Students;                               lc($a->{'fullname'}) cmp lc($b->{'fullname'}) ||
        lc($a->{'username'}) cmp lc($b->{'username'}) } @Students;
     @Students = @TmpStudents;      @Students = @TmpStudents;
     #       # 
     # Now deal with that current student thing....      # Now deal with that current student thing....
Line 298  sub PrepareClasslist { Line 300  sub PrepareClasslist {
     }      }
     #      #
     if (exists($env{'form.StudentData'})) {      if (exists($env{'form.StudentData'})) {
         if (ref($env{'form.StudentData'}) eq 'ARRAY') {   @SelectedStudentData = 
             @SelectedStudentData = @{$env{'form.StudentData'}};      &Apache::loncommon::get_env_multiple('form.StudentData');
         } else {  
             @SelectedStudentData = ($env{'form.StudentData'});  
         }  
     } else {      } else {
         @SelectedStudentData = ('username');          @SelectedStudentData = ('username');
     }      }
Line 330  Returns an array of the selected section Line 329  Returns an array of the selected section
 #######################################################  #######################################################
 #######################################################  #######################################################
 sub get_selected_sections {  sub get_selected_sections {
     my @selected_sections;      my @selected_sections = 
     if (exists($env{'form.Section'})) {   &Apache::loncommon::get_env_multiple('form.Section');
         if (ref($env{'form.Section'})) {  
             @selected_sections = @{$env{'form.Section'}};  
         } elsif ($env{'form.Section'} !~ /^\s*$/) {  
             @selected_sections = ($env{'form.Section'});  
         }  
     }  
     @selected_sections = ('all') if (! @selected_sections);      @selected_sections = ('all') if (! @selected_sections);
     foreach (@selected_sections) {      foreach (@selected_sections) {
         if ($_ eq 'all') {          if ($_ eq 'all') {
Line 569  Returns: Array of symbs of selected maps Line 562  Returns: Array of symbs of selected maps
 #######################################################  #######################################################
 sub get_selected_maps {  sub get_selected_maps {
     my ($elementname) = @_;      my ($elementname) = @_;
     my @selected_maps;      my @selected_maps = 
     if (exists($env{'form.'.$elementname})) {   &Apache::loncommon::get_env_multiple('form.'.$elementname);
         if (ref($env{'form.'.$elementname})) {      @selected_maps = ('all') if (! @selected_maps);
             @selected_maps = @{$env{'form.'.$elementname}};  
         } else {  
             @selected_maps = ($env{'form.'.$elementname});  
         }  
     } else {  
         @selected_maps = ('all');  
     }  
     foreach my $map (@selected_maps) {      foreach my $map (@selected_maps) {
         if ($map eq 'all') {          if ($map eq 'all') {
             @selected_maps = ('all');              @selected_maps = ('all');
Line 929  sub CreateMainMenu { Line 915  sub CreateMainMenu {
                      short_description =>                        short_description => 
     &mt('Display a histogram of student performance in the course.'),      &mt('Display a histogram of student performance in the course.'),
                  },                   },
   #                   { internal_name => 'grading_analysis',
   #                     name => &mt('Detailed Grading Analysis'),
   #                     short_description => 
   #    &mt('Display statistics about who graded who.'),
   #                 },
 #                   { internal_name => 'student_assessment',  #                   { internal_name => 'student_assessment',
 #                     name => &mt('Problem Status Chart'),  #                     name => &mt('Problem Status Chart'),
 #                     short_description =>   #                     short_description => 
Line 1093  ENDSTYLE Line 1084  ENDSTYLE
                 ({href=>'/adm/statistics?reportselected=student_assessment',                  ({href=>'/adm/statistics?reportselected=student_assessment',
                   text=>'Chart'});                    text=>'Chart'});
             &Apache::lonstudentassessment::BuildStudentAssessmentPage($r,$c);              &Apache::lonstudentassessment::BuildStudentAssessmentPage($r,$c);
         }          } elsif($GoToPage eq 'grading_analysis') {
               &Apache::lonhtmlcommon::add_breadcrumb
                   ({href=>'/adm/statistics?reportselected=grading_anaylsis',
                     text=>'Grading Analysis'});
               &Apache::longradinganalysis::build_grading_analysis_page($r,$c);
    }
         #          #
         $r->print("</form>\n");          $r->print("</form>\n");
     }      }

Removed from v.1.123  
changed lines
  Added in v.1.128


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