--- loncom/interface/statistics/lonproblemanalysis.pm	2004/10/05 14:03:45	1.93
+++ loncom/interface/statistics/lonproblemanalysis.pm	2004/12/23 19:58:06	1.110
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemanalysis.pm,v 1.93 2004/10/05 14:03:45 matthew Exp $
+# $Id: lonproblemanalysis.pm,v 1.110 2004/12/23 19:58:06 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,6 +38,7 @@ use Apache::lonstudentsubmissions();
 use HTML::Entities();
 use Time::Local();
 use Spreadsheet::WriteExcel();
+use capa;
 
 my $plotcolors = ['#33ff00', 
                   '#0033cc', '#990000', '#aaaa66', '#663399', '#ff9933',
@@ -86,7 +87,8 @@ 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|radiobutton)';
+    # my $problem_types = '.';#(option)';
     if (exists($ENV{'form.problemchoice'}) && 
         ! exists($ENV{'form.SelectAnother'})) {
         foreach my $button (@SubmitButtons) {
@@ -148,23 +150,14 @@ sub BuildProblemAnalysisPage {
                                         $problem_data,
                                         \@Students);
             } elsif ($current_problem->{'resptype'} eq 'radiobutton') {
-                &RadioResponseAnalysis($r,$current_problem,
-                                       $problem_data,
-                                       \@Students);
+                &radio_response_analysis($r,$current_problem,
+                                         $problem_data,
+                                         \@Students);
             } elsif ($current_problem->{'resptype'} eq 'numerical') {
-                ## 
-                ## analyze all responses of a problem at once
-                my $res = $current_problem->{'resource'};
-                foreach my $partid (@{$res->{'parts'}}) {
-                    $current_problem->{'part'} = $partid;
-                    foreach my $respid (@{$res->{'partdata'}->{$partid}->{'ResponseIds'}}) {
-                        $current_problem->{'respid'}=$respid;
-                        &NumericalResponseAnalysis($r,$current_problem,
-                                                   $problem_data,\@Students);
-                    }
-                }
+                &numerical_response_analysis($r,$current_problem,
+                                             $problem_data,\@Students);
             } else {
-                $r->print('<h2>This analysis is not supported</h2>');
+                $r->print('<h2>Analysis of '.$current_problem->{'resptype'}.' is not supported</h2>');
             }
         }
         $r->print('<hr />');
@@ -178,7 +171,6 @@ sub BuildProblemAnalysisPage {
     }
 }
 
-
 #########################################################
 #########################################################
 ##
@@ -186,80 +178,427 @@ sub BuildProblemAnalysisPage {
 ##
 #########################################################
 #########################################################
-sub NumericalResponseAnalysis {
-    my ($r,$problem,$problem_data,$Students) = @_;
+sub numerical_response_analysis {
+    my ($r,$problem,$problem_analysis,$students) = @_;
     my $c = $r->connection();
-    my ($resource,$partid,$respid) = ($problem->{'resource'},
-                                      $problem->{'part'},
-                                      $problem->{'respid'});
     #
-    if (scalar(@{$resource->{'parts'}})>1) {
-        if (@{$resource->{'partdata'}->{$partid}->{'ResponseIds'}}>1) {
-            $r->print('<h3>'.
-                      &mt('Part [_1], response [_2].',$partid,$respid).
-                      '</h3>');
-        } else { 
-            $r->print('<h3>'.
-                      &mt('Part [_1]',$partid,$respid).
-                      '</h3>');
-        }
-    } elsif (@{$resource->{'partdata'}->{$partid}->{'ResponseIds'}}>1) {
-        $r->print('<h3>'.&mt('Response [_1]',$respid).'</h3>');
+    if ($ENV{'form.AnalyzeOver'} !~ /^(tries|time)$/) {
+        $r->print('Bad request');
     }
     #
-    my $analysis_html;
-    my $PerformanceData = &Apache::loncoursedata::get_response_data
+    my ($resource,$partid,$respid) = ($problem->{'resource'},
+                                      $problem->{'part'},
+                                      $problem->{'respid'});
+    # 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' ) {
-        $analysis_html = '<h2>'.
-            &mt('There is no submission data for this resource').
-            '</h2>';
-        $r->print($analysis_html);
-        return;
+    #
+    $problem_analysis->{'answercomputed'} = 1;
+    if ($problem_analysis->{'answercomputed'}) {
+        my $answers = 
+            &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$students,
+                                                       'Statistics',
+                                                       'stats_status');
+        $r->print(&numerical_one_dimensional_plot($r,600,150,$answers));
     }
     #
-    # This next call causes all the waiting around that people complain about
-    my ($max,$min) = 
-        &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$Students,
-                                                   'Statistics',
-                                                   'stats_status');
-    return if ($c->aborted());
+    if (ref($response_data) ne 'ARRAY') {
+        $r->print('<h2>'.
+                  &mt('There is no submission data for this resource').
+                  '</h2>');
+        return;
+    }
+    my $analysis_html = '<table>';
+    for (my $plot_num = 1;$plot_num<=$ENV{'form.NumPlots'};$plot_num++) {
+        my $restriction_function;
+        my $header_message;
+        my $stats_message;
+        my $post_message; # passed through &mt sooner rather than later
+        my $no_data_message;
+        my @extra_data;
+        if ($ENV{'form.AnalyzeOver'} eq 'tries') {
+            $restriction_function = sub {($_[0]->{'tries'} == $plot_num?1:0)};
+            $header_message = 'Attempt [_1]';
+            $stats_message = 
+                '[_1] submissions, [_2] correct, [_3] incorrect';
+            $post_message = '';
+            $no_data_message = 'No data exists for attempt [_1]';
+        } else {
+            my $starttime = &Apache::lonhtmlcommon::get_date_from_form
+                ('startdate_'.$plot_num);
+            my $endtime = &Apache::lonhtmlcommon::get_date_from_form
+                ('enddate_'.$plot_num);
+            ($starttime,$endtime) = &ensure_start_end_times
+                ($starttime,$endtime,
+                 &get_time_from_row($response_data->[0]),
+                 &get_time_from_row($response_data->[-1]),
+                 $plot_num);
+            $header_message = 'Data from [_2] to [_3]';
+            $extra_data[0] = &Apache::lonlocal::locallocaltime($starttime);
+            $extra_data[1] = &Apache::lonlocal::locallocaltime($endtime);
+            #
+            $stats_message = 
+                '[_1] submissions from [_4] students, [_2] correct, [_3] incorrect';
+            #
+            $post_message = 
+                &mt('Start time: [_1]',
+                    &Apache::lonhtmlcommon::date_setter
+                    ('Statistics','startdate_'.$plot_num,$starttime)).
+                '<br />'.
+                &mt('End time: [_1]',
+                    &Apache::lonhtmlcommon::date_setter
+                    ('Statistics','enddate_'.$plot_num,$endtime));
+            $restriction_function = 
+                sub { 
+                    my $t = $_[0]->{'timestamp'};
+                    if ($t >= $starttime && $t < $endtime) {
+                        return 1;
+                    } else { 
+                        return 0;
+                    }
+                };
+            $no_data_message = 'No data for [_2] to [_3]';
+        }
+        #
+        my ($correct,$answers) = 
+            &numerical_determine_answers($r,$resource,$partid,
+                                         $respid,$students);
+        if ($c->aborted()) { return; };
+        #
+        my $responses = &numerical_classify_responses($response_data,$correct,
+                                                      $restriction_function);
+        if ($responses->{'_count'} == 0) {
+            $analysis_html.= 
+                '<tr><td colspan="2"><font size="+1"><b>'.
+                &mt($no_data_message,$plot_num,@extra_data).
+                '</b></font></td></tr>';
+        } else {
+            $analysis_html.= 
+                '<tr><td colspan="2" align="center"><font size="+1"><b>'.
+                &mt($header_message,$plot_num,@extra_data).
+                '</b></font></td></tr>'.
+                '<tr><td colspan="2" align="center">'.
+                &mt($stats_message,
+                    $responses->{'_count'},
+                    $responses->{'_correct'},
+                    $responses->{'_count'}-$responses->{'_correct'},
+                    $responses->{'_students'},
+                    @extra_data).
+                    '</td></tr>'.
+                    '<tr>'.'<td valign="top" align="center">'.
+                    &numerical_plot_percent($r,$responses).'</td>'.
+                    '<td align="center" valign="top">'.
+                    &numerical_plot_differences($r,$responses).'</td>'.
+                    '</tr>';
+        }
+        if ($post_message ne '') {
+            $analysis_html .=
+                '<tr><td colspan="2">'.$post_message.'</td></tr>';
+        }
+    }
+    $analysis_html.='</table>';
+    $r->print($analysis_html);
     #
-    # Collate the data
-    my %Data;
-    foreach my $student (@$Students) {
-        my $answer = $student->{'answer'};
-        $Data{$answer}++;
-    }
-    my @Labels = sort {$a <=> $b } keys(%Data);
-    my @PlotData = @Data{@Labels};
-    #
-    my $width  = 500; 
-    my $height = 100;
-    my $plot = &one_dimensional_plot($r,500,100,scalar(@$Students),
-                                     \@Labels,\@PlotData);
-    $r->print($plot);
     return;
 }
 
-sub one_dimensional_plot {
-    my ($r,$width,$height,$N,$Labels,$Data)=@_;
+sub numerical_plot_percent {
+    my ($r,$responses) = @_;
     #
-    # Compute data -> image scaling factors
-    my $min = $Labels->[0];
-    my $max = $Labels->[-1];
-    if ($max == $min) {
-        $max =$min+1;
+    my $total = $responses->{'_count'};
+    return '' if ($total == 0);
+    my $minbin = 5;
+    while (my ($interval,$submissions) = each(%$responses)) {
+        next if ($interval =~ /^_/);
+        my ($ans,$ans_low,$ans_high) = split(" ",$interval);
+        my $low_percent  = abs(100*($ans-$ans_low)/$ans);
+        my $high_percent = abs(100*($ans_high-$ans)/$ans);
+        if ($minbin > $high_percent) { $minbin = $high_percent; }
+        if ($minbin > $low_percent) { $minbin = $low_percent; }
+    }
+    #
+    my @bins;
+    if ($minbin < 1) {
+        @bins = ('0.1','0.5','1.0','1.5','2.0','2.5','3.0','4.0','5.0',10,20,50,100);        
+    } elsif ($minbin < 2) {
+        @bins = ('0.5','1.0','1.5','2.0','2.5','3.0','4.0','5.0',10,20,50,100);
+    } elsif ($minbin < 5) {
+        @bins = (1,2,3,4,5,10,25,50,75,100,200);
+    } elsif ($minbin < 10) {
+        @bins = (2,4,6,8,10,12,15,20,25,30,50,75,100,200);
+    } else {
+        @bins = (5,10,15,20,25,30,50,75,100,200);
+    }
+    my @labels = (1..scalar(@bins));
+    #
+    my @correct;
+    my @incorrect;
+    my @count;
+    while (my ($interval,$submissions) = each(%$responses)) {
+        next if ($interval =~ /^_/);
+        my ($ans,$ans_low,$ans_high) = split(" ",$interval);
+        while (my ($submission,$counts) = each(%$submissions)) {
+            my ($correct_count,$incorrect_count) = @$counts;
+            my $scaled_value = abs(($submission-$ans)/$ans);
+            my $bin=0;
+            for ($bin=0;$bin<$#bins;$bin++) { # not <= for a reason
+                last if ($bins[$bin]>$scaled_value);
+            }
+            $correct[$bin]+=$correct_count;
+            $incorrect[$bin]+=$incorrect_count;
+            $count[$bin]+=$correct_count+$incorrect_count;
+        }
     }
-    my $h_scale = ($width-10)/($max-$min);
     #
+    my @plot_correct;
+    my @plot_incorrect;
+    for (my $i=0;$i<=$#bins;$i++) {
+        $plot_correct[$i] = $correct[$i]*100/$total;
+        $plot_incorrect[$i] = $incorrect[$i]*100/$total;
+    }
+    my $title = &mt('Distribution by Percent');
+    my $graph = &Apache::loncommon::DrawBarGraph
+        ($title,'Percent difference from correct','Number of answers',
+         100,['#33FF00','#FF3300'],\@labels,\@plot_correct,\@plot_incorrect,
+         {xskip=>1});
+    #
+    my $table = $graph.$/.
+        &numerical_bin_table(\@bins,\@labels,\@incorrect,\@correct,\@count).$/;
+    return $table;
+}
+
+sub numerical_plot_differences {
+    my ($r,$responses) = @_;
+    #
+    my $total = $responses->{'_count'};
+    return '' if ($total == 0);
+    my $minbin = undef;
+    my $maxbin = undef;
+    while (my ($interval,$submissions) = each(%$responses)) {
+        next if ($interval =~ /^_/);
+        my ($ans,$ans_low,$ans_high) = split(" ",$interval);
+        my $low_diff  = abs($ans-$ans_low);
+        my $high_diff = abs($ans_high-$ans);
+        if (! defined($maxbin)) { $maxbin = $low_diff;}
+        if (! defined($minbin)) { $minbin = $low_diff;}
+        #
+        if ($minbin > $high_diff) { $minbin = $high_diff; }
+        if ($minbin > $low_diff ) { $minbin = $low_diff; }
+        #
+        if ($maxbin < $high_diff) { $maxbin = $high_diff; }
+        if ($maxbin < $low_diff ) { $maxbin = $low_diff; }
+    }    
+    #
+    my @bins;
+    my @labels;
+    # Hmmmm, should switch to absolute difference
+    for (my $i=1;$i<=20;$i++) {
+        push(@bins,$i*$minbin/2);
+        push(@labels,$i);
+    }
+    #
+    my @correct;
+    my @incorrect;
+    my @count;
+    while (my ($interval,$submissions) = each(%$responses)) {
+        next if ($interval =~ /^_/);
+        my ($ans,$ans_low,$ans_high) = split(" ",$interval);
+        while (my ($submission,$counts) = each(%$submissions)) {
+            my ($correct_count,$incorrect_count) = @$counts;
+            my $value = abs($submission-$ans);
+            my $bin=0;
+            for ($bin=0;$bin<$#bins;$bin++) { # not <= for a reason
+                last if ($bins[$bin]>$value);
+            }
+            $correct[$bin]+=$correct_count;
+            $incorrect[$bin]+=$incorrect_count;
+            $count[$bin]+=$correct_count+$incorrect_count;
+        }
+    }
+    #
+    my @plot_correct;
+    my @plot_incorrect;
+    for (my $i=0;$i<=$#bins;$i++) {
+        $plot_correct[$i]   =   $correct[$i]*100/$total;
+        $plot_incorrect[$i] = $incorrect[$i]*100/$total;
+    }
+    my $title = &mt('Distribution by Magnitude');
+    my $graph = &Apache::loncommon::DrawBarGraph
+        ($title,'magnitude difference from correct','Number of answers',
+         100,['#33FF00','#FF3300'],\@labels,\@plot_correct,\@plot_incorrect,
+         {xskip=>1});
+    #
+    my $table = $graph.$/.
+        &numerical_bin_table(\@bins,\@labels,\@incorrect,\@correct,\@count).$/;
+    return $table;
+}
+
+sub numerical_classify_responses {
+    &Apache::lonnet::logthis('--------------');
+    my ($full_row_data,$correct,$function) = @_;
+    my %submission_data;
+    my %students;
+    my $max=0;
+    foreach my $row (@$full_row_data) {
+#        &Apache::lonnet::logthis(' row = '.join(',',@$row));
+        my %subm = &hashify_attempt($row);
+        if (ref($correct) eq 'HASH') {
+            $subm{'correct'} = $correct->{$subm{'student'}}->{'answer'};
+            $subm{'unit'} = $correct->{$subm{'student'}}->{'unit'};
+        } else { # This probably never happens....
+            $subm{'correct'} = $correct->{'answer'};
+            $subm{'unit'} = $correct->{'unit'};
+        }
+        $subm{'submission'} =~ s/=\d+\s*$//;
+        if (&$function(\%subm)) {
+            my $scaled = '1';
+            my ($sname,$sdom) = split(':',$subm{'student'});
+            # Note that $subm{'unit'} is modified by the following call
+            # We do not use it again but you should be aware just in case.
+            my ($myunit,$mysub) = ($subm{'unit'},$subm{'submission'});
+            my $result = 
+                &capa::caparesponse_get_real_response($myunit,
+                                                      $mysub,
+                                                      \$scaled);
+            next if (! defined($scaled));
+            next if ($result ne '6');
+            my $submission = $scaled;
+            $students{$subm{'student'}}++;
+            if (&numerical_submission_is_correct($subm{'award'})) { 
+                &Apache::lonnet::logthis('correct:'.$submission.':'.$subm{'correct'});
+                $submission_data{'_correct'}++;
+                $submission_data{'_count'}++;
+                $submission_data{$subm{'correct'}}->{$submission}->[0]++;
+            } elsif (&numerical_submission_is_incorrect($subm{'award'})) { 
+                &Apache::lonnet::logthis('incorrect:'.$submission.':'.$subm{'correct'});
+                $submission_data{'_count'}++;
+                $submission_data{$subm{'correct'}}->{$submission}->[1]++;
+            }
+            my $value = 
+                $submission_data{$subm{'correct'}}->{$submission}->[0]+ 
+                $submission_data{$subm{'correct'}}->{$submission}->[1];
+            if ($max < $value) { $max = $value; }
+        }
+    }
+    $submission_data{'_max'} = $max;
+    $submission_data{'_students'}=scalar(keys(%students));
+    return \%submission_data;
+}
+
+sub numerical_submission_is_correct {
+    my ($award) = @_;
+    &Apache::lonnet::logthis('award = "'.$award.'"');
+    if ($award =~ /^(APPROX_ANS|EXACT_ANS)$/) {
+        return 1;
+    } else {
+        return 0;
+    }
+}
+
+sub numerical_submission_is_incorrect {
+    my ($award) = @_;
+    if ($award =~ /^(INCORRECT)$/) {
+        return 1;
+    } else {
+        return 0;
+    }
+}
+
+sub numerical_bin_table {
+    my ($bins,$labels,$incorrect,$correct,$count)=@_;
+    my $table = 
+        '<table><tr><th>'.&mt('Bar').'</th>'.
+        '<th colspan="3">'.&mt('Range').'</th>'.
+        '<th>'.&mt('Incorrect').'</th>'.
+        '<th>'.&mt('Correct').'</th>'.
+        '<th>'.&mt('Count').'</th>'.
+        '</tr>'.$/;
+    for (my $i=0;$i<scalar(@{$bins});$i++) {
+        my $lownum;
+        if ($i == 0) {
+            $lownum = 0;
+        } else {
+            $lownum = $bins->[$i-1];
+        }
+        my $highnum = $bins->[$i];
+        $table .= 
+            '<tr>'.
+            '<td>'.$labels->[$i].'</td>'.
+            '<td align="right">'.$lownum.'</td>'.
+            '<td>&nbsp;-&nbsp;</td>'.
+            '<td align="right">'.$highnum.'</td>'.
+            '<td align="right">'.$incorrect->[$i].'</td>'.
+            '<td align="right">'.$correct->[$i].'</td>'.
+            '<td align="right">'.$count->[$i].'</td>'.
+            '</tr>'.$/;
+    }
+    $table.= '</table>';
+    return $table;
+}
+
+sub numerical_determine_answers {
+    my ($r,$resource,$partid,$respid,$students)=@_;
+    my $c = $r->connection();
+    #
+    # FIX ME: May need progress dialog updates
+    #
+    # Read in the cache (if it exists) before we start timing things.
+    &Apache::lonstathelpers::ensure_proper_cache($resource->{'symb'});
+    #
+    my $correct;
+    my %answers;
+    foreach my $student (@$students) {
+        last if ($c->aborted());
+        my $sname = $student->{'username'};
+        my $sdom = $student->{'domain'};
+        # analyze problem
+        my $analysis = 
+            &Apache::lonstathelpers::analyze_problem_as_student($resource,
+                                                                $sname,
+                                                                $sdom);
+        # make the key
+        my $key = $partid.'.'.$respid;
+        $correct->{$sname.':'.$sdom}->{'answer'} = 
+            $analysis->{$key.'.answer'}->[0];
+        $correct->{$sname.':'.$sdom}->{'unit'} = 
+            $analysis->{$key.'.unit'}->[0];
+        $answers{$analysis->{$key.'.answer'}->[0]}++;
+    }
+    &Apache::lonstathelpers::write_analysis_cache();
+    return ($correct,\%answers);
+}
+
+#
+# Inputs: $r, $width, $height, $data
+#         $n = number of students
+#         $data = hashref of $answer => $frequency pairs
+sub numerical_one_dimensional_plot {
+    my ($r,$width,$height,$data)=@_;
+    #
+    # Compute data -> image scaling factors
     my $max_y = 0;
-    foreach (@$Data) {
-        $max_y = $_ if ($max_y < $_);
+    my $min_x = undef;
+    my $max_x = undef;
+    my $n = 0;
+    while (my ($answer,$count) = each(%$data)) {
+        $n+=$count;
+        $max_y = $count if ($max_y < $count);
+        if (! defined($min_x) || $answer < $min_x) {
+            $min_x = $answer;
+        }
+        if (! defined($max_x) || $answer > $max_x) {
+            $max_x = $answer;
+        }
     }
+    #
+    my $min_max_difference = $max_x - $min_x;
+    if (! defined($min_max_difference) || $min_max_difference == 0) {
+        $min_max_difference = 1;
+    }
+    my $h_scale = ($width-10)/$min_max_difference;
+    #
     my $ticscale = 5;
     if ($max_y * $ticscale > $height/2) {
         $ticscale = int($height/2/$max_y);
@@ -269,17 +608,16 @@ sub one_dimensional_plot {
     # Create the plot
     my $plot = 
         qq{<drawimage width="$width" height="$height" bgcolor="transparent" >};
-    for (my $idx=0;$idx<scalar(@$Labels);$idx++) {
-        my $xloc = 5+$h_scale*($Labels->[$idx] - $min);
-        my $top    = $height/2-$Data->[$idx]*$ticscale;
-        my $bottom = $height/2+$Data->[$idx]*$ticscale;
-        $plot .= 
-            &line($xloc,$top,$xloc,$bottom,'888888',1);
+    while (my ($answer,$count) = each(%$data)) {
+        my $xloc = 5+$h_scale*($answer - $min_x);
+        my $top    = $height/2-$count*$ticscale;
+        my $bottom = $height/2+$count*$ticscale;
+        $plot .= &line($xloc,$top,$xloc,$bottom,'888888',1);
     }
     #
     # Put the scale on last to ensure it is on top of the data.
-    if ($min < 0 && $max > 0) {
-        my $circle_x = 5+$h_scale*abs($min);  # '0' in data coordinates
+    if ($min_x < 0 && $max_x > 0) {
+        my $circle_x = 5+$h_scale*abs($min_x);  # '0' in data coordinates
         my $r = 4;
         $plot .= &line(5,$height/2,$circle_x-$r,$height/2,'000000',1);
         $plot .= &circle($circle_x,$height/2,$r+1,'000000');
@@ -289,21 +627,18 @@ sub one_dimensional_plot {
     }
     $plot .= '</drawimage>';
     my $plotresult =  &Apache::lonxml::xmlparse($r,'web',$plot);
-    
-    my $title = 'Distribution of correct answers';
     my $result = '<table>'.
         '<tr><td colspan="3" align="center">'.
-        '<font size="+2">'.$title.' (N='.$N.')'.
-        '</font>'.
+        '<font size="+2">'.&mt('Distribution of correct answers').'</font>'.
+        '<br />'.&mt('[_1] students, [_2] distinct correct answers',
+                     $n,scalar(keys(%$data))).
+        '<br />'.&mt('Maximum number of coinciding values: [_1]',$max_y).
         '</td></tr>'.
         '<tr>'.
-        '<td valign="center">'.$min.'</td>'.
+        '<td valign="center">'.$min_x.'</td>'.
         '<td>'.$plotresult.'</td>'.
-        '<td valign="center">'.$max.'</td>'.
+        '<td valign="center">'.$max_x.'</td>'.
         '</tr>'.
-        '<tr><td colspan="3" align="center">'.
-        'Maximum Number of Coinciding Values: '.$max_y.
-        '</td></tr>'.
         '</table>';
     return $result;
 }
@@ -313,7 +648,7 @@ sub one_dimensional_plot {
 ## These should probably go somewhere more suitable soon.
 sub line {
     my ($x1,$y1,$x2,$y2,$color,$thickness) = @_;
-    return qq{<line x1="$x1" y1="$y1" x2="$x2" y2="$y2" color="$color" thickness="$thickness" />$/};
+    return qq{<line x1="$x1" y1="$y1" x2="$x2" y2="$y2" color="$color" thickness="$thickness" />};
 }
 
 sub text {
@@ -342,33 +677,6 @@ sub circle {
     return &arc($x,$y,$radius,$radius,0,360,$color,$thickness,$filled);
 }
 
-sub build_student_data_worksheet {
-    my ($workbook,$format) = @_;
-    my $rows_output = 3;
-    my $cols_output = 0;
-    my $worksheet  = $workbook->addworksheet('Student Data');
-    $worksheet->write($rows_output++,0,'Student Data',$format->{'h3'});
-    my @Headers = ('full name','username','domain','section',
-                   "student\nnumber",'identifier');
-    $worksheet->write_row($rows_output++,0,\@Headers,$format->{'header'});
-    my @Students = @Apache::lonstatistics::Students;
-    my $studentrows = &Apache::loncoursedata::get_student_data(\@Students);
-    my %ids;
-    foreach my $row (@$studentrows) {
-        my ($mysqlid,$student) = @$row;
-        $ids{$student}=$mysqlid;
-    }
-    foreach my $student (@Students) {
-        my $name_domain = $student->{'username'}.':'.$student->{'domain'};
-        $worksheet->write_row($rows_output++,0,
-                          [$student->{'fullname'},
-                           $student->{'username'},$student->{'domain'},
-                           $student->{'section'},$student->{'id'},
-                           $ids{$name_domain}]);
-    }
-    return $worksheet;
-}
-
 #########################################################
 #########################################################
 ##
@@ -376,176 +684,433 @@ sub build_student_data_worksheet {
 ##
 #########################################################
 #########################################################
-sub RadioResponseAnalysis {
-    my ($r,$problem,$problem_data,$Students) = @_;
-    my ($resource,$respid) = ($problem->{'resource'},
-                              $problem->{'respid'});
+sub radio_response_analysis {
+    my ($r,$problem,$problem_analysis,$students) = @_;
+    #
+    if ($ENV{'form.AnalyzeOver'} !~ /^(tries|time)$/) {
+        $r->print('Bad request');
+    }
+    #
+    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);
+    if (! defined($concepts)) {
+        $concepts = [];
+    }
+    #
+    my %true_foils;
+    my $num_true = 0;
+    if (! $problem_analysis->{'answercomputed'}) {
+        foreach my $foil (@$foils) {
+            if ($foildata->{$foil}->{'value'} eq 'true') {
+                $true_foils{$foil}++; 
+            }
+        }
+        $num_true = scalar(keys(%true_foils));
+    }
+    #
+    $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'};
+            }
+        }
+    }
+    #
+    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'},
-                                             $PerformanceData,$problem_data);
-    } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') {
-        $analysis_html .= &RR_Time_Analysis($r,$problem->{'resource'},
-                                            $PerformanceData,$problem_data);
-    } else {
-        $analysis_html .= '<h2>'.
-           &mt('The analysis you have selected is not supported at this time').
-            '</h2>';
-    }
+    #
+    $analysis_html.='<table>';
+    for (my $plot_num = 1;$plot_num<=$ENV{'form.NumPlots'};$plot_num++) {
+        # classify data ->correct foil -> selected foil
+        my ($restriction_function,
+            $correct_foil_title,$incorrect_foil_title,
+            $pre_graph_text,$post_graph_text,
+            $no_data_text,@extra_data);
+        if ($ENV{'form.AnalyzeOver'} eq 'tries') {
+            $restriction_function = sub {($_[0]->{'tries'} == $plot_num?1:0)};
+            $correct_foil_title = 'Attempt '.$plot_num;
+            $incorrect_foil_title = 'Attempt '.$plot_num;
+            $pre_graph_text = 
+                'Attempt [_1], [_2] submissions, [_3] correct, [_4] incorrect';
+            $post_graph_text = '';
+            $no_data_text = 'No data exists for attempt [_1]';
+        } elsif ($ENV{'form.AnalyzeOver'} eq 'time') {
+            my $starttime = &Apache::lonhtmlcommon::get_date_from_form
+                ('startdate_'.$plot_num);
+            my $endtime = &Apache::lonhtmlcommon::get_date_from_form
+                ('enddate_'.$plot_num);
+            ($starttime,$endtime) = &ensure_start_end_times
+                ($starttime,$endtime,
+                 &get_time_from_row($response_data->[0]),
+                 &get_time_from_row($response_data->[-1]),
+                 $plot_num);
+            $pre_graph_text = 
+                'Data from [_6] to [_7]<br /> [_2] submissions from [_5] students, [_3] correct, [_4] incorrect';
+            $extra_data[0] = &Apache::lonlocal::locallocaltime($starttime);
+            $extra_data[1] = &Apache::lonlocal::locallocaltime($endtime);
+            #
+            $post_graph_text = 
+                &mt('Start time: [_1]',
+                    &Apache::lonhtmlcommon::date_setter
+                    ('Statistics','startdate_'.$plot_num,$starttime)).
+                '<br />'.
+                &mt('End time: [_1]',
+                    &Apache::lonhtmlcommon::date_setter
+                    ('Statistics','enddate_'.$plot_num,$endtime));
+            $restriction_function = 
+                sub { 
+                    my $t = $_[0]->{'timestamp'};
+                    if ($t >= $starttime && $t < $endtime) {
+                        return 1;
+                    } else { 
+                        return 0;
+                    }
+                };
+            $no_data_text = 'No data for [_5] to [_6]';
+        }
+        my $foil_choice_data =
+            &classify_response_data($response_data,$correct,
+                                    $restriction_function);
+        # &Apache::lonstathelpers::log_hash_ref($foil_choice_data);
+        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,
+                                             'Correct Concepts');
+        }
+        # % Choosing plot
+        my $choice_plot = &RR_create_percent_selected_plot
+            ($concepts,$foils,$foil_choice_data,$correct_foil_title);
+        # for each correct foil, how did they mark it? (stacked bar graph)
+        my ($stacked_plot,$count_by_foil);
+        if ($problem_analysis->{'answercomputed'} || $num_true > 1) {
+            ($stacked_plot,$count_by_foil) =
+                &RR_create_stacked_selection_plot($foils,$foil_choice_data,
+                                                  $incorrect_foil_title,
+                                                  \%true_foils);
+        }
+        #
+        if ($concept_plot ne '' ||
+            $choice_plot  ne '' ||
+            $stacked_plot ne '') {
+            my $correct = $foil_choice_data->{'_correct'};
+            if (! defined($correct) || $correct eq '') {
+                $correct = 0;
+            }
+            my $incorrect = 
+            $analysis_html.= '<tr><td colspan="4" align="center">'.
+                '<font size="+1">'.
+                &mt($pre_graph_text,
+                    $plot_num,$foil_choice_data->{'_count'},
+                    $correct,
+                    $foil_choice_data->{'_count'}-$correct,
+                    $foil_choice_data->{'_students'},
+                    @extra_data).
+                    '</td></tr>'.$/;
+            $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>'.$/;
+            if (defined($post_graph_text)) {
+                $analysis_html.= '<tr><td colspan="4" align="center">'.
+                    $post_graph_text.'</td></tr>'.$/;
+            }
+        } elsif ($no_data_text ne '') {
+            $analysis_html.='<tr><td colspan="4" align="center">'.
+                &mt($no_data_text,
+                    $plot_num,$foil_choice_data->{'_count'},
+                    $correct,                    
+                    $foil_choice_data->{'_count'}-$correct,
+                    @extra_data);
+            if (defined($post_graph_text)) {
+                $analysis_html.='<br />'.$post_graph_text;
+            }
+            $analysis_html.='</td></tr>'.$/;
+        }
+    } # end of loop for plots
+    $analysis_html.='</table>';
     $r->print($analysis_html);
 }
 
-sub RR_Excel_output   { 
-    my ($r,$PerformanceData,$problem_data) = @_;
-    return '<h1>No!</h1>';
+sub ensure_start_end_times {
+    my ($start,$end,$first,$last,$plot_num) = @_;
+    if (! defined($start) || ! defined($end)) {
+        my $sec_in_day = 86400;
+        my ($sday,$smon,$syear) = 
+            (localtime($last - $sec_in_day*($plot_num-1)))[3..5];
+        $start = &Time::Local::timelocal(0,0,0,$sday,$smon,$syear);
+        $end   = $start + $sec_in_day;
+        if ($plot_num == $ENV{'form.NumPlots'}) {
+            $start = $first;
+        }
+    }
+    return ($start,$end);
+}
+
+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';
+    my $plot=  &Apache::loncommon::DrawBarGraph($title,
+                                                $xlabel,
+                                                'Percent Choosing',
+                                                100,
+                                                ['#33ff00','#ff3300'],
+                                                undef,
+                                                \@correct);
+    return $plot;
+}
+
+sub RR_create_percent_selected_plot {
+    my ($concepts,$foils,$foil_data,$title) = @_;
+    #
+    if ($foil_data->{'_count'} == 0) { return ''; };
+    my %correct_selections;
+    my %incorrect_selections;
+    foreach my $foil (@$foils) {
+        # foil_data has format $foil_data->{true_foil}->{selected foil}=count
+        next if (! exists($foil_data->{$foil}));
+        while (my ($f,$count)= each(%{$foil_data->{$foil}})) {
+            if ($f eq $foil) {
+                $correct_selections{$foil} += $count;
+            } else {
+                $incorrect_selections{$f} += $count;
+            }
+        }
+    }
+    # 
+    # need arrays for incorrect and correct because we want to use different
+    # colors for them
+    my @correct;
+    my @incorrect;
+    #
+    my $total = $foil_data->{'_count'};
+    for (my $i=0;$i<scalar(@$foils);$i++) {
+        my $foil = $foils->[$i];
+        $correct[$i]   = $correct_selections{$foil};
+        $incorrect[$i] = $incorrect_selections{$foil};
+    }
+    for (my $i=0;$i<=$#correct;$i++) { 
+        $correct[$i] = sprintf('%2f',$correct[$i]/$total*100);
+    }
+    for (my $i=0;$i<=$#incorrect;$i++) {
+        $incorrect[$i] = sprintf('%2f',$incorrect[$i]/$total*100);
+    }
+    #
+    # Put a blank in the data sets between concepts, if there are concepts
+    my @labels;
+    if (defined($concepts) && scalar(@$concepts) > 1) {
+        my @new_correct;
+        my @new_incorrect;
+        my $foil_count = 0;
+        foreach my $concept (@$concepts) {
+            foreach (@{$concept->{'foils'}}) {
+                push(@new_correct,  $correct[$foil_count]);
+                push(@new_incorrect,$incorrect[$foil_count]);
+                push(@labels,++$foil_count);
+            }
+            push(@new_correct,'');
+            push(@new_incorrect,'');
+            push(@labels,'');
+        }
+        @correct = @new_correct;
+        @incorrect = @new_incorrect;
+    } else {
+        @labels = (1 .. scalar(@correct));
+    }
+    #
+    my $xlabel = 'foil chosen';
+    my $plot=  &Apache::loncommon::DrawBarGraph($title,
+                                                $xlabel,
+                                                'Percent Choosing',
+                                                100,
+                                                ['#33ff00','#ff3300'],
+                                                \@labels,
+                                                \@correct,
+                                                \@incorrect);
+    return $plot;
 }
 
-sub RR_Tries_Analysis { 
-    my ($r,$resource,$PerformanceData,$problem_data) = @_;
-    my $analysis_html;
-    my $mintries = 1;
-    my $maxtries = $ENV{'form.NumPlots'};
-    my ($table,$Foils,$Concepts) = &build_foil_index($problem_data);
-    if ((! defined($Concepts)) || (@$Concepts < 2)) {
-        $table = '<h3>'.
-            &mt('Not enough data for concept analysis.  '.
-                'Performing Foil Analysis').
-            '</h3>'.$table;
-    }
-    $analysis_html .= $table;
-    my @TryData = &RR_tries_data_analysis($r,$PerformanceData);
-        $analysis_html .= &RR_Tries_Foil_Analysis($mintries,$maxtries,$Foils,
-                                                 \@TryData,$problem_data);
-    return $analysis_html;
-}
-
-sub RR_tries_data_analysis {
-    my ($r,$Attempt_data) = @_;
-    my @TryData;
-    foreach my $attempt (@$Attempt_data) {
-        my %Attempt = &hashify_attempt($attempt);
-        my ($answer,undef) = split('=',$Attempt{'submission'});
-        $TryData[$Attempt{'tries'}]->{$answer}++;
-    }
-    return @TryData;
-}
-
-sub RR_Time_Analysis  { 
-    my ($r,$PerformanceData,$problem_data) = @_;
-    my $html;
-    return $html;
-}
-
-sub RR_Tries_Foil_Analysis {
-    my ($min,$max,$Foils,$TryData,$problem_data) = @_;
-    my $html;
-    #
-    # Compute the data neccessary to make the plots
-    for (my $try=$min;$try<=$max;$try++) {
-        my @PlotData_Correct; 
-        my @PlotData_Incorrect;
-        next if ($try > scalar(@{$TryData}));
-        next if (! defined($TryData->[$try]));
-        my %DataSet = %{$TryData->[$try]};
-        my $total = 0;
-        foreach my $foilid (@$Foils) {
-            $total += $DataSet{$foilid};
+sub RR_create_stacked_selection_plot {
+    my ($foils,$foil_data,$title,$true_foils)=@_;
+    #
+    my @dataset; # array of array refs - multicolor rows $datasets[row]->[col]
+    my @labels;
+    my $count;
+    my %column; # maps foil name to column in @datasets
+    for (my $i=0;$i<scalar(@$foils);$i++) {
+        my $foil = $foils->[$i];
+        if (defined($true_foils) && scalar(keys(%$true_foils)) > 0 ) {
+            next if (! $true_foils->{$foil} );
+            push(@labels,$i+1);
+        } else {
+            next if (! exists($foil_data->{$foil}));
+            push(@labels,$i+1);
         }
-        foreach my $foilid (@$Foils) {
-            if ($total == 0) {
-                push (@PlotData_Correct,0);
-                push (@PlotData_Incorrect,0);
-            } else {
-                if ($problem_data->{'_Foils'}->{$foilid}->{'value'} eq 'true') {
-                    push (@PlotData_Correct,
-                          int(100*$DataSet{$foilid}/$total));
-                    push (@PlotData_Incorrect,0);
-                } else {
-                    push (@PlotData_Correct,0);
-                    push (@PlotData_Incorrect,
-                          int(100*$DataSet{$foilid}/$total));
-                }
+        next if (! exists($foil_data->{$foils->[$i]}));
+        $column{$foil}= $count++;
+        for (my $j=0;$j<scalar(@$foils);$j++) {
+            my $value = 0;
+            if ($i != $j ) {
+                $value += $foil_data->{$foil}->{$foils->[$j]};
             }
+            $dataset[$j]->[$column{$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);
         }
-        my $title='Attempt '.$try.' (N='.$total.')';
-        my $xlabel = 'Foil Chosen';
-        $html.=  &Apache::loncommon::DrawBarGraph($title,
-                                                  $xlabel,
-                                                  'Percent Choosing',
-                                                  100,
-                                                  ['#33ff00','#ff3300'],
-                                                  undef,
-                                                  \@PlotData_Correct,
-                                                  \@PlotData_Incorrect);
-    }
-    return $html;
-}
-
-sub RR_Tries_Concept_Analysis {
-    my ($min,$max,$Concepts,$ResponseData,$problem_data) = @_;
-    my $html;
-    return $html;
-}
-
-sub RR_Time_Foil_Analysis {
-    my ($min,$max,$Foils,$ResponseData,$problem_data) = @_;
-    my $html;
-    return $html;
-}
-
-sub RR_Time_Concept_Analysis {
-    my ($min,$max,$Concepts,$ResponseData,$problem_data) = @_;
-    my $html;
-    return $html;
+        $count_per_foil{$foil}=' ( '.$bar_total.' )';
+        $grand_total += $bar_total;
+    }
+    if ($grand_total == 0) {
+        return ('',undef);
+    }
+    my @empty_row = ();
+    foreach (@{$dataset[0]}) {
+        push(@empty_row,0);
+    }
+    #
+    my $graph = &Apache::loncommon::DrawBarGraph
+        ($title,'Correct Foil','foils chosen Incorrectly',
+         100,$plotcolors,\@labels,\@empty_row,@dataset);
+    return ($graph,\%count_per_foil);
 }
 
 
-sub get_Radio_problem_data {
-    my ($url) = @_;
-    my $Answ=&Apache::lonnet::ssi($url,('grade_target' => 'analyze'));
-    (my $garbage,$Answ)=split('_HASH_REF__',$Answ,2);
-    my %Answer = &Apache::lonnet::str2hash($Answ);
-    my %Partdata;
-    foreach my $part (@{$Answer{'parts'}}) {
-        while (my($key,$value) = each(%Answer)) {
-#            if (ref($value) eq 'ARRAY') {
-#                &Apache::lonnet::logthis('is ref part:'.$part.' '.$key.'='.join(',',@$value));
-#            } else {
-#                &Apache::lonnet::logthis('notref part:'.$part.' '.$key.'='.$value);
-#            }                
-            next if ($key !~ /^$part/);
-            $key =~ s/^$part\.//;
-            if ($key eq 'foils') {
-                $Partdata{$part}->{'_Foils'}=$value;
-            } elsif ($key eq 'options') {
-                $Partdata{$part}->{'_Options'}=$value;
-            } elsif ($key eq 'shown') {
-                $Partdata{$part}->{'_Shown'}=$value;
-            } elsif ($key =~ /^foil.value.(.*)$/) {
-                $Partdata{$part}->{$1}->{'value'}=$value;
-            } elsif ($key =~ /^foil.text.(.*)$/) {
-                $Partdata{$part}->{$1}->{'text'}=$value;
+#########################################################
+#########################################################
+##
+##       Misc routines
+##
+#########################################################
+#########################################################
+
+# 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 classify_response_data {
+    my ($full_row_data,$correct,$function) = @_;
+    my %submission_data;
+    my %students;
+    my $max=0;
+    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)) {
+            $students{$subm{'student'}}++;
+            $submission_data{'_count'}++;
+            if (&submission_is_correct($subm{'award'})) { 
+                $submission_data{'_correct'}++;
+            }
+            
+            if($max<++$submission_data{$subm{'correct'}}->{$subm{'submission'}}) {
+                $max=$submission_data{$subm{'correct'}}->{$subm{'submission'}};
             }
         }
     }
-    return %Partdata;
+    $submission_data{'_max'} = $max;
+    $submission_data{'_students'}=scalar(keys(%students));
+    return \%submission_data;
 }
 
+
 #########################################################
 #########################################################
 ##
@@ -576,13 +1141,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 +1164,7 @@ sub OptionResponseAnalysis {
 
 #########################################################
 #
-#       Option Response:  Tries Analysis
+#       Option Response:  tries Analysis
 #
 #########################################################
 sub OR_tries_analysis {
@@ -607,6 +1172,9 @@ sub OR_tries_analysis {
     my $mintries = 1;
     my $maxtries = $ENV{'form.NumPlots'};
     my ($table,$Foils,$Concepts) = &build_foil_index($ORdata);
+    if (! defined($Concepts)) {
+        $Concepts = [];
+    }
     my %response_data = &OR_analyze_by_tries($r,$PerformanceData,
                                                      $mintries,$maxtries);
     my $analysis = '';
@@ -657,7 +1225,7 @@ 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); }
@@ -692,17 +1260,14 @@ sub OR_tries_analysis {
                 }
             }
             #
-            my $title;
-            my $count = $response_data{'_total'}->[$try];
-            $title = 'Attempt '.$try.' (N='.$count.')';
             $concept_graph = &Apache::loncommon::DrawBarGraph
-                ($title,'Concept Number','Percent Correct',
-                 100,$plotcolors,undef,\@concept_plot_data);
+                ('Correct Concepts','Concept Number','Percent Correct',
+                 100,$plotcolors,undef,\@concept_plot_data,{xskip=>1});
         }
         #
         # 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}));
@@ -734,8 +1299,8 @@ sub OR_tries_analysis {
         }
         #
         my $correct_graph = &Apache::loncommon::DrawBarGraph
-            ($title,'Foil Number','Percent Correct',
-             100,$plotcolors,\@Labels,$Datasets[0]);
+            ('Correct Statements','Statement','% Answered Correct',
+             100,$plotcolors,\@Labels,$Datasets[0],{xskip=>1});
         
         #
         #
@@ -743,13 +1308,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',
-             100,$plotcolors,\@Labels,@Datasets);
+            ('Incorrect Statements','Statement','% Chosen Incorrectly',
+             100,$plotcolors,\@Labels,@Datasets,{xskip=>1});
         $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>'.
@@ -767,11 +1336,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;
@@ -782,6 +1354,9 @@ sub OR_analyze_by_tries {
             }
         }
     }
+    for (my $try=$mintries;$try<=$maxtries;$try++) {
+        $Trydata{'_studentcount'}->[$try] = scalar(keys(%{$students[$try]}));
+    }
     return %Trydata;
 }
 
@@ -806,8 +1381,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++) {
         ##
@@ -818,19 +1393,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
@@ -853,33 +1428,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, [_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>';
@@ -888,47 +1462,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);
                 }
             }
         }
@@ -941,77 +1500,40 @@ 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],
+                                                        {xskip=>1});
     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,{xskip=>1});
     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);
@@ -1021,14 +1543,51 @@ 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,
                                             $plotcolors,
                                             undef,
-                                            \@plotdata);
+                                            \@plotdata,{xskip=>1});
+}
+
+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++;
+    }
+    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;
+            }
+        }
+    }
+    return (\%processed_time_data,$correct,$data_count,
+            scalar(keys(%distinct_students)));
 }
 
 #########################################################
@@ -1038,6 +1597,33 @@ sub OR_Concept_Time_Analysis {
 ##
 #########################################################
 #########################################################
+sub build_student_data_worksheet {
+    my ($workbook,$format) = @_;
+    my $rows_output = 3;
+    my $cols_output = 0;
+    my $worksheet  = $workbook->addworksheet('Student Data');
+    $worksheet->write($rows_output++,0,'Student Data',$format->{'h3'});
+    my @Headers = ('full name','username','domain','section',
+                   "student\nnumber",'identifier');
+    $worksheet->write_row($rows_output++,0,\@Headers,$format->{'header'});
+    my @Students = @Apache::lonstatistics::Students;
+    my $studentrows = &Apache::loncoursedata::get_student_data(\@Students);
+    my %ids;
+    foreach my $row (@$studentrows) {
+        my ($mysqlid,$student) = @$row;
+        $ids{$student}=$mysqlid;
+    }
+    foreach my $student (@Students) {
+        my $name_domain = $student->{'username'}.':'.$student->{'domain'};
+        $worksheet->write_row($rows_output++,0,
+                          [$student->{'fullname'},
+                           $student->{'username'},$student->{'domain'},
+                           $student->{'section'},$student->{'id'},
+                           $ids{$name_domain}]);
+    }
+    return $worksheet;
+}
+
 sub OR_excel_sheet {
     my ($r,$resource,$performance_data,$ORdata) = @_;
     my $response = '';
@@ -1188,6 +1774,7 @@ sub OR_build_response_data_worksheet {
             my ($foilid,$correct)  = split('=',$Foilgrades[$j]);
             my (undef,$submission) = split('=',$Foilsubs[$j]);
             $submission = &Apache::lonnet::unescape($submission);
+            $foilid = &Apache::lonnet::unescape($foilid);
             $response_data{$foilid.' submission'}=$submission;
             $response_data{$foilid.' award'}=$correct;
         }
@@ -1335,10 +1922,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");
     }
@@ -1347,6 +1935,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";
+}
+
 #########################################################
 #########################################################
 ##
@@ -1358,7 +1967,7 @@ sub CreateInterface {
     ##
     ## Environment variable initialization
     if (! exists$ENV{'form.AnalyzeOver'}) {
-        $ENV{'form.AnalyzeOver'} = 'Tries';
+        $ENV{'form.AnalyzeOver'} = 'tries';
     }
     ##
     ## Build the menu
@@ -1408,15 +2017,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>'.
@@ -1479,8 +2088,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;
@@ -1489,14 +2099,14 @@ 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)/) {
+    if (&submission_is_correct($award)) {
         $RowData{'_correct'} = 1;
     }
     $RowData{'_total'} = 1;
@@ -1517,6 +2127,15 @@ sub Process_OR_Row {
     return %RowData;
 }
 
+sub submission_is_correct {
+    my ($award) = @_;
+    if ($award =~ /(APPROX_ANS|EXACT_ANS)/) {
+        return 1;
+    } else {
+        return 0;
+    }
+}
+
 1;
 
 __END__