--- loncom/interface/statistics/lonproblemanalysis.pm	2004/10/04 19:10:26	1.91
+++ loncom/interface/statistics/lonproblemanalysis.pm	2004/10/27 17:47:13	1.96
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemanalysis.pm,v 1.91 2004/10/04 19:10:26 matthew Exp $
+# $Id: lonproblemanalysis.pm,v 1.96 2004/10/27 17:47:13 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -86,7 +86,7 @@ sub BuildProblemAnalysisPage {
     # Support for numerical and radio response isn't complete enough to
     # include in 1.2 release.
     # my $problem_types = '(option|radiobutton|numerical)';
-    my $problem_types = '(option)';
+    my $problem_types = '.';#(option)';
     if (exists($ENV{'form.problemchoice'}) && 
         ! exists($ENV{'form.SelectAnother'})) {
         foreach my $button (@SubmitButtons) {
@@ -222,10 +222,9 @@ sub NumericalResponseAnalysis {
     }
     #
     # This next call causes all the waiting around that people complain about
-    my ($max,$min) = 
-        &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$Students,
-                                                   'Statistics',
-                                                   'stats_status');
+    &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$Students,
+                                               'Statistics',
+                                               'stats_status');
     return if ($c->aborted());
     #
     # Collate the data
@@ -377,30 +376,365 @@ sub build_student_data_worksheet {
 #########################################################
 #########################################################
 sub RadioResponseAnalysis {
-    my ($r,$problem,$problem_data,$Students) = @_;
-    my ($resource,$respid) = ($problem->{'resource'},
-                              $problem->{'respid'});
+    my ($r,$problem,$problem_analysis,$students) = @_;
+    if ($ENV{'form.AnalyzeOver'} eq 'tries') {
+        &RR_tries_analysis($r,$problem,$problem_analysis,$students);
+    } elsif ($ENV{'form.AnalyzeOver'} eq 'time') {
+        &RR_static_time_analysis($r,$problem,$problem_analysis,$students);
+    } else {
+        $r->print('Bad request');
+    }
+    return;
+}
+
+sub RR_computed_tries_analysis {
+    my ($r,$problem,$problem_analysis) = @_;
+    my ($resource,$partid,$respid) = ($problem->{'resource'},
+                                      $problem->{'part'},
+                                      $problem->{'respid'});
+    $r->print('The tries answer you seek must be computed');
+    # Gather student data
+    # for each try
+    #    loop through data, classifying it by
+    #         correct foil -> selected foil
+    #    if there is concept data
+    #         make a concept correct plot
+    #    for each correct foil
+    #         make a plot of the data
+}
+
+sub RR_computed_time_analysis {
+    my ($r,$problem,$problem_analysis) = @_;
+    my ($resource,$partid,$respid) = ($problem->{'resource'},
+                                      $problem->{'part'},
+                                      $problem->{'respid'});
+    $r->print('The time answer you seek must be computed');
+    # Gather student data
+    # for time division
+    #    limit to between start time & end time
+    #    loop through data, classifying it by
+    #         correct foil -> selected foil
+    #    if there is concept data
+    #         make a concept correct plot
+    #    for each correct foil
+    #         make a plot of the data
+}
+
+sub RR_tries_analysis {
+    my ($r,$problem,$problem_analysis,$students) = @_;
+    my ($resource,$partid,$respid) = ($problem->{'resource'},
+                                      $problem->{'part'},
+                                      $problem->{'respid'});
+    #
     my $analysis_html;
-    my $PerformanceData = &Apache::loncoursedata::get_response_data
+    my $foildata = $problem_analysis->{'_Foils'};
+    my ($table,$foils,$concepts) = &build_foil_index($problem_analysis);
+    $analysis_html .= $table;
+    # Gather student data
+    my $response_data = &Apache::loncoursedata::get_response_data
         (\@Apache::lonstatistics::SelectedSections,
          $Apache::lonstatistics::enrollment_status,
          $resource->{'symb'},$respid);
-    if (! defined($PerformanceData) || 
-        ref($PerformanceData) ne 'ARRAY' ) {
+    my $correct;   # either a hash reference or a scalar
+    if ($problem_analysis->{'answercomputed'} || scalar(@$concepts) > 1) {
+        # This takes a while for large classes...
+        &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$students,
+                                                   'Statistics',
+                                                   'stats_status');
+        foreach my $student (@$students) {
+            my ($idx,@remainder) = split('&',$student->{'answer'});
+            my ($answer) = ($remainder[$idx]=~/^(.*)=([^=]*)$/);
+            $correct->{$student->{'username'}.':'.$student->{'domain'}}=
+                &Apache::lonnet::unescape($answer);
+        }
+    } else {
+        foreach my $foil (keys(%$foildata)) {
+            if ($foildata->{$foil}->{'value'} eq 'true') {
+                $correct = $foildata->{$foil}->{'name'};
+                last;
+            }
+        }
+    }
+    if (! defined($response_data) || 
+        ref($response_data) ne 'ARRAY' ) {
+        $analysis_html = '<h2>'.
+            &mt('There is no submission data for this resource').
+            '</h2>';
+        $r->print($analysis_html);
+        return;
+    }
+    #
+    $analysis_html.='<table>';
+    for (my $try = 1;$try<=$ENV{'form.NumPlots'};$try++) {
+        # classify data ->correct foil -> selected foil
+        my $attempt_restriction_function = 
+        my $foil_choice_data = 
+            &RR_classify_response_data($response_data,$correct,
+                                       sub {($_[0]->{'tries'} == $try?1:0)});
+        my $answers;
+        if (ref($correct)) {
+            my %tmp;
+            foreach my $foil (values(%$correct)) {
+                $tmp{$foil}++;
+            }
+            $answers = [keys(%tmp)];
+        } else {
+            $answers = [$correct];
+        }
+        # Concept Plot
+        my $concept_plot = '';
+        if (scalar(@$concepts) > 1) {
+            $concept_plot = &RR_concept_plot($concepts,$foil_choice_data,
+                                             '% choosing');
+        }
+        # % Choosing plot
+        my $choice_plot = &RR_create_percent_selected_plot
+            ($foils,$foil_choice_data,'Attempt '.$try);
+        # for each correct foil, how did they mark it? (stacked bar graph)
+        my ($stacked_plot,$count_by_foil) = 
+            &RR_create_stacked_selection_plot($foils,$foil_choice_data,'');
+        #
+        if ($concept_plot ne '' ||
+            $choice_plot ne '' ||
+            $stacked_plot ne '') {
+            $analysis_html.=
+                '<tr>'.
+                '<td>'.$concept_plot.'</td>'.
+                '<td>'.$choice_plot.'</td>';
+            if ($stacked_plot ne '') {
+                $analysis_html .= 
+                '<td>'.$stacked_plot.'</td>'.
+                '<td>'.&build_foil_key($foils,$count_by_foil).'</td>';
+            } else {
+                $analysis_html .= ('<td></td>'x2);
+            }
+            $analysis_html.='</tr>'.$/;
+        }
+    }
+    $analysis_html.='</table>';
+    $r->print($analysis_html);
+}
+
+
+sub RR_concept_plot {
+    my ($concepts,$foil_data,$title) = @_;
+    #
+    my %correct_by_concept;
+    my %incorrect_by_concept;
+    my %true;
+    foreach my $concept (@$concepts) {
+        foreach my $foil (@{$concept->{'foils'}}) {
+            next if (! exists($foil_data->{$foil}));
+            foreach my $choice (keys(%{$foil_data->{$foil}})) {
+                if ($choice eq $foil) {
+                    $correct_by_concept{$concept->{'name'}} +=
+                        $foil_data->{$foil}->{$choice};
+                } else {
+                    $incorrect_by_concept{$concept->{'name'}} +=
+                        $foil_data->{$foil}->{$choice};
+                    
+                }
+            }
+        }
+    }
+    # 
+    # need arrays for incorrect and correct because we want to use different
+    # colors for them
+    my @correct;
+    #
+    my $total =0;
+    for (my $i=0;$i<scalar(@$concepts);$i++) {
+        my $concept = $concepts->[$i];
+        $correct[$i]   =   $correct_by_concept{$concept->{'name'}};
+        $total += $correct_by_concept{$concept->{'name'}}+
+            $incorrect_by_concept{$concept->{'name'}};
+    }
+    if ($total == 0) { return ''; };
+    for (my $i=0;$i<=$#correct;$i++) { 
+        $correct[$i] = sprintf('%0f',$correct[$i]/$total*100);
+    }
+    my $xlabel = 'concept';
+    $title.= ' (N='.$total.')';
+    my $plot=  &Apache::loncommon::DrawBarGraph($title,
+                                                $xlabel,
+                                                'Percent Choosing',
+                                                100,
+                                                ['#33ff00','#ff3300'],
+                                                undef,
+                                                \@correct);
+    return $plot;
+}
+
+
+sub RR_create_percent_selected_plot {
+    my ($foils,$foil_data,$title) = @_;
+    #
+    my %foil_selections;
+    my %true;
+    foreach my $foil (@$foils) {
+        # foil_data has format $foil_data->{true_foil}->{selected foil}
+        next if (! exists($foil_data->{$foil}));
+        $true{$foil}++;
+        while (my ($f,$count)= each(%{$foil_data->{$foil}})) {
+            $foil_selections{$f}+=$count;
+        }
+    }
+    # 
+    # need arrays for incorrect and correct because we want to use different
+    # colors for them
+    my @correct;
+    my @incorrect;
+    #
+    my $total =0;
+    for (my $i=0;$i<scalar(@$foils);$i++) {
+        my $foil = $foils->[$i];
+        if ($true{$foil}) {
+            $correct[$i]   = $foil_selections{$foil};
+            $incorrect[$i] = 0;
+        } else {
+            $correct[$i]   = 0;
+            $incorrect[$i] = $foil_selections{$foil};
+        }
+        $total+=$foil_selections{$foil};
+    }
+    if ($total == 0) { return ''; };
+    for (my $i=0;$i<=$#correct;$i++) { 
+        $correct[$i] = sprintf('%0f',$correct[$i]/$total*100);
+    }
+    for (my $i=0;$i<=$#incorrect;$i++) {
+        $incorrect[$i] = sprintf('%0f',$incorrect[$i]/$total*100);
+    }
+    my $xlabel = 'foil chosen';
+    $title.= ' (N='.$total.')';
+    my $plot=  &Apache::loncommon::DrawBarGraph($title,
+                                                $xlabel,
+                                                'Percent Choosing',
+                                                100,
+                                                ['#33ff00','#ff3300'],
+                                                undef,
+                                                \@correct,
+                                                \@incorrect);
+    return $plot;
+}
+
+
+sub RR_create_stacked_selection_plot {
+    my ($foils,$foil_data,$title)=@_;
+    #
+    my @correct_choice; # the green row
+    my @dataset; # array of array refs - multicolor rows.
+    my %filled;
+    my @labels;
+    my $count=-1;
+    my %column;
+    for (my $i=0;$i<scalar(@$foils);$i++) {
+        next if (! exists($foil_data->{$foils->[$i]}));
+        my $correct_foil = $foils->[$i];
+        push(@labels,$i+1);
+        $column{$correct_foil}= ++$count;
+        for (my $j=0;$j<scalar(@$foils);$j++) {
+            my $value = 0;
+            if ($i != $j ) {
+                $value += $foil_data->{$correct_foil}->{$foils->[$j]};
+            }
+            $dataset[$j]->[$column{$correct_foil}]=$value;
+        }
+    }
+    #
+    return '' if (! scalar(keys(%column)));
+    #
+    my $grand_total = 0;
+    my %count_per_foil;
+    while (my ($foil,$bar) = each (%column)) {
+        my $bar_total = 0;
+        for (my $j=0;$j<scalar(@dataset);$j++) {
+            $bar_total += $dataset[$j]->[$bar];
+        }
+        next if ($bar_total == 0);
+        for (my $j=0;$j<scalar(@dataset);$j++) {
+            $dataset[$j]->[$bar] = 
+                sprintf('%2f',$dataset[$j]->[$bar]/$bar_total * 100);
+        }
+        $count_per_foil{$foil}=' (N='.$bar_total.')';
+        $grand_total += $bar_total;
+    }
+    if ($grand_total == 0) {
+        return ('',undef);
+    }
+    my @empty_row = ();
+    foreach (@{$dataset[0]}) {
+        push(@empty_row,0);
+    }
+    #
+    $title .= ' (N='.$grand_total.')';
+    my $graph = &Apache::loncommon::DrawBarGraph
+        ($title,'Correct Foil','foils chosen Incorrectly',
+         100,$plotcolors,\@labels,\@empty_row,@dataset);
+    return ($graph,\%count_per_foil);
+}
+
+
+# if $correct is a hash ref, it is assumed to be indexed by student names.
+#    the values are assumed to be hash refs with a key of 'answer'.
+sub RR_classify_response_data {
+    my ($full_row_data,$correct,$function) = @_;
+    my %submission_data;
+    foreach my $row (@$full_row_data) {
+        my %subm = &hashify_attempt($row);
+        if (ref($correct) eq 'HASH') {
+            $subm{'correct'} = $correct->{$subm{'student'}};
+        } else {
+            $subm{'correct'} = $correct;
+        }
+        $subm{'submission'} =~ s/=\d+\s*$//;
+        if (&$function(\%subm)) {
+            $submission_data{$subm{'correct'}}->{$subm{'submission'}}++;
+        }
+    }
+    return \%submission_data;
+}
+
+sub RR_static_time_analysis {
+    my ($r,$problem,$problem_analysis) = @_;
+    my ($resource,$partid,$respid) = ($problem->{'resource'},
+                                      $problem->{'part'},
+                                      $problem->{'respid'});
+    $r->print('<h3>The time answer you seek is static</h3>');
+    my $analysis_html;
+    # Gather student data
+    my $response_data = &Apache::loncoursedata::get_response_data
+        (\@Apache::lonstatistics::SelectedSections,
+         $Apache::lonstatistics::enrollment_status,
+         $resource->{'symb'},$respid);
+    if (! defined($response_data) || 
+        ref($response_data) ne 'ARRAY' ) {
         $analysis_html = '<h2>'.
             &mt('There is no submission data for this resource').
             '</h2>';
         $r->print($analysis_html);
         return;
     }
-    if (exists($ENV{'form.ExcelOutput'})) {
-        $analysis_html .= &RR_Excel_output($r,$problem->{'resource'},
-                                           $PerformanceData,$problem_data);
-    } elsif ($ENV{'form.AnalyzeOver'} eq 'Tries') {
-        $analysis_html .= &RR_Tries_Analysis($r,$problem->{'resource'},
+    # for time division
+
+    #    limit to between start time & end time
+    #    loop through data, classifying it by
+    #         correct foil -> selected foil
+    #    if there is concept data
+    #         make a concept correct plot
+    #    for each correct foil
+    #         make a plot of the data
+
+}
+
+
+=pod
+
+
+    } elsif ($ENV{'form.AnalyzeOver'} eq 'tries') {
+        $analysis_html .= &RR_tries_Analysis($r,$problem->{'resource'},
                                              $PerformanceData,$problem_data);
-    } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') {
-        $analysis_html .= &RR_Time_Analysis($r,$problem->{'resource'},
+    } elsif ($ENV{'form.AnalyzeOver'} eq 'time') {
+        $analysis_html .= &RR_time_Analysis($r,$problem->{'resource'},
                                             $PerformanceData,$problem_data);
     } else {
         $analysis_html .= '<h2>'.
@@ -415,7 +749,7 @@ sub RR_Excel_output   {
     return '<h1>No!</h1>';
 }
 
-sub RR_Tries_Analysis { 
+sub RR_tries_Analysis { 
     my ($r,$resource,$PerformanceData,$problem_data) = @_;
     my $analysis_html;
     my $mintries = 1;
@@ -429,7 +763,7 @@ sub RR_Tries_Analysis {
     }
     $analysis_html .= $table;
     my @TryData = &RR_tries_data_analysis($r,$PerformanceData);
-        $analysis_html .= &RR_Tries_Foil_Analysis($mintries,$maxtries,$Foils,
+        $analysis_html .= &RR_tries_Foil_Analysis($mintries,$maxtries,$Foils,
                                                  \@TryData,$problem_data);
     return $analysis_html;
 }
@@ -445,13 +779,13 @@ sub RR_tries_data_analysis {
     return @TryData;
 }
 
-sub RR_Time_Analysis  { 
+sub RR_time_Analysis  { 
     my ($r,$PerformanceData,$problem_data) = @_;
     my $html;
     return $html;
 }
 
-sub RR_Tries_Foil_Analysis {
+sub RR_tries_Foil_Analysis {
     my ($min,$max,$Foils,$TryData,$problem_data) = @_;
     my $html;
     #
@@ -496,19 +830,19 @@ sub RR_Tries_Foil_Analysis {
     return $html;
 }
 
-sub RR_Tries_Concept_Analysis {
+sub RR_tries_Concept_Analysis {
     my ($min,$max,$Concepts,$ResponseData,$problem_data) = @_;
     my $html;
     return $html;
 }
 
-sub RR_Time_Foil_Analysis {
+sub RR_time_Foil_Analysis {
     my ($min,$max,$Foils,$ResponseData,$problem_data) = @_;
     my $html;
     return $html;
 }
 
-sub RR_Time_Concept_Analysis {
+sub RR_time_Concept_Analysis {
     my ($min,$max,$Concepts,$ResponseData,$problem_data) = @_;
     my $html;
     return $html;
@@ -546,6 +880,8 @@ sub get_Radio_problem_data {
     return %Partdata;
 }
 
+=cut
+
 #########################################################
 #########################################################
 ##
@@ -576,13 +912,13 @@ sub OptionResponseAnalysis {
             $r->print($result);
             $r->rflush();
         } else {
-            if ($ENV{'form.AnalyzeOver'} eq 'Tries') {
+            if ($ENV{'form.AnalyzeOver'} eq 'tries') {
                 my $analysis_html = &OR_tries_analysis($r,
                                                     $PerformanceData,
                                                     $problem_data);
                 $r->print($analysis_html);
                 $r->rflush();
-            } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') {
+            } elsif ($ENV{'form.AnalyzeOver'} eq 'time') {
                 my $analysis_html = &OR_time_analysis($PerformanceData,
                                                    $problem_data);
                 $r->print($analysis_html);
@@ -599,7 +935,7 @@ sub OptionResponseAnalysis {
 
 #########################################################
 #
-#       Option Response:  Tries Analysis
+#       Option Response:  tries Analysis
 #
 #########################################################
 sub OR_tries_analysis {
@@ -619,9 +955,9 @@ sub OR_tries_analysis {
         foreach my $foilid (@{$concept->{'foils'}}) {
             for (my $try=$mintries;$try<=$maxtries;$try++) {
                 # concept analysis data
-                $concept_data[$j]->{'_correct'} +=
+                $concept_data[$j]->[$try]->{'_correct'} +=
                     $response_data{$foilid}->[$try]->{'_correct'};
-                $concept_data[$j]->{'_total'} +=
+                $concept_data[$j]->[$try]->{'_total'} +=
                     $response_data{$foilid}->[$try]->{'_total'};
                 #
                 # foil analysis data
@@ -657,39 +993,49 @@ sub OR_tries_analysis {
     } # End of concept loops
     # 
     # Build a table for the plots
-    my $analysis_html = "<table>\n";
+    my $analysis_html = "<br /><table>\n";
     my $optionkey = &build_option_index($ORdata);
     my $num_concepts = 1;
     if (defined($Concepts)) { $num_concepts = scalar(@$Concepts); }
     #
     for (my $try=$mintries;$try<=$maxtries;$try++) {
+        if (! defined($response_data{'_total'}->[$try]) ||
+            $response_data{'_total'}->[$try] == 0) { 
+            if ($try > 1) {
+                $analysis_html.= '<tr><td align="center" colspan="4"><b>'.
+                    &mt('None of the selected students attempted the problem more than [_1] times.',$try-1).
+                    '</b></td></tr>';
+            } else {
+                $analysis_html.= '<tr><td colspan="4" align="center"><b>'.
+                    &mt('None of the selected students have attempted the problem').'</b></td></tr>';
+            }
+            last;
+        }
         my $concept_graph='';
         if ($num_concepts > 1) {
             #
             # Create concept plot
             my @concept_plot_data;
             for (my $j=0;$j<=$#concept_data;$j++) {
-                my $total = $concept_data[$j]->{'_total'};
+                my $total = $concept_data[$j]->[$try]->{'_total'};
                 if ($total == 0) {
                     $concept_plot_data[$j] = 0;
                 } else {
                     $concept_plot_data[$j] = 100 * 
                         sprintf('%0.3f',
-                                $concept_data[$j]->{'_correct'} / $total);
+                                $concept_data[$j]->[$try]->{'_correct'} / 
+                                $total);
                 }
             }
             #
-            my $title;
-            my $count = $response_data{'_total'}->[$try];
-            $title = 'Attempt '.$try.' (N='.$count.')';
             $concept_graph = &Apache::loncommon::DrawBarGraph
-                ($title,'Concept Number','Percent Correct',
+                ('Correct Concepts','Concept Number','Percent Correct',
                  100,$plotcolors,undef,\@concept_plot_data);
         }
         #
         # Create Foil Plots
-        my $count = $response_data{'_total'}->[$try];
-        my $title = 'Attempt '.$try.' (N='.$count.')';
+        my $data_count = $response_data{'_total'}->[$try];
+        my $correct = $response_data{'_correct'}->[$try];
         my @Datasets;
         foreach my $option ('_correct',@{$ORdata->{'_Options'}}) {
             next if (! exists($foil_plot[$try]->{$option}));
@@ -721,7 +1067,7 @@ sub OR_tries_analysis {
         }
         #
         my $correct_graph = &Apache::loncommon::DrawBarGraph
-            ($title,'Foil Number','Percent Correct',
+            ('Correct Statements','Statement','% Answered Correct',
              100,$plotcolors,\@Labels,$Datasets[0]);
         
         #
@@ -730,13 +1076,17 @@ sub OR_tries_analysis {
         for (my $i=0; $i< scalar(@{$Datasets[0]});$i++) {
             $Datasets[0]->[$i]=0;
         }
-        $count = $response_data{'_total'}->[$try] - 
+        my $count = $response_data{'_total'}->[$try] - 
                                            $response_data{'_correct'}->[$try];
-        $title = 'Attempt '.$try.' (N='.$count.')';
         my $incorrect_graph = &Apache::loncommon::DrawBarGraph
-            ($title,'Foil Number','% Option Chosen Incorrectly',
+            ('Incorrect Statements','Statement','% Chosen Incorrectly',
              100,$plotcolors,\@Labels,@Datasets);
         $analysis_html.= 
+            '<tr><td colspan="4" align="center">'.
+            '<font size="+1">'.
+            &mt('Attempt [_1], [_2] submissions, [_3] correct, [_4] incorrect',
+                $try,$data_count,$correct,$data_count-$correct).
+            '</font>'.'</td></tr>'.$/.                
             '<tr>'.
             '<td>'.$concept_graph.'</td>'.
             '<td>'.$correct_graph.'</td>'.
@@ -754,11 +1104,14 @@ sub OR_analyze_by_tries {
     my %Trydata;
     $mintries = 1         if (! defined($mintries) || $mintries < 1);
     $maxtries = $mintries if (! defined($maxtries) || $maxtries < $mintries);
+    my @students;
     foreach my $row (@$PerformanceData) {
         next if (! defined($row));
         my $tries = &get_tries_from_row($row);
         my %Row   = &Process_OR_Row($row);
         next if (! %Row);
+        my $student_id = $row->[&Apache::loncoursedata::RD_student_id()];
+        $students[$tries]->{$student_id}++;
         while (my ($foilid,$href) = each(%Row)) {
             if (! ref($href)) { 
                 $Trydata{$foilid}->[$tries] += $href;
@@ -769,6 +1122,9 @@ sub OR_analyze_by_tries {
             }
         }
     }
+    for (my $try=$mintries;$try<=$maxtries;$try++) {
+        $Trydata{'_studentcount'}->[$try] = scalar(keys(%{$students[$try]}));
+    }
     return %Trydata;
 }
 
@@ -793,8 +1149,8 @@ sub OR_time_analysis {
     #
     my $num_plots = $ENV{'form.NumPlots'};
     my $num_data = scalar(@$performance_data)-1;
-    my $percent = sprintf('%2f',100/$num_plots);
     #
+    my $current_index;
     $table .= "<table>\n";
     for (my $i=0;$i<$num_plots;$i++) {
         ##
@@ -805,19 +1161,19 @@ sub OR_time_analysis {
         if (! defined($starttime) || ! defined($endtime)) {
             my $sec_in_day = 86400;
             my $last_sub_time = &get_time_from_row($performance_data->[-1]);
-            my ($sday,$smon,$syear);
-            (undef,undef,undef,$sday,$smon,$syear) = 
-                localtime($last_sub_time - $sec_in_day*$i);
+            my ($sday,$smon,$syear) = 
+                (localtime($last_sub_time - $sec_in_day*$i))[3..5];
             $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($performance_data->[0]);
             }
         }
-        $table .= '<tr><td colspan="4" align="center">'.
+        $table .= '<tr><td colspan="4" align="center"><font size="+1">'.
             &mt('Data from [_1] to [_2]',
                 &Apache::lonlocal::locallocaltime($starttime),
-                &Apache::lonlocal::locallocaltime($endtime)).'</td></tr>'.$/;
+                &Apache::lonlocal::locallocaltime($endtime)).
+                '</font></td></tr>'.$/;
         my $startdateform = &Apache::lonhtmlcommon::date_setter
             ('Statistics','startdate_'.$i,$starttime);
         my $enddateform = &Apache::lonhtmlcommon::date_setter
@@ -840,33 +1196,32 @@ sub OR_time_analysis {
         }
         $end_index = $j;
         ##
-        my $interval = {
-            begin_index => $begin_index,
-            end_index   => $end_index,
-            startdateform => $startdateform,
-            enddateform   => $enddateform,
-        };
+        my ($processed_time_data,$correct,$data_count,$student_count) =
+            &OR_time_process_data($performance_data,$begin_index,$end_index);
+        ##
+        $table .= '<tr><td colspan="4" align="center"><font size="+1">'.
+            &mt('[_1] submissions from [_2] students submitting, [_3] correct, [_4] incorrect',
+                $data_count,$student_count,$correct,$data_count-$correct).
+                '</font></td></tr>'.$/;
         my $concept_correct_plot = '';
         if ($num_concepts > 1) {
             $concept_correct_plot = 
-                &OR_Concept_Time_Analysis($performance_data,
-                                          $ORdata,$Concepts,
-                                          $interval);
+                &OR_Concept_Time_Analysis($processed_time_data,
+                                          $correct,$data_count,$student_count,
+                                          $ORdata,$Concepts);
         }
         my ($foil_correct_plot,$foil_incorrect_plot) = 
-            &OR_Foil_Time_Analysis($performance_data,$ORdata,
-                                   $Foils,$Concepts,$interval);
+            &OR_Foil_Time_Analysis($processed_time_data,
+                                   $correct,$data_count,$student_count,
+                                   $ORdata,$Foils,$Concepts);
         $table .= '<tr>'.
             '<td>'.$concept_correct_plot.'</td>'.
             '<td>'.$foil_correct_plot.'</td>'.
             '<td>'.$foil_incorrect_plot.'</td>'.
             '<td align="left" valign="top">'.$foilkey.'</td></tr>'.$/;
         $table .= '<tr><td colspan="4" align="center">'.
-            &mt('Start time: [_1]',
-                $interval->{'startdateform'}).'<br />'.
-            &mt('End time: [_1]',
-                $interval->{'enddateform'}).
-                '</td></tr>'.$/;
+            &mt('Start time: [_1]',$startdateform).'<br />'.
+            &mt('End time: [_1]',$enddateform).'</td></tr>'.$/;
         $table.= '<tr><td colspan="4">&nbsp</td></tr>'.$/;
     }
     $table .= '</table>';
@@ -875,47 +1230,32 @@ sub OR_time_analysis {
 }
 
 sub OR_Foil_Time_Analysis {
-    my ($performance_data,$ORdata,$Foils,$Concepts,$interval) = @_;
-    my $analysis_html;
-    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 = $performance_data->[$j];
-        next if (! defined($row));
-        my %Row = &Process_OR_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 ($processed_time_data,$correct,$data_count,$student_count,
+        $ORdata,$Foils,$Concepts) = @_;
+    if ($data_count <= 0) {
+        return ('<h2>'.&mt('There is no data to plot').'</h2>','');
     }
+    my $analysis_html;
     my @plotdata;
     my @labels;
     foreach my $concept (@{$Concepts}) {
         foreach my $foil (@{$concept->{'foils'}}) {
             push(@labels,scalar(@labels)+1);
-            my $total = $TimeData{$foil}->{'_total'};
+            my $total = $processed_time_data->{$foil}->{'_total'};
             if ($total == 0) {
                 push(@{$plotdata[0]},0);
             } else {
                 push(@{$plotdata[0]},
-                     100 * $TimeData{$foil}->{'_correct'} / $total);
+                     100 * $processed_time_data->{$foil}->{'_correct'} / $total);
             }
-            my $total_incorrect = $total - $TimeData{$foil}->{'_correct'};
+            my $total_incorrect = $total - $processed_time_data->{$foil}->{'_correct'};
             for (my $i=0;$i<scalar(@{$ORdata->{'_Options'}});$i++) {
                 my $option = $ORdata->{'_Options'}->[$i];
                 if ($total_incorrect == 0) {
                     push(@{$plotdata[$i+1]},0);
                 } else {
                     push(@{$plotdata[$i+1]},
-                         100 * $TimeData{$foil}->{$option} / $total_incorrect);
+                         100 * $processed_time_data->{$foil}->{$option} / $total_incorrect);
                 }
             }
         }
@@ -928,77 +1268,39 @@ sub OR_Foil_Time_Analysis {
     }
     #
     # Create the plot
-    my $count = $end_index-$begin_index;
-    return ('No data','') if ($count <= 0);
-    my $title;
-    if ($count == 0) {
-        $title = 'no submissions';
-    } elsif ($count == 1) {
-        $title = 'one submission';
-    } elsif ($count > 1) {
-        $title = $count.' submissions';
-    }
-    my $correct_plot = &Apache::loncommon::DrawBarGraph($title,
-                                                       'Foil Number',
-                                                       'Percent Correct',
-                                                       100,
-                                                       $plotcolors,
-                                                       undef,
-                                                       $plotdata[0]);
+    my $correct_plot = &Apache::loncommon::DrawBarGraph('Correct Statements',
+                                                        'Statement Number',
+                                                        'Percent Correct',
+                                                        100,
+                                                        $plotcolors,
+                                                        undef,
+                                                        $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 < 0) {
-        return ($correct_plot,'');
-    } elsif ($count == 1) {
-        $title = 'one submission';
-    } else {
-        $title = $count.' submissions';
-    }
-    my $incorrect_plot = &Apache::loncommon::DrawBarGraph($title,
-                                                 'Foil Number',
-                                                 'Incorrect Option Choice',
-                                                 100,
-                                                 $plotcolors,
-                                                 undef,
-                                                 @plotdata);
+    my $incorrect_plot = 
+        &Apache::loncommon::DrawBarGraph('Incorrect Statements',
+                                         'Statement Number',
+                                         'Incorrect Option Choice',
+                                         100,
+                                         $plotcolors,
+                                         undef,
+                                         @plotdata);
     return ($correct_plot,$incorrect_plot);
 }
 
 sub OR_Concept_Time_Analysis {
-    my ($performance_data,$ORdata,$Concepts,$interval) = @_;
-    ##
-    ## 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 = $performance_data->[$j];
-        next if (! defined($row));
-        my %Row = &Process_OR_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 ($processed_time_data,$correct,$data_count,$student_count,
+        $ORdata,$Concepts) = @_;
+    return '' if ($data_count == 0);
     #
     # 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'};
+            $total += $processed_time_data->{$foil}->{'_total'};
+            $correct += $processed_time_data->{$foil}->{'_correct'};
         }
         if ($total == 0) {
             push(@plotdata,0);
@@ -1008,8 +1310,7 @@ sub OR_Concept_Time_Analysis {
     }
     #
     # Create the plot
-    my $title = ($end_index - $begin_index).' submissions';
-    return &Apache::loncommon::DrawBarGraph($title,
+    return &Apache::loncommon::DrawBarGraph('Correct Concepts',
                                             'Concept Number',
                                             'Percent Correct',
                                             100,
@@ -1018,6 +1319,46 @@ sub OR_Concept_Time_Analysis {
                                             \@plotdata);
 }
 
+sub OR_time_process_data {
+    my ($performance_data,$begin_index,$end_index)=@_;
+    my %processed_time_data;
+    my %distinct_students;
+    my ($correct,$data_count);
+    if (($begin_index == $end_index) && 
+        ($end_index != scalar(@$performance_data)-1)) { 
+        return undef;
+    }
+    # Be sure we include the last one if we are asked for it.
+    # That we have to correct here (and not when $end_index is 
+    # given a value) should probably be considered a bug.
+    if ($end_index == scalar(@$performance_data)-1) {
+        $end_index++;
+    }
+    &Apache::lonnet::logthis('  '.$begin_index.':'.$end_index);
+    my $count;
+    for (my $i=$begin_index;$i<$end_index;$i++) {
+        my $attempt = $performance_data->[$i];
+        $count++;
+        next if (! defined($attempt));
+        my %attempt = &Process_OR_Row($attempt);
+        $data_count++;
+        $correct += $attempt{'_correct'};
+        $distinct_students{$attempt->[&Apache::loncoursedata::RD_student_id()]}++;
+        while (my ($foilid,$href) = each(%attempt)) {
+            if (! ref($href)) {
+                $processed_time_data{$foilid} += $href;
+                next;
+            }
+            while (my ($option,$value) = each(%$href)) {
+                $processed_time_data{$foilid}->{$option}+=$value;
+            }
+        }
+    }
+    &Apache::lonnet::logthis('count = '.$count);
+    return (\%processed_time_data,$correct,$data_count,
+            scalar(keys(%distinct_students)));
+}
+
 #########################################################
 #########################################################
 ##
@@ -1322,10 +1663,11 @@ sub build_option_index {
     my $optionindex = 0;
     my @Rows;
     foreach my $option (&mt('correct option chosen'),@{$ORdata->{'_Options'}}) {
+        my $color = $plotcolors->[$optionindex++];
         push (@Rows,
               '<tr>'.
-              '<td bgcolor="'.$plotcolors->[$optionindex++].'">'.
-              ('&nbsp;'x4).'</td>'.
+              '<td bgcolor="'.$color.'">'.
+              '<font color="'.$color.'">'.('*'x3).'</font>'.'</td>'.
               '<td>'.&HTML::Entities::encode($option,'<>&"').'</td>'.
               "</tr>\n");
     }
@@ -1334,6 +1676,27 @@ sub build_option_index {
     $table .= "</table>\n";
 }
 
+sub build_foil_key {
+    my ($foils,$extra_data)= @_;
+    if (! defined($extra_data)) { $extra_data = {}; }
+    my $table = "<table>\n";
+    my $foil_index = 0;
+    my @rows;
+    foreach my $foil (&mt('correct foil chosen'),@{$foils}) {
+        my $color = $plotcolors->[$foil_index++];
+        push (@rows,
+              '<tr>'.
+              '<td bgcolor="'.$color.'" class="key">'.
+              '<font color="'.$color.'">'.('*'x4).'</font></td>'.
+              '<td>'.&HTML::Entities::encode($foil,'<>&"').
+              ('&nbsp;'x2).$extra_data->{$foil}.'</td>'.
+              "</tr>\n");
+    }
+    shift(@rows); # Throw away 'correct foil chosen' color
+    $table .= join('',reverse(@rows));
+    $table .= "</table>\n";
+}
+
 #########################################################
 #########################################################
 ##
@@ -1345,7 +1708,7 @@ sub CreateInterface {
     ##
     ## Environment variable initialization
     if (! exists$ENV{'form.AnalyzeOver'}) {
-        $ENV{'form.AnalyzeOver'} = 'Tries';
+        $ENV{'form.AnalyzeOver'} = 'tries';
     }
     ##
     ## Build the menu
@@ -1395,15 +1758,15 @@ sub CreateInterface {
         '</label></nobr><br />';
     ##
     my $analyze_selector = '<select name="AnalyzeOver" >';
-    $analyze_selector .= '<option value="Tries" ';
+    $analyze_selector .= '<option value="tries" ';
     if (! exists($ENV{'form.AnalyzeOver'}) || 
-        $ENV{'form.AnalyzeOver'} eq 'Tries'){
-        # Default to Tries
+        $ENV{'form.AnalyzeOver'} eq 'tries'){
+        # Default to tries
         $analyze_selector .= ' selected ';
     }
     $analyze_selector .= '>'.&mt('Tries').'</option>';
-    $analyze_selector .= '<option value="Time" ';
-    $analyze_selector .= ' selected ' if ($ENV{'form.AnalyzeOver'} eq 'Time');
+    $analyze_selector .= '<option value="time" ';
+    $analyze_selector .= ' selected ' if ($ENV{'form.AnalyzeOver'} eq 'time');
     $analyze_selector .= '>'.&mt('Time').'</option>';
     $analyze_selector .= '</select>';
     $Str .= '<nobr><label>'.
@@ -1466,8 +1829,9 @@ sub get_tries_from_row {
 sub hashify_attempt {
     my ($row) = @_;
     my %attempt;
+    $attempt{'student'}    = $row->[&Apache::loncoursedata::RD_sname()];
     $attempt{'tries'}      = $row->[&Apache::loncoursedata::RD_tries()];
-    $attempt{'submission'} = $row->[&Apache::loncoursedata::RD_submission()];
+    $attempt{'submission'} = &Apache::lonnet::unescape($row->[&Apache::loncoursedata::RD_submission()]);
     $attempt{'award'}      = $row->[&Apache::loncoursedata::RD_awarddetail()];
     $attempt{'timestamp'}  = $row->[&Apache::loncoursedata::RD_timestamp()];
     return %attempt;
@@ -1476,12 +1840,12 @@ sub hashify_attempt {
 sub Process_OR_Row {
     my ($row) = @_;
     my %RowData;
-    my $student_id = $row->[&Apache::loncoursedata::RD_student_id()];
+#    my $student_id = $row->[&Apache::loncoursedata::RD_student_id()];
     my $award      = $row->[&Apache::loncoursedata::RD_awarddetail()];
     my $grading    = $row->[&Apache::loncoursedata::RD_response_eval()];
     my $submission = $row->[&Apache::loncoursedata::RD_submission()];
     my $time       = $row->[&Apache::loncoursedata::RD_timestamp()];
-    my $tries      = $row->[&Apache::loncoursedata::RD_tries()];
+#    my $tries      = $row->[&Apache::loncoursedata::RD_tries()];
     return undef if ($award eq 'MISSING_ANSWER');
     if ($award =~ /(APPROX_ANS|EXACT_ANS)/) {
         $RowData{'_correct'} = 1;