--- loncom/interface/statistics/lonsubmissiontimeanalysis.pm	2004/01/19 21:31:08	1.10
+++ loncom/interface/statistics/lonsubmissiontimeanalysis.pm	2004/07/06 16:01:48	1.17
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonsubmissiontimeanalysis.pm,v 1.10 2004/01/19 21:31:08 matthew Exp $
+# $Id: lonsubmissiontimeanalysis.pm,v 1.17 2004/07/06 16:01:48 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -45,10 +45,14 @@ my $plotcolors = ['#33ff00',
                   ]; 
 
 my @SubmitButtons = (
-                     { name => 'ProblemAnalyis',
+                     { name => 'PrevProblemAnalysis',
+                       text => 'Previous Problem' },
+                     { name => 'ProblemAnalysis',
                        text => 'Analyze Problem Again' },
+                     { name => 'NextProblemAnalysis',
+                       text => 'Next Problem' },
                      { name => 'SelectAnother',
-                       text => 'Choose a different resource' },
+                       text => 'Choose a different Problem' },
                      );
 
 sub BuildSubmissionTimePage {
@@ -63,7 +67,6 @@ sub BuildSubmissionTimePage {
     #
     &Apache::lonstatistics::PrepareClasslist();    
     #
-    $r->print('<h2>'.&mt('Submission Time Plots').'</h2>');
     $r->print(&CreateInterface());
     #
     my @Students = @Apache::lonstatistics::Students;
@@ -72,18 +75,8 @@ sub BuildSubmissionTimePage {
         $r->print('<h2>There are no students in the sections selected</h2>');
     }
     #
-    &Apache::loncoursedata::clear_internal_caches();
-    if (exists($ENV{'form.ClearCache'}) || 
-        exists($ENV{'form.updatecaches'}) ||
-        (exists($ENV{'form.firstanalysis'}) &&
-         $ENV{'form.firstanalysis'} ne 'no')) {
-        &Apache::lonstatistics::Gather_Full_Student_Data($r);
-    }
-    if (! exists($ENV{'form.firstanalysis'})) {
-        $r->print('<input type="hidden" name="firstanalysis" value="yes" />');
-    } else {
-        $r->print('<input type="hidden" name="firstanalysis" value="no" />');
-    }
+    my @CacheButtonHTML = 
+        &Apache::lonstathelpers::manage_caches($r,'Statistics','stats_status');
     $r->rflush();
     #
     if (! exists($ENV{'form.problemchoice'}) ||
@@ -92,23 +85,44 @@ sub BuildSubmissionTimePage {
                   &mt('Graph Problem Submission Times').'" />');
         $r->print('&nbsp;'x5);
         $r->print('<h3>'.&mt('Please select a problem to analyze').'</h3>');
-        $r->print(&ProblemSelector());
+        $r->print(&Apache::lonstathelpers::ProblemSelector('.'));
     } else {
         foreach my $button (@SubmitButtons) {
             $r->print('<input type="submit" name="'.$button->{'name'}.'" '.
                       'value="'.&mt($button->{'text'}).'" />');
             $r->print('&nbsp;'x5);
         }
+        foreach my $html (@CacheButtonHTML) {
+            $r->print($html.('&nbsp;'x5));
+        }
+        $r->rflush();
+        #
+        # Determine which problem we are to analyze
+        my $current_problem = &Apache::lonstathelpers::get_target_from_id
+            ($ENV{'form.problemchoice'});
+        #
+        my ($prev,$curr,$next) = 
+            &Apache::lonstathelpers::get_prev_curr_next($current_problem,
+                                                        '.',
+                                                        'part');
+        if (exists($ENV{'form.PrevProblemAnalysis'}) && defined($prev)) {
+            $current_problem = $prev;
+        } 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'} = 
+            &Apache::lonstathelpers::make_target_id($current_problem);
         $r->print('<input type="hidden" name="problemchoice" value="'.
                   $ENV{'form.problemchoice'}.'" />');
         #
         $r->print('<hr />');
-        #
-        my ($symb,$part) = &get_problem_symb(
-                  &Apache::lonnet::unescape($ENV{'form.problemchoice'}));
         $r->rflush();
         #
-        my $resource = &get_resource_from_symb($symb);
+        my $resource = $current_problem->{'resource'};
         if (! defined($resource)) {
             $r->print('resource is undefined');
         } else {
@@ -116,8 +130,10 @@ sub BuildSubmissionTimePage {
             $r->print('<h3>'.$resource->{'src'}.'</h3>');
             $r->rflush();
             $r->print(&Apache::lonstathelpers::render_resource($resource));
+            $r->print('<br />');
             $r->rflush();
-            $r->print(&analyze_times($r,$resource,\@Students,$part));
+            $r->print(&analyze_times($r,$resource,\@Students,
+                                     $current_problem->{'part'}));
         }
         $r->print('<hr />');
     }
@@ -143,6 +159,7 @@ sub get_week_start {
 
 sub analyze_times {
     my ($r,$resource,$students,$part) = @_;
+    my $htmltable;
     #
     # Convenience arrays
     my @FullWeekDay = (qw/Sunday Monday Tuesday Wednesday Thursday Friday
@@ -176,20 +193,22 @@ sub analyze_times {
     my $endtime = $day_start;
     #
     # Initialize loop variables
-    my $max;
-    my @Ydata=(0);
-    my @AnsData=(0);
-    my @Xlabel=($WeekDay[$wday]);
-    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
     #
     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) {
                 $wday++;
                 $wday %= 7;
@@ -203,20 +222,14 @@ sub analyze_times {
         $AnsData[$bincount] += &successful_submission($row);
         $cumulative_answers += &successful_submission($row);
     }
-    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;
@@ -226,10 +239,63 @@ sub analyze_times {
         }
     }
     my $numstudents = scalar(@$students);
-    for (my $i=0;$i<=$#AnsData;$i++) {
-        $AnsData[$i] = int(100*($AnsData[$i]/$numstudents));
+    #
+    # 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').'</th>'.
+        '<th>'.('&nbsp;'x3).'</th>'.
+        '<th valign="bottom">'.&mt('End').'</th>'.
+        '<th valign="bottom">'.&mt('Submissions').'</th>'.
+        '<th>'.('&nbsp;'x3).'</th>'.
+        '<th valign="bottom">'.&mt('Correct Submissions').'</th>'.
+        '<th>'.('&nbsp;'x3).'</th>'.
+        '<th valign="bottom">'.&mt('Cumulative Percent Correct').'</th>'.
+        '</tr>'.
+        '</thead>'.
+        '<tbody>';
+    my @CumulativeCorrect=(0);
+    my @CumulativeCorrectPercent;
+    for (my $i=0;$i<=$#Ydata;$i++) {
+        $CumulativeCorrect[$i]=$CumulativeCorrect[-1]+$AnsData[$i];
+        $CumulativeCorrectPercent[$i] = (int(100*$CumulativeCorrect[$i]/$numstudents));
+        if ($Ydata[$i] != 0) {
+            next if (! defined($BinEnd[$i]) || $BinEnd[$i] == 0);
+            $htmltable .= 
+                '<tr>'.
+                '<td align="right"><nobr>'.
+                &Apache::lonlocal::locallocaltime($BinEnd[$i]-$binsize).
+                '</nobr></td>'.
+                '<td>&nbsp;</td>'.
+                '<td align="right"><nobr>'.
+                    &Apache::lonlocal::locallocaltime($BinEnd[$i]).'</td>'.
+                '</nobr></td>'.
+                '<td align="right">'.$Ydata[$i].('&nbsp;'x3).'</td>'.
+                '<td>&nbsp;</td>'.
+                '<td align="right">'.$AnsData[$i].('&nbsp;'x3).'</td>'.
+                '<td>&nbsp;</td>'.
+                '<td align="right">'.$CumulativeCorrectPercent[$i].'</td>'.
+                '</tr>'.$/;
+        }
     }
-    my $title = 'Number of Submissions and Number Correct';
+    $htmltable .= '</tbody></table></p>';
+    #
+    # 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].' '.
@@ -241,15 +307,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,
+                                              \@CumulativeCorrectPercent,0,100,
                                               (xskip => $bins_per_day,
                                                x_ticks => $bins_per_day,
                                                x_tick_offset => $bins_per_day,
@@ -260,7 +325,7 @@ sub analyze_times {
                      'data.2.label'=>'Percent correct',
                                                )
                                               );
-    $html .= '<br />';
+    $html .= '<br />'.$htmltable;
     return $html;
 }
 
@@ -312,119 +377,34 @@ sub CreateInterface {
     ##
     ## Build the menu
     my $Str = '';
+    $Str .= &Apache::lonhtmlcommon::breadcrumbs(undef,'Submission Time Plots');
+    $Str .= '<p>';
     $Str .= '<table cellspacing="5">'."\n";
     $Str .= '<tr>';
-    $Str .= '<td align="center"><b>'.&mt('Sections').'</b></td>';
-    $Str .= '<td align="center"><b>'.&mt('Enrollment Status').'</b></td>';
-    $Str .= '<td align="center">&nbsp;</td>';
+    $Str .= '<th align="center">'.&mt('Sections').'</th>';
+    $Str .= '<th align="center">'.&mt('Enrollment Status').'</th>';
     $Str .= '</tr>'."\n";
     ##
     ## 
     $Str .= '<tr><td align="center">'."\n";
-    $Str .= &Apache::lonstatistics::SectionSelect('Section','multiple',5);
+    $Str .= &Apache::lonstatistics::SectionSelect('Section','multiple',4);
     $Str .= '</td>';
     #
     $Str .= '<td align="center">';
-    $Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5);
+    $Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,4);
     $Str .= '</td>';
     #
-    my $only_seq_with_assessments = sub { 
-        my $s=shift;
-        if ($s->{'num_assess'} < 1) { 
-            return 0;
-        } else { 
-            return 1;
-        }
-    };
-    &Apache::lonstatistics::MapSelect('Maps','multiple,all',5,
-                                              $only_seq_with_assessments);
-    ##
-    ##
     $Str .= '</tr>'."\n";
     $Str .= '</table>'."\n";
+    #
+    $Str .= '<nobr>'.&mt('Status: [_1]',
+                         '<input type="text" '.
+                         'name="stats_status" size="60" value="" />').
+            '</nobr>'.'</p>';
+    ##
     return $Str;
 }
 
-sub ProblemSelector {
-    my $Str;
-    $Str = "<table>\n";
-    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
-        next if ($seq->{'num_assess'}<1);
-        my $seq_str = '';
-        foreach my $res (@{$seq->{'contents'}}) {
-            next if ($res->{'type'} ne 'assessment');
-            if (@{$res->{'parts'}} == 1) {
-                my $value = &Apache::lonnet::escape($res->{'symb'}.':'.
-                                                    $res->{'parts'}->[0]);
-                my $checked;
-                if ($ENV{'form.problemchoice'} eq $value) {
-                    $checked = 'checked ';
-                }
-                my $title = $res->{'title'};
-                if (! defined($title) || $title eq '') {
-                    ($title) = ($res->{'src'} =~ m:/([^/]*)$:);
-                }
-#                &Apache::lonnet::logthis('title = :'.$title.':');
-                $seq_str .= '<tr><td>'.
-  '<input type="radio" name="problemchoice" value="'.$value.'" '.$checked.'/>'.
-  '</td><td>'.
-  '<a href="'.$res->{'src'}.'">'.$title.'</a> ';
-            } else {
-                my $title = $res->{'title'};
-                if (! defined($title) || $title eq '') {
-                    ($title) = ($res->{'src'} =~ m:/([^/]*)$:);
-                }
-                $seq_str .= '<tr><td>'.
-                    '&nbsp;'.'</td><td>'.
-                    '<a href="'.$res->{'src'}.'">'.$title.'</a>'.
-                    "</td></tr>\n";
-                foreach my $part (@{$res->{'parts'}}) {
-                    my $value = &Apache::lonnet::escape
-                                               ($res->{'symb'}.':'.$part);
-                    my $checked;
-                    if ($ENV{'form.problemchoice'} eq $value) {
-                        $checked = 'checked ';
-                    }
-                    $seq_str .= '<tr><td>'.
-  '<input type="radio" name="problemchoice" value="'.$value.'" '.$checked.'/>'.
-  '</td><td>'.('&nbsp;'x5).'part '.$part."</td></tr>\n";
-                }
-            }
-        }
-        if ($seq_str ne '') {
-            $Str .= '<tr><td>&nbsp</td><td><b>'.$seq->{'title'}.'</b></td>'.
-                "</tr>\n".$seq_str;
-        }
-    }
-    $Str .= "</table>\n";
-    return $Str;
-}
-
-#########################################################
-#########################################################
-##
-##      Misc functions (ought to be put in a module)
-##
-#########################################################
-#########################################################
-sub get_problem_symb {
-    my $problemstring = shift();
-    my ($symb,$partid) = ($problemstring=~ /^(.*):([^:]*)$/);
-    return ($symb,$partid);
-}
-
-sub get_resource_from_symb {
-    my ($symb) = @_;
-    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
-        foreach my $res (@{$seq->{'contents'}}) {
-            if ($res->{'symb'} eq $symb) {
-                return $res;
-            }
-        }
-    }
-    return undef;
-}
-
 1;
 
 __END__