--- loncom/interface/statistics/lonproblemanalysis.pm	2003/10/10 13:47:48	1.30
+++ loncom/interface/statistics/lonproblemanalysis.pm	2003/10/14 14:23:14	1.35
@@ -1,6 +1,7 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemanalysis.pm,v 1.30 2003/10/10 13:47:48 matthew Exp $
+
+# $Id: lonproblemanalysis.pm,v 1.35 2003/10/14 14:23:14 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,17 +43,39 @@ sub BuildProblemAnalysisPage {
     #
     my @Students = @Apache::lonstatistics::Students;
     #
-    if (exists($ENV{'form.problemchoice'})) {
-        $r->print('<hr />');
+    if (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" />');
+    }
+    if (exists($ENV{'form.problemchoice'}) && 
+        ! exists($ENV{'form.SelectAnother'})) {
+        $r->print('<input type="submit" name="ProblemAnalysis" value="'.
+                  &mt('Analyze Problem Again').'" />');
+        $r->print('&nbsp;'x5);
+        $r->print('<input type="submit" name="ClearCache" value="'.
+                  &mt('Clear Caches').'" />');
+        $r->print('&nbsp;'x5);
+        $r->print('<input type="submit" name="updatecaches" value="'.
+                  &mt('Update Student Data').'" />');
+        $r->print('&nbsp;'x5);
+        $r->print('<input type="hidden" name="problemchoice" value="'.
+                  $ENV{'form.problemchoice'}.'" />');
+        $r->print('<input type="submit" name="SelectAnother" value="'.
+                  &mt('Choose a different resource').'" />');
+        $r->print('&nbsp;'x5);
+        #
+        $r->print('<hr />');
         #
         my ($symb,$part,$resid) = &get_problem_symb(
                      &Apache::lonnet::unescape($ENV{'form.problemchoice'})
                                            );
         #
-#        my ($firsttime,$lasttime) = 
-#            &Apache::loncoursedata::get_timestamp_data($symb,$resid);
-        #
         my $resource = &get_resource_from_symb($symb);
         if (defined($resource)) {
             my %Data = &get_problem_data($resource->{'src'});
@@ -78,13 +101,13 @@ sub BuildProblemAnalysisPage {
             if (defined($PerformanceData) && 
                 ref($PerformanceData) eq 'ARRAY') {
                 if ($ENV{'form.AnalyzeBy'} eq 'Tries') {
-                    my $analysis_html = &DoTriesAnalysis($PerformanceData,
+                    my $analysis_html = &tries_analysis($PerformanceData,
+                                                         $ORdata);
+                    $r->print($analysis_html);
+                } elsif ($ENV{'form.AnalyzeBy'} eq 'Time') {
+                    my $analysis_html = &time_analysis($PerformanceData,
                                                          $ORdata);
                 $r->print($analysis_html);
-#                } elsif ($ENV{'form.AnalyzeBy'} eq 'Time') {
-#                    my $analysis_html = &DoTimeAnalysis($PerformanceData,
-#                                                         $ORdata);
-#                $r->print($analysis_html);
                 } else {
                     $r->print('<h2>'.
                               &mt('The analysis you have selected is '.
@@ -101,61 +124,75 @@ sub BuildProblemAnalysisPage {
         }
         $r->print('<hr />');
     } else {
+        $r->print('<input type="submit" name="ProblemAnalysis" value="'.
+                  &mt('Analyze Problem').'" />');
+        $r->print('&nbsp;'x5);
         $r->print('<h3>'.&mt('Please select a problem to analyze').'</h3>');
+        $r->print(&OptionResponseProblemSelector());
     }
-    # Okay, they asked for data, so make sure we get the latest data.
-    $r->print(&OptionResponseProblemSelector());
 }
 
 
-sub DoTriesAnalysis {
-    my ($PerformanceData,$ORdata) = @_;
-    my $mintries = 1;
-    my $maxtries = 10;
-    my %ResponseData = &analyze_option_data_by_tries($PerformanceData,
-                                                 $mintries,$maxtries);
-    my @Foils = sort(keys(%ResponseData));
+#########################################################
+#########################################################
+##
+##      Misc interface routines use by analysis code
+##
+#########################################################
+#########################################################
+sub build_foil_index {
+    my ($ORdata) = @_;
+    my @Foils = sort(keys(%{$ORdata->{'Foiltext'}}));
     my %Row_Label;
     foreach my $foilid (@Foils) {
         my $value = $ORdata->{'Foiltext'}->{$foilid};
-#        &Apache::lonnet::logthis('row label '.$foilid.' = '.$value);
         $Row_Label{$foilid} = $ORdata->{'Foiltext'}->{$foilid};
     }
-    my @Rows;
-    $Rows[0] = ['<td>&nbsp;</td>'];
-    for (my $i=$mintries;$i<=$maxtries;$i++) {
-        push (@{$Rows[0]},
-              '<th colspan="3">'.&mt('Attempt').' '.$i.'</th>');
-    }
-    $Rows[1] = ['<th>'.&mt('Foil').'</th>'];
-    for (my $i=$mintries;$i<=$maxtries;$i++) {
-        push (@{$Rows[1]},('<th>'.&mt('Correct').'</th>',
-                           '<th>'.&mt('Incorrect').'</th>',
-                           '<th>'.&mt('Percent Correct').'</th>',
-                           ));
+    #
+    # Build up the table of row labels.
+    my $table = '<table border="1" >'."\n";
+    $table .= '<tr><th>'.&mt('Foil Number').'</th>'.
+        '<th>'.&mt('Foil Text')."</th></tr>\n";
+    my $index = 1;
+    foreach my $foilid (@Foils) {
+        $table .= '<tr><td>'.$index.'</td>'.
+            '<td>'.$Row_Label{$foilid}."</td></tr>\n";
+    } continue {
+        $index++;
     }
+    $table .= "</table>\n";
+    return ($table,@Foils);
+}
+
+#########################################################
+#########################################################
+##
+##         Tries Analysis
+##
+#########################################################
+#########################################################
+sub tries_analysis {
+    my ($PerformanceData,$ORdata) = @_;
+    my $mintries = 1;
+    my $maxtries = $ENV{'form.NumPlots'};
+    my %ResponseData = &analyze_option_data_by_tries($PerformanceData,
+                                                 $mintries,$maxtries);
+    my ($table,@Foils) = &build_foil_index($ORdata);
+    #
+    # Compute the data neccessary to make the plots
     my @PlotData;
     my @CumulativePlotData;
-    my $index = 1;
     foreach my $foilid (@Foils) {
-        my @Data = ('<td>'.$index.' '.$Row_Label{$foilid}.'</td>');
         for (my $i=$mintries;$i<=$maxtries;$i++) {
-            push(@Data,
-                 ('<td>'.$ResponseData{$foilid}->[$i]->{'correct'}.'</td>',
-                  '<td>'.$ResponseData{$foilid}->[$i]->{'incorrect'}.
-                  '</td>',
-                  '<td>'.
-                  sprintf("%4.2f",
-                          $ResponseData{$foilid}->[$i]->{'percent_corr'}).
-                  '</td>'));
             #
             # Gather the per-attempt data
             push (@{$PlotData[$i]->{'good'}},
                   $ResponseData{$foilid}->[$i]->{'percent_corr'});
             push (@{$PlotData[$i]->{'bad'}},
                   100-$ResponseData{$foilid}->[$i]->{'percent_corr'});
-        }
-        for (my $i=0;$i<=$maxtries;$i++) {
+            #
+            # Someday we may need the cumulative data and I think
+            # this is a neat way of computing it as we go along.
             push (@{$CumulativePlotData[$i]->{'good'}},
                   $CumulativePlotData[-1]->{'good'}+
                   $ResponseData{$foilid}->[$i]->{'correct'});
@@ -163,11 +200,11 @@ sub DoTriesAnalysis {
                   $CumulativePlotData[-1]->{'bad'}+
                   $ResponseData{$foilid}->[$i]->{'incorrect'});
         }
-        push(@Rows,\@Data);
-    } continue {
-        $index++;
     }
-    my @Data = ('<td></td>');
+    # 
+    # Build a table for the plots
+    $table .= "<table>\n";
+    my @Plots;
     for (my $i=$mintries;$i<=$maxtries;$i++) {
         my $minstu = $ResponseData{$Foils[0]}->[$i]->{'total'};
         my $maxstu = $ResponseData{$Foils[0]}->[$i]->{'total'};
@@ -181,33 +218,35 @@ sub DoTriesAnalysis {
         }
         $maxstu = 0 if (! $maxstu);
         $minstu = 0 if (! $minstu);
-        my $graphlink;
+        my $title;
         if ($maxstu == $minstu) {
-            $graphlink = &Apache::loncommon::DrawGraph
-                ('Attempt '.$i.', '.$maxstu.' students',
-                 'Foil Number',
-                 'Percent Correct',
-                 100,
-                 $PlotData[$i]->{'good'},
-                 $PlotData[$i]->{'bad'});
+            $title = 'Attempt '.$i.', '.$maxstu.' students';
         } else {
-            $graphlink = &Apache::loncommon::DrawGraph
-                ('Attempt '.$i.', '.$minstu.'-'.$maxstu.
-                 ' students',
-                 'Foil Number',
-                 'Percent Correct',
-                 100,
-                 $PlotData[$i]->{'good'},
-                 $PlotData[$i]->{'bad'});
+            $title = 'Attempt '.$i.', '.$minstu.'-'.$maxstu.' students';
         }
-        push(@Data,'<td colspan="3">'.$graphlink.'</td>');
+        my $graphlink = &Apache::loncommon::DrawGraph($title,
+                                                      'Foil Number',
+                                                      'Percent Correct',
+                                                      100,
+                                                      $PlotData[$i]->{'good'},
+                                                      $PlotData[$i]->{'bad'});
+        push(@Plots,$graphlink);
     }
-    push (@Rows,\@Data);
-    my $table = '<table border="1" >'."\n";
-    for (my $i=0; $i <=$#Rows;$i++) {
-        $table .= '<tr>'.join('',@{$Rows[$i]})."</tr>\n";
+    #
+    # Should this be something the user can set?  Too many dialogs!
+    my $plots_per_row = 2;
+    while (my $plotlink = shift(@Plots)) {
+        $table .= '<tr><td>'.$plotlink.'</td>';
+        for (my $i=1;$i<$plots_per_row;$i++) {
+            if ($plotlink = shift(@Plots)) {
+                $table .= '<td>'.$plotlink.'</td>';
+            } else {
+                $table .= '<td></td>';
+            }
+        }
+        $table .= "</tr>\n";
     }
-    $table .= '</table>';
+    $table .= "</table>\n";
     return ($table);
 }
 
@@ -251,12 +290,128 @@ sub analyze_option_data_by_tries {
     return %Trydata;
 }
 
-sub get_problem_symb {
-    my $problemstring = shift();
-    my ($symb,$partid,$resid) = ($problemstring=~ /^(.*):([^:]*):([^:]*)$/);
-    return ($symb,$partid,$resid);
+#########################################################
+#########################################################
+##
+##                 Time Analysis
+##
+#########################################################
+#########################################################
+sub time_analysis {
+    my ($PerformanceData,$ORdata) = @_;
+    my $num_plots = $ENV{'form.NumPlots'};
+    my ($table,@Foils) = &build_foil_index($ORdata);
+    my $num_data = scalar(@$PerformanceData)-1;
+    my $percent = sprintf('%2f',100/$num_plots);
+    for (my $i=0;$i<$num_plots;$i++) {
+        my $starttime = &Apache::lonhtmlcommon::get_date_from_form
+            ('startdate_'.$i);
+        my $endtime = &Apache::lonhtmlcommon::get_date_from_form
+            ('enddate_'.$i);
+        my ($begin_index,$end_index,$plottitle,$plothtml,$data);
+        if (! defined($starttime) || ! defined($endtime)) {
+            $begin_index = $i*int($num_data/$num_plots);
+            $end_index = ($i+1)*int($num_data/$num_plots);
+            my $lownum  = sprintf('%2.1f',$i*$percent);
+            $lownum =~ s/(\.0)$//;
+            my $highnum = sprintf('%2.1f',($i+1)*$percent);
+            $highnum =~ s/(\.0)$//;
+            $plottitle = $lownum.'% to '.$highnum.'% of submissions';
+        } else {
+            my $j;
+            while (++$j < scalar(@$PerformanceData)) {
+                last if ($PerformanceData->[$j]->[2] > $starttime);
+            }
+            $begin_index = $j;
+            while (++$j < scalar(@$PerformanceData)) {
+                last if ($PerformanceData->[$j]->[2] > $endtime);
+            }
+            $end_index = $j;
+            $plottitle = 'Tries plot '.($i+1);
+        }
+
+        ($plothtml,$starttime,$endtime,$data) = 
+            &analyze_option_data_by_time($PerformanceData,
+                                         $begin_index,$end_index,
+                                         $plottitle,
+                                         @Foils);
+        my $startdateform = &Apache::lonhtmlcommon::date_setter
+            ('Statistics','startdate_'.$i,$starttime);
+        my $enddateform = &Apache::lonhtmlcommon::date_setter
+            ('Statistics','enddate_'.$i,$endtime);
+        $plothtml.= "<br />\n".
+            "<b>Start Time</b>: "."&nbsp;".$startdateform."<br />\n".
+            "<b>End Time</b>&nbsp;&nbsp;: "."&nbsp;".$enddateform."<br />\n";
+        $table.=$plothtml;
+    }
+    return $table;
 }
 
+sub analyze_option_data_by_time {
+    my ($PerformanceData,$begin_index,$end_index,$description,@Foils) = @_;
+    my %TimeData;
+    #
+    # Get the start and end times for this segment of the plot
+    my $starttime = $PerformanceData->[$begin_index]->[2];
+    my $endtime   = $PerformanceData->[$end_index  ]->[2];
+    #
+    # Compute the number getting the foils correct or incorrects
+    for (my $i=$begin_index;$i<=$end_index;$i++) {
+        my $row = $PerformanceData->[$i];
+        next if (! defined($row));
+        my ($grading,$submission,$time,$tries) = @$row;
+        my @Foilgrades = split('&',$grading);
+        my @Foilsubs   = split('&',$submission);
+        foreach my $foilgrade (@Foilgrades) {
+            my ($foilid,$correct) = split('=',$foilgrade);
+            if ($correct) {
+                $TimeData{$foilid}->{'correct'}++;
+            } else {
+                $TimeData{$foilid}->{'incorrect'}++;
+            }
+        }
+    }
+    #
+    # Compute the total and percent correct
+    my @Plotdata1;
+    my @Plotdata2;
+    foreach my $foilid (@Foils) {
+        if (! exists($TimeData{$foilid}->{'correct'})) {
+            $TimeData{$foilid}->{'correct'} = 0;
+        }
+        if (! exists($TimeData{$foilid}->{'incorrect'})) {
+            $TimeData{$foilid}->{'incorrect'} = 0;
+        }
+        $TimeData{$foilid}->{'total'} = $TimeData{$foilid}->{'correct'} +
+                                $TimeData{$foilid}->{'incorrect'};
+        $TimeData{$foilid}->{'percent_corr'} = 100 *
+            $TimeData{$foilid}->{'correct'} / 
+            $TimeData{$foilid}->{'total'};
+        push (@Plotdata1,    $TimeData{$foilid}->{'percent_corr'});
+        push (@Plotdata2,100-$TimeData{$foilid}->{'percent_corr'});
+    }
+    #
+    # Create the plot
+    my $graphlink = &Apache::loncommon::DrawGraph
+        ($description,#'Time Interval Analysis',
+         'Foil Number',
+         'Percent Correct / Incorrect',
+         100,
+         \@Plotdata1,\@Plotdata2);
+    #
+    return ($graphlink,$starttime,$endtime,\%TimeData);
+}
+
+
+
+
+#########################################################
+#########################################################
+##
+##             Interface 
+##
+#########################################################
+#########################################################
 sub CreateInterface {
     ##
     ## Environment variable initialization
@@ -270,10 +425,11 @@ sub CreateInterface {
     $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"><b>'.&mt('Sequences and Folders').'</b></td>';
-    $Str .= '<td align="center"><b>'.&mt('Analyze By').'</b></td>';
+#    $Str .= '<td align="center"><b>'.&mt('Sequences and Folders').'</b></td>';
+    $Str .= '<td align="center">&nbsp;</td>';
     $Str .= '</tr>'."\n";
-    #
+    ##
+    ## 
     $Str .= '<tr><td align="center">'."\n";
     $Str .= &Apache::lonstatistics::SectionSelect('Section','multiple',5);
     $Str .= '</td>';
@@ -282,7 +438,7 @@ sub CreateInterface {
     $Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5);
     $Str .= '</td>';
     #
-    $Str .= '<td align="center">';
+#    $Str .= '<td align="center">';
     my $only_seq_with_assessments = sub { 
         my $s=shift;
         if ($s->{'num_assess'} < 1) { 
@@ -291,31 +447,43 @@ sub CreateInterface {
             return 1;
         }
     };
-    $Str .= &Apache::lonstatistics::MapSelect('Maps','multiple,all',5,
+    &Apache::lonstatistics::MapSelect('Maps','multiple,all',5,
                                               $only_seq_with_assessments);
-    $Str .= '</td>';
+#    $Str .= '</td>';
     #
     $Str .= '<td>';
-    $Str .='<input type="radio" name="AnalyzeBy" value="Tries" ';
-    if ($ENV{'form.AnalyzeBy'} eq 'Tries') {
-        $Str .= 'checked ';
-    }
-    $Str .= '>'.&mt('Tries').'<br />';
-    $Str .='<input type="radio" name="AnalyzeBy" value="Time" ';
-    if ($ENV{'form.AnalyzeBy'} eq 'Time') {
-        $Str .= 'checked ';
+    $Str .= '<nobr>'.&mt('Analyze By ');
+    $Str .='<select name="AnalyzeBy" >';
+    #
+    $Str .= '<option value="Tries" ';
+    if (! exists($ENV{'form.AnalyzeBy'}) || $ENV{'form.AnalyzeBy'} eq 'Tries'){
+        # Default to Tries
+        $Str .= ' selected ';
     }
-    $Str .= '>'.&mt('Time').'<br />';
+    $Str .= '>'.&mt('Tries').'</option>';
+    #
+    $Str .= '<option value="Time" ';
+    $Str .= ' selected ' if ($ENV{'form.AnalyzeBy'} eq 'Time');
+    $Str .= '>'.&mt('Time').'</option>';
+    $Str .= '</select></nobr><br />';
+    #
+    $Str .= '<br /><nobr>'.&mt('Number of Plots:');
+    $Str .= '<select name="NumPlots">';
+    if (! exists($ENV{'form.NumPlots'}) 
+        || $ENV{'form.NumPlots'} < 1 
+        || $ENV{'form.NumPlots'} > 20) {
+        $ENV{'form.NumPlots'} = 5;
+    }
+    foreach my $i (1,2,3,4,5,6,7,8,10,15,20) {
+        $Str .= '<option value="'.$i.'" ';
+        if ($ENV{'form.NumPlots'} == $i) { $Str.=' selected '; }
+        $Str .= '>'.$i.'</option>';
+    }
+    $Str .= '</select></nobr>';
     $Str .= '</td>';
     #
     $Str .= '</tr>'."\n";
     $Str .= '</table>'."\n";
-    $Str .= '<input type="submit" name="ProblemAnalysis" value="'.
-        &mt('Analyze Problem').'" />';
-    $Str .= '&nbsp;'x5;
-    $Str .= '<input type="submit" name="ClearCache" value="'.
-        &mt('Clear Caches').'" />';
-    $Str .= '&nbsp;'x5;
     return ($Str);
 }
 
@@ -364,6 +532,19 @@ sub OptionResponseProblemSelector {
     return $Str;
 }
 
+#########################################################
+#########################################################
+##
+##              Misc functions
+##
+#########################################################
+#########################################################
+sub get_problem_symb {
+    my $problemstring = shift();
+    my ($symb,$partid,$resid) = ($problemstring=~ /^(.*):([^:]*):([^:]*)$/);
+    return ($symb,$partid,$resid);
+}
+
 sub get_resource_from_symb {
     my ($symb) = @_;
     foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {