--- loncom/interface/statistics/lonsubmissiontimeanalysis.pm	2005/03/04 20:34:15	1.19
+++ loncom/interface/statistics/lonsubmissiontimeanalysis.pm	2005/03/08 17:39:35	1.20
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonsubmissiontimeanalysis.pm,v 1.19 2005/03/04 20:34:15 matthew Exp $
+# $Id: lonsubmissiontimeanalysis.pm,v 1.20 2005/03/08 17:39:35 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -264,21 +264,27 @@ sub analyze_times {
         '<th valign="bottom">'.&mt('Begin').'</th>'.
         '<th>'.('&nbsp;'x3).'</th>'.
         '<th valign="bottom">'.&mt('End').'</th>'.
-        '<th valign="bottom">'.&mt('Submissions').'</th>'.
+        '<th valign="bottom">'.&mt('Submissions (plotted)').'</th>'.
         '<th>'.('&nbsp;'x3).'</th>'.
-        '<th valign="bottom">'.&mt('Correct Submissions').'</th>'.
+        '<th valign="bottom">'.&mt('Correct Submissions (not plotted)').'</th>'.
         '<th>'.('&nbsp;'x3).'</th>'.
-        '<th valign="bottom">'.&mt('Cumulative Correct of those attempting the problem').'</th>'.
+        '<th valign="bottom">'.&mt('Cumulative Correct of those attempting the problem (not plotted)').'</th>'.
         '<th>'.('&nbsp;'x3).'</th>'.
-        '<th valign="bottom">'.&mt('Cumulative Percent Correct of those attempting the problem').'</th>'.
+        '<th valign="bottom">'.&mt('Cumulative Percent Correct of those attempting the problem (not plotted)').'</th>'.
+        '<th>'.('&nbsp;'x3).'</th>'.
+        '<th valign="bottom">'.&mt('Cumulative Percent Correct of selected students (plotted)').'</th>'.
         '</tr>'.
         '</thead>'.
         '<tbody>';
     my @CumulativeCorrect=(0);
-    my @CumulativeCorrectPercent;
+    my @corr_as_percent_of_selected;
+    my @corr_as_percent_of_answering;
     for (my $i=0;$i<=$#Ydata;$i++) {
         $CumulativeCorrect[$i]=$CumulativeCorrect[-1]+$AnsData[$i];
-        $CumulativeCorrectPercent[$i] = sprintf('%3.1f',100*$CumulativeCorrect[$i]/$numstudents);
+        $corr_as_percent_of_answering[$i] = 
+            sprintf('%3.1f',100*$CumulativeCorrect[$i]/$numstudents);
+        $corr_as_percent_of_selected[$i] = 
+            sprintf('%3.1f',100*$CumulativeCorrect[$i]/scalar(@$students));
         if ($Ydata[$i] != 0) {
             next if (! defined($BinEnd[$i]) || $BinEnd[$i] == 0);
             $htmltable .= 
@@ -296,7 +302,9 @@ sub analyze_times {
                 '<td>&nbsp;</td>'.
                 '<td align="right">'.$CumulativeCorrect[$i].'</td>'.
                 '<td>&nbsp;</td>'.
-                '<td align="right">'.$CumulativeCorrectPercent[$i].'</td>'.
+                '<td align="right">'.$corr_as_percent_of_answering[$i].'</td>'.
+                '<td>&nbsp;</td>'.
+                '<td align="right">'.$corr_as_percent_of_selected[$i].'</td>'.
                 '</tr>'.$/;
         }
     }
@@ -322,7 +330,7 @@ sub analyze_times {
                                               $plotcolors,
                                               \@Xlabel,
                                               \@Ydata,0,$max,
-                                              \@CumulativeCorrectPercent,0,100,
+                                              \@corr_as_percent_of_selected,0,100,
                                               (xskip => $bins_per_day,
                                                x_ticks => $bins_per_day,
                                                x_tick_offset => $bins_per_day,