Diff for /loncom/interface/lonstatistics.pm between versions 1.100 and 1.104

version 1.100, 2004/03/01 16:39:19 version 1.104, 2004/06/15 14:22:45
Line 77  use Apache::lonproblemstatistics(); Line 77  use Apache::lonproblemstatistics();
 use Apache::lonstudentassessment();  use Apache::lonstudentassessment();
 use Apache::lonpercentage;  use Apache::lonpercentage;
 use Apache::lonstudentsubmissions();  use Apache::lonstudentsubmissions();
   use Apache::lonsurveyreports();
   
 #######################################################  #######################################################
 #######################################################  #######################################################
Line 471  assessments. Line 472  assessments.
 #######################################################  #######################################################
 #######################################################  #######################################################
 sub Sequences_with_Assess {  sub Sequences_with_Assess {
       my ($mode) = @_;
       $mode = 'selected' if (! defined($mode));
     my @Sequences_to_Show;      my @Sequences_to_Show;
     foreach my $map_symb (@SelectedMaps) {      foreach my $sequence (@Sequences) {
         foreach my $sequence (@Sequences) {          next if ($sequence->{'num_assess'} < 1);
             next if ($sequence->{'symb'} ne $map_symb && $map_symb ne 'all');          if ($mode eq 'all') {
             next if ($sequence->{'num_assess'} < 1);  
             push (@Sequences_to_Show,$sequence);              push (@Sequences_to_Show,$sequence);
           } elsif ($mode eq 'selected') {
               foreach my $map_symb (@SelectedMaps) {
                   if ($sequence->{'symb'} eq $map_symb || $map_symb eq 'all'){
                       push (@Sequences_to_Show,$sequence);
                       last; # Only put it in once
                   }
               }
         }          }
   
     }      }
     return @Sequences_to_Show;      return @Sequences_to_Show;
 }  }
Line 896  Ensures all student data is up to date. Line 906  Ensures all student data is up to date.
 ###############################################  ###############################################
 ###############################################  ###############################################
 sub Gather_Full_Student_Data {  sub Gather_Full_Student_Data {
     my ($r) = @_;      my ($r,$formname,$inputname) = @_;
       my $status_type;
       if (defined($formname)) {
           $status_type = 'inline';
       } else {
           $status_type = 'popup';
       }
     my $c = $r->connection();      my $c = $r->connection();
     #      #
     &Apache::loncoursedata::clear_internal_caches();      &Apache::loncoursedata::clear_internal_caches();
Line 906  sub Gather_Full_Student_Data { Line 922  sub Gather_Full_Student_Data {
     # Open the progress window      # Open the progress window
     my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin      my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
         ($r,&mt('Student Data Compilation Status'),          ($r,&mt('Student Data Compilation Status'),
          &mt('Student Data Compilation Progress'), scalar(@Students));           &mt('Student Data Compilation Progress'), scalar(@Students),
            $status_type,undef,$formname,$inputname);
     #      #
     while (my $student = shift @Students) {      while (my $student = shift @Students) {
         return if ($c->aborted());          return if ($c->aborted());
Line 971  sub DisplayClasslist { Line 988  sub DisplayClasslist {
     $Str .= '<table border="0"><tr><td bgcolor="#777777">'."\n";      $Str .= '<table border="0"><tr><td bgcolor="#777777">'."\n";
     $Str .= '<table border="0" cellpadding="3"><tr bgcolor="#e6ffff">'."\n";      $Str .= '<table border="0" cellpadding="3"><tr bgcolor="#e6ffff">'."\n";
     foreach my $field (@Fields) {      foreach my $field (@Fields) {
         $Str .= '<th><a href="/adm/statistics?reportSelected=classlist&sort='.$field.'">'.$field.          $Str .= '<th><a href="/adm/statistics?'.
               'reportSelected=student_assessment&'.
               'selectstudent=1&'.
               'sort='.$field.'">'.$field.
             '</a></th>';              '</a></th>';
     }      }
     $Str .= '</tr>'."\n";      $Str .= '</tr>'."\n";
Line 1036  sub CreateMainMenu { Line 1056  sub CreateMainMenu {
                      short_description =>                        short_description => 
     &mt('Prepare Excel spreadsheets of student submissions.'),      &mt('Prepare Excel spreadsheets of student submissions.'),
                  },                   },
                      { internal_name => 'survey_reports',
                        name => &mt('Survey Reports'),
                        short_description => 
       &mt('Prepare reports on survey results.'),
                    },
                    { internal_name => 'correct_problems_plot',                     { internal_name => 'correct_problems_plot',
                      name => &mt('Correct Problems Plot'),                       name => &mt('Correct Problems Plot'),
                      short_description =>                        short_description => 
Line 1181  sub handler { Line 1206  sub handler {
                   '/adm/statistics?reportselected=student_submission_reports',                    '/adm/statistics?reportselected=student_submission_reports',
                   text=>'Student Submission Reports'});                    text=>'Student Submission Reports'});
             &Apache::lonstudentsubmissions::BuildStudentSubmissionsPage($r,$c);              &Apache::lonstudentsubmissions::BuildStudentSubmissionsPage($r,$c);
           } elsif($GoToPage eq 'survey_reports') {
               &Apache::lonhtmlcommon::add_breadcrumb
                   ({href=>
                     '/adm/statistics?reportselected=survey_reports',
                     text=>'Survey Reports'});
               &Apache::lonsurveyreports::BuildSurveyReportsPage($r,$c);
         } elsif($GoToPage eq 'correct_problems_plot') {          } elsif($GoToPage eq 'correct_problems_plot') {
             &Apache::lonhtmlcommon::add_breadcrumb              &Apache::lonhtmlcommon::add_breadcrumb
                 ({href=>'/adm/statistics?reportselected=correct_problems_plot',                  ({href=>'/adm/statistics?reportselected=correct_problems_plot',

Removed from v.1.100  
changed lines
  Added in v.1.104


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