--- loncom/interface/statistics/lonproblemanalysis.pm	2004/10/29 15:52:32	1.98
+++ loncom/interface/statistics/lonproblemanalysis.pm	2006/12/21 19:52:28	1.129
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemanalysis.pm,v 1.98 2004/10/29 15:52:32 matthew Exp $
+# $Id: lonproblemanalysis.pm,v 1.129 2006/12/21 19:52:28 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -27,7 +27,7 @@
 package Apache::lonproblemanalysis;
 
 use strict;
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::loncoursedata();
@@ -37,7 +37,10 @@ use Apache::lonstathelpers();
 use Apache::lonstudentsubmissions();
 use HTML::Entities();
 use Time::Local();
-use Spreadsheet::WriteExcel();
+use capa;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+  
 
 my $plotcolors = ['#33ff00', 
                   '#0033cc', '#990000', '#aaaa66', '#663399', '#ff9933',
@@ -52,15 +55,14 @@ my @SubmitButtons = ({ name => 'PrevProb
                        text => 'Next Problem' },
                      { name => 'break'},
                      { name => 'SelectAnother',
-                       text => 'Choose a different Problem' },
-                     { name => 'ExcelOutput',
-                       text => 'Produce Excel Output' });
+                       text => 'Choose a different Problem' });
 
 sub BuildProblemAnalysisPage {
     my ($r,$c)=@_;
     #
     my %Saveable_Parameters = ('Status' => 'scalar',
                                'Section' => 'array',
+                               'Groups' => 'array',
                                'NumPlots' => 'scalar',
                                'AnalyzeOver' => 'scalar',
                                );
@@ -75,20 +77,17 @@ sub BuildProblemAnalysisPage {
     #
     my @Students = @Apache::lonstatistics::Students;
     #
-    if (@Students < 1 && exists($ENV{'form.firstrun'})) {
-        $r->print('<h2>There are no students in the sections selected</h2>');
+    if (@Students < 1 && exists($env{'form.firstrun'})) {
+        $r->print('<h2>There are no students in the sections/groups selected</h2>');
     }
     #
     my @CacheButtonHTML = 
         &Apache::lonstathelpers::manage_caches($r,'Statistics','stats_status');
     $r->rflush();
     #
-    # 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)';
-    if (exists($ENV{'form.problemchoice'}) && 
-        ! exists($ENV{'form.SelectAnother'})) {
+    my $problem_types = '(option|radiobutton|numerical)';
+    if (exists($env{'form.problemchoice'}) && 
+        ! exists($env{'form.SelectAnother'})) {
         foreach my $button (@SubmitButtons) {
             if ($button->{'name'} eq 'break') {
                 $r->print("<br />\n");
@@ -102,83 +101,84 @@ sub BuildProblemAnalysisPage {
             $r->print($html.('&nbsp;'x5));
         }
         #
+
+        # This is commented out pending actual implementation of 
+        # CSV and Excel output.
+        #$r->print(&Apache::lonstathelpers::submission_report_form
+        #                                              ('problem_analysis'));
+        #
         $r->print('<hr />');
         $r->rflush();
         #
         # Determine which problem we are to analyze
         my $current_problem = &Apache::lonstathelpers::get_target_from_id
-            ($ENV{'form.problemchoice'});
+            ($env{'form.problemchoice'});
         #
-        my ($prev,$curr,$next) = 
+        my ($navmap,$prev,$curr,$next) = 
             &Apache::lonstathelpers::get_prev_curr_next($current_problem,
                                                         $problem_types,
                                                         'response',
                                                         );
-        if (exists($ENV{'form.PrevProblemAnalysis'}) && defined($prev)) {
+        if (exists($env{'form.PrevProblemAnalysis'}) && defined($prev)) {
             $current_problem = $prev;
-        } elsif (exists($ENV{'form.NextProblemAnalysis'}) && defined($next)) {
+        } elsif (exists($env{'form.NextProblemAnalysis'}) && defined($next)) {
             $current_problem = $next;
         } else {
             $current_problem = $curr;
         }
         #
         # Store the current problem choice and send it out in the form
-        $ENV{'form.problemchoice'} = 
+        $env{'form.problemchoice'} = 
             &Apache::lonstathelpers::make_target_id($current_problem);
         $r->print('<input type="hidden" name="problemchoice" value="'.
-                  $ENV{'form.problemchoice'}.'" />');
+                  $env{'form.problemchoice'}.'" />');
         #
         if (! defined($current_problem->{'resource'})) {
             $r->print('resource is undefined');
         } else {
             my $resource = $current_problem->{'resource'};
-            $r->print('<h1>'.$resource->{'title'}.'</h1>');
-            $r->print('<h3>'.$resource->{'src'}.'</h3>');
-            if ($ENV{'form.show_prob'} eq 'true') {
+            $r->print('<h1>'.$resource->compTitle.'</h1>');
+            $r->print('<h3>'.$resource->src.'</h3>');
+            $r->print('<h4>'.&Apache::lonstatistics::section_and_enrollment_description().'</h4>');
+            if ($env{'form.show_prob'} eq 'true') {
                 $r->print(&Apache::lonstathelpers::render_resource($resource));
             }
             $r->rflush();
-            my %Data = &Apache::lonstathelpers::get_problem_data
-                ($resource->{'src'});
-            my $problem_data = $Data{$current_problem->{'part'}.
-                                    '.'.
-                                    $current_problem->{'respid'}};
-            if ($current_problem->{'resptype'} eq 'option') {
-                &OptionResponseAnalysis($r,$current_problem,
-                                        $problem_data,
-                                        \@Students);
-            } elsif ($current_problem->{'resptype'} eq 'radiobutton') {
-                &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);
-                    }
-                }
-            } else {
-                $r->print('<h2>This analysis is not supported</h2>');
-            }
+	    if (@Students) {
+		my %Data = &Apache::lonstathelpers::get_problem_data
+		    ($resource->src);
+		my $problem_data = $Data{$current_problem->{'part'}.
+					     '.'.
+					     $current_problem->{'respid'}};
+		if ($current_problem->{'resptype'} eq 'option') {
+		    &OptionResponseAnalysis($r,$current_problem,
+					    $problem_data,
+					    \@Students);
+		} elsif ($current_problem->{'resptype'} eq 'radiobutton') {
+		    &radio_response_analysis($r,$current_problem,
+					     $problem_data,
+					     \@Students);
+		} elsif ($current_problem->{'resptype'} eq 'numerical') {
+		    &numerical_response_analysis($r,$current_problem,
+						 $problem_data,\@Students);
+		} else {
+		    $r->print('<h2>Analysis of '.$current_problem->{'resptype'}.' is not supported</h2>');
+		}
+	    }
         }
         $r->print('<hr />');
     } else {
-        $r->print('<input type="submit" name="ProblemAnalysis" value="'.
-                  &mt('Analyze Problem').'" />');
+        my $submit_button = '<input type="submit" '.
+            'name="ProblemAnalysis" value="'.
+            &mt('Analyze Problem').'" />';
+        $r->print($submit_button);
         $r->print('&nbsp;'x5);
         $r->print('<h3>'.&mt('Please select a problem to analyze').'</h3>');
-        $r->print(&Apache::lonstathelpers::ProblemSelector
-                  ($problem_types));
+        $r->print(&Apache::lonstathelpers::problem_selector($problem_types,
+                                                            $submit_button));
     }
 }
 
-
 #########################################################
 #########################################################
 ##
@@ -186,79 +186,498 @@ sub BuildProblemAnalysisPage {
 ##
 #########################################################
 #########################################################
-sub NumericalResponseAnalysis {
-    my ($r,$problem,$problem_data,$Students) = @_;
+sub numerical_response_analysis {
+    my ($r,$problem,$problem_analysis,$students) = @_;
     my $c = $r->connection();
+    #
+    if ($env{'form.AnalyzeOver'} !~ /^(tries|time)$/) {
+        $r->print('Bad request');
+    }
+    #
     my ($resource,$partid,$respid) = ($problem->{'resource'},
                                       $problem->{'part'},
                                       $problem->{'respid'});
+    # Gather student data
+    my $response_data = &Apache::loncoursedata::get_response_data
+        ([&Apache::lonstatistics::get_selected_sections()],
+         [&Apache::lonstatistics::get_selected_groups()],
+         $Apache::lonstatistics::enrollment_status,
+         $resource->symb,$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>');
+    $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));
     }
     #
-    my $analysis_html;
-    my $PerformanceData = &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);
+    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,$stats) = 
+            &numerical_classify_responses($response_data,$correct,
+                                          $restriction_function);
+        if ($stats->{'submission_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,
+                    $stats->{'submission_count'},
+                    $stats->{'correct_count'},
+                    $stats->{'incorrect_count'},
+                    $stats->{'students'},
+                    @extra_data).
+                    '</td></tr>'.
+                    '<tr>'.'<td valign="top" align="center">'.
+                    &numerical_plot_percent($r,$responses,$stats).'</td>'.
+                    '<td align="center" valign="top">'.
+                    &numerical_plot_differences($r,$responses,$stats).'</td>'.
+                    '</tr>';
+        }
+        if ($post_message ne '') {
+            $analysis_html .=
+                '<tr><td colspan="2">'.$post_message.'</td></tr>';
+        }
+    }
+    $analysis_html.='</table>';
+    $r->print($analysis_html);
     #
-    # This next call causes all the waiting around that people complain about
-    &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$Students,
-                                               'Statistics',
-                                               'stats_status');
-    return if ($c->aborted());
-    #
-    # 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,$stats) = @_;
     #
-    # Compute data -> image scaling factors
-    my $min = $Labels->[0];
-    my $max = $Labels->[-1];
-    if ($max == $min) {
-        $max =$min+1;
+    my $total = $stats->{'submission_count'};
+    return '' if ($total == 0);
+    my $max_bins = 50;
+    my $lowest_percent = $stats->{'min_percent'};
+    my $highest_percent = $stats->{'max_percent'};
+    my $percent_spread = $highest_percent - $lowest_percent;
+    foreach (qw/20 30 40 50 100 200/) {
+        if ($percent_spread < $_) {
+            $highest_percent =$_/2;
+            last;
+        }
+    }
+    $percent_spread = $highest_percent - $lowest_percent;
+    my $bin_size = 1;
+    foreach (qw/0.01 0.05 0.1 0.5 1 2 5 10 20 25 50 100/) {
+        if ($lowest_percent/2 < $_){
+            $bin_size = $_;
+	    if ( ($percent_spread/$bin_size) < $max_bins ) {
+		last;
+	    }
+        }
+    }
+    my @bins;
+    for (my $bin = -$highest_percent;$bin<0;$bin+=$bin_size) {
+        push (@bins,$bin);
+    }
+    for (my $bin = 0; $bin<$highest_percent;$bin+=$bin_size) {
+        push (@bins,$bin);
+    }
+    push(@bins,$highest_percent);
+    #
+    my @correct;
+    my @incorrect;
+    my @count;
+    while (my ($ans,$submissions) = each(%$responses)) {
+        while (my ($submission,$counts) = each(%$submissions)) {
+            my ($correct_count,$incorrect_count) = @$counts;
+	    my $scaled_value = 
+		($ans) ? 100*($submission-$ans)/abs($ans)
+		       : 0;
+            if ($scaled_value < $bins[0]) {
+                $bins[0]=$scaled_value -1;
+            }
+            my $bin;
+            for ($bin=0;$bin<$#bins;$bin++) {
+                last if ($bins[$bin]>$scaled_value);
+            }
+            $correct[$bin-1]+=$correct_count;
+            $incorrect[$bin-1]+=$incorrect_count;
+            $count[$bin-1]+=$correct_count+$incorrect_count;
+        }
+    }
+    #
+    my @plot_correct   = @correct;
+    my @plot_incorrect = @incorrect;
+    my $max;
+    for (my $i=0;$i<$#bins;$i++) {
+        $plot_correct[$i]   *= 100/$total;
+        $plot_incorrect[$i] *= 100/$total;
+        if (! defined($max) || 
+            $max < $plot_correct[$i]+$plot_incorrect[$i] ) {
+            $max = $plot_correct[$i]+$plot_incorrect[$i];
+        }
+    }
+    foreach (qw/1 5 10 15 20 25 30 40 50 75 100/) {
+        if ($max <$_) { $max = $_; last; }
+    }
+    #
+    my $title = &mt('Percent Difference');
+    my @labels = (1..scalar(@bins)-1);
+    my $graph = &Apache::loncommon::DrawBarGraph
+        ($title,'Percent Difference from Correct','Percent of Answers',
+         $max,['#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,$stats) = @_;
+    #
+    my $total = $stats->{'submission_count'};
+    return '' if ($total == 0);
+    my $max_bins = 21;
+    my $min_bin_size = $stats->{'min_abs'};
+    my $low_bin  = $stats->{'lowest_ans'}-$stats->{'max_bin_size'};
+    my $high_bin = $stats->{'highest_ans'}+$stats->{'max_bin_size'};
+    if ($high_bin > 0 && $low_bin > -$high_bin) {
+        $low_bin = -$high_bin;
+    } elsif ($low_bin < 0 && $high_bin < -$low_bin) {
+        $high_bin = -$low_bin;
+    }
+    if ($high_bin == $low_bin) {
+	$high_bin+=1;
+	$low_bin-=1;
+    }
+    if (!$min_bin_size ||
+        ($high_bin -$low_bin)/$min_bin_size * 2 > $max_bins) {
+        $min_bin_size = abs($high_bin - $low_bin) / $max_bins * 2;
+    }
+    my @bins;
+    for (my $num = $low_bin;$num <= $high_bin;$num+=($min_bin_size/2)) {
+        push(@bins,$num);
+    }
+    #
+    my @correct;
+    my @incorrect;
+    my @count;
+    while (my ($ans,$submissions) = each(%$responses)) {
+        while (my ($submission,$counts) = each(%$submissions)) {
+            my ($correct_count,$incorrect_count) = @$counts;
+            my $scaled_value = $submission-$ans;
+            if ($scaled_value < $bins[0]) {
+                $bins[0]=$scaled_value-1;
+            }
+            my $bin=0;
+            for ($bin=0;$bin<$#bins;$bin++) {
+                last if ($bins[$bin]>$scaled_value);
+            }
+            $correct[$bin-1]+=$correct_count;
+            $incorrect[$bin-1]+=$incorrect_count;
+            $count[$bin-1]+=$correct_count+$incorrect_count;
+        }
+    }
+    my @plot_correct   = @correct;
+    my @plot_incorrect = @incorrect;
+    my $max;
+    for (my $i=0;$i<=$#bins;$i++) {
+        $plot_correct[$i]   *= 100/$total;
+        $plot_incorrect[$i] *= 100/$total;
+        if (! defined($max) || 
+            $max < $plot_correct[$i]+$plot_incorrect[$i] ) {
+            $max = $plot_correct[$i]+$plot_incorrect[$i];
+        }
+    }
+    foreach (qw/1 5 10 15 20 25 30 40 50 75 100/) {
+        if ($max <$_) { $max = $_; last; }
+    }
+    #
+    my $title = &mt('Difference between submission and correct');
+    my @labels = (1..scalar(@bins)-1);
+    my $graph = &Apache::loncommon::DrawBarGraph
+        ($title,'Difference from Correct','Percent of Answers',
+         $max,['#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 {
+    my ($full_row_data,$correct,$function) = @_;
+    my %submission_data;
+    my %students;
+    my %stats;
+    my $max=0;
+    foreach my $row (@$full_row_data) {
+        my %subm = &hashify_attempt($row);
+        if (ref($correct) eq 'HASH') {
+            my $s_correct = $correct->{$subm{'student'}};
+            $subm{'correct'} = $s_correct->{'answer'};
+            foreach my $item ('unit','ans_low','ans_high') {
+                $subm{$item} = $s_correct->{$item};
+            }
+        } else { # This probably never happens....
+            $subm{'correct'} = $correct->{'answer'};
+            $subm{'unit'} = $correct->{'unit'};
+        }
+        # 
+        my $abs_low =abs($subm{'correct'}-$subm{'ans_low'});
+        my $abs_high=abs($subm{'correct'}-$subm{'ans_high'});
+        if (! defined($stats{'min_abs'}) ||
+            $stats{'min_abs'} > $abs_low) {
+            $stats{'min_abs'} = $abs_low;
+        }
+        if ($stats{'min_abs'} > $abs_high) {
+            $stats{'min_abs'} = $abs_high;
+        }
+        if (! defined($stats{'max_abs'}) ||
+            $stats{'max_abs'} < $abs_low) {
+            $stats{'max_abs'} = $abs_low;
+        }
+        if ($stats{'max_abs'} < $abs_high) {
+            $stats{'max_abs'} = $abs_high;
+        }
+        my $low_percent;
+        my $high_percent;
+        if (defined($subm{'correct'}) && $subm{'correct'} != 0) {
+            $low_percent  = 100 * abs($abs_low  / $subm{'correct'});
+            $high_percent = 100 * abs($abs_high / $subm{'correct'});
+        }
+        if (! defined($stats{'min_percent'}) ||
+            $stats{'min_percent'} > $low_percent) {
+            $stats{'min_percent'} = $low_percent;
+        }
+        if ($stats{'min_percent'} > $high_percent) {
+            $stats{'min_percent'} = $high_percent;
+        }
+        if (! defined($stats{'max_percent'}) ||
+            $stats{'max_percent'} < $low_percent) {
+            $stats{'max_percent'} = $low_percent;
+        }
+        if ($stats{'max_percent'} < $high_percent) {
+            $stats{'max_percent'} = $high_percent;
+        }
+        if (! defined($stats{'lowest_ans'}) ||
+            $stats{'lowest_ans'} > $subm{'correct'}) {
+            $stats{'lowest_ans'} = $subm{'correct'};
+        }
+        if (! defined($stats{'highest_ans'}) ||
+            $stats{'highest_ans'} < $subm{'correct'}) {
+            $stats{'highest_ans'} = $subm{'correct'};
+        }
+        # 
+        $subm{'submission'} =~ s/=\d+\s*$//;
+        if (&$function(\%subm)) {
+            my $scaled = '1';
+            my ($sname,$sdom) = split(':',$subm{'student'});
+            my ($myunit,$mysub) = ($subm{'unit'},$subm{'submission'});
+            my $result = 
+                &capa::caparesponse_get_real_response($myunit,
+                                                      $mysub,
+                                                      \$scaled);
+#            &Apache::lonnet::logthis('scaled = '.$scaled.' result ='.$result);
+            next if (! defined($scaled));
+#            next if ($result ne '6');
+            my $submission = $scaled;
+            $students{$subm{'student'}}++;
+            $stats{'submission_count'}++;
+            if (&numerical_submission_is_correct($subm{'award'})) { 
+                $stats{'correct_count'}++;
+                $submission_data{$subm{'correct'}}->{$submission}->[0]++;
+            } elsif (&numerical_submission_is_incorrect($subm{'award'})) { 
+                $stats{'incorrect_count'}++;
+                $submission_data{$subm{'correct'}}->{$submission}->[1]++;
+            }
+        }
+    }
+    $stats{'correct_count'} |= 0;
+    $stats{'incorrect_count'} |= 0;
+    $stats{'students'}=scalar(keys(%students));
+    return (\%submission_data,\%stats);
+}
+
+sub numerical_submission_is_correct {
+    my ($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}-1);$i++) {
+        my $lownum = $bins->[$i];
+        if ($i == 0) { $lownum = '-&infin;'; }
+        my $highnum = $bins->[$i+1];
+        if ($i == scalar(@{$bins})-2) { $highnum = '&infin;'; }
+        $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>'.$/;
     }
-    my $h_scale = ($width-10)/($max-$min);
+    $table.= '</table>';
+    return $table;
+}
+
+sub numerical_determine_answers {
+    my ($r,$resource,$partid,$respid,$students)=@_;
+    my $c = $r->connection();
+    #
+    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
+        ($r,'Student Answer Compilation Status',
+         'Student Answer Compilation Progress', scalar(@$students),
+         'inline',undef,'Statistics','stats_status');
+    #
+    # 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;
+        foreach my $item ('answer','unit','ans_high','ans_low') {
+            $correct->{$sname.':'.$sdom}->{$item} = 
+                $analysis->{$key.'.'.$item}->[0];
+        }
+        $answers{$analysis->{$key.'.answer'}->[0]}++;
+        &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
+                                                 &mt('last student'));
+    }
+    &Apache::lonstathelpers::write_analysis_cache();
+    &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+    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);
@@ -268,17 +687,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');
@@ -288,21 +706,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;
 }
@@ -312,7 +727,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 {
@@ -341,33 +756,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;
-}
-
 #########################################################
 #########################################################
 ##
@@ -378,7 +766,7 @@ sub build_student_data_worksheet {
 sub radio_response_analysis {
     my ($r,$problem,$problem_analysis,$students) = @_;
     #
-    if ($ENV{'form.AnalyzeOver'} !~ /^(tries|time)$/) {
+    if ($env{'form.AnalyzeOver'} !~ /^(tries|time)$/) {
         $r->print('Bad request');
     }
     #
@@ -389,6 +777,9 @@ sub radio_response_analysis {
     my $analysis_html;
     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;
@@ -404,9 +795,10 @@ sub radio_response_analysis {
     $analysis_html .= $table;
     # Gather student data
     my $response_data = &Apache::loncoursedata::get_response_data
-        (\@Apache::lonstatistics::SelectedSections,
+        ([&Apache::lonstatistics::get_selected_sections()],
+         [&Apache::lonstatistics::get_selected_groups()],
          $Apache::lonstatistics::enrollment_status,
-         $resource->{'symb'},$respid);
+         $resource->symb,$respid);
     my $correct;   # either a hash reference or a scalar
     if ($problem_analysis->{'answercomputed'} || scalar(@$concepts) > 1) {
         # This takes a while for large classes...
@@ -417,7 +809,7 @@ sub radio_response_analysis {
             my ($idx,@remainder) = split('&',$student->{'answer'});
             my ($answer) = ($remainder[$idx]=~/^(.*)=([^=]*)$/);
             $correct->{$student->{'username'}.':'.$student->{'domain'}}=
-                &Apache::lonnet::unescape($answer);
+                &unescape($answer);
         }
     } else {
         foreach my $foil (keys(%$foildata)) {
@@ -436,13 +828,13 @@ sub radio_response_analysis {
     }
     #
     $analysis_html.='<table>';
-    for (my $plot_num = 1;$plot_num<=$ENV{'form.NumPlots'};$plot_num++) {
+    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') {
+        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;
@@ -450,7 +842,7 @@ sub radio_response_analysis {
                 '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') {
+        } 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
@@ -461,7 +853,7 @@ sub radio_response_analysis {
                  &get_time_from_row($response_data->[-1]),
                  $plot_num);
             $pre_graph_text = 
-                'Data from [_5] to [_6], [_2] submissions, [_3] correct, [_4] incorrect';
+                '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);
             #
@@ -485,8 +877,8 @@ sub radio_response_analysis {
             $no_data_text = 'No data for [_5] to [_6]';
         }
         my $foil_choice_data =
-            &RR_classify_response_data($response_data,$correct,
-                                       $restriction_function);
+            &classify_response_data($response_data,$correct,
+                                    $restriction_function);
         # &Apache::lonstathelpers::log_hash_ref($foil_choice_data);
         my $answers;
         if (ref($correct)) {
@@ -520,16 +912,15 @@ sub radio_response_analysis {
             $choice_plot  ne '' ||
             $stacked_plot ne '') {
             my $correct = $foil_choice_data->{'_correct'};
-            if (! defined($correct) || $correct eq '') {
-                $correct = 0;
-            }
-            my $incorrect = 
+            $correct |= 0;
+            my $incorrect = $foil_choice_data->{'_count'}-$correct;
             $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,
+                    $correct,
+                    $incorrect,
+                    $foil_choice_data->{'_students'},
                     @extra_data).
                     '</td></tr>'.$/;
             $analysis_html.=
@@ -573,7 +964,7 @@ sub ensure_start_end_times {
             (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'}) {
+        if ($plot_num == $env{'form.NumPlots'}) {
             $start = $first;
         }
     }
@@ -596,7 +987,6 @@ sub RR_concept_plot {
                 } else {
                     $incorrect_by_concept{$concept->{'name'}} +=
                         $foil_data->{$foil}->{$choice};
-                    
                 }
             }
         }
@@ -631,14 +1021,18 @@ sub RR_concept_plot {
 sub RR_create_percent_selected_plot {
     my ($concepts,$foils,$foil_data,$title) = @_;
     #
-    my %foil_selections;
-    my %true;
+    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}
+        # foil_data has format $foil_data->{true_foil}->{selected foil}=count
         next if (! exists($foil_data->{$foil}));
-        $true{$foil}++;
         while (my ($f,$count)= each(%{$foil_data->{$foil}})) {
-            $foil_selections{$f}+=$count;
+            if ($f eq $foil) {
+                $correct_selections{$foil} += $count;
+            } else {
+                $incorrect_selections{$f} += $count;
+            }
         }
     }
     # 
@@ -647,24 +1041,17 @@ sub RR_create_percent_selected_plot {
     my @correct;
     my @incorrect;
     #
-    my $total =0;
+    my $total = $foil_data->{'_count'};
     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};
+        $correct[$i]   = $correct_selections{$foil};
+        $incorrect[$i] = $incorrect_selections{$foil};
     }
-    if ($total == 0) { return ''; };
     for (my $i=0;$i<=$#correct;$i++) { 
-        $correct[$i] = sprintf('%0f',$correct[$i]/$total*100);
+        $correct[$i] = sprintf('%2f',$correct[$i]/$total*100);
     }
     for (my $i=0;$i<=$#incorrect;$i++) {
-        $incorrect[$i] = sprintf('%0f',$incorrect[$i]/$total*100);
+        $incorrect[$i] = sprintf('%2f',$incorrect[$i]/$total*100);
     }
     #
     # Put a blank in the data sets between concepts, if there are concepts
@@ -759,11 +1146,22 @@ sub RR_create_stacked_selection_plot {
     return ($graph,\%count_per_foil);
 }
 
+
+#########################################################
+#########################################################
+##
+##       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 RR_classify_response_data {
+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') {
@@ -773,13 +1171,19 @@ sub RR_classify_response_data {
         }
         $subm{'submission'} =~ s/=\d+\s*$//;
         if (&$function(\%subm)) {
+            $students{$subm{'student'}}++;
             $submission_data{'_count'}++;
             if (&submission_is_correct($subm{'award'})) { 
                 $submission_data{'_correct'}++;
             }
-            $submission_data{$subm{'correct'}}->{$subm{'submission'}}++;
+            
+            if($max<++$submission_data{$subm{'correct'}}->{$subm{'submission'}}) {
+                $max=$submission_data{$subm{'correct'}}->{$subm{'submission'}};
+            }
         }
     }
+    $submission_data{'_max'} = $max;
+    $submission_data{'_students'}=scalar(keys(%students));
     return \%submission_data;
 }
 
@@ -797,9 +1201,10 @@ sub OptionResponseAnalysis {
                               $problem->{'respid'});
     # Note: part data is not needed.
     my $PerformanceData = &Apache::loncoursedata::get_response_data
-        (\@Apache::lonstatistics::SelectedSections,
+        ([&Apache::lonstatistics::get_selected_sections()],
+         [&Apache::lonstatistics::get_selected_groups()],
          $Apache::lonstatistics::enrollment_status,
-         $resource->{'symb'},$respid);
+         $resource->symb,$respid);
     if (! defined($PerformanceData) || 
         ref($PerformanceData) ne 'ARRAY' ) {
         $r->print('<h2>'.
@@ -807,30 +1212,22 @@ sub OptionResponseAnalysis {
                   '</h2>');
     }  else {
         $r->rflush();
-        if (exists($ENV{'form.ExcelOutput'})) {
-            my $result = &OR_excel_sheet($r,$resource,
-                                         $PerformanceData,
-                                         $problem_data);
-            $r->print($result);
+        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') {
+            my $analysis_html = &OR_time_analysis($PerformanceData,
+                                                  $problem_data);
+            $r->print($analysis_html);
             $r->rflush();
         } else {
-            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') {
-                my $analysis_html = &OR_time_analysis($PerformanceData,
-                                                   $problem_data);
-                $r->print($analysis_html);
-                $r->rflush();
-            } else {
-                $r->print('<h2>'.
-                          &mt('The analysis you have selected is '.
-                              'not supported at this time').
-                          '</h2>');
-            }
+            $r->print('<h2>'.
+                      &mt('The analysis you have selected is '.
+                          'not supported at this time').
+                      '</h2>');
         }
     }
 }
@@ -843,8 +1240,11 @@ sub OptionResponseAnalysis {
 sub OR_tries_analysis {
     my ($r,$PerformanceData,$ORdata) = @_;
     my $mintries = 1;
-    my $maxtries = $ENV{'form.NumPlots'};
+    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 = '';
@@ -932,12 +1332,13 @@ sub OR_tries_analysis {
             #
             $concept_graph = &Apache::loncommon::DrawBarGraph
                 ('Correct Concepts','Concept Number','Percent Correct',
-                 100,$plotcolors,undef,\@concept_plot_data);
+                 100,$plotcolors,undef,\@concept_plot_data,{xskip=>1});
         }
         #
         # Create Foil Plots
         my $data_count = $response_data{'_total'}->[$try];
         my $correct = $response_data{'_correct'}->[$try];
+        $correct |= 0;
         my @Datasets;
         foreach my $option ('_correct',@{$ORdata->{'_Options'}}) {
             next if (! exists($foil_plot[$try]->{$option}));
@@ -970,7 +1371,7 @@ sub OR_tries_analysis {
         #
         my $correct_graph = &Apache::loncommon::DrawBarGraph
             ('Correct Statements','Statement','% Answered Correct',
-             100,$plotcolors,\@Labels,$Datasets[0]);
+             100,$plotcolors,\@Labels,$Datasets[0],{xskip=>1});
         
         #
         #
@@ -982,7 +1383,7 @@ sub OR_tries_analysis {
                                            $response_data{'_correct'}->[$try];
         my $incorrect_graph = &Apache::loncommon::DrawBarGraph
             ('Incorrect Statements','Statement','% Chosen Incorrectly',
-             100,$plotcolors,\@Labels,@Datasets);
+             100,$plotcolors,\@Labels,@Datasets,{xskip=>1});
         $analysis_html.= 
             '<tr><td colspan="4" align="center">'.
             '<font size="+1">'.
@@ -1049,7 +1450,7 @@ sub OR_time_analysis {
                 '</h3>'.$table;
     }
     #
-    my $num_plots = $ENV{'form.NumPlots'};
+    my $num_plots = $env{'form.NumPlots'};
     my $num_data = scalar(@$performance_data)-1;
     #
     my $current_index;
@@ -1100,9 +1501,10 @@ sub OR_time_analysis {
         ##
         my ($processed_time_data,$correct,$data_count,$student_count) =
             &OR_time_process_data($performance_data,$begin_index,$end_index);
+        $correct |= 0;
         ##
         $table .= '<tr><td colspan="4" align="center"><font size="+1">'.
-            &mt('[_1] submissions from [_2] students submitting, [_3] correct, [_4] incorrect',
+            &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 = '';
@@ -1176,7 +1578,8 @@ sub OR_Foil_Time_Analysis {
                                                         100,
                                                         $plotcolors,
                                                         undef,
-                                                        $plotdata[0]);
+                                                        $plotdata[0],
+                                                        {xskip=>1});
     for (my $j=0; $j< scalar(@{$plotdata[0]});$j++) {
         $plotdata[0]->[$j]=0;
     }
@@ -1187,7 +1590,7 @@ sub OR_Foil_Time_Analysis {
                                          100,
                                          $plotcolors,
                                          undef,
-                                         @plotdata);
+                                         @plotdata,{xskip=>1});
     return ($correct_plot,$incorrect_plot);
 }
 
@@ -1218,7 +1621,7 @@ sub OR_Concept_Time_Analysis {
                                             100,
                                             $plotcolors,
                                             undef,
-                                            \@plotdata);
+                                            \@plotdata,{xskip=>1});
 }
 
 sub OR_time_process_data {
@@ -1236,7 +1639,6 @@ sub OR_time_process_data {
     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];
@@ -1256,188 +1658,10 @@ sub OR_time_process_data {
             }
         }
     }
-    &Apache::lonnet::logthis('count = '.$count);
     return (\%processed_time_data,$correct,$data_count,
             scalar(keys(%distinct_students)));
 }
 
-#########################################################
-#########################################################
-##
-##             Excel output 
-##
-#########################################################
-#########################################################
-sub OR_excel_sheet {
-    my ($r,$resource,$performance_data,$ORdata) = @_;
-    my $response = '';
-    my (undef,$Foils,$Concepts) = &build_foil_index($ORdata);
-    #
-    # Create excel worksheet
-    my $filename = '/prtspool/'.
-        $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
-        time.'_'.rand(1000000000).'.xls';
-    my $workbook  = Spreadsheet::WriteExcel->new('/home/httpd'.$filename);
-    if (! defined($workbook)) {
-        $r->log_error("Error creating excel spreadsheet $filename: $!");
-        $r->print('<p>'.&mt("Unable to create new Excel file.  ".
-                            "This error has been logged.  ".
-                            "Please alert your LON-CAPA administrator").
-                  '</p>');
-        return undef;
-    }
-    #
-    $workbook->set_tempdir('/home/httpd/perl/tmp');
-    my $format = &Apache::loncommon::define_excel_formats($workbook);
-    #
-    # Create and populate main worksheets
-    my $problem_data_sheet  = $workbook->addworksheet('Problem Data');
-    my $student_data_sheet = &build_student_data_worksheet($workbook,$format);
-    my $response_data_sheet = $workbook->addworksheet('Response Data');
-    foreach my $sheet ($problem_data_sheet,$student_data_sheet,
-                       $response_data_sheet) {
-        $sheet->write(0,0,$resource->{'title'},$format->{'h2'});
-        $sheet->write(1,0,$resource->{'src'},$format->{'h3'});
-    }
-    #
-    my $result;
-    $result = &OR_build_problem_data_worksheet($problem_data_sheet,$format,
-                                            $Concepts,$ORdata);
-    if ($result ne 'okay') {
-        # Do something useful
-    }
-    $result = &OR_build_response_data_worksheet($response_data_sheet,$format,
-                                             $performance_data,$Foils,
-                                             $ORdata);
-    if ($result ne 'okay') {
-        # Do something useful
-    }
-    $response_data_sheet->activate();
-    #
-    # Close the excel file
-    $workbook->close();
-    #
-    # Write a link to allow them to download it
-    $result .= '<h2>'.&mt('Excel Raw Data Output').'</h2>'.
-              '<p><a href="'.$filename.'">'.
-              &mt('Your Excel spreadsheet.').
-              '</a></p>'."\n";
-    return $result;
-}
-
-sub OR_build_problem_data_worksheet {
-    my ($worksheet,$format,$Concepts,$ORdata) = @_;
-    my $rows_output = 3;
-    my $cols_output = 0;
-    $worksheet->write($rows_output++,0,'Problem Structure',$format->{'h3'});
-    ##
-    ##
-    my @Headers;
-    if (@$Concepts > 1) {
-        @Headers = ("Concept\nNumber",'Concept',"Foil\nNumber",
-                    'Foil Name','Foil Text','Correct value');
-    } else {
-        @Headers = ('Foil Number','FoilName','Foil Text','Correct value');
-    }
-    $worksheet->write_row($rows_output++,0,\@Headers,$format->{'header'});
-    my %Foildata = %{$ORdata->{'_Foils'}};
-    my $conceptindex = 1;
-    my $foilindex = 1;
-    foreach my $concept (@$Concepts) {
-        my @FoilsInConcept = @{$concept->{'foils'}};
-        my $firstfoil = shift(@FoilsInConcept);
-        if (@$Concepts > 1) {
-            $worksheet->write_row($rows_output++,0,
-                                  [$conceptindex,
-                                   $concept->{'name'},
-                                   $foilindex++,
-                                   $Foildata{$firstfoil}->{'name'},
-                                   $Foildata{$firstfoil}->{'text'},
-                                   $Foildata{$firstfoil}->{'value'},]);
-        } else {
-            $worksheet->write_row($rows_output++,0,
-                                  [ $foilindex++,
-                                    $Foildata{$firstfoil}->{'name'},
-                                    $Foildata{$firstfoil}->{'text'},
-                                    $Foildata{$firstfoil}->{'value'},]);
-        }
-        foreach my $foilid (@FoilsInConcept) {
-            if (@$Concepts > 1) {
-                $worksheet->write_row($rows_output++,0,
-                                      ['',
-                                       '',
-                                       $foilindex,
-                                       $Foildata{$foilid}->{'name'},
-                                       $Foildata{$foilid}->{'text'},
-                                       $Foildata{$foilid}->{'value'},]);
-            } else {
-                $worksheet->write_row($rows_output++,0,                
-                                      [$foilindex,
-                                       $Foildata{$foilid}->{'name'},
-                                       $Foildata{$foilid}->{'text'},
-                                       $Foildata{$foilid}->{'value'},]);
-            }                
-        } continue {
-            $foilindex++;
-        }
-    } continue {
-        $conceptindex++;
-    }
-    $rows_output++;
-    $rows_output++;
-    ##
-    ## Option data output
-    $worksheet->write($rows_output++,0,'Options',$format->{'header'});
-    foreach my $string (@{$ORdata->{'_Options'}}) {
-        $worksheet->write($rows_output++,0,$string);
-    }
-    return 'okay';
-}
-
-sub OR_build_response_data_worksheet {
-    my ($worksheet,$format,$performance_data,$Foils,$ORdata)=@_;
-    my $rows_output = 3;
-    my $cols_output = 0;
-    $worksheet->write($rows_output++,0,'Response Data',$format->{'h3'});
-    $worksheet->set_column(1,1,20);
-    $worksheet->set_column(2,2,13);
-    my @Headers = ('identifier','time','award detail','attempt');
-    foreach my $foil (@$Foils) {
-        push (@Headers,$foil.' submission');
-        push (@Headers,$foil.' grading');
-    }
-    $worksheet->write_row($rows_output++,0,\@Headers,$format->{'header'});
-    #
-    foreach my $row (@$performance_data) {
-        next if (! defined($row));
-        my ($student,$award,$grading,$submission,$time,$tries) = @$row;
-        my @Foilgrades = split('&',$grading);
-        my @Foilsubs   = split('&',$submission);
-        my %response_data;
-        for (my $j=0;$j<=$#Foilgrades;$j++) {
-            my ($foilid,$correct)  = split('=',$Foilgrades[$j]);
-            my (undef,$submission) = split('=',$Foilsubs[$j]);
-            $submission = &Apache::lonnet::unescape($submission);
-            $response_data{$foilid.' submission'}=$submission;
-            $response_data{$foilid.' award'}=$correct;
-        }
-        $worksheet->write($rows_output,$cols_output++,$student);
-        $worksheet->write($rows_output,$cols_output++,
-             &Apache::lonstathelpers::calc_serial($time),$format->{'date'});
-        $worksheet->write($rows_output,$cols_output++,$award);
-        $worksheet->write($rows_output,$cols_output++,$tries);
-        foreach my $foilid (@$Foils) {
-            $worksheet->write($rows_output,$cols_output++,
-                              $response_data{$foilid.' submission'});
-            $worksheet->write($rows_output,$cols_output++,
-                              $response_data{$foilid.' award'});
-        }
-        $rows_output++;
-        $cols_output = 0;
-    }
-    return;
-}
-
 sub build_foil_index {
     my ($ORdata) = @_;
     return if (! exists($ORdata->{'_Foils'}));
@@ -1609,19 +1833,18 @@ sub build_foil_key {
 sub CreateInterface {
     ##
     ## Environment variable initialization
-    if (! exists$ENV{'form.AnalyzeOver'}) {
-        $ENV{'form.AnalyzeOver'} = 'tries';
+    if (! exists($env{'form.AnalyzeOver'})) {
+        $env{'form.AnalyzeOver'} = 'tries';
     }
     ##
     ## Build the menu
     my $Str = '';
-    $Str .= &Apache::lonhtmlcommon::breadcrumbs
-        (undef,'Detailed Problem Analysis');
+    $Str .= &Apache::lonhtmlcommon::breadcrumbs('Detailed Problem Analysis');
     $Str .= '<table cellspacing="5">'."\n";
     $Str .= '<tr>';
     $Str .= '<td align="center"><b>'.&mt('Sections').'</b></td>';
-    $Str .= '<td align="center"><b>'.&mt('Enrollment Status').'</b></td>';
-#    $Str .= '<td align="center"><b>'.&mt('Sequences and Folders').'</b></td>';
+    $Str .= '<td align="center"><b>'.&mt('Groups').'</b></td>';
+    $Str .= '<td align="center"><b>'.&mt('Access Status').'</b></td>';
     $Str .= '<td align="center">&nbsp;</td>';
     $Str .= '</tr>'."\n";
     ##
@@ -1630,28 +1853,21 @@ sub CreateInterface {
     $Str .= &Apache::lonstatistics::SectionSelect('Section','multiple',5);
     $Str .= '</td>';
     #
+    $Str .= '<td align="center">'."\n";
+    $Str .= &Apache::lonstatistics::GroupSelect('Group','multiple',5);
+    $Str .= '</td>';
+    #
     $Str .= '<td align="center">';
     $Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5);
     $Str .= '</td>';
     #
-#    $Str .= '<td align="center">';
-    my $only_seq_with_assessments = sub { 
-        my $s=shift;
-        if ($s->{'num_assess'} < 1) { 
-            return 0;
-        } else { 
-            return 1;
-        }
-    };
-    &Apache::lonstatistics::MapSelect('Maps','multiple,all',5,
-                                              $only_seq_with_assessments);
     ##
     ##
     $Str .= '<td>';
     ##
     my $showprob_checkbox = 
         '<input type="checkbox" name="show_prob" value="true" ';
-    if ($ENV{'form.show_prob'} eq 'true') {
+    if ($env{'form.show_prob'} eq 'true') {
         $showprob_checkbox .= 'checked ';
     }
     $showprob_checkbox.= ' />';
@@ -1661,14 +1877,14 @@ sub CreateInterface {
     ##
     my $analyze_selector = '<select name="AnalyzeOver" >';
     $analyze_selector .= '<option value="tries" ';
-    if (! exists($ENV{'form.AnalyzeOver'}) || 
-        $ENV{'form.AnalyzeOver'} eq 'tries'){
+    if (! exists($env{'form.AnalyzeOver'}) || 
+        $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 .= ' selected ' if ($env{'form.AnalyzeOver'} eq 'time');
     $analyze_selector .= '>'.&mt('Time').'</option>';
     $analyze_selector .= '</select>';
     $Str .= '<nobr><label>'.
@@ -1678,14 +1894,14 @@ sub CreateInterface {
             '</label></nobr><br />'.$/;
     ##
     my $numplots_selector = '<select name="NumPlots">';
-    if (! exists($ENV{'form.NumPlots'}) 
-        || $ENV{'form.NumPlots'} < 1 
-        || $ENV{'form.NumPlots'} > 20) {
-        $ENV{'form.NumPlots'} = 5;
+    if (! exists($env{'form.NumPlots'}) 
+        || $env{'form.NumPlots'} < 1 
+        || $env{'form.NumPlots'} > 20) {
+        $env{'form.NumPlots'} = 5;
     }
     foreach my $i (1,2,3,4,5,6,7,8,10,15,20) {
         $numplots_selector .= '<option value="'.$i.'" ';
-        if ($ENV{'form.NumPlots'} == $i) { $numplots_selector.=' selected '; }
+        if ($env{'form.NumPlots'} == $i) { $numplots_selector.=' selected '; }
         $numplots_selector .= '>'.$i.'</option>';
     }
     $numplots_selector .= '</select></nobr><br />';
@@ -1733,7 +1949,7 @@ sub hashify_attempt {
     my %attempt;
     $attempt{'student'}    = $row->[&Apache::loncoursedata::RD_sname()];
     $attempt{'tries'}      = $row->[&Apache::loncoursedata::RD_tries()];
-    $attempt{'submission'} = &Apache::lonnet::unescape($row->[&Apache::loncoursedata::RD_submission()]);
+    $attempt{'submission'} = &unescape($row->[&Apache::loncoursedata::RD_submission()]);
     $attempt{'award'}      = $row->[&Apache::loncoursedata::RD_awarddetail()];
     $attempt{'timestamp'}  = $row->[&Apache::loncoursedata::RD_timestamp()];
     return %attempt;
@@ -1757,12 +1973,12 @@ sub Process_OR_Row {
     my @Foilsubs   = split('&',$submission);
     for (my $j=0;$j<=$#Foilgrades;$j++) {
         my ($foilid,$correct)  = split('=',$Foilgrades[$j]);
-        $foilid = &Apache::lonnet::unescape($foilid);
+        $foilid = &unescape($foilid);
         my (undef,$submission) = split('=',$Foilsubs[$j]);
         if ($correct) {
             $RowData{$foilid}->{'_correct'}++;
         } else {
-            $submission = &Apache::lonnet::unescape($submission);
+            $submission = &unescape($submission);
             $RowData{$foilid}->{$submission}++;
         }
         $RowData{$foilid}->{'_total'}++;