--- loncom/interface/statistics/lonproblemanalysis.pm	2003/10/09 22:10:02	1.28
+++ loncom/interface/statistics/lonproblemanalysis.pm	2003/10/17 22:05:45	1.42
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemanalysis.pm,v 1.28 2003/10/09 22:10:02 matthew Exp $
+# $Id: lonproblemanalysis.pm,v 1.42 2003/10/17 22:05:45 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,6 +34,13 @@ use Apache::lonhtmlcommon();
 use Apache::loncoursedata();
 use Apache::lonstatistics;
 use Apache::lonlocal;
+use HTML::Entities();
+use Time::Local();
+
+my $plotcolors = ['#33ff00', 
+                  '#0033cc', '#990000', '#aaaa66', '#663399', '#ff9933',
+                  '#66ccff', '#ff9999', '#cccc33', '#660000', '#33cc66',
+                  ]; 
 
 sub BuildProblemAnalysisPage {
     my ($r,$c)=@_;
@@ -42,19 +49,44 @@ sub BuildProblemAnalysisPage {
     #
     my @Students = @Apache::lonstatistics::Students;
     #
-    if (exists($ENV{'form.problemchoice'})) {
-        $r->print('<hr />');
+    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" />');
+    }
+    $r->rflush();
+    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)) {
+            $r->print('<h3>'.$resource->{'src'}.'</h3>');
             my %Data = &get_problem_data($resource->{'src'});
             my $ORdata = $Data{$part.'.'.$resid};
             ##
@@ -64,8 +96,8 @@ sub BuildProblemAnalysisPage {
             $base = "http://".$ENV{'SERVER_NAME'}.$base;
             my $rendered_problem = 
                 &Apache::lonnet::ssi_body($resource->{'src'});
-            $rendered_problem =~ s/<form /<nop /g;
-            $rendered_problem =~ s/<\s*\/form\s>/<\/nop>/g;
+            $rendered_problem =~ s/<\s*form\s*/<nop /g;
+            $rendered_problem =~ s|(<\s*/form\s*>)|<\/nop>|g;
             $r->print('<table bgcolor="ffffff"><tr><td>'.
                       '<base href="'.$base.'" />'.
                       $rendered_problem.
@@ -77,14 +109,14 @@ sub BuildProblemAnalysisPage {
                                            (\@Students,$symb,$resid);
             if (defined($PerformanceData) && 
                 ref($PerformanceData) eq 'ARRAY') {
-                if ($ENV{'form.AnalyzeBy'} eq 'Tries') {
-                    my $analysis_html = &DoTriesAnalysis($PerformanceData,
+                if ($ENV{'form.AnalyzeOver'} eq 'Tries') {
+                    my $analysis_html = &tries_analysis($PerformanceData,
+                                                         $ORdata);
+                    $r->print($analysis_html);
+                } elsif ($ENV{'form.AnalyzeOver'} 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,114 +133,330 @@ 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());
 }
 
+#########################################################
+#########################################################
+##
+##      Misc interface routines use by analysis code
+##
+#########################################################
+#########################################################
+sub build_foil_index {
+    my ($ORdata) = @_;
+    return if (! exists($ORdata->{'Foils'}));
+    my %Foildata = %{$ORdata->{'Foils'}};
+    my @Foils = sort(keys(%Foildata));
+    my %Concepts;
+    foreach my $foilid (@Foils) {
+        push(@{$Concepts{$Foildata{$foilid}->{'Concept'}}},
+             $foilid);
+    }
+    undef(@Foils);
+    # Having gathered the concept information in a hash, we now translate it
+    # into an array because we need to be consistent about order.
+    # Also put the foils in order, too.
+    my $sortfunction = sub {
+        my %Numbers = (one   => 1,
+                       two   => 2,
+                       three => 3,
+                       four  => 4,
+                       five  => 5,
+                       six   => 6,
+                       seven => 7,
+                       eight => 8,
+                       nine  => 9,
+                       ten   => 10,);
+        my $a1 = $a; 
+        my $b1 = $b;
+        if (exists($Numbers{lc($a)})) {
+            $a1 = $Numbers{lc($a)};
+        }
+        if (exists($Numbers{lc($b)})) {
+            $b1 = $Numbers{lc($b)};
+        }
+        $a1 cmp $b1;
+    };
+    my @Concepts;
+    foreach my $concept (sort $sortfunction (keys(%Concepts))) {
+        push(@Concepts,{ name => $concept,
+                        foils => [@{$Concepts{$concept}}]});
+        push(@Foils,(@{$Concepts{$concept}}));
+    }
+    #
+    # Build up the table of row labels.
+    my $table = '<table border="1" >'."\n";
+    if (@Concepts > 1) {
+        $table .= '<tr>'.
+            '<th>'.&mt('Concept Number').'</th>'.
+            '<th>'.&mt('Concept').'</th>'.
+            '<th>'.&mt('Foil Number').'</th>'.
+            '<th>'.&mt('Foil Name').'</th>'.
+            '<th>'.&mt('Foil Text').'</th>'.
+            '<th>'.&mt('Correct Value').'</th>'.
+            "</tr>\n";
+    } else {
+        $table .= '<tr>'.
+            '<th>'.&mt('Foil Number').'</th>'.
+            '<th>'.&mt('Foil Name').'</th>'.
+            '<th>'.&mt('Foil Text').'</th>'.
+            '<th>'.&mt('Correct Value').'</th>'.
+            "</tr>\n";
+    }        
+    my $conceptindex = 1;
+    my $foilindex = 1;
+    foreach my $concept (@Concepts) {
+        my @FoilsInConcept = @{$concept->{'foils'}};
+        my $firstfoil = shift(@FoilsInConcept);
+        if (@Concepts > 1) {
+            $table .= '<tr>'.
+                '<td>'.$conceptindex.'</td>'.
+                '<td>'.$concept->{'name'}.'</td>'.
+                '<td>'.$foilindex++.'</td>'.
+                '<td>'.$Foildata{$firstfoil}->{'name'}.'</td>'.
+                '<td>'.$Foildata{$firstfoil}->{'text'}.'</td>'.
+                '<td>'.$Foildata{$firstfoil}->{'value'}.'</td>'.
+                "</tr>\n";
+        } else {
+            $table .= '<tr>'.
+                '<td>'.$foilindex++.'</td>'.
+                '<td>'.$Foildata{$firstfoil}->{'name'}.'</td>'.
+                '<td>'.$Foildata{$firstfoil}->{'text'}.'</td>'.
+                '<td>'.$Foildata{$firstfoil}->{'value'}.'</td>'.
+                "</tr>\n";
+        }
+        foreach my $foilid (@FoilsInConcept) {
+            if (@Concepts > 1) {
+                $table .= '<tr>'.
+                    '<td></td>'.
+                    '<td></td>'.
+                    '<td>'.$foilindex.'</td>'.
+                    '<td>'.$Foildata{$foilid}->{'name'}.'</td>'.
+                    '<td>'.$Foildata{$foilid}->{'text'}.'</td>'.
+                    '<td>'.$Foildata{$foilid}->{'value'}.'</td>'.
+                    "</tr>\n";
+            } else {
+                $table .= '<tr>'.
+                    '<td>'.$foilindex.'</td>'.
+                    '<td>'.$Foildata{$foilid}->{'name'}.'</td>'.
+                    '<td>'.$Foildata{$foilid}->{'text'}.'</td>'.
+                    '<td>'.$Foildata{$foilid}->{'value'}.'</td>'.
+                    "</tr>\n";
+            }                
+        } continue {
+            $foilindex++;
+        }
+    } continue {
+        $conceptindex++;
+    }
+    $table .= "</table>\n";
+    #
+    # Build option index with color stuff
+    return ($table,\@Foils,\@Concepts);
+}
 
-sub DoTriesAnalysis {
+sub build_option_index {
+    my ($ORdata)= @_;
+    my $table = "<table>\n";
+    my $optionindex = 0;
+    my @Rows;
+    foreach my $option (&mt('correct option chosen'),@{$ORdata->{'Options'}}) {
+        push (@Rows,
+              '<tr>'.
+              '<td bgcolor="'.$plotcolors->[$optionindex++].'">'.
+              ('&nbsp;'x4).'</td>'.
+              '<td>'.$option.'</td>'.
+              "</tr>\n");
+    }
+    shift(@Rows); # Throw away 'correct option chosen' color
+    $table .= join('',reverse(@Rows));
+    $table .= "</table>\n";
+}
+
+#########################################################
+#########################################################
+##
+##         Tries Analysis
+##
+#########################################################
+#########################################################
+sub tries_analysis {
     my ($PerformanceData,$ORdata) = @_;
     my $mintries = 1;
-    my $maxtries = 10;
+    my $maxtries = $ENV{'form.NumPlots'};
+    my ($table,$Foils,$Concepts) = &build_foil_index($ORdata);
+    if ((@$Concepts < 2) && ($ENV{'form.AnalyzeAs'} ne 'Foils')) {
+        $table = '<h3>'.
+            &mt('Not enough data for concept analysis.  '.
+                'Performing Foil Analysis').
+            '</h3>'.$table;
+        $ENV{'form.AnalyzeAs'} = 'Foils';
+    }
     my %ResponseData = &analyze_option_data_by_tries($PerformanceData,
-                                                 $mintries,$maxtries);
-    my @Foils = sort(keys(%ResponseData));
-    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};
+                                                     $mintries,$maxtries);
+    my $analysis = '';
+    if ($ENV{'form.AnalyzeAs'} eq 'Foils') {
+        $analysis = &Tries_Foil_Analysis($mintries,$maxtries,$Foils,
+                                         \%ResponseData,$ORdata);
+    } else {
+        $analysis = &Tries_Concept_Analysis($mintries,$maxtries,
+                                            $Concepts,\%ResponseData,$ORdata);
     }
-    my @Rows;
-    $Rows[0] = ['<td>&nbsp;</td>'];
-    for (my $i=$mintries;$i<=$maxtries;$i++) {
-        push (@{$Rows[0]},
-              '<th colspan="3">'.&mt('Attempt').' '.$i.'</th>');
+    $table .= $analysis;
+    return $table;
+}
+
+sub Tries_Foil_Analysis {
+    my ($mintries,$maxtries,$Foils,$respdat,$ORdata) = @_;
+    my %ResponseData = %$respdat;
+    #
+    # Compute the data neccessary to make the plots
+    my @PlotData; 
+    foreach my $foilid (@$Foils) {
+        for (my $i=$mintries;$i<=$maxtries;$i++) {
+            if ($ResponseData{$foilid}->[$i]->{'_total'} == 0) {
+                push(@{$PlotData[$i]->{'_correct'}},0);
+            } else {
+                push(@{$PlotData[$i]->{'_correct'}},
+                     100*$ResponseData{$foilid}->[$i]->{'_correct'}/
+                     $ResponseData{$foilid}->[$i]->{'_total'});
+            }
+            foreach my $option (@{$ORdata->{'Options'}}) {
+                push(@{$PlotData[$i]->{'_total'}},
+                     $ResponseData{$foilid}->[$i]->{'_total'});
+                if ($ResponseData{$foilid}->[$i]->{'_total'} == 0) {
+                    push (@{$PlotData[$i]->{$option}},0);
+                } else {
+                    if ($ResponseData{$foilid}->[$i]->{'_total'} ==
+                        $ResponseData{$foilid}->[$i]->{'_correct'}) {
+                        push(@{$PlotData[$i]->{$option}},0);
+                    } else {
+                        push (@{$PlotData[$i]->{$option}},
+                              100 * $ResponseData{$foilid}->[$i]->{$option} / 
+                              ($ResponseData{$foilid}->[$i]->{'_total'} - 
+                               $ResponseData{$foilid}->[$i]->{'_correct'}));
+                    }
+                }
+            }
+        }
     }
-    $Rows[1] = ['<th>'.&mt('Foil').'</th>'];
+    # 
+    # Build a table for the plots
+    my $analysis_html = "<table>\n";
+    my $foilkey = &build_option_index($ORdata);
     for (my $i=$mintries;$i<=$maxtries;$i++) {
-        push (@{$Rows[1]},('<th>'.&mt('Correct').'</th>',
-                           '<th>'.&mt('Incorrect').'</th>',
-                           '<th>'.&mt('Percent Correct').'</th>',
-                           ));
+        my $count = $ResponseData{'_total'}->[$i];
+        if ($count == 0) {
+            $count = 'no submissions';
+        } elsif ($count == 1) {
+            $count = '1 submission';
+        } else {
+            $count = $count.' submissions';
+        }
+        my $title = 'Attempt '.$i.', '.$count;
+        my @Datasets;
+        foreach my $option ('_correct',@{$ORdata->{'Options'}}) {
+            next if (! exists($PlotData[$i]->{$option}));
+            push(@Datasets,$PlotData[$i]->{$option});
+        }
+        my $correctgraph = &Apache::loncommon::DrawGraph
+            ($title,'Foil Number','Percent Correct',
+             100,$plotcolors,$Datasets[0]);
+        $analysis_html.= '<tr><td>'.$correctgraph.'</td>';
+        ##
+        ##
+        for (my $i=0; $i< scalar(@{$Datasets[0]});$i++) {
+            $Datasets[0]->[$i]=0;
+        }
+        $count = $ResponseData{'_total'}->[$i]-$ResponseData{'_correct'}->[$i];
+        if ($count == 0) {
+            $count = 'no submissions';
+        } elsif ($count == 1) {
+            $count = '1 submission';
+        } else {
+            $count = $count.' submissions';
+        }
+        $title = 'Attempt '.$i.', '.$count;
+        my $incorrectgraph = &Apache::loncommon::DrawGraph
+            ($title,'Foil Number','% Option Chosen Incorrectly',
+             100,$plotcolors,@Datasets);
+        $analysis_html.= '<td>'.$incorrectgraph.'</td>';
+        $analysis_html.= '<td>'.$foilkey."<td></tr>\n";
     }
+    $analysis_html .= "</table>\n";
+    return $analysis_html;
+}
+
+sub Tries_Concept_Analysis {
+    my ($mintries,$maxtries,$Concepts,$respdat,$ORdata) = @_;
+    my %ResponseData = %$respdat;
+    my $analysis_html = "<table>\n";
+    #
+    # 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>');
+    # Concept analysis
+    #
+    # Note: we do not bother with characterizing the students incorrect
+    # answers at the concept level because an incorrect answer for one foil
+    # may be a correct answer for another foil.
+    my %ConceptData;
+    foreach my $concept (@{$Concepts}) {
         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++) {
-            push (@{$CumulativePlotData[$i]->{'good'}},
-                  $CumulativePlotData[-1]->{'good'}+
-                  $ResponseData{$foilid}->[$i]->{'correct'});
-            push (@{$CumulativePlotData[$i]->{'bad'}},
-                  $CumulativePlotData[-1]->{'bad'}+
-                  $ResponseData{$foilid}->[$i]->{'incorrect'});
+            my $cdata = $ConceptData{$concept}->[$i];
+            foreach my $foilid (@{$concept->{'foils'}}) {
+                $cdata->{'_correct'} += 
+                    $ResponseData{$foilid}->[$i]->{'_correct'};
+                $cdata->{'_total'}   += 
+                    $ResponseData{$foilid}->[$i]->{'_total'};
+            }
+            push (@{$PlotData[$i]->{'_total'}},$cdata->{'_total'});
+            if ($cdata->{'_total'} == 0) {
+                push (@{$PlotData[$i]->{'_correct'}},0);
+            } else {
+                push (@{$PlotData[$i]->{'_correct'}},
+                      100*$cdata->{'_correct'}/$cdata->{'_total'});
+                }
         }
-        push(@Rows,\@Data);
-    } continue {
-        $index++;
     }
-    my @Data = ('<td></td>');
+    # Build a table for the plots
     for (my $i=$mintries;$i<=$maxtries;$i++) {
-        my $minstu = $ResponseData{$Foils[0]}->[$i]->{'total'};
-        my $maxstu = $ResponseData{$Foils[0]}->[$i]->{'total'};
-        foreach my $foilid (@Foils) {
-            if ($minstu > $ResponseData{$foilid}->[$i]->{'total'}) {
-                $minstu = $ResponseData{$foilid}->[$i]->{'total'};
-            }
-            if ($maxstu < $ResponseData{$foilid}->[$i]->{'total'}) {
-                $maxstu = $ResponseData{$foilid}->[$i]->{'total'};
-            }
-        }
-        $maxstu = 0 if (! $maxstu);
-        $minstu = 0 if (! $minstu);
-        my $graphlink;
-        if ($maxstu == $minstu) {
-            $graphlink = &Apache::loncommon::DrawGraph
-                ('Attempt '.$i.', '.$maxstu.' students',
-                 'Foil Number',
-                 'Percent Correct',
-                 100,
-                 $PlotData[$i]->{'good'},
-                 $PlotData[$i]->{'bad'});
+        my $minstu = $PlotData[$i]->{'_total'}->[0];
+        my $maxstu = $PlotData[$i]->{'_total'}->[0];
+        foreach my $count (@{$PlotData[$i]->{'_total'}}) {
+            if ($minstu > $count) {
+                $minstu = $count;
+            }
+            if ($maxstu < $count) {
+                $maxstu = $count;
+            }
+        }
+        $maxstu = 0 if (! defined($maxstu));
+        $minstu = 0 if (! defined($minstu));
+        my $title;
+        my $count = $ResponseData{'_total'}->[$i];
+        if ($count == 0) {
+            $count = 'no submissions';
+        } elsif ($count == 1) {
+            $count = '1 submission';
         } else {
-            $graphlink = &Apache::loncomon::DrawGraph
-                ('Attempt '.$i.', '.$minstu.'-'.$maxstu.
-                 ' students',
-                 'Foil Number',
-                 'Percent Correct',
-                 100,
-                 $PlotData[$i]->{'good'},
-                 $PlotData[$i]->{'bad'});
+            $count = $count.' submissions';
         }
-        push(@Data,'<td colspan="3">'.$graphlink.'</td>');
-    }
-    push (@Rows,\@Data);
-    my $table = '<table border="1" >'."\n";
-    for (my $i=0; $i <=$#Rows;$i++) {
-        $table .= '<tr>'.join('',@{$Rows[$i]})."</tr>\n";
+        $title = 'Attempt '.$i.', '.$count;
+        my $graphlink = &Apache::loncommon::DrawGraph
+            ($title,'Concept Number','Percent Correct',
+             100,$plotcolors,$PlotData[$i]->{'_correct'});
+        $analysis_html.= '<tr><td>'.$graphlink."</td></tr>\n";
     }
-    $table .= '</table>';
-    return ($table);
+    $analysis_html .= "</table>\n";
+    return $analysis_html;
 }
 
 sub analyze_option_data_by_tries {
@@ -218,50 +466,280 @@ sub analyze_option_data_by_tries {
     $maxtries = $mintries if (! defined($maxtries) || $maxtries < $mintries);
     foreach my $row (@$PerformanceData) {
         next if (! defined($row));
-        my ($grading,$submission,$time,$tries) = @$row;
-        my @Foilgrades = split('&',$grading);
-        my @Foilsubs   = split('&',$submission);
-        for (my $numtries = 1; $numtries <= $maxtries; $numtries++) {
-            if ($tries == $numtries) {
-                foreach my $foilgrade (@Foilgrades) {
-                    my ($foilid,$correct) = split('=',$foilgrade);
-                    if ($correct) {
-                        $Trydata{$foilid}->[$numtries]->{'correct'}++;
-                    } else {
-                        $Trydata{$foilid}->[$numtries]->{'incorrect'}++;
-                    }                        
-                }
+        my $tries = &get_tries_from_row($row);
+        my %Row   = &Process_Row($row);
+        while (my ($foilid,$href) = each(%Row)) {
+            if (! ref($href)) { 
+                $Trydata{$foilid}->[$tries] += $href;
+                next;
+            }
+            while (my ($option,$value) = each(%$href)) {
+                $Trydata{$foilid}->[$tries]->{$option}+=$value;
             }
         }
     }
-    foreach my $foilid (keys(%Trydata)) {
-        foreach my $tryhash (@{$Trydata{$foilid}}) {
-            next if ((! exists($tryhash->{'correct'}) && 
-                      ! exists($tryhash->{'incorrect'})) ||
-                     ($tryhash->{'correct'} < 1 &&
-                      $tryhash->{'incorrect'} < 1));
-            $tryhash->{'total'} = $tryhash->{'correct'} + 
-                                        $tryhash->{'incorrect'};
-            $tryhash->{'percent_corr'} = 100 *
-                ($tryhash->{'correct'} /
-                         ($tryhash->{'correct'} + $tryhash->{'incorrect'})
-                 );
+    return %Trydata;
+}
+
+#########################################################
+#########################################################
+##
+##                 Time Analysis
+##
+#########################################################
+#########################################################
+sub time_analysis {
+    my ($PerformanceData,$ORdata) = @_;
+    my ($table,$Foils,$Concepts) = &build_foil_index($ORdata);
+    if ((@$Concepts < 2) && ($ENV{'form.AnalyzeAs'} ne 'Foils')) {
+        $table = '<h3>'.
+            &mt('Not enough data for concept analysis.  '.
+                'Performing Foil Analysis').
+            '</h3>'.$table;
+        $ENV{'form.AnalyzeAs'} = 'Foils';
+    }
+    my $num_plots = $ENV{'form.NumPlots'};
+    my $num_data = scalar(@$PerformanceData)-1;
+    my $percent = sprintf('%2f',100/$num_plots);
+    #
+    $table .= "<table>\n";
+    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);
+        if (! defined($starttime) || ! defined($endtime)) {
+            my $sec_in_day = 86400;
+            my $last_sub_time = &get_time_from_row($PerformanceData->[-1]);
+            my ($sday,$smon,$syear);
+            (undef,undef,undef,$sday,$smon,$syear) = 
+                localtime($last_sub_time - $sec_in_day*$i);
+            $starttime = &Time::Local::timelocal(0,0,0,$sday,$smon,$syear);
+            $endtime = $starttime + $sec_in_day;
+            if ($i == ($num_plots -1 )) {
+                $starttime = &get_time_from_row($PerformanceData->[0]);
+            }
+        }
+        my $startdateform = &Apache::lonhtmlcommon::date_setter
+            ('Statistics','startdate_'.$i,$starttime);
+        my $enddateform = &Apache::lonhtmlcommon::date_setter
+            ('Statistics','enddate_'.$i,$endtime);
+        #
+        my $begin_index;
+        my $end_index;
+        my $j;
+        while (++$j < scalar(@$PerformanceData)) {
+            last if (&get_time_from_row($PerformanceData->[$j]) > $starttime);
+        }
+        $begin_index = $j;
+        while (++$j < scalar(@$PerformanceData)) {
+            last if (&get_time_from_row($PerformanceData->[$j]) > $endtime);
+        }
+        $end_index = $j;
+        ##
+        my $interval = {
+            begin_index => $begin_index,
+            end_index   => $end_index,
+            startdateform => $startdateform,
+            enddateform   => $enddateform,
+        };
+        if ($ENV{'form.AnalyzeAs'} eq 'Foils') {
+            $table .= &Foil_Time_Analysis($PerformanceData,$ORdata,$Foils,
+                                          $interval);
+        } else {
+            $table .= &Concept_Time_Analysis($PerformanceData,$ORdata,
+                                             $Concepts,$interval);
         }
     }
-    return %Trydata;
+    #
+    return $table;
 }
 
-sub get_problem_symb {
-    my $problemstring = shift();
-    my ($symb,$partid,$resid) = ($problemstring=~ /^(.*):([^:]*):([^:]*)$/);
-    return ($symb,$partid,$resid);
+sub Foil_Time_Analysis {
+    my ($PerformanceData,$ORdata,$Foils,$interval) = @_;
+    my $analysis_html;
+    my $foilkey = &build_option_index($ORdata);
+    my ($begin_index,$end_index) = ($interval->{'begin_index'},
+                                    $interval->{'end_index'});
+    my %TimeData;
+    #
+    # Compute the number getting the foils correct or incorrects
+    for (my $j=$begin_index;$j<=$end_index;$j++) {
+        my $row = $PerformanceData->[$j];
+        next if (! defined($row));
+        my %Row = &Process_Row($row);
+        while (my ($foilid,$href) = each(%Row)) {
+            if (! ref($href)) {
+                $TimeData{$foilid} += $href;
+                next;
+            }
+            while (my ($option,$value) = each(%$href)) {
+                $TimeData{$foilid}->{$option}+=$value;
+            }
+        }
+    }
+    my @Plotdata;
+    foreach my $foil (@$Foils) {
+        my $total = $TimeData{$foil}->{'_total'};
+        if ($total == 0) {
+            push(@{$Plotdata[0]},0);
+        } else {
+            push(@{$Plotdata[0]},
+                 100 * $TimeData{$foil}->{'_correct'} / $total);
+        }
+        my $total_incorrect = $total - $TimeData{$foil}->{'_correct'};
+        my $optionidx = 1;
+        foreach my $option (@{$ORdata->{'Options'}}) {
+            if ($total_incorrect == 0) {
+                push(@{$Plotdata[$optionidx]},0);
+            } else {
+                push(@{$Plotdata[$optionidx]},
+                     100 * $TimeData{$foil}->{$option} / $total_incorrect);
+            }
+        } continue {
+            $optionidx++;
+        }
+    }
+    #
+    # Create the plot
+    my $count = $end_index-$begin_index;
+    my $title;
+    if ($count == 0) {
+        $title = 'no submissions';
+    } elsif ($count == 1) {
+        $title = 'one submission';
+    } else {
+        $title = $count.' submissions';
+    }
+    my $correctplot = &Apache::loncommon::DrawGraph($title,
+                                                    'Foil Number',
+                                                    'Percent Correct',
+                                                    100,
+                                                    $plotcolors,
+                                                    $Plotdata[0]);
+    for (my $j=0; $j< scalar(@{$Plotdata[0]});$j++) {
+        $Plotdata[0]->[$j]=0;
+    }
+    $count = $end_index-$begin_index-$TimeData{'_correct'};
+    if ($count == 0) {
+        $title = 'no submissions';
+    } elsif ($count == 1) {
+        $title = 'one submission';
+    } else {
+        $title = $count.' submissions';
+    }
+    my $incorrectplot = &Apache::loncommon::DrawGraph($title,
+                                                 'Foil Number',
+                                                 'Incorrect Option Choice',
+                                                 100,
+                                                 $plotcolors,
+                                                 @Plotdata);        
+    $analysis_html.='<tr>'.
+        '<td>'.$correctplot.'</td>'.
+        '<td>'.$incorrectplot.'</td>'.
+        '<td align="left" valign="top">'.$foilkey.'</td>'."</tr>\n";
+    $analysis_html.= '<tr>'.'<td colspan="3">'.
+        '<b>Start Time</b>:'.
+        ' &nbsp;'.$interval->{'startdateform'}.'<br />'.
+        '<b>End Time</b>&nbsp;&nbsp;: '.
+        '&nbsp;'.$interval->{'enddateform'}.'<br />'.
+#        '<b>Plot Title</b>&nbsp;&nbsp;:'.
+#        ("&nbsp;"x3).$interval->{'titleform'}.
+        '</td>'.
+        "</tr>\n";
+    return $analysis_html;
+}
+
+sub Concept_Time_Analysis {
+    my ($PerformanceData,$ORdata,$Concepts,$interval) = @_;
+    my $analysis_html;
+    ##
+    ## Determine starttime, endtime, startindex, endindex
+    my ($begin_index,$end_index) = ($interval->{'begin_index'},
+                                    $interval->{'end_index'});
+    my %TimeData;
+    #
+    # Compute the number getting the foils correct or incorrects
+    for (my $j=$begin_index;$j<=$end_index;$j++) {
+        my $row = $PerformanceData->[$j];
+        next if (! defined($row));
+        my %Row = &Process_Row($row);
+        while (my ($foilid,$href) = each(%Row)) {
+            if (! ref($href)) {
+                $TimeData{$foilid} += $href;
+                next;
+            }
+            while (my ($option,$value) = each(%$href)) {
+                $TimeData{$foilid}->{$option}+=$value;
+            }
+        }
+    }
+    #
+    # Put the data in plottable form
+    my @Plotdata;
+    foreach my $concept (@$Concepts) {
+        my ($total,$correct);
+        foreach my $foil (@{$concept->{'foils'}}) {
+            $total += $TimeData{$foil}->{'_total'};
+            $correct += $TimeData{$foil}->{'_correct'};
+        }
+        if ($total == 0) {
+            push(@Plotdata,0);
+        } else {
+            push(@Plotdata,100 * $correct / $total);
+        }
+    }
+    #
+    # Create the plot
+    my $title = ($end_index - $begin_index).' submissions';
+    my $correctplot = &Apache::loncommon::DrawGraph($title,
+                                                    'Concept Number',
+                                                    'Percent Correct',
+                                                    100,
+                                                    $plotcolors,
+                                                    \@Plotdata);
+    $analysis_html.='<tr>'.
+        '<td>'.$correctplot.'</td>'.
+        '<td align="left" valign="top">'.
+        '<b>Start Time</b>: &nbsp;'.$interval->{'startdateform'}.'<br />'.
+        '<b>End Time</b>&nbsp;&nbsp;: '.
+           '&nbsp;'.$interval->{'enddateform'}.'<br />'.
+#        '<b>Plot Title</b>&nbsp;&nbsp;:'.("&nbsp;"x3).
+#            $interval->{'titleform'}.
+        '</td>'.
+        "</tr>\n";
+    return $analysis_html;
+}
+
+#########################################################
+#########################################################
+##
+##             Excel output 
+##
+#########################################################
+#########################################################
+sub prepare_excel_sheet {
+    my ($PerformanceData,$ORdata) = @_;
+    my (undef,$Foils,$Concepts) = &build_foil_index($ORdata);
 }
 
+sub process_data_for_excel_sheet {
+    my ($PerformanceData,$Foils,$Concepts,$ORdata)=@_;
+}
+
+#########################################################
+#########################################################
+##
+##             Interface 
+##
+#########################################################
+#########################################################
 sub CreateInterface {
     ##
     ## Environment variable initialization
-    if (! exists$ENV{'form.AnalyzeBy'}) {
-        $ENV{'form.AnalyzeBy'} = 'Tries';
+    if (! exists$ENV{'form.AnalyzeOver'}) {
+        $ENV{'form.AnalyzeOver'} = 'Tries';
     }
     ##
     ## Build the menu
@@ -270,10 +748,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 +761,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,32 +770,64 @@ 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 .='<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 ';
+    { # These braces are here to organize the code, not scope it.
+        {
+            $Str .= '<nobr>'.&mt('Analyze Over ');
+            $Str .='<select name="AnalyzeOver" >';
+            $Str .= '<option value="Tries" ';
+            if (! exists($ENV{'form.AnalyzeOver'}) || 
+                $ENV{'form.AnalyzeOver'} eq 'Tries'){
+                # Default to Tries
+                $Str .= ' selected ';
+            }
+            $Str .= '>'.&mt('Tries').'</option>';
+            $Str .= '<option value="Time" ';
+            $Str .= ' selected ' if ($ENV{'form.AnalyzeOver'} eq 'Time');
+            $Str .= '>'.&mt('Time').'</option>';
+            $Str .= '</select></nobr><br />';
+        }
+        {
+            $Str .= '<nobr>'.&mt('Analyze as ');
+            $Str .='<select name="AnalyzeAs" >';
+            $Str .= '<option value="Concepts" ';
+            if (! exists($ENV{'form.AnalyzeAs'}) || 
+                $ENV{'form.AnalyzeAs'} eq 'Concepts'){
+                # Default to Concepts
+                $Str .= ' selected ';
+            }
+            $Str .= '>'.&mt('Concepts').'</option>';
+            $Str .= '<option value="Foils" ';
+            $Str .= ' selected ' if ($ENV{'form.AnalyzeAs'} eq 'Foils');
+            $Str .= '>'.&mt('Foils').'</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 .= '>'.&mt('Time').'<br />';
     $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);
+    return $Str;
 }
 
 sub OptionResponseProblemSelector {
@@ -326,7 +837,6 @@ sub OptionResponseProblemSelector {
         next if ($seq->{'num_assess'}<1);
         my $seq_str = '';
         foreach my $res (@{$seq->{'contents'}}) {
-#            &Apache::lonnet::logthis('checking '.$res->{'title'});
             next if ($res->{'type'} ne 'assessment');
             foreach my $part (@{$res->{'parts'}}) {
                 my $partdata = $res->{'partdata'}->{$part};
@@ -364,6 +874,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()) {
@@ -376,20 +899,59 @@ sub get_resource_from_symb {
     return undef;
 }
 
+sub get_time_from_row {
+    my ($row) = @_;
+    if (ref($row)) {
+        return $row->[3];
+    } 
+    return undef;
+}
+
+sub get_tries_from_row {
+    my ($row) = @_;
+    if (ref($row)) {
+        return $row->[4];
+    }
+    return undef;
+}
+
+sub Process_Row {
+    my ($row) = @_;
+    my %RowData;
+    my ($award,$grading,$submission,$time,$tries) = @$row;
+    next if ($award eq 'MISSING_ANSWER');
+    if ($award =~ /(APPROX_ANS|EXACT_ANS)/) {
+        $RowData{'_correct'} = 1;
+    }
+    $RowData{'_total'} = 1;
+    my @Foilgrades = split('&',$grading);
+    my @Foilsubs   = split('&',$submission);
+    for (my $j=0;$j<=$#Foilgrades;$j++) {
+        my ($foilid,$correct)  = split('=',$Foilgrades[$j]);
+        my (undef,$submission) = split('=',$Foilsubs[$j]);
+        if ($correct) {
+            $RowData{$foilid}->{'_correct'}++;
+        } else {
+            $submission = &Apache::lonnet::unescape($submission);
+            $submission =~ s/\%20/ /g;
+            $RowData{$foilid}->{$submission}++;
+        }
+        $RowData{$foilid}->{'_total'}++;
+    }
+    return %RowData;
+}
+
+##
+## get problem data and put it into a useful data structure.
+## note: we must force each foil and option to not begin or end with
+##       spaces as they are stored without such data.
+##
 sub get_problem_data {
     my ($url) = @_;
-#    my $Answ=&Apache::lonnet::ssi($URI,('grade_target' => 'analyze',
-#                                  'grade_username' => $sname,
-#                                  'grade_domain' => $sdom,
-#                                  'grade_courseid' => $cid,
-#                                  'grade_symb' => $symb));
     my $Answ=&Apache::lonnet::ssi($url,('grade_target' => 'analyze'));
     (my $garbage,$Answ)=split(/_HASH_REF__/,$Answ,2);
     my %Answer;
     %Answer=&Apache::lonnet::str2hash($Answ);
-#    &Apache::lonnet::logthis('keys of %Answer = '.join(', ',(keys(%Answer))));
-#    &Apache::lonnet::logthis('$Answer{parts} = '.
-#                             join(', ',@{$Answer{'parts'}}));
     my %Partdata;
     foreach my $part (@{$Answer{'parts'}}) {
         while (my($key,$value) = each(%Answer)) {
@@ -403,45 +965,22 @@ sub get_problem_data {
                 } elsif ($key =~ /^concept\.(.*)$/) {
                     my $concept = $1;
                     foreach my $foil (@$value) {
-                        $Partdata{$part}->{$foil}->{'Concept'}=$concept;
+                        $Partdata{$part}->{'Foils'}->{$foil}->{'Concept'}=
+                                                                      $concept;
                     }
                 }
- #               &Apache::lonnet::logthis($part.' '.$key.' (array) = '.
- #                                        join(', ',@$value));
             } else {
-                $value =~ s/^\s*//g;
-                $value =~ s/\s*$//g;
                 if ($key=~ /^foil\.text\.(.*)$/) {
                     my $foil = $1;
-                    $Partdata{$part}->{'Foiltext'}->{$foil}=$value;
+                    $Partdata{$part}->{'Foils'}->{$foil}->{'name'}=$foil;
+                    $Partdata{$part}->{'Foils'}->{$foil}->{'text'}=$value;
                 } elsif ($key =~ /^foil\.value\.(.*)$/) {
                     my $foil = $1;
-                    $Partdata{$part}->{'FoilValues'}->{$foil}=$value;
+                    $Partdata{$part}->{'Foils'}->{$foil}->{'value'}=$value;
                 }
-#                &Apache::lonnet::logthis($part.' '.$key.' = '.$value);
             }
         }
     }
-
-#    my $parts='';
-#    foreach my $elm (@{$Answer{"parts"}}) {
-#        $parts.="$elm,";
-#    }
-#    chop($parts);
-#    my $conc='';
-#    foreach my $elm (@{$Answer{"$parts.concepts"}}) {
-#        $conc.="$elm@";
-#    }
-#    chop($conc);
-#
-#    @Concepts=split(/\@/,$conc);
-#    foreach my $concept (@{$Answer{"$parts.concepts"}}) {
-#        foreach my $foil (@{$Answer{"$parts.concept.$concept"}}) {
-#            $foil_to_concept{$foil} = $concept;
-#            #$ConceptData{$foil} = $Answer{"$parts.foil.value.$foil"};
-#        }
-#    }
-#    return $symb;
     return %Partdata;
 }