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

Diff for /loncom/interface/statistics/lonproblemstatistics.pm between versions 1.69 and 1.70

version 1.69, 2004/03/01 16:39:19 version 1.70, 2004/03/07 21:42:19
Line 57  use Apache::loncoursedata; Line 57  use Apache::loncoursedata;
 use Apache::lonstatistics;  use Apache::lonstatistics;
 use Apache::lonlocal;  use Apache::lonlocal;
 use Spreadsheet::WriteExcel;  use Spreadsheet::WriteExcel;
   use Apache::lonstathelpers();
   
 ##  ##
 ## Localization notes:  ## Localization notes:
Line 185  select sections, maps, and output. Line 186  select sections, maps, and output.
 ###############################################  ###############################################
 my @OutputOptions =   my @OutputOptions = 
     (      (
      { name  => 'problem statistics grouped by sequence',       { name  => 'grouped by sequence',
        value => 'HTML problem statistics grouped',         value => 'HTML problem statistics grouped',
        description => 'Output statistics for the problem parts.',         description => 'Output statistics for the problem parts.',
        mode => 'html',         mode => 'html',
        show => 'grouped',         show => 'grouped',
      },       },
      { name  => 'problem statistics ungrouped',       { name  => 'ungrouped',
        value => 'HTML problem statistics ungrouped',         value => 'HTML problem statistics ungrouped',
        description => 'Output statistics for the problem parts.',         description => 'Output statistics for the problem parts.',
        mode => 'html',         mode => 'html',
        show => 'ungrouped',         show => 'ungrouped',
      },       },
      { name  => 'problem statistics, Excel',       { name  => 'Excel',
        value => 'Excel problem statistics',         value => 'Excel problem statistics',
        description => 'Output statistics for the problem parts '.         description => 'Output statistics for the problem parts '.
            'in an Excel workbook',             'in an Excel workbook',
Line 216  sub CreateInterface { Line 217  sub CreateInterface {
     $Str .= '<td align="center"><b>'.&mt('Enrollment Status').'</b></td>';      $Str .= '<td align="center"><b>'.&mt('Enrollment Status').'</b></td>';
     $Str .= '<td align="center"><b>'.&mt('Sequences and Folders').'</b></td>';      $Str .= '<td align="center"><b>'.&mt('Sequences and Folders').'</b></td>';
     $Str .= '<td align="center"><b>'.&mt('Output').'</b></td>';      $Str .= '<td align="center"><b>'.&mt('Output').'</b></td>';
       $Str .= '<td rowspan="2">'.
           &Apache::lonstathelpers::limit_by_time_form().'</td>';
     $Str .= '</tr>'."\n";      $Str .= '</tr>'."\n";
     #      #
     $Str .= '<tr><td align="center">'."\n";      $Str .= '<tr><td align="center">'."\n";
Line 297  sub BuildProblemStatisticsPage { Line 300  sub BuildProblemStatisticsPage {
         $r->print("<h2>".          $r->print("<h2>".
                   $ENV{'course.'.$ENV{'request.course.id'}.'.description'}.                    $ENV{'course.'.$ENV{'request.course.id'}.'.description'}.
                   "</h2>\n");                    "</h2>\n");
         $r->print("<h3>".localtime(time)."</h3>");          my ($starttime,$endtime) = &Apache::lonstathelpers::get_time_limits();
           if (defined($starttime) || defined($endtime)) {
               # Inform the user what the time limits on the data are.
               $r->print('<h3>'.&mt('Statistics on submissions from [_1] to [_2]',
                                    &Apache::lonlocal::locallocaltime($starttime),
                                    &Apache::lonlocal::locallocaltime($endtime)).
                         '</h3>');
           }
           $r->print("<h3>".&mt('Compiled on [_1]',
                                &Apache::lonlocal::locallocaltime(time))."</h3>");
         $r->rflush();          $r->rflush();
         if ($show eq 'grouped') {          if ($show eq 'grouped') {
             &output_html_grouped_by_sequence($r);              &output_html_grouped_by_sequence($r);
Line 503  sub output_excel { Line 515  sub output_excel {
         $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.          $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
             time.'_'.rand(1000000000).'.xls';              time.'_'.rand(1000000000).'.xls';
     #      #
       my ($starttime,$endtime) = &Apache::lonstathelpers::get_time_limits();
       #
     my $excel_workbook = undef;      my $excel_workbook = undef;
     my $excel_sheet = undef;      my $excel_sheet = undef;
     #      #
Line 561  sub output_excel { Line 575  sub output_excel {
     $excel_sheet->write($rows_output,$cols_output++,$sectionstring);      $excel_sheet->write($rows_output,$cols_output++,$sectionstring);
     $cols_output += scalar(@Sections);      $cols_output += scalar(@Sections);
     #      #
       # Time restrictions
       my $time_string;
       if (defined($starttime)) {
           # call localtime but not lonlocal:locallocaltime because excel probably
           # cannot handle localized text.  Probably.
           $time_string .= 'Data collected from '.localtime($time_string);
           if (defined($endtime)) {
               $time_string .= ' to '.localtime($endtime);
           }
           $time_string .= '.';
       } elsif (defined($endtime)) {
           # See note above about lonlocal:locallocaltime
           $time_string .= 'Data collected before '.localtime($endtime).'.';
       }
       
       #
     # Put the date in there too      # Put the date in there too
     $excel_sheet->write($rows_output,$cols_output++,      $excel_sheet->write($rows_output,$cols_output++,
                         'Compiled on '.localtime(time));                          'Compiled on '.localtime(time));
Line 782  sub plot_statistics { Line 812  sub plot_statistics {
     return;      return;
 }  }
   
   ########################################################
   ########################################################
   
   =pod
   
   =item &get_statistics()
   
   Wrapper routine from the call to loncoursedata::get_problem_statistics.  
   Calls lonstathelpers::get_time_limits() to limit the data set by time.
   
   Inputs: $sequence, $resource, $part, $problem_num
   
   Returns: Hash reference with statistics data from 
   loncoursedata::get_problem_statistics.
   
   =cut
   
   ########################################################
   ########################################################
 sub get_statistics {  sub get_statistics {
     my ($sequence,$resource,$part,$problem_num) = @_;      my ($sequence,$resource,$part,$problem_num) = @_;
     #      #
       my ($starttime,$endtime) = &Apache::lonstathelpers::get_time_limits();
     my $symb = $resource->{'symb'};      my $symb = $resource->{'symb'};
     my $courseid = $ENV{'request.course.id'};      my $courseid = $ENV{'request.course.id'};
     #      #
     my $data = &Apache::loncoursedata::get_problem_statistics      my $data = &Apache::loncoursedata::get_problem_statistics
                         (\@Apache::lonstatistics::SelectedSections,                          (\@Apache::lonstatistics::SelectedSections,
                          $Apache::lonstatistics::enrollment_status,                           $Apache::lonstatistics::enrollment_status,
                          $symb,$part,$courseid);                           $symb,$part,$courseid,$starttime,$endtime);
     $data->{'part'}        = $part;      $data->{'part'}        = $part;
     $data->{'problem_num'} = $problem_num;      $data->{'problem_num'} = $problem_num;
     $data->{'container'}   = $sequence->{'title'};      $data->{'container'}   = $sequence->{'title'};
Removed from v.1.69  
changed lines
  Added in v.1.70

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