--- loncom/interface/statistics/lonproblemanalysis.pm	2003/10/21 16:00:30	1.44
+++ loncom/interface/statistics/lonproblemanalysis.pm	2004/10/04 19:49:41	1.92
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemanalysis.pm,v 1.44 2003/10/21 16:00:30 matthew Exp $
+# $Id: lonproblemanalysis.pm,v 1.92 2004/10/04 19:49:41 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -24,7 +24,6 @@
 #
 # http://www.lon-capa.org/
 #
-
 package Apache::lonproblemanalysis;
 
 use strict;
@@ -34,6 +33,8 @@ use Apache::lonhtmlcommon();
 use Apache::loncoursedata();
 use Apache::lonstatistics;
 use Apache::lonlocal;
+use Apache::lonstathelpers();
+use Apache::lonstudentsubmissions();
 use HTML::Entities();
 use Time::Local();
 use Spreadsheet::WriteExcel();
@@ -43,113 +44,128 @@ my $plotcolors = ['#33ff00',
                   '#66ccff', '#ff9999', '#cccc33', '#660000', '#33cc66',
                   ]; 
 
+my @SubmitButtons = ({ name => 'PrevProblemAnalysis',
+                       text => 'Previous Problem' },
+                     { name => 'ProblemAnalysis',
+                       text => 'Analyze Problem Again' },
+                     { name => 'NextProblemAnalysis',
+                       text => 'Next Problem' },
+                     { name => 'break'},
+                     { name => 'SelectAnother',
+                       text => 'Choose a different Problem' },
+                     { name => 'ExcelOutput',
+                       text => 'Produce Excel Output' });
+
 sub BuildProblemAnalysisPage {
     my ($r,$c)=@_;
-    $r->print('<h2>'.&mt('Option Response Problem Analysis').'</h2>');
+    #
+    my %Saveable_Parameters = ('Status' => 'scalar',
+                               'Section' => 'array',
+                               'NumPlots' => 'scalar',
+                               'AnalyzeOver' => 'scalar',
+                               );
+    &Apache::loncommon::store_course_settings('problem_analysis',
+                                              \%Saveable_Parameters);
+    &Apache::loncommon::restore_course_settings('problem_analysis',
+                                                \%Saveable_Parameters);
+    #
+    &Apache::lonstatistics::PrepareClasslist();
+    #
     $r->print(&CreateInterface());
     #
     my @Students = @Apache::lonstatistics::Students;
     #
-    if (exists($ENV{'form.ClearCache'}) || 
-        exists($ENV{'form.updatecaches'}) ||
-        (exists($ENV{'form.firstanalysis'}) &&
-         $ENV{'form.firstanalysis'} ne 'no')) {
-        &Apache::lonstatistics::Gather_Full_Student_Data($r);
-    }
-    if (! exists($ENV{'form.firstanalysis'})) {
-        $r->print('<input type="hidden" name="firstanalysis" value="yes" />');
-    } else {
-        $r->print('<input type="hidden" name="firstanalysis" value="no" />');
+    if (@Students < 1 && exists($ENV{'form.firstrun'})) {
+        $r->print('<h2>There are no students in the sections 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'})) {
-        $r->print('<input type="submit" name="ProblemAnalysis" value="'.
-                  &mt('Analyze Problem Again').'" />');
-        $r->print('&nbsp;'x5);
-        $r->print('<input type="submit" name="ClearCache" value="'.
-                  &mt('Clear Caches').'" />');
-        $r->print('&nbsp;'x5);
-        $r->print('<input type="submit" name="updatecaches" value="'.
-                  &mt('Update Student Data').'" />');
-        $r->print('&nbsp;'x5);
-        $r->print('<input type="hidden" name="problemchoice" value="'.
-                  $ENV{'form.problemchoice'}.'" />');
-        $r->print('<input type="submit" name="SelectAnother" value="'.
-                  &mt('Choose a different resource').'" />');
-        $r->print('&nbsp;'x5);
-        $r->print('<input type="submit" name="ExcelOutput" value="'.
-                  &mt('Produce Excel Data Sheet').'" />');
-        $r->print('&nbsp;'x5);
+        foreach my $button (@SubmitButtons) {
+            if ($button->{'name'} eq 'break') {
+                $r->print("<br />\n");
+            } else {
+                $r->print('<input type="submit" name="'.$button->{'name'}.'" '.
+                          'value="'.&mt($button->{'text'}).'" />');
+                $r->print('&nbsp;'x5);
+            }
+        }
+        foreach my $html (@CacheButtonHTML) {
+            $r->print($html.('&nbsp;'x5));
+        }
         #
         $r->print('<hr />');
-        #
-        my ($symb,$part,$resid) = &get_problem_symb(
-                     &Apache::lonnet::unescape($ENV{'form.problemchoice'})
-                                           );
         $r->rflush();
         #
-        my $resource = &get_resource_from_symb($symb);
-        if (defined($resource)) {
+        # Determine which problem we are to analyze
+        my $current_problem = &Apache::lonstathelpers::get_target_from_id
+            ($ENV{'form.problemchoice'});
+        #
+        my ($prev,$curr,$next) = 
+            &Apache::lonstathelpers::get_prev_curr_next($current_problem,
+                                                        $problem_types,
+                                                        'response',
+                                                        );
+        if (exists($ENV{'form.PrevProblemAnalysis'}) && defined($prev)) {
+            $current_problem = $prev;
+        } 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'} = 
+            &Apache::lonstathelpers::make_target_id($current_problem);
+        $r->print('<input type="hidden" name="problemchoice" value="'.
+                  $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>');
-            $r->rflush();
-            my %Data = &get_problem_data($resource->{'src'});
-            my $PerformanceData = 
-                &Apache::loncoursedata::get_optionresponse_data
-                                           (\@Students,$symb,$resid);
-            my $ORdata = $Data{$part.'.'.$resid};
-            if (exists($ENV{'form.ExcelOutput'}) && 
-                defined($PerformanceData)) {
-                my $result = &prepare_excel_sheet($r,$resource,
-                                                  $PerformanceData,$ORdata);
-                $r->print($result);
-                $r->rflush();
+            if ($ENV{'form.show_prob'} eq 'true') {
+                $r->print(&Apache::lonstathelpers::render_resource($resource));
             }
-            ##
-            ## Render the problem
-            my $base;
-            ($base,undef) = ($resource->{'src'} =~ m|(.*/)[^/]*$|);
-            $base = "http://".$ENV{'SERVER_NAME'}.$base;
-            my $rendered_problem = 
-                &Apache::lonnet::ssi_body($resource->{'src'});
-            $rendered_problem =~ s/<\s*form\s*/<nop /g;
-            $rendered_problem =~ s|(<\s*/form\s*>)|<\/nop>|g;
-            $r->print('<table bgcolor="ffffff"><tr><td>'.
-                      '<base href="'.$base.'" />'.
-                      $rendered_problem.
-                      '</td></tr></table>');
             $r->rflush();
-            if (! exists($ENV{'form.ExcelOutput'})) {
-                ##
-                ## Analyze the problem
-                if (defined($PerformanceData) && 
-                    ref($PerformanceData) eq 'ARRAY') {
-                    if ($ENV{'form.AnalyzeOver'} eq 'Tries') {
-                        my $analysis_html = &tries_analysis($r,
-                                                            $PerformanceData,
-                                                            $ORdata);
-                        $r->print($analysis_html);
-                        $r->rflush();
-                    } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') {
-                        my $analysis_html = &time_analysis($PerformanceData,
-                                                           $ORdata);
-                        $r->print($analysis_html);
-                        $r->rflush();
-                    } else {
-                        $r->print('<h2>'.
-                                  &mt('The analysis you have selected is '.
-                                      'not supported at this time').
-                                  '</h2>');
+            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') {
+                &RadioResponseAnalysis($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>'.
-                         &mt('There is no student data for this problem.').
-                              '</h2>');
                 }
+            } else {
+                $r->print('<h2>This analysis is not supported</h2>');
             }
-        } else {
-            $r->print('resource is undefined');
         }
         $r->print('<hr />');
     } else {
@@ -157,329 +173,595 @@ sub BuildProblemAnalysisPage {
                   &mt('Analyze Problem').'" />');
         $r->print('&nbsp;'x5);
         $r->print('<h3>'.&mt('Please select a problem to analyze').'</h3>');
-        $r->print(&OptionResponseProblemSelector());
+        $r->print(&Apache::lonstathelpers::ProblemSelector
+                  ($problem_types));
     }
 }
 
+
 #########################################################
 #########################################################
 ##
-##      Misc interface routines use by analysis code
+##      Numerical Response Routines
 ##
 #########################################################
 #########################################################
-sub build_foil_index {
-    my ($ORdata) = @_;
-    return if (! exists($ORdata->{'Foils'}));
-    my %Foildata = %{$ORdata->{'Foils'}};
-    my @Foils = sort(keys(%Foildata));
-    my %Concepts;
-    foreach my $foilid (@Foils) {
-        push(@{$Concepts{$Foildata{$foilid}->{'Concept'}}},
-             $foilid);
-    }
-    undef(@Foils);
-    # Having gathered the concept information in a hash, we now translate it
-    # into an array because we need to be consistent about order.
-    # Also put the foils in order, too.
-    my $sortfunction = sub {
-        my %Numbers = (one   => 1,
-                       two   => 2,
-                       three => 3,
-                       four  => 4,
-                       five  => 5,
-                       six   => 6,
-                       seven => 7,
-                       eight => 8,
-                       nine  => 9,
-                       ten   => 10,);
-        my $a1 = lc($a); 
-        my $b1 = lc($b);
-        if (exists($Numbers{$a})) {
-            $a1 = $Numbers{$a};
-        }
-        if (exists($Numbers{$b})) {
-            $b1 = $Numbers{$b};
+sub NumericalResponseAnalysis {
+    my ($r,$problem,$problem_data,$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>');
         }
-        $a1 cmp $b1;
-    };
-    my @Concepts;
-    foreach my $concept (sort $sortfunction (keys(%Concepts))) {
-        push(@Concepts,{ name => $concept,
-                        foils => [@{$Concepts{$concept}}]});
-        push(@Foils,(@{$Concepts{$concept}}));
+    } elsif (@{$resource->{'partdata'}->{$partid}->{'ResponseIds'}}>1) {
+        $r->print('<h3>'.&mt('Response [_1]',$respid).'</h3>');
     }
     #
-    # Build up the table of row labels.
-    my $table = '<table border="1" >'."\n";
-    if (@Concepts > 1) {
-        $table .= '<tr>'.
-            '<th>'.&mt('Concept Number').'</th>'.
-            '<th>'.&mt('Concept').'</th>'.
-            '<th>'.&mt('Foil Number').'</th>'.
-            '<th>'.&mt('Foil Name').'</th>'.
-            '<th>'.&mt('Foil Text').'</th>'.
-            '<th>'.&mt('Correct Value').'</th>'.
-            "</tr>\n";
-    } else {
-        $table .= '<tr>'.
-            '<th>'.&mt('Foil Number').'</th>'.
-            '<th>'.&mt('Foil Name').'</th>'.
-            '<th>'.&mt('Foil Text').'</th>'.
-            '<th>'.&mt('Correct Value').'</th>'.
-            "</tr>\n";
-    }        
-    my $conceptindex = 1;
-    my $foilindex = 1;
-    foreach my $concept (@Concepts) {
-        my @FoilsInConcept = @{$concept->{'foils'}};
-        my $firstfoil = shift(@FoilsInConcept);
-        if (@Concepts > 1) {
-            $table .= '<tr>'.
-                '<td>'.$conceptindex.'</td>'.
-                '<td>'.$concept->{'name'}.'</td>'.
-                '<td>'.$foilindex++.'</td>'.
-                '<td>'.$Foildata{$firstfoil}->{'name'}.'</td>'.
-                '<td>'.$Foildata{$firstfoil}->{'text'}.'</td>'.
-                '<td>'.$Foildata{$firstfoil}->{'value'}.'</td>'.
-                "</tr>\n";
-        } else {
-            $table .= '<tr>'.
-                '<td>'.$foilindex++.'</td>'.
-                '<td>'.$Foildata{$firstfoil}->{'name'}.'</td>'.
-                '<td>'.$Foildata{$firstfoil}->{'text'}.'</td>'.
-                '<td>'.$Foildata{$firstfoil}->{'value'}.'</td>'.
-                "</tr>\n";
-        }
-        foreach my $foilid (@FoilsInConcept) {
-            if (@Concepts > 1) {
-                $table .= '<tr>'.
-                    '<td></td>'.
-                    '<td></td>'.
-                    '<td>'.$foilindex.'</td>'.
-                    '<td>'.$Foildata{$foilid}->{'name'}.'</td>'.
-                    '<td>'.$Foildata{$foilid}->{'text'}.'</td>'.
-                    '<td>'.$Foildata{$foilid}->{'value'}.'</td>'.
-                    "</tr>\n";
-            } else {
-                $table .= '<tr>'.
-                    '<td>'.$foilindex.'</td>'.
-                    '<td>'.$Foildata{$foilid}->{'name'}.'</td>'.
-                    '<td>'.$Foildata{$foilid}->{'text'}.'</td>'.
-                    '<td>'.$Foildata{$foilid}->{'value'}.'</td>'.
-                    "</tr>\n";
-            }                
-        } continue {
-            $foilindex++;
-        }
-    } continue {
-        $conceptindex++;
+    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);
+        return;
+    }
+    #
+    # 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());
+    #
+    # 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)=@_;
+    #
+    # Compute data -> image scaling factors
+    my $min = $Labels->[0];
+    my $max = $Labels->[-1];
+    if ($max == $min) {
+        $max =$min+1;
+    }
+    my $h_scale = ($width-10)/($max-$min);
+    #
+    my $max_y = 0;
+    foreach (@$Data) {
+        $max_y = $_ if ($max_y < $_);
+    }
+    my $ticscale = 5;
+    if ($max_y * $ticscale > $height/2) {
+        $ticscale = int($height/2/$max_y);
+        $ticscale = 1 if ($ticscale < 1);
     }
-    $table .= "</table>\n";
     #
-    # Build option index with color stuff
-    return ($table,\@Foils,\@Concepts);
+    # 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);
+    }
+    #
+    # 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
+        my $r = 4;
+        $plot .= &line(5,$height/2,$circle_x-$r,$height/2,'000000',1);
+        $plot .= &circle($circle_x,$height/2,$r+1,'000000');
+        $plot .= &line($circle_x+$r,$height/2,$width-5,$height/2,'000000',1);
+    } else {
+        $plot .= &line(5,$height/2,$width-5,$height/2,'000000',1);
+    }
+    $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>'.
+        '</td></tr>'.
+        '<tr>'.
+        '<td valign="center">'.$min.'</td>'.
+        '<td>'.$plotresult.'</td>'.
+        '<td valign="center">'.$max.'</td>'.
+        '</tr>'.
+        '<tr><td colspan="3" align="center">'.
+        'Maximum Number of Coinciding Values: '.$max_y.
+        '</td></tr>'.
+        '</table>';
+    return $result;
 }
 
-sub build_option_index {
-    my ($ORdata)= @_;
-    my $table = "<table>\n";
-    my $optionindex = 0;
-    my @Rows;
-    foreach my $option (&mt('correct option chosen'),@{$ORdata->{'Options'}}) {
-        push (@Rows,
-              '<tr>'.
-              '<td bgcolor="'.$plotcolors->[$optionindex++].'">'.
-              ('&nbsp;'x4).'</td>'.
-              '<td>'.$option.'</td>'.
-              "</tr>\n");
+##
+## Helper subroutines for <drawimage>.  
+## 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" />$/};
+}
+
+sub text {
+    my ($x,$y,$color,$text,$font,$direction) = @_;
+    if (! defined($font) || $font !~ /^(tiny|small|medium|large|giant)$/) {
+        $font = 'medium';
     }
-    shift(@Rows); # Throw away 'correct option chosen' color
-    $table .= join('',reverse(@Rows));
-    $table .= "</table>\n";
+    if (! defined($direction) || $direction ne 'vertical') {
+        $direction = '';
+    }
+    return qq{<text x="$x" y="$y" color="$color" font="$font" direction="$direction" >$text</text>};
+}
+
+sub rectangle {
+    my ($x1,$y1,$x2,$y2,$color,$thickness,$filled) = @_;
+    return qq{<rectangle x1="$x1" y1="$y1" x2="$x2" y2="$y2" color="$color" thickness="$thickness" filled="$filled" />};
+}
+
+sub arc {
+    my ($x,$y,$width,$height,$start,$end,$color,$thickness,$filled)=@_;
+    return qq{<arc x="$x" y="$y" width="$width" height="$height" start="$start" end="$end" color="$color" thickness="$thickness" filled="$filled" />};
+}
+
+sub circle {
+    my ($x,$y,$radius,$color,$thickness,$filled)=@_;
+    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;
 }
 
 #########################################################
 #########################################################
 ##
-##         Tries Analysis
+##      Radio Response Routines
 ##
 #########################################################
 #########################################################
-sub tries_analysis {
-    my ($r,$PerformanceData,$ORdata) = @_;
+sub RadioResponseAnalysis {
+    my ($r,$problem,$problem_data,$Students) = @_;
+    my ($resource,$respid) = ($problem->{'resource'},
+                              $problem->{'respid'});
+    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);
+        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>';
+    }
+    $r->print($analysis_html);
+}
+
+sub RR_Excel_output   { 
+    my ($r,$PerformanceData,$problem_data) = @_;
+    return '<h1>No!</h1>';
+}
+
+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($ORdata);
-    if ((@$Concepts < 2) && ($ENV{'form.AnalyzeAs'} ne 'Foils')) {
+    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;
-        $ENV{'form.AnalyzeAs'} = 'Foils';
     }
-    my %ResponseData = &analyze_option_data_by_tries($r,$PerformanceData,
-                                                     $mintries,$maxtries);
-    my $analysis = '';
-    if ($ENV{'form.AnalyzeAs'} eq 'Foils') {
-        $analysis = &Tries_Foil_Analysis($mintries,$maxtries,$Foils,
-                                         \%ResponseData,$ORdata);
-    } else {
-        $analysis = &Tries_Concept_Analysis($mintries,$maxtries,
-                                            $Concepts,\%ResponseData,$ORdata);
-    }
-    $table .= $analysis;
-    return $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 Tries_Foil_Analysis {
-    my ($mintries,$maxtries,$Foils,$respdat,$ORdata) = @_;
-    my %ResponseData = %$respdat;
+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
-    my @PlotData; 
-    foreach my $foilid (@$Foils) {
-        for (my $i=$mintries;$i<=$maxtries;$i++) {
-            if ($ResponseData{$foilid}->[$i]->{'_total'} == 0) {
-                push(@{$PlotData[$i]->{'_correct'}},0);
+    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};
+        }
+        foreach my $foilid (@$Foils) {
+            if ($total == 0) {
+                push (@PlotData_Correct,0);
+                push (@PlotData_Incorrect,0);
             } else {
-                push(@{$PlotData[$i]->{'_correct'}},
-                     100*$ResponseData{$foilid}->[$i]->{'_correct'}/
-                     $ResponseData{$foilid}->[$i]->{'_total'});
-            }
-            foreach my $option (@{$ORdata->{'Options'}}) {
-                push(@{$PlotData[$i]->{'_total'}},
-                     $ResponseData{$foilid}->[$i]->{'_total'});
-                if ($ResponseData{$foilid}->[$i]->{'_total'} == 0) {
-                    push (@{$PlotData[$i]->{$option}},0);
+                if ($problem_data->{'_Foils'}->{$foilid}->{'value'} eq 'true') {
+                    push (@PlotData_Correct,
+                          int(100*$DataSet{$foilid}/$total));
+                    push (@PlotData_Incorrect,0);
                 } else {
-                    if ($ResponseData{$foilid}->[$i]->{'_total'} ==
-                        $ResponseData{$foilid}->[$i]->{'_correct'}) {
-                        push(@{$PlotData[$i]->{$option}},0);
-                    } else {
-                        push (@{$PlotData[$i]->{$option}},
-                              100 * $ResponseData{$foilid}->[$i]->{$option} / 
-                              ($ResponseData{$foilid}->[$i]->{'_total'} - 
-                               $ResponseData{$foilid}->[$i]->{'_correct'}));
-                    }
+                    push (@PlotData_Correct,0);
+                    push (@PlotData_Incorrect,
+                          int(100*$DataSet{$foilid}/$total));
                 }
             }
         }
+        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);
     }
-    # 
-    # Build a table for the plots
-    my $analysis_html = "<table>\n";
-    my $foilkey = &build_option_index($ORdata);
-    for (my $i=$mintries;$i<=$maxtries;$i++) {
-        my $count = $ResponseData{'_total'}->[$i];
-        if ($count == 0) {
-            $count = 'no submissions';
-        } elsif ($count == 1) {
-            $count = '1 submission';
-        } else {
-            $count = $count.' submissions';
-        }
-        my $title = 'Attempt '.$i.', '.$count;
-        my @Datasets;
-        foreach my $option ('_correct',@{$ORdata->{'Options'}}) {
-            next if (! exists($PlotData[$i]->{$option}));
-            push(@Datasets,$PlotData[$i]->{$option});
-        }
-        my $correctgraph = &Apache::loncommon::DrawGraph
-            ($title,'Foil Number','Percent Correct',
-             100,$plotcolors,$Datasets[0]);
-        $analysis_html.= '<tr><td>'.$correctgraph.'</td>';
-        ##
-        ##
-        for (my $i=0; $i< scalar(@{$Datasets[0]});$i++) {
-            $Datasets[0]->[$i]=0;
+    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;
+}
+
+
+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;
+            }
         }
-        $count = $ResponseData{'_total'}->[$i]-$ResponseData{'_correct'}->[$i];
-        if ($count == 0) {
-            $count = 'no submissions';
-        } elsif ($count == 1) {
-            $count = '1 submission';
+    }
+    return %Partdata;
+}
+
+#########################################################
+#########################################################
+##
+##      Option Response Routines
+##
+#########################################################
+#########################################################
+sub OptionResponseAnalysis {
+    my ($r,$problem,$problem_data,$Students) = @_;
+    my ($resource,$respid) = ($problem->{'resource'},
+                              $problem->{'respid'});
+    # Note: part data is not needed.
+    my $PerformanceData = &Apache::loncoursedata::get_response_data
+        (\@Apache::lonstatistics::SelectedSections,
+         $Apache::lonstatistics::enrollment_status,
+         $resource->{'symb'},$respid);
+    if (! defined($PerformanceData) || 
+        ref($PerformanceData) ne 'ARRAY' ) {
+        $r->print('<h2>'.
+                  &mt('There is no student data for this problem.').
+                  '</h2>');
+    }  else {
+        $r->rflush();
+        if (exists($ENV{'form.ExcelOutput'})) {
+            my $result = &OR_excel_sheet($r,$resource,
+                                         $PerformanceData,
+                                         $problem_data);
+            $r->print($result);
+            $r->rflush();
         } else {
-            $count = $count.' submissions';
+            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>');
+            }
         }
-        $title = 'Attempt '.$i.', '.$count;
-        my $incorrectgraph = &Apache::loncommon::DrawGraph
-            ($title,'Foil Number','% Option Chosen Incorrectly',
-             100,$plotcolors,@Datasets);
-        $analysis_html.= '<td>'.$incorrectgraph.'</td>';
-        $analysis_html.= '<td>'.$foilkey."<td></tr>\n";
     }
-    $analysis_html .= "</table>\n";
-    return $analysis_html;
 }
 
-sub Tries_Concept_Analysis {
-    my ($mintries,$maxtries,$Concepts,$respdat,$ORdata) = @_;
-    my %ResponseData = %$respdat;
-    my $analysis_html = "<table>\n";
-    #
-    # Compute the data neccessary to make the plots
-    my @PlotData;
-    # Concept analysis
+#########################################################
+#
+#       Option Response:  Tries Analysis
+#
+#########################################################
+sub OR_tries_analysis {
+    my ($r,$PerformanceData,$ORdata) = @_;
+    my $mintries = 1;
+    my $maxtries = $ENV{'form.NumPlots'};
+    my ($table,$Foils,$Concepts) = &build_foil_index($ORdata);
+    my %response_data = &OR_analyze_by_tries($r,$PerformanceData,
+                                                     $mintries,$maxtries);
+    my $analysis = '';
     #
-    # Note: we do not bother with characterizing the students incorrect
-    # answers at the concept level because an incorrect answer for one foil
-    # may be a correct answer for another foil.
-    my %ConceptData;
-    foreach my $concept (@{$Concepts}) {
-        for (my $i=$mintries;$i<=$maxtries;$i++) {
-            #
-            # Gather the per-attempt data
-            my $cdata = $ConceptData{$concept}->[$i];
-            foreach my $foilid (@{$concept->{'foils'}}) {
-                $cdata->{'_correct'} += 
-                    $ResponseData{$foilid}->[$i]->{'_correct'};
-                $cdata->{'_total'}   += 
-                    $ResponseData{$foilid}->[$i]->{'_total'};
-            }
-            push (@{$PlotData[$i]->{'_total'}},$cdata->{'_total'});
-            if ($cdata->{'_total'} == 0) {
-                push (@{$PlotData[$i]->{'_correct'}},0);
+    # Compute the data necessary to make the plots
+    my @foil_plot; 
+    my @concept_data;
+    for (my $j=0;$j<=scalar(@$Concepts);$j++) {
+        my $concept = $Concepts->[$j];
+        foreach my $foilid (@{$concept->{'foils'}}) {
+            for (my $try=$mintries;$try<=$maxtries;$try++) {
+                # concept analysis data
+                $concept_data[$j]->{'_correct'} +=
+                    $response_data{$foilid}->[$try]->{'_correct'};
+                $concept_data[$j]->{'_total'} +=
+                    $response_data{$foilid}->[$try]->{'_total'};
+                #
+                # foil analysis data
+                if ($response_data{$foilid}->[$try]->{'_total'} == 0) {
+                    push(@{$foil_plot[$try]->{'_correct'}},0);
+                } else {
+                    push(@{$foil_plot[$try]->{'_correct'}},
+                         100*$response_data{$foilid}->[$try]->{'_correct'}/
+                         $response_data{$foilid}->[$try]->{'_total'});
+                }
+                foreach my $option (@{$ORdata->{'_Options'}}) {
+                    push(@{$foil_plot[$try]->{'_total'}},
+                         $response_data{$foilid}->[$try]->{'_total'});
+                    if ($response_data{$foilid}->[$try]->{'_total'} == 0) {
+                        push (@{$foil_plot[$try]->{$option}},0);
+                    } else {
+                        if ($response_data{$foilid}->[$try]->{'_total'} ==
+                            $response_data{$foilid}->[$try]->{'_correct'}) {
+                            push(@{$foil_plot[$try]->{$option}},0);
+                        } else {
+                            push (@{$foil_plot[$try]->{$option}},
+                                  100 * 
+                                  $response_data{$foilid}->[$try]->{$option} / 
+                                  ($response_data{$foilid}->[$try]->{'_total'} 
+                                   - 
+                                   $response_data{$foilid}->[$try]->{'_correct'}
+                                   ));
+                        }
+                    }
+                } # End of foreach my $option
+            }
+        } # End of foreach my $foilid
+    } # End of concept loops
+    # 
+    # Build a table for the plots
+    my $analysis_html = "<table>\n";
+    my $optionkey = &build_option_index($ORdata);
+    my $num_concepts = 1;
+    if (defined($Concepts)) { $num_concepts = scalar(@$Concepts); }
+    #
+    for (my $try=$mintries;$try<=$maxtries;$try++) {
+        if (! defined($response_data{'_total'}->[$try]) ||
+            $response_data{'_total'}->[$try] == 0) { 
+            if ($try > 1) {
+                $analysis_html.= '<tr><td align="center" colspan="4"><b>'.
+                    &mt('None of the selected students attempted the problem more than [_1] times.',$try-1).
+                    '</b></td></tr>';
             } else {
-                push (@{$PlotData[$i]->{'_correct'}},
-                      100*$cdata->{'_correct'}/$cdata->{'_total'});
+                $analysis_html.= '<tr><td colspan="4" align="center"><b>'.
+                    &mt('None of the selected students have attempted the problem').'</b></td></tr>';
+            }
+            last;
+        }
+        my $concept_graph='';
+        if ($num_concepts > 1) {
+            #
+            # Create concept plot
+            my @concept_plot_data;
+            for (my $j=0;$j<=$#concept_data;$j++) {
+                my $total = $concept_data[$j]->{'_total'};
+                if ($total == 0) {
+                    $concept_plot_data[$j] = 0;
+                } else {
+                    $concept_plot_data[$j] = 100 * 
+                        sprintf('%0.3f',
+                                $concept_data[$j]->{'_correct'} / $total);
                 }
+            }
+            #
+            my $title;
+            my $count = $response_data{'_total'}->[$try];
+            $title = 'Attempt '.$try.' (N='.$count.')';
+            $concept_graph = &Apache::loncommon::DrawBarGraph
+                ($title,'Concept Number','Percent Correct',
+                 100,$plotcolors,undef,\@concept_plot_data);
         }
-    }
-    # Build a table for the plots
-    for (my $i=$mintries;$i<=$maxtries;$i++) {
-        my $minstu = $PlotData[$i]->{'_total'}->[0];
-        my $maxstu = $PlotData[$i]->{'_total'}->[0];
-        foreach my $count (@{$PlotData[$i]->{'_total'}}) {
-            if ($minstu > $count) {
-                $minstu = $count;
-            }
-            if ($maxstu < $count) {
-                $maxstu = $count;
-            }
-        }
-        $maxstu = 0 if (! defined($maxstu));
-        $minstu = 0 if (! defined($minstu));
-        my $title;
-        my $count = $ResponseData{'_total'}->[$i];
-        if ($count == 0) {
-            $count = 'no submissions';
-        } elsif ($count == 1) {
-            $count = '1 submission';
-        } else {
-            $count = $count.' submissions';
+        #
+        # Create Foil Plots
+        my $count = $response_data{'_total'}->[$try];
+        my $title = 'Attempt '.$try.' (N='.$count.')';
+        my @Datasets;
+        foreach my $option ('_correct',@{$ORdata->{'_Options'}}) {
+            next if (! exists($foil_plot[$try]->{$option}));
+            push(@Datasets,$foil_plot[$try]->{$option});
         }
-        $title = 'Attempt '.$i.', '.$count;
-        my $graphlink = &Apache::loncommon::DrawGraph
-            ($title,'Concept Number','Percent Correct',
-             100,$plotcolors,$PlotData[$i]->{'_correct'});
-        $analysis_html.= '<tr><td>'.$graphlink."</td></tr>\n";
+        #
+        # Put a blank in the data set between concepts
+        for (my $set =0;$set<=$#Datasets;$set++) {
+            my @Data = @{$Datasets[$set]};
+            my $idx = 0;
+            foreach my $concept (@{$Concepts}) {
+                foreach my $foilid (@{$concept->{'foils'}}) {
+                    $Datasets[$set]->[$idx++]=shift(@Data);
+                }
+                if ($concept->{'name'} ne $Concepts->[-1]->{'name'}) {
+                    $Datasets[$set]->[$idx++] = 0;
+                }
+            }
+        }
+        #
+        # Set up the labels needed for the bar graph
+        my @Labels;
+        my $idx = 1;
+        foreach my $concept (@{$Concepts}) {
+            foreach my $foilid (@{$concept->{'foils'}}) {
+                push(@Labels,$idx++);
+            }
+            push(@Labels,'');
+        }
+        #
+        my $correct_graph = &Apache::loncommon::DrawBarGraph
+            ($title,'Foil Number','Percent Correct',
+             100,$plotcolors,\@Labels,$Datasets[0]);
+        
+        #
+        #
+        next if (! defined($Datasets[0]));
+        for (my $i=0; $i< scalar(@{$Datasets[0]});$i++) {
+            $Datasets[0]->[$i]=0;
+        }
+        $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);
+        $analysis_html.= 
+            '<tr>'.
+            '<td>'.$concept_graph.'</td>'.
+            '<td>'.$correct_graph.'</td>'.
+            '<td>'.$incorrect_graph.'</td>'.
+            '<td>'.$optionkey.'<td>'.
+            '</tr>'.$/;
     }
     $analysis_html .= "</table>\n";
-    return $analysis_html;
+    $table .= $analysis_html;
+    return $table;
 }
 
-sub analyze_option_data_by_tries {
+sub OR_analyze_by_tries {
     my ($r,$PerformanceData,$mintries,$maxtries) = @_;
     my %Trydata;
     $mintries = 1         if (! defined($mintries) || $mintries < 1);
@@ -487,7 +769,7 @@ sub analyze_option_data_by_tries {
     foreach my $row (@$PerformanceData) {
         next if (! defined($row));
         my $tries = &get_tries_from_row($row);
-        my %Row   = &Process_Row($row);
+        my %Row   = &Process_OR_Row($row);
         next if (! %Row);
         while (my ($foilid,$href) = each(%Row)) {
             if (! ref($href)) { 
@@ -503,24 +785,26 @@ sub analyze_option_data_by_tries {
 }
 
 #########################################################
+#
+#     Option Response: Time Analysis
+#
 #########################################################
-##
-##                 Time Analysis
-##
-#########################################################
-#########################################################
-sub time_analysis {
-    my ($PerformanceData,$ORdata) = @_;
+sub OR_time_analysis {
+    my ($performance_data,$ORdata) = @_;
     my ($table,$Foils,$Concepts) = &build_foil_index($ORdata);
-    if ((@$Concepts < 2) && ($ENV{'form.AnalyzeAs'} ne 'Foils')) {
+    my $foilkey = &build_option_index($ORdata);
+    my $num_concepts = 1;
+    if (defined($Concepts)) { $num_concepts = scalar(@$Concepts); }
+    #
+    if ($num_concepts < 2) {
         $table = '<h3>'.
             &mt('Not enough data for concept analysis.  '.
                 'Performing Foil Analysis').
-            '</h3>'.$table;
-        $ENV{'form.AnalyzeAs'} = 'Foils';
+                '</h3>'.$table;
     }
+    #
     my $num_plots = $ENV{'form.NumPlots'};
-    my $num_data = scalar(@$PerformanceData)-1;
+    my $num_data = scalar(@$performance_data)-1;
     my $percent = sprintf('%2f',100/$num_plots);
     #
     $table .= "<table>\n";
@@ -532,16 +816,20 @@ sub time_analysis {
             ('enddate_'.$i);
         if (! defined($starttime) || ! defined($endtime)) {
             my $sec_in_day = 86400;
-            my $last_sub_time = &get_time_from_row($PerformanceData->[-1]);
+            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);
             $starttime = &Time::Local::timelocal(0,0,0,$sday,$smon,$syear);
             $endtime = $starttime + $sec_in_day;
             if ($i == ($num_plots -1 )) {
-                $starttime = &get_time_from_row($PerformanceData->[0]);
+                $starttime = &get_time_from_row($performance_data->[0]);
             }
         }
+        $table .= '<tr><td colspan="4" align="center">'.
+            &mt('Data from [_1] to [_2]',
+                &Apache::lonlocal::locallocaltime($starttime),
+                &Apache::lonlocal::locallocaltime($endtime)).'</td></tr>'.$/;
         my $startdateform = &Apache::lonhtmlcommon::date_setter
             ('Statistics','startdate_'.$i,$starttime);
         my $enddateform = &Apache::lonhtmlcommon::date_setter
@@ -550,12 +838,17 @@ sub time_analysis {
         my $begin_index;
         my $end_index;
         my $j;
-        while (++$j < scalar(@$PerformanceData)) {
-            last if (&get_time_from_row($PerformanceData->[$j]) > $starttime);
+        while (++$j < scalar(@$performance_data)) {
+            last if (&get_time_from_row($performance_data->[$j]) 
+                                                              > $starttime);
         }
         $begin_index = $j;
-        while (++$j < scalar(@$PerformanceData)) {
-            last if (&get_time_from_row($PerformanceData->[$j]) > $endtime);
+        while ($j < scalar(@$performance_data)) {
+            if (&get_time_from_row($performance_data->[$j]) > $endtime) {
+                last;
+            } else {
+                $j++;
+            }
         }
         $end_index = $j;
         ##
@@ -565,31 +858,46 @@ sub time_analysis {
             startdateform => $startdateform,
             enddateform   => $enddateform,
         };
-        if ($ENV{'form.AnalyzeAs'} eq 'Foils') {
-            $table .= &Foil_Time_Analysis($PerformanceData,$ORdata,$Foils,
+        my $concept_correct_plot = '';
+        if ($num_concepts > 1) {
+            $concept_correct_plot = 
+                &OR_Concept_Time_Analysis($performance_data,
+                                          $ORdata,$Concepts,
                                           $interval);
-        } else {
-            $table .= &Concept_Time_Analysis($PerformanceData,$ORdata,
-                                             $Concepts,$interval);
         }
+        my ($foil_correct_plot,$foil_incorrect_plot) = 
+            &OR_Foil_Time_Analysis($performance_data,$ORdata,
+                                   $Foils,$Concepts,$interval);
+        $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>'.$/;
+        $table.= '<tr><td colspan="4">&nbsp</td></tr>'.$/;
     }
+    $table .= '</table>';
     #
     return $table;
 }
 
-sub Foil_Time_Analysis {
-    my ($PerformanceData,$ORdata,$Foils,$interval) = @_;
+sub OR_Foil_Time_Analysis {
+    my ($performance_data,$ORdata,$Foils,$Concepts,$interval) = @_;
     my $analysis_html;
-    my $foilkey = &build_option_index($ORdata);
     my ($begin_index,$end_index) = ($interval->{'begin_index'},
                                     $interval->{'end_index'});
     my %TimeData;
     #
     # Compute the number getting the foils correct or incorrects
     for (my $j=$begin_index;$j<=$end_index;$j++) {
-        my $row = $PerformanceData->[$j];
+        my $row = $performance_data->[$j];
         next if (! defined($row));
-        my %Row = &Process_Row($row);
+        my %Row = &Process_OR_Row($row);
         while (my ($foilid,$href) = each(%Row)) {
             if (! ref($href)) {
                 $TimeData{$foilid} += $href;
@@ -600,81 +908,80 @@ sub Foil_Time_Analysis {
             }
         }
     }
-    my @Plotdata;
-    foreach my $foil (@$Foils) {
-        my $total = $TimeData{$foil}->{'_total'};
-        if ($total == 0) {
-            push(@{$Plotdata[0]},0);
-        } else {
-            push(@{$Plotdata[0]},
-                 100 * $TimeData{$foil}->{'_correct'} / $total);
-        }
-        my $total_incorrect = $total - $TimeData{$foil}->{'_correct'};
-        my $optionidx = 1;
-        foreach my $option (@{$ORdata->{'Options'}}) {
-            if ($total_incorrect == 0) {
-                push(@{$Plotdata[$optionidx]},0);
+    my @plotdata;
+    my @labels;
+    foreach my $concept (@{$Concepts}) {
+        foreach my $foil (@{$concept->{'foils'}}) {
+            push(@labels,scalar(@labels)+1);
+            my $total = $TimeData{$foil}->{'_total'};
+            if ($total == 0) {
+                push(@{$plotdata[0]},0);
             } else {
-                push(@{$Plotdata[$optionidx]},
-                     100 * $TimeData{$foil}->{$option} / $total_incorrect);
+                push(@{$plotdata[0]},
+                     100 * $TimeData{$foil}->{'_correct'} / $total);
             }
-        } continue {
-            $optionidx++;
+            my $total_incorrect = $total - $TimeData{$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);
+                }
+            }
+        }
+        # Put in a blank one
+        push(@labels,'');
+        push(@{$plotdata[0]},0);
+        for (my $i=0;$i<scalar(@{$ORdata->{'_Options'}});$i++) {
+            push(@{$plotdata[$i+1]},0);
         }
     }
     #
     # 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';
-    } else {
+    } elsif ($count > 1) {
         $title = $count.' submissions';
     }
-    my $correctplot = &Apache::loncommon::DrawGraph($title,
-                                                    'Foil Number',
-                                                    'Percent Correct',
-                                                    100,
-                                                    $plotcolors,
-                                                    $Plotdata[0]);
-    for (my $j=0; $j< scalar(@{$Plotdata[0]});$j++) {
-        $Plotdata[0]->[$j]=0;
+    my $correct_plot = &Apache::loncommon::DrawBarGraph($title,
+                                                       'Foil Number',
+                                                       'Percent Correct',
+                                                       100,
+                                                       $plotcolors,
+                                                       undef,
+                                                       $plotdata[0]);
+    for (my $j=0; $j< scalar(@{$plotdata[0]});$j++) {
+        $plotdata[0]->[$j]=0;
     }
     $count = $end_index-$begin_index-$TimeData{'_correct'};
     if ($count == 0) {
         $title = 'no submissions';
+    } elsif ($count < 0) {
+        return ($correct_plot,'');
     } elsif ($count == 1) {
         $title = 'one submission';
     } else {
         $title = $count.' submissions';
     }
-    my $incorrectplot = &Apache::loncommon::DrawGraph($title,
+    my $incorrect_plot = &Apache::loncommon::DrawBarGraph($title,
                                                  'Foil Number',
                                                  'Incorrect Option Choice',
                                                  100,
                                                  $plotcolors,
-                                                 @Plotdata);        
-    $analysis_html.='<tr>'.
-        '<td>'.$correctplot.'</td>'.
-        '<td>'.$incorrectplot.'</td>'.
-        '<td align="left" valign="top">'.$foilkey.'</td>'."</tr>\n";
-    $analysis_html.= '<tr>'.'<td colspan="3">'.
-        '<b>Start Time</b>:'.
-        ' &nbsp;'.$interval->{'startdateform'}.'<br />'.
-        '<b>End Time</b>&nbsp;&nbsp;: '.
-        '&nbsp;'.$interval->{'enddateform'}.'<br />'.
-#        '<b>Plot Title</b>&nbsp;&nbsp;:'.
-#        ("&nbsp;"x3).$interval->{'titleform'}.
-        '</td>'.
-        "</tr>\n";
-    return $analysis_html;
+                                                 undef,
+                                                 @plotdata);
+    return ($correct_plot,$incorrect_plot);
 }
 
-sub Concept_Time_Analysis {
-    my ($PerformanceData,$ORdata,$Concepts,$interval) = @_;
-    my $analysis_html;
+sub OR_Concept_Time_Analysis {
+    my ($performance_data,$ORdata,$Concepts,$interval) = @_;
     ##
     ## Determine starttime, endtime, startindex, endindex
     my ($begin_index,$end_index) = ($interval->{'begin_index'},
@@ -683,9 +990,9 @@ sub Concept_Time_Analysis {
     #
     # Compute the number getting the foils correct or incorrects
     for (my $j=$begin_index;$j<=$end_index;$j++) {
-        my $row = $PerformanceData->[$j];
+        my $row = $performance_data->[$j];
         next if (! defined($row));
-        my %Row = &Process_Row($row);
+        my %Row = &Process_OR_Row($row);
         while (my ($foilid,$href) = each(%Row)) {
             if (! ref($href)) {
                 $TimeData{$foilid} += $href;
@@ -698,7 +1005,7 @@ sub Concept_Time_Analysis {
     }
     #
     # Put the data in plottable form
-    my @Plotdata;
+    my @plotdata;
     foreach my $concept (@$Concepts) {
         my ($total,$correct);
         foreach my $foil (@{$concept->{'foils'}}) {
@@ -706,31 +1013,21 @@ sub Concept_Time_Analysis {
             $correct += $TimeData{$foil}->{'_correct'};
         }
         if ($total == 0) {
-            push(@Plotdata,0);
+            push(@plotdata,0);
         } else {
-            push(@Plotdata,100 * $correct / $total);
+            push(@plotdata,100 * $correct / $total);
         }
     }
     #
     # Create the plot
     my $title = ($end_index - $begin_index).' submissions';
-    my $correctplot = &Apache::loncommon::DrawGraph($title,
-                                                    'Concept Number',
-                                                    'Percent Correct',
-                                                    100,
-                                                    $plotcolors,
-                                                    \@Plotdata);
-    $analysis_html.='<tr>'.
-        '<td>'.$correctplot.'</td>'.
-        '<td align="left" valign="top">'.
-        '<b>Start Time</b>: &nbsp;'.$interval->{'startdateform'}.'<br />'.
-        '<b>End Time</b>&nbsp;&nbsp;: '.
-           '&nbsp;'.$interval->{'enddateform'}.'<br />'.
-#        '<b>Plot Title</b>&nbsp;&nbsp;:'.("&nbsp;"x3).
-#            $interval->{'titleform'}.
-        '</td>'.
-        "</tr>\n";
-    return $analysis_html;
+    return &Apache::loncommon::DrawBarGraph($title,
+                                            'Concept Number',
+                                            'Percent Correct',
+                                            100,
+                                            $plotcolors,
+                                            undef,
+                                            \@plotdata);
 }
 
 #########################################################
@@ -740,8 +1037,8 @@ sub Concept_Time_Analysis {
 ##
 #########################################################
 #########################################################
-sub prepare_excel_sheet {
-    my ($r,$resource,$PerformanceData,$ORdata) = @_;
+sub OR_excel_sheet {
+    my ($r,$resource,$performance_data,$ORdata) = @_;
     my $response = '';
     my (undef,$Foils,$Concepts) = &build_foil_index($ORdata);
     #
@@ -760,22 +1057,11 @@ sub prepare_excel_sheet {
     }
     #
     $workbook->set_tempdir('/home/httpd/perl/tmp');
-    #
-    # Define some potentially useful formats
-    my $format;
-    $format->{'header'} = $workbook->add_format(bold      => 1, 
-                                                bottom    => 1,
-                                                align     => 'center');
-    $format->{'bold'} = $workbook->add_format(bold=>1);
-    $format->{'h1'}   = $workbook->add_format(bold=>1, size=>18);
-    $format->{'h2'}   = $workbook->add_format(bold=>1, size=>16);
-    $format->{'h3'}   = $workbook->add_format(bold=>1, size=>14);
-    $format->{'date'} = $workbook->add_format(num_format=>
-                                              'mmm d yyyy hh:mm AM/PM');
+    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  = $workbook->addworksheet('Student 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) {
@@ -784,17 +1070,13 @@ sub prepare_excel_sheet {
     }
     #
     my $result;
-    $result = &build_problem_data_worksheet($problem_data_sheet,$format,
+    $result = &OR_build_problem_data_worksheet($problem_data_sheet,$format,
                                             $Concepts,$ORdata);
     if ($result ne 'okay') {
         # Do something useful
     }
-    $result = &build_student_data_worksheet($student_data_sheet,$format);
-    if ($result ne 'okay') {
-        # Do something useful
-    }
-    $result = &build_response_data_worksheet($response_data_sheet,$format,
-                                             $PerformanceData,$Foils,
+    $result = &OR_build_response_data_worksheet($response_data_sheet,$format,
+                                             $performance_data,$Foils,
                                              $ORdata);
     if ($result ne 'okay') {
         # Do something useful
@@ -812,7 +1094,7 @@ sub prepare_excel_sheet {
     return $result;
 }
 
-sub build_problem_data_worksheet {
+sub OR_build_problem_data_worksheet {
     my ($worksheet,$format,$Concepts,$ORdata) = @_;
     my $rows_output = 3;
     my $cols_output = 0;
@@ -827,7 +1109,7 @@ sub build_problem_data_worksheet {
         @Headers = ('Foil Number','FoilName','Foil Text','Correct value');
     }
     $worksheet->write_row($rows_output++,0,\@Headers,$format->{'header'});
-    my %Foildata = %{$ORdata->{'Foils'}};
+    my %Foildata = %{$ORdata->{'_Foils'}};
     my $conceptindex = 1;
     my $foilindex = 1;
     foreach my $concept (@$Concepts) {
@@ -875,40 +1157,14 @@ sub build_problem_data_worksheet {
     ##
     ## Option data output
     $worksheet->write($rows_output++,0,'Options',$format->{'header'});
-    foreach my $string (@{$ORdata->{'Options'}}) {
+    foreach my $string (@{$ORdata->{'_Options'}}) {
         $worksheet->write($rows_output++,0,$string);
     }
     return 'okay';
 }
 
-sub build_student_data_worksheet {
-    my ($worksheet,$format) = @_;
-    my $rows_output = 3;
-    my $cols_output = 0;
-    $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;
-}
-
-sub build_response_data_worksheet {
-    my ($worksheet,$format,$PerformanceData,$Foils,$ORdata)=@_;
+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'});
@@ -921,29 +1177,29 @@ sub build_response_data_worksheet {
     }
     $worksheet->write_row($rows_output++,0,\@Headers,$format->{'header'});
     #
-    foreach my $row (@$PerformanceData) {
+    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 %ResponseData;
+        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);
-            $ResponseData{$foilid.' submission'}=$submission;
-            $ResponseData{$foilid.' award'}=$correct;
+            $response_data{$foilid.' submission'}=$submission;
+            $response_data{$foilid.' award'}=$correct;
         }
         $worksheet->write($rows_output,$cols_output++,$student);
         $worksheet->write($rows_output,$cols_output++,
-                          &calc_serial($time),$format->{'date'});
+             &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++,
-                              $ResponseData{$foilid.' submission'});
+                              $response_data{$foilid.' submission'});
             $worksheet->write($rows_output,$cols_output++,
-                              $ResponseData{$foilid.' award'});
+                              $response_data{$foilid.' award'});
         }
         $rows_output++;
         $cols_output = 0;
@@ -951,189 +1207,149 @@ sub build_response_data_worksheet {
     return;
 }
 
-
-##
-## The following is copied from datecalc1.pl, part of the 
-## Spreadsheet::WriteExcel CPAN module.
-##
-##
-######################################################################
-#
-# Demonstration of writing date/time cells to Excel spreadsheets,
-# using UNIX/Perl time as source of date/time.
-#
-# Copyright 2000, Andrew Benham, adsb@bigfoot.com
-#
-######################################################################
-#
-# UNIX/Perl time is the time since the Epoch (00:00:00 GMT, 1 Jan 1970)
-# measured in seconds.
-#
-# An Excel file can use exactly one of two different date/time systems.
-# In these systems, a floating point number represents the number of days
-# (and fractional parts of the day) since a start point. The floating point
-# number is referred to as a 'serial'.
-# The two systems ('1900' and '1904') use different starting points:
-#  '1900'; '1.00' is 1 Jan 1900 BUT 1900 is erroneously regarded as
-#          a leap year - see:
-#            http://support.microsoft.com/support/kb/articles/Q181/3/70.asp
-#          for the excuse^H^H^H^H^H^Hreason.
-#  '1904'; '1.00' is 2 Jan 1904.
-#
-# The '1904' system is the default for Apple Macs. Windows versions of
-# Excel have the option to use the '1904' system.
-#
-# Note that Visual Basic's "DateSerial" function does NOT erroneously
-# regard 1900 as a leap year, and thus its serials do not agree with
-# the 1900 serials of Excel for dates before 1 Mar 1900.
-#
-# Note that StarOffice (at least at version 5.2) does NOT erroneously
-# regard 1900 as a leap year, and thus its serials do not agree with
-# the 1900 serials of Excel for dates before 1 Mar 1900.
-#
-######################################################################
-#
-# Calculation description
-# =======================
-#
-# 1900 system
-# -----------
-# Unix time is '0' at 00:00:00 GMT 1 Jan 1970, i.e. 70 years after 1 Jan 1900.
-# Of those 70 years, 17 (1904,08,12,16,20,24,28,32,36,40,44,48,52,56,60,64,68)
-# were leap years with an extra day.
-# Thus there were 17 + 70*365 days = 25567 days between 1 Jan 1900 and
-# 1 Jan 1970.
-# In the 1900 system, '1' is 1 Jan 1900, but as 1900 was not a leap year
-# 1 Jan 1900 should really be '2', so 1 Jan 1970 is '25569'.
-#
-# 1904 system
-# -----------
-# Unix time is '0' at 00:00:00 GMT 1 Jan 1970, i.e. 66 years after 1 Jan 1904.
-# Of those 66 years, 17 (1904,08,12,16,20,24,28,32,36,40,44,48,52,56,60,64,68)
-# were leap years with an extra day.
-# Thus there were 17 + 66*365 days = 24107 days between 1 Jan 1904 and
-# 1 Jan 1970.
-# In the 1904 system, 2 Jan 1904 being '1', 1 Jan 1970 is '24107'.
-#
-######################################################################
-#
-# Copyright (c) 2000, Andrew Benham.
-# This program is free software. It may be used, redistributed and/or
-# modified under the same terms as Perl itself.
-#
-# Andrew Benham, adsb@bigfoot.com
-# London, United Kingdom
-# 11 Nov 2000
-#
-######################################################################
-
-# Use 1900 date system on all platforms other than Apple Mac (for which
-# use 1904 date system).
-my $DATE_SYSTEM = ($^O eq 'MacOS') ? 1 : 0;
-
-#-----------------------------------------------------------
-# calc_serial()
-#
-# Called with (up to) 2 parameters.
-#   1.  Unix timestamp.  If omitted, uses current time.
-#   2.  GMT flag. Set to '1' to return serial in GMT.
-#       If omitted, returns serial in appropriate timezone.
-#
-# Returns date/time serial according to $DATE_SYSTEM selected
-#-----------------------------------------------------------
-sub calc_serial {
-        my $time = (defined $_[0]) ? $_[0] : time();
-        my $gmtflag = (defined $_[1]) ? $_[1] : 0;
-
-        # Divide timestamp by number of seconds in a day.
-        # This gives a date serial with '0' on 1 Jan 1970.
-        my $serial = $time / 86400;
-
-        # Adjust the date serial by the offset appropriate to the
-        # currently selected system (1900/1904).
-        if ($DATE_SYSTEM == 0) {        # use 1900 system
-                $serial += 25569;
-        } else {                        # use 1904 system
-                $serial += 24107;
-        }
-
-        unless ($gmtflag) {
-                # Now have a 'raw' serial with the right offset. But this
-                # gives a serial in GMT, which is false unless the timezone
-                # is GMT. We need to adjust the serial by the appropriate
-                # timezone offset.
-                # Calculate the appropriate timezone offset by seeing what
-                # the differences between localtime and gmtime for the given
-                # time are.
-
-                my @gmtime = gmtime($time);
-                my @ltime  = localtime($time);
-
-                # For the first 7 elements of the two arrays, adjust the
-                # date serial where the elements differ.
-                for (0 .. 6) {
-                        my $diff = $ltime[$_] - $gmtime[$_];
-                        if ($diff) {
-                                $serial += _adjustment($diff,$_);
-                        }
-                }
+sub build_foil_index {
+    my ($ORdata) = @_;
+    return if (! exists($ORdata->{'_Foils'}));
+    my %Foildata = %{$ORdata->{'_Foils'}};
+    my @Foils = sort(keys(%Foildata));
+    my %Concepts;
+    foreach my $foilid (@Foils) {
+        push(@{$Concepts{$Foildata{$foilid}->{'_Concept'}}},
+             $foilid);
+    }
+    undef(@Foils);
+    # Having gathered the concept information in a hash, we now translate it
+    # into an array because we need to be consistent about order.
+    # Also put the foils in order, too.
+    my $sortfunction = sub {
+        my %Numbers = (one   => 1,
+                       two   => 2,
+                       three => 3,
+                       four  => 4,
+                       five  => 5,
+                       six   => 6,
+                       seven => 7,
+                       eight => 8,
+                       nine  => 9,
+                       ten   => 10,);
+        my $a1 = lc($a); 
+        my $b1 = lc($b);
+        if (exists($Numbers{$a1})) {
+            $a1 = $Numbers{$a1};
         }
-
-        # Perpetuate the error that 1900 was a leap year by decrementing
-        # the serial if we're using the 1900 system and the date is prior to
-        # 1 Mar 1900. This has the effect of making serial value '60'
-        # 29 Feb 1900.
-
-        # This fix only has any effect if UNIX/Perl time on the platform
-        # can represent 1900. Many can't.
-
-        unless ($DATE_SYSTEM) {
-                $serial-- if ($serial < 61);    # '61' is 1 Mar 1900
-        }
-        return $serial;
-}
-
-sub _adjustment {
-        # Based on the difference in the localtime/gmtime array elements
-        # number, return the adjustment required to the serial.
-
-        # We only look at some elements of the localtime/gmtime arrays:
-        #    seconds    unlikely to be different as all known timezones
-        #               have an offset of integral multiples of 15 minutes,
-        #               but it's easy to do.
-        #    minutes    will be different for timezone offsets which are
-        #               not an exact number of hours.
-        #    hours      very likely to be different.
-        #    weekday    will differ when localtime/gmtime difference
-        #               straddles midnight.
-        #
-        # Assume that difference between localtime and gmtime is less than
-        # 5 days, then don't have to do maths for day of month, month number,
-        # year number, etc...
-
-        my ($delta,$element) = @_;
-        my $adjust = 0;
-
-        if ($element == 0) {            # Seconds
-                $adjust = $delta/86400;         # 60 * 60 * 24
-        } elsif ($element == 1) {       # Minutes
-                $adjust = $delta/1440;          # 60 * 24
-        } elsif ($element == 2) {       # Hours
-                $adjust = $delta/24;            # 24
-        } elsif ($element == 6) {       # Day of week number
-                # Catch difference straddling Sat/Sun in either direction
-                $delta += 7 if ($delta < -4);
-                $delta -= 7 if ($delta > 4);
-
-                $adjust = $delta;
+        if (exists($Numbers{$b1})) {
+            $b1 = $Numbers{$b1};
+        }
+        if (($a1 =~/^\d+$/) && ($b1 =~/^\d+$/)) {
+            return $a1 <=> $b1;
+        } else {
+            return $a1 cmp $b1;
+        }
+    };
+    my @Concepts;
+    foreach my $concept (sort $sortfunction (keys(%Concepts))) {
+        if (! defined($Concepts{$concept})) {
+            $Concepts{$concept}=[];
+#            next;
+        }
+        push(@Concepts,{ name => $concept,
+                        foils => [@{$Concepts{$concept}}]});
+        push(@Foils,(@{$Concepts{$concept}}));
+    }
+    #
+    # Build up the table of row labels.
+    my $table = '<table border="1" >'."\n";
+    if (@Concepts > 1) {
+        $table .= '<tr>'.
+            '<th>'.&mt('Concept Number').'</th>'.
+            '<th>'.&mt('Concept').'</th>'.
+            '<th>'.&mt('Foil Number').'</th>'.
+            '<th>'.&mt('Foil Name').'</th>'.
+            '<th>'.&mt('Foil Text').'</th>'.
+            '<th>'.&mt('Correct Value').'</th>'.
+            "</tr>\n";
+    } else {
+        $table .= '<tr>'.
+            '<th>'.&mt('Foil Number').'</th>'.
+            '<th>'.&mt('Foil Name').'</th>'.
+            '<th>'.&mt('Foil Text').'</th>'.
+            '<th>'.&mt('Correct Value').'</th>'.
+            "</tr>\n";
+    }        
+    my $conceptindex = 1;
+    my $foilindex = 1;
+    foreach my $concept (@Concepts) {
+        my @FoilsInConcept = @{$concept->{'foils'}};
+        my $firstfoil = shift(@FoilsInConcept);
+        if (@Concepts > 1) {
+            $table .= '<tr>'.
+                '<td>'.$conceptindex.'</td>'.
+                '<td>'.&HTML::Entities::encode($concept->{'name'},'<>&"').'</td>'.
+                '<td>'.$foilindex++.'</td>'.
+                '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'},'<>&"').'</td>'.
+                '<td>'.$Foildata{$firstfoil}->{'text'}.'</td>'.
+                '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'},'<>&"').'</td>'.
+                "</tr>\n";
+        } else {
+            $table .= '<tr>'.
+                '<td>'.$foilindex++.'</td>'.
+                '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'},'<>&"').'</td>'.
+                '<td>'.$Foildata{$firstfoil}->{'text'}.'</td>'.
+                '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'},'<>&"').'</td>'.
+                "</tr>\n";
         }
-        return $adjust;
+        foreach my $foilid (@FoilsInConcept) {
+            if (@Concepts > 1) {
+                $table .= '<tr>'.
+                    '<td></td>'.
+                    '<td></td>'.
+                    '<td>'.$foilindex.'</td>'.
+                    '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'name'},'<>&"').'</td>'.
+                    '<td>'.$Foildata{$foilid}->{'text'}.'</td>'.
+                    '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'value'},'<>&"').'</td>'.
+                    "</tr>\n";
+            } else {
+                $table .= '<tr>'.
+                    '<td>'.$foilindex.'</td>'.
+                    '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'name'},'<>&"').'</td>'.
+                    '<td>'.$Foildata{$foilid}->{'text'}.'</td>'.
+                    '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'value'},'<>&"').'</td>'.
+                    "</tr>\n";
+            }                
+        } continue {
+            $foilindex++;
+        }
+    } continue {
+        $conceptindex++;
+    }
+    $table .= "</table>\n";
+    #
+    # Build option index with color stuff
+    return ($table,\@Foils,\@Concepts);
+}
+
+sub build_option_index {
+    my ($ORdata)= @_;
+    my $table = "<table>\n";
+    my $optionindex = 0;
+    my @Rows;
+    foreach my $option (&mt('correct option chosen'),@{$ORdata->{'_Options'}}) {
+        push (@Rows,
+              '<tr>'.
+              '<td bgcolor="'.$plotcolors->[$optionindex++].'">'.
+              ('&nbsp;'x4).'</td>'.
+              '<td>'.&HTML::Entities::encode($option,'<>&"').'</td>'.
+              "</tr>\n");
+    }
+    shift(@Rows); # Throw away 'correct option chosen' color
+    $table .= join('',reverse(@Rows));
+    $table .= "</table>\n";
 }
 
 #########################################################
 #########################################################
 ##
-##             Interface 
+##   Generic Interface Routines
 ##
 #########################################################
 #########################################################
@@ -1146,6 +1362,8 @@ sub CreateInterface {
     ##
     ## Build the menu
     my $Str = '';
+    $Str .= &Apache::lonhtmlcommon::breadcrumbs
+        (undef,'Detailed Problem Analysis');
     $Str .= '<table cellspacing="5">'."\n";
     $Str .= '<tr>';
     $Str .= '<td align="center"><b>'.&mt('Sections').'</b></td>';
@@ -1177,53 +1395,55 @@ sub CreateInterface {
     ##
     ##
     $Str .= '<td>';
-    { # These braces are here to organize the code, not scope it.
-        {
-            $Str .= '<nobr>'.&mt('Analyze Over ');
-            $Str .='<select name="AnalyzeOver" >';
-            $Str .= '<option value="Tries" ';
-            if (! exists($ENV{'form.AnalyzeOver'}) || 
-                $ENV{'form.AnalyzeOver'} eq 'Tries'){
-                # Default to Tries
-                $Str .= ' selected ';
-            }
-            $Str .= '>'.&mt('Tries').'</option>';
-            $Str .= '<option value="Time" ';
-            $Str .= ' selected ' if ($ENV{'form.AnalyzeOver'} eq 'Time');
-            $Str .= '>'.&mt('Time').'</option>';
-            $Str .= '</select></nobr><br />';
-        }
-        {
-            $Str .= '<nobr>'.&mt('Analyze as ');
-            $Str .='<select name="AnalyzeAs" >';
-            $Str .= '<option value="Concepts" ';
-            if (! exists($ENV{'form.AnalyzeAs'}) || 
-                $ENV{'form.AnalyzeAs'} eq 'Concepts'){
-                # Default to Concepts
-                $Str .= ' selected ';
-            }
-            $Str .= '>'.&mt('Concepts').'</option>';
-            $Str .= '<option value="Foils" ';
-            $Str .= ' selected ' if ($ENV{'form.AnalyzeAs'} eq 'Foils');
-            $Str .= '>'.&mt('Foils').'</option>';
-            $Str .= '</select></nobr><br />';
-        }
-        {
-            $Str .= '<br /><nobr>'.&mt('Number of Plots:');
-            $Str .= '<select name="NumPlots">';
-            if (! exists($ENV{'form.NumPlots'}) 
-                || $ENV{'form.NumPlots'} < 1 
-                || $ENV{'form.NumPlots'} > 20) {
-                $ENV{'form.NumPlots'} = 5;
-            }
-            foreach my $i (1,2,3,4,5,6,7,8,10,15,20) {
-                $Str .= '<option value="'.$i.'" ';
-                if ($ENV{'form.NumPlots'} == $i) { $Str.=' selected '; }
-                $Str .= '>'.$i.'</option>';
-            }
-            $Str .= '</select></nobr>';
-        }
-    }
+    ##
+    my $showprob_checkbox = 
+        '<input type="checkbox" name="show_prob" value="true" ';
+    if ($ENV{'form.show_prob'} eq 'true') {
+        $showprob_checkbox .= 'checked ';
+    }
+    $showprob_checkbox.= ' />';
+    $Str.= '<nobr><label>'.
+        &mt('Show problem [_1]',$showprob_checkbox).
+        '</label></nobr><br />';
+    ##
+    my $analyze_selector = '<select name="AnalyzeOver" >';
+    $analyze_selector .= '<option value="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 .= '>'.&mt('Time').'</option>';
+    $analyze_selector .= '</select>';
+    $Str .= '<nobr><label>'.
+        &mt('Analyze Over [_1] [_2]',
+            $analyze_selector,
+            &Apache::loncommon::help_open_topic('Analysis_Analyze_Over')).
+            '</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;
+    }
+    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 '; }
+        $numplots_selector .= '>'.$i.'</option>';
+    }
+    $numplots_selector .= '</select></nobr><br />';
+    $Str .= '<nobr><label>'.&mt('Number of Plots [_1]',$numplots_selector).
+        '</label></nobr>';
+    ##
+    $Str .= '<nobr><label>'.&mt('Status: [_1]',
+                                 '<input type="text" '.
+                                 'name="stats_status" size="60" value="" />'
+                                 ).
+                    '</label></nobr>';
     $Str .= '</td>';
     ##
     ##
@@ -1232,79 +1452,17 @@ sub CreateInterface {
     return $Str;
 }
 
-sub OptionResponseProblemSelector {
-    my $Str;
-    $Str = "\n<table>\n";
-    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
-        next if ($seq->{'num_assess'}<1);
-        my $seq_str = '';
-        foreach my $res (@{$seq->{'contents'}}) {
-            next if ($res->{'type'} ne 'assessment');
-            foreach my $part (@{$res->{'parts'}}) {
-                my $partdata = $res->{'partdata'}->{$part};
-                if (! exists($partdata->{'option'}) || 
-                    $partdata->{'option'} == 0) {
-                    next;
-                }
-                for (my $i=0;$i<scalar(@{$partdata->{'ResponseTypes'}});$i++){
-                    my $respid = $partdata->{'ResponseIds'}->[$i];
-                    my $resptype = $partdata->{'ResponseTypes'}->[$i];
-                    if ($resptype eq 'option') {
-                        my $value = &Apache::lonnet::escape($res->{'symb'}.':'.$part.':'.$respid);
-                        my $checked = '';
-                        if ($ENV{'form.problemchoice'} eq $value) {
-                            $checked = 'checked ';
-                        }
-                        $seq_str .= '<tr><td>'.
-  '<input type="radio" name="problemchoice" value="'.$value.'" '.$checked.'/>'.
-  '</td><td>'.
-  '<a href="'.$res->{'src'}.'">'.$res->{'title'}.'</a> ';
-                        if ($partdata->{'option'} > 1) {
-                            $seq_str .= &mt('response').' '.$respid;
-                        }
-                        $seq_str .= "</td></tr>\n";
-                    }
-                }
-            }
-        }
-        if ($seq_str ne '') {
-            $Str .= '<tr><td>&nbsp</td><td><b>'.$seq->{'title'}.'</b></td>'.
-                "</tr>\n".$seq_str;
-        }
-    }
-    $Str .= "</table>\n";
-    return $Str;
-}
-
 #########################################################
 #########################################################
 ##
-##              Misc functions
+##              Misc Option Response functions
 ##
 #########################################################
 #########################################################
-sub get_problem_symb {
-    my $problemstring = shift();
-    my ($symb,$partid,$resid) = ($problemstring=~ /^(.*):([^:]*):([^:]*)$/);
-    return ($symb,$partid,$resid);
-}
-
-sub get_resource_from_symb {
-    my ($symb) = @_;
-    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
-        foreach my $res (@{$seq->{'contents'}}) {
-            if ($res->{'symb'} eq $symb) {
-                return $res;
-            }
-        }
-    }
-    return undef;
-}
-
 sub get_time_from_row {
     my ($row) = @_;
     if (ref($row)) {
-        return $row->[3];
+        return $row->[&Apache::loncoursedata::RD_timestamp()];
     } 
     return undef;
 }
@@ -1312,15 +1470,30 @@ sub get_time_from_row {
 sub get_tries_from_row {
     my ($row) = @_;
     if (ref($row)) {
-        return $row->[5];
+        return $row->[&Apache::loncoursedata::RD_tries()];
     }
     return undef;
 }
 
-sub Process_Row {
+sub hashify_attempt {
+    my ($row) = @_;
+    my %attempt;
+    $attempt{'tries'}      = $row->[&Apache::loncoursedata::RD_tries()];
+    $attempt{'submission'} = $row->[&Apache::loncoursedata::RD_submission()];
+    $attempt{'award'}      = $row->[&Apache::loncoursedata::RD_awarddetail()];
+    $attempt{'timestamp'}  = $row->[&Apache::loncoursedata::RD_timestamp()];
+    return %attempt;
+}
+
+sub Process_OR_Row {
     my ($row) = @_;
     my %RowData;
-    my ($student_id,$award,$grading,$submission,$time,$tries) = @$row;
+    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()];
     return undef if ($award eq 'MISSING_ANSWER');
     if ($award =~ /(APPROX_ANS|EXACT_ANS)/) {
         $RowData{'_correct'} = 1;
@@ -1330,6 +1503,7 @@ sub Process_Row {
     my @Foilsubs   = split('&',$submission);
     for (my $j=0;$j<=$#Foilgrades;$j++) {
         my ($foilid,$correct)  = split('=',$Foilgrades[$j]);
+        $foilid = &Apache::lonnet::unescape($foilid);
         my (undef,$submission) = split('=',$Foilsubs[$j]);
         if ($correct) {
             $RowData{$foilid}->{'_correct'}++;
@@ -1342,50 +1516,6 @@ sub Process_Row {
     return %RowData;
 }
 
-##
-## get problem data and put it into a useful data structure.
-## note: we must force each foil and option to not begin or end with
-##       spaces as they are stored without such data.
-##
-sub get_problem_data {
-    my ($url) = @_;
-    my $Answ=&Apache::lonnet::ssi($url,('grade_target' => 'analyze'));
-    (my $garbage,$Answ)=split(/_HASH_REF__/,$Answ,2);
-    my %Answer;
-    %Answer=&Apache::lonnet::str2hash($Answ);
-    my %Partdata;
-    foreach my $part (@{$Answer{'parts'}}) {
-        while (my($key,$value) = each(%Answer)) {
-            next if ($key !~ /^$part/);
-            $key =~ s/^$part\.//;
-            if (ref($value) eq 'ARRAY') {
-                if ($key eq 'options') {
-                    $Partdata{$part}->{'Options'}=$value;
-                } elsif ($key eq 'concepts') {
-                    $Partdata{$part}->{'Concepts'}=$value;
-                } elsif ($key =~ /^concept\.(.*)$/) {
-                    my $concept = $1;
-                    foreach my $foil (@$value) {
-                        $Partdata{$part}->{'Foils'}->{$foil}->{'Concept'}=
-                                                                      $concept;
-                    }
-                }
-            } else {
-                if ($key=~ /^foil\.text\.(.*)$/) {
-                    my $foil = $1;
-                    $Partdata{$part}->{'Foils'}->{$foil}->{'name'}=$foil;
-                    $value =~ s/(\s*$|^\s*)//g;
-                    $Partdata{$part}->{'Foils'}->{$foil}->{'text'}=$value;
-                } elsif ($key =~ /^foil\.value\.(.*)$/) {
-                    my $foil = $1;
-                    $Partdata{$part}->{'Foils'}->{$foil}->{'value'}=$value;
-                }
-            }
-        }
-    }
-    return %Partdata;
-}
-
 1;
 
 __END__