--- loncom/interface/statistics/lonsubmissiontimeanalysis.pm	2004/06/25 18:23:02	1.16
+++ loncom/interface/statistics/lonsubmissiontimeanalysis.pm	2005/04/19 13:59:35	1.24
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonsubmissiontimeanalysis.pm,v 1.16 2004/06/25 18:23:02 matthew Exp $
+# $Id: lonsubmissiontimeanalysis.pm,v 1.24 2005/04/19 13:59:35 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -28,7 +28,7 @@
 package Apache::lonsubmissiontimeanalysis;
 
 use strict;
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::loncoursedata();
@@ -37,7 +37,6 @@ use Apache::lonstathelpers;
 use Apache::lonlocal;
 use HTML::Entities();
 use Time::Local();
-use Spreadsheet::WriteExcel();
 
 my $plotcolors = ['#33ff00', 
                   '#ff33cc', '#990000', '#aaaa66', '#663399', '#ff9933',
@@ -79,13 +78,14 @@ sub BuildSubmissionTimePage {
         &Apache::lonstathelpers::manage_caches($r,'Statistics','stats_status');
     $r->rflush();
     #
-    if (! exists($ENV{'form.problemchoice'}) ||
-        exists($ENV{'form.SelectAnother'})) {
-        $r->print('<input type="submit" name="" value="'.
-                  &mt('Graph Problem Submission Times').'" />');
-        $r->print('&nbsp;'x5);
+    if (! exists($env{'form.problemchoice'}) ||
+        exists($env{'form.SelectAnother'})) {
+        my $submit_button = '<input type="submit" name="" value="'.
+            &mt('Graph Problem Submission Times').'" />';
+        $r->print($submit_button.'&nbsp;'x5);
         $r->print('<h3>'.&mt('Please select a problem to analyze').'</h3>');
-        $r->print(&Apache::lonstathelpers::ProblemSelector('.'));
+        $r->print(&Apache::lonstathelpers::problem_selector('.',
+                                                            $submit_button));
     } else {
         foreach my $button (@SubmitButtons) {
             $r->print('<input type="submit" name="'.$button->{'name'}.'" '.
@@ -99,25 +99,25 @@ sub BuildSubmissionTimePage {
         #
         # Determine which problem we are to analyze
         my $current_problem = &Apache::lonstathelpers::get_target_from_id
-            ($ENV{'form.problemchoice'});
+            ($env{'form.problemchoice'});
         #
-        my ($prev,$curr,$next) = 
+        my ($navmap,$prev,$curr,$next) = 
             &Apache::lonstathelpers::get_prev_curr_next($current_problem,
                                                         '.',
                                                         'part');
-        if (exists($ENV{'form.PrevProblemAnalysis'}) && defined($prev)) {
+        if (exists($env{'form.PrevProblemAnalysis'}) && defined($prev)) {
             $current_problem = $prev;
-        } elsif (exists($ENV{'form.NextProblemAnalysis'}) && defined($next)) {
+        } elsif (exists($env{'form.NextProblemAnalysis'}) && defined($next)) {
             $current_problem = $next;
         } else {
             $current_problem = $curr;
         }
         #
         # Store the current problem choice and send it out in the form
-        $ENV{'form.problemchoice'} = 
+        $env{'form.problemchoice'} = 
             &Apache::lonstathelpers::make_target_id($current_problem);
         $r->print('<input type="hidden" name="problemchoice" value="'.
-                  $ENV{'form.problemchoice'}.'" />');
+                  $env{'form.problemchoice'}.'" />');
         #
         $r->print('<hr />');
         $r->rflush();
@@ -126,13 +126,16 @@ sub BuildSubmissionTimePage {
         if (! defined($resource)) {
             $r->print('resource is undefined');
         } else {
-            $r->print('<h1>'.$resource->{'title'}.'</h1>');
-            $r->print('<h3>'.$resource->{'src'}.'</h3>');
+            $r->print('<h1>'.$resource->compTitle.'</h1>');
+            $r->print('<h3>'.$resource->src.'</h3>');
+            $r->print('<h4>'.
+                 &Apache::lonstatistics::section_and_enrollment_description().
+                      '</h4>');
             $r->rflush();
             $r->print(&Apache::lonstathelpers::render_resource($resource));
             $r->print('<br />');
             $r->rflush();
-            $r->print(&analyze_times($r,$resource,\@Students,
+            $r->print(&analyze_times($r,$resource->symb,\@Students,
                                      $current_problem->{'part'}));
         }
         $r->print('<hr />');
@@ -158,7 +161,7 @@ sub get_week_start {
 }
 
 sub analyze_times {
-    my ($r,$resource,$students,$part) = @_;
+    my ($r,$symb,$students,$part) = @_;
     my $htmltable;
     #
     # Convenience arrays
@@ -170,9 +173,11 @@ sub analyze_times {
     my $html; # holds results of analysis
     # Get the data
     my $SubData = &Apache::loncoursedata::get_response_time_data
-        ($students,$resource->{'symb'},$part);
+        ([&Apache::lonstatistics::get_selected_sections()],
+         $Apache::lonstatistics::enrollment_status,
+         $symb,$part);
     if (! defined($SubData) || ! ref($SubData)) {
-        $html.= '<h2>There is no submission data for this problem</h2>';
+        $html.= '<h2>There is no submission data for this problem at all</h2>';
         return $html;
     }
     my $NumSub = scalar(@{$SubData});
@@ -193,20 +198,21 @@ sub analyze_times {
     my $endtime = $day_start;
     #
     # Initialize loop variables
-    my $max;
-    my @Ydata=(0);
-    my @AnsData=(0);
-    my @Xlabel=($WeekDay[$wday]);
-    my @BinEnd;
-    my $cumulative_answers = 0;
+    my $max;            # The sum of @Ydata
+    my @Ydata=(0);      # number of submissions
+    my @AnsData=(0);    # number of correct submissions
+    my @Xlabel=($WeekDay[$wday]); # Labels of itmes
+    my @BinEnd;                   # The end time of each bin
+    my $cumulative_answers = 0;   # The sum of @AnsData
+    my %students;       # which students have attempted the problem?
     #
     foreach my $row (@$SubData) {
         my $subtime = &get_time_from_row($row);
         while ($subtime > $endtime && $endtime < time) {
             # Create a new bin
             $bincount++;
-            $Ydata[$bincount]=0;
-            $AnsData[$bincount]=$AnsData[$bincount-1];
+            $Ydata[$bincount]   = 0;
+            $AnsData[$bincount] = 0;
             $endtime += $binsize;
             push(@BinEnd,$endtime);
             if ($bincount % (86400/$binsize) == 0) {
@@ -221,21 +227,16 @@ sub analyze_times {
         $max = $Ydata[$bincount] if ($max < $Ydata[$bincount]);
         $AnsData[$bincount] += &successful_submission($row);
         $cumulative_answers += &successful_submission($row);
+        $students{$row->[&Apache::loncoursedata::RT_student_id()]}++;
     }
-    foreach my $maximum (10,15,20,25,30,40,50,60,70,80,90,100,
-                          120,150,200,250,300,350,400,450,500,
-                          600,700,800,900,1000,1100,1200,1500,2000,
-                          2500,3000,4000,5000) {
-        if ($max < $maximum) {
-            $max = $maximum;
-            last;
-        }
-    }
+    #
+    # Pad the data to a full day
     while ($bincount % $bins_per_day != 0) {
         $bincount++;
         $Ydata[$bincount]=0;
-        $AnsData[$bincount]=$AnsData[$bincount-1];
+        $AnsData[$bincount]=0;
         $endtime += $binsize;
+        push(@BinEnd,$endtime);
         if ($bincount % (86400/$binsize) == 0) {
             $wday ++;
             $wday %= 7;
@@ -244,44 +245,76 @@ sub analyze_times {
             $Xlabel[$bincount] = '';
         }
     }
-    my $numstudents = scalar(@$students);
+    my $numstudents = scalar(keys(%students));
+    #
+    # Determine a nice maximum value to use
+    foreach my $maximum (10,15,20,25,30,40,50,60,70,80,90,100,
+                          120,150,200,250,300,350,400,450,500,
+                          600,700,800,900,1000,1100,1200,1500,2000,
+                          2500,3000,4000,5000) {
+        if ($max < $maximum) {
+            $max = $maximum;
+            last;
+        }
+    }
+    #
+    # Build the data table
     $htmltable = '<p>'.
         '<table rules="groups" frame="border" '.
         'summary="Student submission data">'.
         '<thead>'.
         '<tr>'.
-        '<th valign="bottom">'.&mt('Begin Date').'</th>'.
+        '<th valign="bottom">'.&mt('Begin').'</th>'.
         '<th>'.('&nbsp;'x3).'</th>'.
-        '<th valign="bottom">'.&mt('End Date').'</th>'.
-        '<th valign="bottom">'.&mt('Submissions').'</th>'.
+        '<th valign="bottom">'.&mt('End').'</th>'.
+        '<th valign="bottom">'.&mt('Submissions (plotted)').'</th>'.
         '<th>'.('&nbsp;'x3).'</th>'.
-        '<th valign="bottom">'.&mt('Correct<br />Submissions').'</th>'.
+        '<th valign="bottom">'.&mt('Correct Submissions (not plotted)').'</th>'.
         '<th>'.('&nbsp;'x3).'</th>'.
-        '<th valign="bottom">'.&mt('Percent<br />Correct').'</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 (not plotted)').'</th>'.
+        '<th>'.('&nbsp;'x3).'</th>'.
+        '<th valign="bottom">'.&mt('Cumulative Percent Correct of selected students (plotted)').'</th>'.
         '</tr>'.
         '</thead>'.
         '<tbody>';
-    for (my $i=0;$i<=$#AnsData;$i++) {
-        $AnsData[$i] = int(100*($AnsData[$i]/$numstudents));
+    my @CumulativeCorrect=(0);
+    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];
+        $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 .= 
                 '<tr>'.
-                '<td align="right">'.
+                '<td align="right"><nobr>'.
                 &Apache::lonlocal::locallocaltime($BinEnd[$i]-$binsize).
-                '</td>'.
+                '</nobr></td>'.
                 '<td>&nbsp;</td>'.
-                '<td align="right">'.
+                '<td align="right"><nobr>'.
                     &Apache::lonlocal::locallocaltime($BinEnd[$i]).'</td>'.
-                '</td>'.
+                '</nobr></td>'.
                 '<td align="right">'.$Ydata[$i].('&nbsp;'x3).'</td>'.
                 '<td>&nbsp;</td>'.
-                '<td align="right">'.($i>0?$AnsData[$i]-$AnsData[$i-1]:$AnsData[$i]).('&nbsp;'x3).'</td>'.
+                '<td align="right">'.$AnsData[$i].('&nbsp;'x3).'</td>'.
+                '<td>&nbsp;</td>'.
+                '<td align="right">'.$CumulativeCorrect[$i].'</td>'.
+                '<td>&nbsp;</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>'.$/;
         }
     }
     $htmltable .= '</tbody></table></p>';
-    my $title = 'Number of Submissions and Number Correct';
+    #
+    # Build the plot
+    my $title = '';#'Number of Submissions and Number Correct';
     my $xlabel;
     (undef,undef,undef,$mday,$month,$year,$wday) = localtime($day_start);
     $xlabel .= $FullWeekDay[$wday].' '.
@@ -293,15 +326,14 @@ sub analyze_times {
     if ($width < 250) {
         $width = 250;
     }
+    #
     $html .= &Apache::loncommon::DrawXYYGraph($title,
                                               $xlabel,
                                               'Submissions vs Time',
                                               $plotcolors,
                                               \@Xlabel,
-                                              \@Ydata,
-                                              0,$max,
-                                              \@AnsData,
-                                              0,100,
+                                              \@Ydata,0,$max,
+                                              \@corr_as_percent_of_selected,0,100,
                                               (xskip => $bins_per_day,
                                                x_ticks => $bins_per_day,
                                                x_tick_offset => $bins_per_day,
@@ -322,7 +354,6 @@ sub successful_submission {
         return $row->[&Apache::loncoursedata::RT_awarded()];
     }
     return undef;
-    return 0;
 }
 
 sub get_time_from_row {
@@ -358,8 +389,8 @@ sub Process_Row {
 sub CreateInterface {
     ##
     ## Environment variable initialization
-    if (! exists$ENV{'form.AnalyzeOver'}) {
-        $ENV{'form.AnalyzeOver'} = 'Tries';
+    if (! exists$env{'form.AnalyzeOver'}) {
+        $env{'form.AnalyzeOver'} = 'Tries';
     }
     ##
     ## Build the menu