--- loncom/interface/statistics/lonproblemstatistics.pm	2004/03/26 22:04:22	1.73
+++ loncom/interface/statistics/lonproblemstatistics.pm	2004/03/29 19:50:23	1.78
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemstatistics.pm,v 1.73 2004/03/26 22:04:22 matthew Exp $
+# $Id: lonproblemstatistics.pm,v 1.78 2004/03/29 19:50:23 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -73,23 +73,34 @@ my @Fields = (
            { name => 'problem_num',
              title => 'P#',
              align => 'right',
-             color => '#FFFFE6' },
+             color => '#FFFFE6',
+             selectable => 'no',
+             selected => 'yes',
+           },
            { name   => 'container',
              title  => 'Sequence or Folder',
              align  => 'left',
              color  => '#FFFFE6',
-             sortable => 'yes' },
+             sortable => 'yes',
+             selectable => 'no',
+             selected => 'yes',
+           },
            { name   => 'title',
              title  => 'Title',
              align  => 'left',
              color  => '#FFFFE6',
              special  => 'link',
-             sortable => 'yes', },
+             sortable => 'yes', 
+             selectable => 'no',
+             selected => 'yes',
+           },
            { name   => 'part', 
              title  => 'Part',
              align  => 'left',
              color  => '#FFFFE6',
-             },
+             selectable => 'no',
+             selected => 'yes',
+           },
            { name   => 'num_students',
              title  => '#Stdnts',
              align  => 'right',
@@ -97,7 +108,10 @@ my @Fields = (
              format => '%d',
              sortable  => 'yes',
              graphable => 'yes',
-             long_title => 'Number of Students Attempting Problem' },
+             long_title => 'Number of Students Attempting Problem',
+             selectable => 'yes',
+             selected => 'yes',
+           },
            { name   => 'tries',
              title  => 'Tries',
              align  => 'right',
@@ -105,7 +119,10 @@ my @Fields = (
              format => '%d',
              sortable  => 'yes',
              graphable => 'yes',
-             long_title => 'Total Number of Tries' },
+             long_title => 'Total Number of Tries',
+             selectable => 'yes',
+             selected => 'yes',
+           },
            { name   => 'max_tries',
              title  => 'Max Tries',
              align  => 'right',
@@ -113,7 +130,10 @@ my @Fields = (
              format => '%d',
              sortable  => 'yes',
              graphable => 'yes',
-             long_title => 'Maximum Number of Tries' },
+             long_title => 'Maximum Number of Tries',
+             selectable => 'yes',
+             selected => 'yes',
+           },
            { name   => 'min_tries',
              title  => 'Min Tries',
              align  => 'right',
@@ -121,7 +141,10 @@ my @Fields = (
              format => '%d',
              sortable  => 'yes',
              graphable => 'yes',
-             long_title => 'Minumum Number of Tries' },
+             long_title => 'Minumum Number of Tries',
+             selectable => 'yes',
+             selected => 'yes',
+           },
            { name   => 'mean_tries',
              title  => 'Mean Tries',
              align  => 'right',
@@ -129,7 +152,10 @@ my @Fields = (
              format => '%5.2f',
              sortable  => 'yes',
              graphable => 'yes',
-             long_title => 'Average Number of Tries' },
+             long_title => 'Average Number of Tries',
+             selectable => 'yes',
+             selected => 'yes',
+           },
            { name   => 'std_tries',
              title  => 'S.D. tries',
              align  => 'right',
@@ -137,7 +163,10 @@ my @Fields = (
              format => '%5.2f',
              sortable  => 'yes',
              graphable => 'yes',
-             long_title => 'Standard Deviation of Number of Tries' },
+             long_title => 'Standard Deviation of Number of Tries',
+             selectable => 'yes',
+             selected => 'yes',
+           },
            { name   => 'skew_tries',
              title  => 'Skew Tries',
              align  => 'right',
@@ -145,7 +174,10 @@ my @Fields = (
              format => '%5.2f',
              sortable  => 'yes',
              graphable => 'yes',
-             long_title => 'Skew of Number of Tries' },
+             long_title => 'Skew of Number of Tries',
+             selectable => 'yes',
+             selected => 'no',
+           },
            { name   => 'num_solved',
              title  => '#YES',
              align  => 'right',
@@ -153,7 +185,10 @@ my @Fields = (
              format => '%4.1f',#             format => '%d',
              sortable  => 'yes',
              graphable => 'yes',
-             long_title => 'Number of Students able to Solve' },
+             long_title => 'Number of Students able to Solve',
+             selectable => 'yes',
+             selected => 'yes',
+           },
            { name   => 'num_override',
              title  => '#yes',
              align  => 'right',
@@ -161,7 +196,10 @@ my @Fields = (
              format => '%4.1f',#             format => '%d',
              sortable  => 'yes',
              graphable => 'yes',
-             long_title => 'Number of Students given Override' },
+             long_title => 'Number of Students given Override',
+             selectable => 'yes',
+             selected => 'yes',
+           },
            { name   => 'num_wrong',
              title  => '#Wrng',
              align  => 'right',
@@ -169,7 +207,10 @@ my @Fields = (
              format => '%4.1f',
              sortable  => 'yes',
              graphable => 'yes',
-             long_title => 'Percent of students whose final answer is wrong' },
+             long_title => 'Percent of students whose final answer is wrong',
+             selectable => 'yes',
+             selected => 'yes',
+           },
            { name   => 'deg_of_diff',
              title  => 'DoDiff',
              align  => 'right',
@@ -178,7 +219,10 @@ my @Fields = (
              sortable  => 'yes',
              graphable => 'yes',
              long_title => 'Degree of Difficulty'.
-                           '[ 1 - ((#YES+#yes) / Tries) ]'},
+                           '[ 1 - ((#YES+#yes) / Tries) ]',
+             selectable => 'yes',
+             selected => 'yes',
+           },
            { name   => 'deg_of_disc',
              title  => 'DoDisc',
              align  => 'right',
@@ -186,9 +230,61 @@ my @Fields = (
              format => '%4.2f',
              sortable  => 'yes',
              graphable => 'yes',
-             long_title => 'Degree of Discrimination' },
+             long_title => 'Degree of Discrimination',
+             selectable => 'yes',
+             selected => 'no',
+           },
 );
 
+my %SelectedFields;
+
+sub parse_field_selection {
+    #
+    # Pull out the defaults
+    if (! defined($ENV{'form.fieldselections'})) {
+        $ENV{'form.fieldselections'} = [];
+        foreach my $field (@Fields) {
+            next if ($field->{'selectable'} ne 'yes');
+            if ($field->{'selected'} eq 'yes') {
+                push(@{$ENV{'form.fieldselections'}},$field->{'name'});
+            }
+        }
+    }
+    #
+    # This should not happen, but in case it does...
+    if (ref($ENV{'form.fieldselections'}) ne 'ARRAY') {
+        $ENV{'form.fieldselections'} = [$ENV{'form.fieldselections'}];
+    }
+    #
+    # Set the field data and the selected fields (for easier checking)
+    undef(%SelectedFields);
+    foreach my $field (@Fields) {
+        next if ($field->{'selectable'} ne 'yes');
+        $field->{'selected'} = 'no';
+        foreach my $selection (@{$ENV{'form.fieldselections'}}) {
+            if ($selection eq $field->{'name'} || $selection eq 'all') {
+                $field->{'selected'} = 'yes';
+                $SelectedFields{$field->{'name'}}++;
+            }
+        }
+    }
+    return;
+}
+
+sub field_selection_input {
+    my $Str = '<select name="fieldselections" multiple size="5">'."\n";
+    $Str .= '<option value="all">all</option>'."\n";
+    foreach my $field (@Fields) {
+        next if ($field->{'selectable'} ne 'yes');
+        $Str .= '    <option value="'.$field->{'name'}.'" ';
+        if ($field->{'selected'} eq 'yes') {
+            $Str .= 'selected ';
+        }
+        $Str .= '>'.$field->{'title'}.'</option>'."\n";
+    }
+    $Str .= "</select>\n";
+}
+
 ###############################################
 ###############################################
 
@@ -204,6 +300,7 @@ select sections, maps, and output.
 ###############################################
 ###############################################
 sub CreateInterface {
+    &parse_field_selection();
     my $Str = '';
     $Str .= &Apache::lonhtmlcommon::breadcrumbs
         (undef,'Overall Problem Statistics','Statistics_Overall_Key');
@@ -212,6 +309,7 @@ sub CreateInterface {
     $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('Statistics').'</b></td>';
     $Str .= '<td rowspan="2">'.
         &Apache::lonstathelpers::limit_by_time_form().'</td>';
     $Str .= '</tr>'."\n";
@@ -232,6 +330,7 @@ sub CreateInterface {
     };
     $Str .= &Apache::lonstatistics::MapSelect('Maps','multiple,all',5,
                                               $only_seq_with_assessments);
+    $Str .= '</td><td>'.&field_selection_input();
     $Str .= '</td></tr>'."\n";
     $Str .= '</table>'."\n";
     $Str .= '<input type="submit" name="GenerateStatistics" value="'.
@@ -270,7 +369,8 @@ sub BuildProblemStatisticsPage {
                                'statsoutputmode' => 'scalar',
                                'Section' => 'array',
                                'StudentData' => 'array',
-                               'Maps' => 'array');
+                               'Maps' => 'array',
+                               'fieldselections'=> 'array');
     &Apache::loncommon::store_course_settings('statistics',
                                               \%Saveable_Parameters);
     &Apache::loncommon::restore_course_settings('statistics',
@@ -310,18 +410,34 @@ sub BuildProblemStatisticsPage {
     # This probably does not need to be done each time we are called, but
     # it does not slow things down noticably.
     &Apache::loncoursedata::populate_weight_table();
+    #
     if (exists($ENV{'form.Excel'})) {
         &Excel_output($r);
     } else {
+        my $count = 0;
+        foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
+            $count += $seq->{'num_assess_parts'};
+        }
+        if ($count > 10) {
+            $r->print('<h2>'.
+                      &mt('Compiling statistics for [_1] problems',$count).
+                      '</h2>');
+            if ($count > 30) {
+                $r->print('<h3>'.&mt('This will take some time.').'</h3>');
+            }
+            $r->rflush();
+        }
+        #
         my $sortby = $ENV{'form.sortby'};
         $sortby = 'container' if (! defined($sortby) || $sortby =~ /^\s*$/);
         my $plot = $ENV{'form.plot'};
-        &Apache::lonnet::logthis('form.plot = '.$plot);
+        if ($plot eq '' || $plot eq 'none') {
+            undef($plot);
+        }
         if ($sortby eq 'container' && ! defined($plot)) {
             &output_html_by_sequence($r);
         } else {
             if (defined($plot)) {
-                &Apache::lonnet::logthis('calling plot routine');
                 &make_plot($r,$plot);
             }
             &output_html_stats($r);
@@ -385,7 +501,6 @@ sub output_html_stats {
     return;
 }
 
-
 sub html_preamble {
     my $Str='';
     $Str .= "<h2>".
@@ -417,6 +532,7 @@ sub statistics_html_table_data {
     my $row = '';
     foreach my $field (@Fields) {
         next if ($options =~ /no $field->{'name'}/);
+        next if ($field->{'selected'} ne 'yes');
         $row .= '<td bgcolor="'.$field->{'color'}.'"';
         if (exists($field->{'align'})) {
             $row .= ' align="'.$field->{'align'}.'"';
@@ -443,6 +559,7 @@ sub statistics_table_header {
     my $header_row;
     foreach my $field (@Fields) {
         next if ($options =~ /no $field->{'name'}/);
+        next if ($field->{'selected'} ne 'yes');
         $header_row .= '<th>';
         if (exists($field->{'sortable'}) && $field->{'sortable'} eq 'yes') {
             $header_row .= '<a href="javascript:'.
@@ -480,6 +597,8 @@ sub make_plot {
     &sort_data($ENV{'form.sortby'});
     if ($plot eq 'degrees') {
         &degrees_plot($r);
+    } elsif ($plot eq 'tries statistics') {
+        &tries_data_plot($r);
     } else {
         &make_single_stat_plot($r,$plot);
     }
@@ -636,6 +755,85 @@ END
     return;
 }
 
+sub tries_data_plot {
+    my ($r)=@_;
+    my $count = scalar(@StatsArray);
+    my $width = 50 + 10*$count;
+    $width = 300 if ($width < 300);
+    my $height = 300;
+    my $plot = '';
+    my @STD;  my @Mean; my @Max; my @Min;
+    my @Labels;
+    my $ymax = 5;
+    foreach my $data (@StatsArray) {
+        my $max = $data->{'mean_tries'} + $data->{'std_tries'};
+        $ymax = $max if ($ymax < $max);
+        $ymax = $max if ($ymax < $max);
+        push(@Labels,$data->{'problem_num'});
+        push(@STD,$data->{'std_tries'});
+        push(@Mean,$data->{'mean_tries'});
+    }
+    #
+    # Make sure we show relevant information.
+    my $xmax = $Labels[-1];
+    if ($xmax > 50) {
+        if ($xmax % 10 != 0) {
+            $xmax = 10 * (int($xmax/10)+1);
+        }
+    } else {
+        if ($xmax % 5 != 0) {
+            $xmax = 5 * (int($xmax/5)+1);
+        }
+    }
+    $ymax = int($ymax)+1+2;
+    #
+    my $std_data .= '<data>'.join(',',@Labels).'</data>'.$/.
+                    '<data>'.join(',',@Mean).'</data>'.$/;
+    #
+    my $std_error_data .= '<data>'.join(',',@Labels).'</data>'.$/.
+                          '<data>'.join(',',@Mean).'</data>'.$/.
+                          '<data>'.join(',',@STD).'</data>'.$/;
+    #
+    $plot=<<"END";
+<gnuplot 
+    texfont="10"
+    fgcolor="x000000"
+    plottype="Cartesian"
+    font="large"
+    grid="on"
+    align="center"
+    border="on"
+    transparent="on"
+    alttag="Sample Plot"
+    samples="100"
+    bgcolor="xffffff"
+    height="$height"
+    width="$width">
+    <title>Mean and S.D. of Tries</title>
+    <axis xmin="0" ymin="0" xmax="$xmax" ymax="$ymax" color="x000000" />
+    <xlabel>Problem Number</xlabel>
+    <curve 
+        linestyle="yerrorbars"
+        name="S.D. Tries" 
+        pointtype="1" 
+        color="x666666">
+        $std_error_data
+    </curve>
+    <curve 
+        linestyle="points"
+        name="Mean Tries" 
+        pointtype="1" 
+        color="xCC4444">
+        $std_data
+    </curve>
+</gnuplot>
+END
+    my $plotresult = 
+        '<p>'.&Apache::lonxml::xmlparse($r,'web',$plot).'</p>'.$/;
+    $r->print($plotresult);
+    return;
+}
+
 sub plot_dropdown {
     my $current = '';
     #
@@ -646,7 +844,10 @@ sub plot_dropdown {
     my @Additional_Plots = (
                             { graphable=>'yes',
                               name => 'degrees',
-                              title => 'DoDisc and DoDiff' });
+                              title => 'DoDisc and DoDiff' },
+                            { graphable=>'yes',
+                              name => 'tries statistics',
+                              title => 'Mean and S.D. of Tries' });
     #
     my $Str= "\n".'<select name="plot" size="1">';
     $Str .= '<option name="none"></option>'."\n";
@@ -768,6 +969,7 @@ sub Excel_output {
     # Long Headers
     foreach my $field (@Fields) {
         next if ($field->{'name'} eq 'problem_num');
+        next if ($field->{'selected'} ne 'yes');
         if (exists($field->{'long_title'})) {
             $excel_sheet->write($rows_output,$cols_output++,
                                 $field->{'long_title'});
@@ -779,6 +981,7 @@ sub Excel_output {
     $cols_output=0;
     # Brief headers
     foreach my $field (@Fields) {
+        next if ($field->{'selected'} ne 'yes');
         next if ($field->{'name'} eq 'problem_num');
         # Use english for excel as I am not sure how well excel handles 
         # other character sets....
@@ -788,6 +991,7 @@ sub Excel_output {
     foreach my $data (@StatsArray) {
         $cols_output=0;
         foreach my $field (@Fields) {
+            next if ($field->{'selected'} ne 'yes');
             next if ($field->{'name'} eq 'problem_num');
             $excel_sheet->write($rows_output,$cols_output++,
                                 $data->{$field->{'name'}});
@@ -937,7 +1141,10 @@ sub get_statistics {
     $data->{'title.link'}  = $resource->{'src'}.'?symb='.
         &Apache::lonnet::escape($resource->{'symb'});
     #
-    $data->{'deg_of_disc'} = &compute_discrimination_factor($resource,$part,$sequence);
+    if ($SelectedFields{'deg_of_disc'}) {
+        $data->{'deg_of_disc'} = 
+            &compute_discrimination_factor($resource,$part,$sequence);
+    }
     return $data;
 }