--- loncom/interface/statistics/lonproblemstatistics.pm	2003/08/29 21:11:25	1.57
+++ loncom/interface/statistics/lonproblemstatistics.pm	2004/03/07 21:42:19	1.70
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemstatistics.pm,v 1.57 2003/08/29 21:11:25 matthew Exp $
+# $Id: lonproblemstatistics.pm,v 1.70 2004/03/07 21:42:19 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,11 +51,21 @@ package Apache::lonproblemstatistics;
 
 use strict;
 use Apache::lonnet();
+use Apache::loncommon();
 use Apache::lonhtmlcommon;
 use Apache::loncoursedata;
 use Apache::lonstatistics;
+use Apache::lonlocal;
 use Spreadsheet::WriteExcel;
+use Apache::lonstathelpers();
 
+##
+## Localization notes:
+##
+## in @Fields[0]->{'long_title'} is placed in Excel files and is used as the
+## header for plots created with Graph.pm, both of which more than likely do
+## not support localization.
+##
 my @Fields = (
            { name => 'problem_num',
              title => 'P#',
@@ -138,7 +148,7 @@ my @Fields = (
              title  => '#YES',
              align  => 'right',
              color  => '#FFDDDD',
-             format => '%d',
+             format => '%4.1f',#             format => '%d',
              sortable  => 'yes',
              graphable => 'yes',
              long_title => 'Number of Students able to Solve' },
@@ -146,7 +156,7 @@ my @Fields = (
              title  => '#yes',
              align  => 'right',
              color  => '#FFDDDD',
-             format => '%d',
+             format => '%4.1f',#             format => '%d',
              sortable  => 'yes',
              graphable => 'yes',
              long_title => 'Number of Students given Override' },
@@ -176,19 +186,19 @@ select sections, maps, and output.
 ###############################################
 my @OutputOptions = 
     (
-     { name  => 'problem statistics grouped by sequence',
+     { name  => 'grouped by sequence',
        value => 'HTML problem statistics grouped',
        description => 'Output statistics for the problem parts.',
        mode => 'html',
        show => 'grouped',
      },
-     { name  => 'problem statistics ungrouped',
+     { name  => 'ungrouped',
        value => 'HTML problem statistics ungrouped',
        description => 'Output statistics for the problem parts.',
        mode => 'html',
        show => 'ungrouped',
      },
-     { name  => 'problem statistics, Excel',
+     { name  => 'Excel',
        value => 'Excel problem statistics',
        description => 'Output statistics for the problem parts '.
            'in an Excel workbook',
@@ -199,12 +209,16 @@ my @OutputOptions =
 
 sub CreateInterface {
     my $Str = '';
+    $Str .= &Apache::lonhtmlcommon::breadcrumbs
+        (undef,'Overall Problem Statistics','Statistics_Overall_Key');
     $Str .= '<table cellspacing="5">'."\n";
     $Str .= '<tr>';
-    $Str .= '<td align="center"><b>Sections</b></td>';
-    $Str .= '<td align="center"><b>Enrollment Status</b></td>';
-    $Str .= '<td align="center"><b>Sequences and Folders</b></td>';
-    $Str .= '<td align="center"><b>Output</b></td>';
+    $Str .= '<td align="center"><b>'.&mt('Sections').'</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('Output').'</b></td>';
+    $Str .= '<td rowspan="2">'.
+        &Apache::lonstathelpers::limit_by_time_form().'</td>';
     $Str .= '</tr>'."\n";
     #
     $Str .= '<tr><td align="center">'."\n";
@@ -232,9 +246,11 @@ sub CreateInterface {
     $Str .= $html;
     $Str .= '</td></tr>'."\n";
     $Str .= '</table>'."\n";
-    $Str .= '<input type="submit" value="Generate Statistics" />';
+    $Str .= '<input type="submit" name="GenerateStatistics" value="'.
+        &mt('Generate Statistics').'" />';
     $Str .= '&nbsp;'x5;
-    $Str .= '<input type="submit" name="ClearCache" value="Clear Caches" />';
+    $Str .= '<input type="submit" name="ClearCache" value="'.
+        &mt('Clear Caches').'" />';
     $Str .= '&nbsp;'x5;
     return ($Str,$outputmode,$show);
 }
@@ -255,6 +271,18 @@ Main interface to problem statistics.
 sub BuildProblemStatisticsPage {
     my ($r,$c)=@_;
     #
+    my %Saveable_Parameters = ('Status' => 'scalar',
+                               'statsoutputmode' => 'scalar',
+                               'Section' => 'array',
+                               'StudentData' => 'array',
+                               'Maps' => 'array');
+    &Apache::loncommon::store_course_settings('statistics',
+                                              \%Saveable_Parameters);
+    &Apache::loncommon::restore_course_settings('statistics',
+                                                \%Saveable_Parameters);
+    #
+    &Apache::lonstatistics::PrepareClasslist();
+    #
     my ($interface,$output_mode,$show) = &CreateInterface();
     $r->print($interface);
     $r->print('<input type="hidden" name="statsfirstcall" value="no" />');
@@ -272,7 +300,16 @@ sub BuildProblemStatisticsPage {
         $r->print("<h2>".
                   $ENV{'course.'.$ENV{'request.course.id'}.'.description'}.
                   "</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();
         if ($show eq 'grouped') {
             &output_html_grouped_by_sequence($r);
@@ -280,10 +317,10 @@ sub BuildProblemStatisticsPage {
             &output_html_ungrouped($r);
         }
     } elsif ($output_mode eq 'excel') {
-        $r->print("<h2>Preparing Excel Spreadsheet</h2>");
+        $r->print('<h2>'.&mt('Preparing Excel Spreadsheet').'</h2>');
         &output_excel($r);
     } else {
-        $r->print("<h1>Not implemented</h1>");
+        $r->print('<h1>'.&mt('Not implemented').'</h1>');
     }
     return;
 }
@@ -478,6 +515,8 @@ sub output_excel {
         $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
             time.'_'.rand(1000000000).'.xls';
     #
+    my ($starttime,$endtime) = &Apache::lonstathelpers::get_time_limits();
+    #
     my $excel_workbook = undef;
     my $excel_sheet = undef;
     #
@@ -490,9 +529,9 @@ sub output_excel {
     # Check for errors
     if (! defined($excel_workbook)) {
         $r->log_error("Error creating excel spreadsheet $filename: $!");
-        $r->print("Problems creating new Excel file.  ".
+        $r->print(&mt("Problems creating new Excel file.  ".
                   "This error has been logged.  ".
-                  "Please alert your LON-CAPA administrator");
+                  "Please alert your LON-CAPA administrator."));
         return ;
     }
     #
@@ -507,7 +546,9 @@ sub output_excel {
     if (length($sheetname) > 31) {
         $sheetname = substr($sheetname,0,31);
     }
-    $excel_sheet = $excel_workbook->addworksheet($sheetname);
+    $excel_sheet = $excel_workbook->addworksheet(
+                       &Apache::loncommon::clean_excel_name($sheetname)
+                                                 );
     #
     # Put the course description in the header
     $excel_sheet->write($rows_output,$cols_output++,
@@ -534,6 +575,22 @@ sub output_excel {
     $excel_sheet->write($rows_output,$cols_output++,$sectionstring);
     $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
     $excel_sheet->write($rows_output,$cols_output++,
                         'Compiled on '.localtime(time));
@@ -556,6 +613,8 @@ sub output_excel {
     # Brief headers
     foreach my $field (@Fields) {
         next if ($field->{'name'} eq 'problem_num');
+        # Use english for excel as I am not sure how well excel handles 
+        # other character sets....
         $excel_sheet->write($rows_output,$cols_output++,$field->{'title'});
     }
     $rows_output++;
@@ -589,7 +648,8 @@ sub output_excel {
     $excel_workbook->close();
     # Tell the user where to get their excel file
     $r->print('<br />'.
-              '<a href="'.$filename.'">Your Excel spreadsheet.</a>'."\n");
+              '<a href="'.$filename.'">'.
+              &mt('Your Excel Spreadsheet').'</a>'."\n");
     $r->rflush();
     return;
 }
@@ -645,7 +705,7 @@ sub statistics_table_header {
                 'document.Statistics.sortby.value='."'".$field->{'name'}."'".
                     ';document.Statistics.submit();">';
         }
-        $header_row .= $field->{'title'};
+        $header_row .= &mt($field->{'title'});
         if ($options =~ /sortable/) {
             $header_row.= '</a>';
         }
@@ -656,7 +716,7 @@ sub statistics_table_header {
             $header_row .= '<a href="javascript:'.
                 "document.Statistics.plot.value='$field->{'name'}'".
                     ';document.Statistics.submit();">';
-            $header_row .= 'plot</a>)';
+            $header_row .= &mt('plot').'</a>)';
         }
         $header_row .= '</th>';
     }
@@ -738,8 +798,13 @@ sub plot_statistics {
         }
     }
     
-    $r->print("<p>".&DrawGraph(\@Data,$title,'Problem Number',$yaxis,
-                               $Max)."</p>\n");
+    $r->print("<p>".&Apache::loncommon::DrawBarGraph($title,
+                                                     'Problem Number',
+                                                     $yaxis,
+                                                     $Max,
+                                                     undef, # colors
+                                                     undef, # labels
+                                                     \@Data)."</p>\n");
     #
     # Print out the data
     $ENV{'form.sortby'} = 'Contents';
@@ -747,47 +812,36 @@ sub plot_statistics {
     return;
 }
 
-###############################################
-###############################################
+########################################################
+########################################################
 
-=pod 
+=pod
 
-=item &DrawGraph()
+=item &get_statistics()
 
-=cut
+Wrapper routine from the call to loncoursedata::get_problem_statistics.  
+Calls lonstathelpers::get_time_limits() to limit the data set by time.
 
-###############################################
-###############################################
-sub DrawGraph {
-    my ($values,$title,$xaxis,$yaxis,$Max)=@_;
-    $title = '' if (! defined($title));
-    $xaxis = '' if (! defined($xaxis));
-    $yaxis = '' if (! defined($yaxis));
-    #
-    my $sendValues = join(',', @$values);
-    my $sendCount = scalar(@$values);
-    $Max =1 if ($Max < 1);
-    if ( int($Max) < $Max ) {
-        $Max++;
-        $Max = int($Max);
-    }
-    my @GData = ($title,$xaxis,$yaxis,$Max,$sendCount,$sendValues);
-    return '<IMG src="/cgi-bin/graph.png?'.
-        (join('&', @GData)).'" border="1" />';
-}
+Inputs: $sequence, $resource, $part, $problem_num
 
+Returns: Hash reference with statistics data from 
+loncoursedata::get_problem_statistics.
+
+=cut
+
+########################################################
+########################################################
 sub get_statistics {
     my ($sequence,$resource,$part,$problem_num) = @_;
     #
+    my ($starttime,$endtime) = &Apache::lonstathelpers::get_time_limits();
     my $symb = $resource->{'symb'};
     my $courseid = $ENV{'request.course.id'};
     #
-    my $students = \@Apache::lonstatistics::Students;
-    if ($Apache::lonstatistics::SelectedSections[0] eq 'all') {
-        $students = undef;
-    }
     my $data = &Apache::loncoursedata::get_problem_statistics
-                        ($students,$symb,$part,$courseid);
+                        (\@Apache::lonstatistics::SelectedSections,
+                         $Apache::lonstatistics::enrollment_status,
+                         $symb,$part,$courseid,$starttime,$endtime);
     $data->{'part'}        = $part;
     $data->{'problem_num'} = $problem_num;
     $data->{'container'}   = $sequence->{'title'};
@@ -805,6 +859,8 @@ sub get_statistics {
 
 =item &ProblemStatisticsLegend()
 
+HELP  This needs to be localized, or at least generated automatically.
+
 =cut
 
 ###############################################