--- loncom/interface/statistics/lonproblemanalysis.pm	2004/03/01 16:39:19	1.74
+++ loncom/interface/statistics/lonproblemanalysis.pm	2004/09/28 20:45:40	1.89
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemanalysis.pm,v 1.74 2004/03/01 16:39:19 matthew Exp $
+# $Id: lonproblemanalysis.pm,v 1.89 2004/09/28 20:45:40 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,10 +51,6 @@ my @SubmitButtons = ({ name => 'PrevProb
                      { name => 'NextProblemAnalysis',
                        text => 'Next Problem' },
                      { name => 'break'},
-                     { name => 'ClearCache',
-                       text => 'Clear Caches' },
-                     { name => 'updatecaches',
-                       text => 'Update Student Data' },
                      { name => 'SelectAnother',
                        text => 'Choose a different Problem' },
                      { name => 'ExcelOutput',
@@ -67,7 +63,6 @@ sub BuildProblemAnalysisPage {
     my %Saveable_Parameters = ('Status' => 'scalar',
                                'Section' => 'array',
                                'NumPlots' => 'scalar',
-                               'AnalyzeAs' => 'scalar',
                                'AnalyzeOver' => 'scalar',
                                );
     &Apache::loncommon::store_course_settings('problem_analysis',
@@ -81,25 +76,18 @@ sub BuildProblemAnalysisPage {
     #
     my @Students = @Apache::lonstatistics::Students;
     #
-    if (@Students < 1) {
+    if (@Students < 1 && exists($ENV{'form.firstrun'})) {
         $r->print('<h2>There are no students in the sections selected</h2>');
     }
     #
-    &Apache::loncoursedata::clear_internal_caches();
-    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" />');
-    }
+    my @CacheButtonHTML = 
+        &Apache::lonstathelpers::manage_caches($r,'Statistics','stats_status');
     $r->rflush();
     #
-    my $problem_types = '(option|radiobutton|numerical)';
+    # 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'})) {
         foreach my $button (@SubmitButtons) {
@@ -111,6 +99,9 @@ sub BuildProblemAnalysisPage {
                 $r->print('&nbsp;'x5);
             }
         }
+        foreach my $html (@CacheButtonHTML) {
+            $r->print($html.('&nbsp;'x5));
+        }
         #
         $r->print('<hr />');
         $r->rflush();
@@ -148,25 +139,29 @@ sub BuildProblemAnalysisPage {
             $r->rflush();
             my %Data = &Apache::lonstathelpers::get_problem_data
                 ($resource->{'src'});
-            my $ProblemData = $Data{$current_problem->{'part'}.
+            my $problem_data = $Data{$current_problem->{'part'}.
                                     '.'.
                                     $current_problem->{'respid'}};
             if ($current_problem->{'resptype'} eq 'option') {
                 &OptionResponseAnalysis($r,$current_problem,
-                                        $ProblemData,
+                                        $problem_data,
                                         \@Students);
             } elsif ($current_problem->{'resptype'} eq 'radiobutton') {
                 &RadioResponseAnalysis($r,$current_problem,
-                                       $ProblemData,
+                                       $problem_data,
                                        \@Students);
             } elsif ($current_problem->{'resptype'} eq 'numerical') {
-#                if (exists($ENV{'form.ExcelOutput'})) {
-                    &Apache::lonstudentsubmissions::prepare_excel_output
-                        ($r,$current_problem,$ProblemData,\@Students);
-#                } else {
-#                    &NumericalResponseAnalysis($r,$current_problem,
-#                                               $ProblemData,\@Students);
-#                }
+                ## 
+                ## 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>');
             }
@@ -191,14 +186,31 @@ sub BuildProblemAnalysisPage {
 #########################################################
 #########################################################
 sub NumericalResponseAnalysis {
-    my ($r,$problem,$ProblemData,$Students) = @_;
-    $r->print('<h2>This analysis is not yet supported</h2>');
-    my ($resource,$respid) = ($problem->{'resource'},
-                              $problem->{'respid'});
+    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>');
+        }
+    } elsif (@{$resource->{'partdata'}->{$partid}->{'ResponseIds'}}>1) {
+        $r->print('<h3>'.&mt('Response [_1]',$respid).'</h3>');
+    }
+    #
     my $analysis_html;
-    my $PerformanceData = 
-        &Apache::loncoursedata::get_response_data
-        ($Students,$resource->{'symb'},$respid);
+    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>'.
@@ -207,66 +219,126 @@ sub NumericalResponseAnalysis {
         $r->print($analysis_html);
         return;
     }
-    my ($max,$min) = &GetStudentAnswers($r,$problem,$Students);
-    $r->print('Maximum = '.$max.' Minimum = '.$min);
-    my $max_students = 0;
+    #
+    # 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}++;
-        if ($max_students < $Data{$answer}) {
-            $max_students = $Data{$answer};
-        }
-    }
-    foreach (5,10,20,25,50,75,100,150,200,250,500,1000,1500,2000,2500,5000) {
-        if ($max_students < $_) {
-            $max_students = $_;
-            last;
-        }
     }
     my @Labels = sort {$a <=> $b } keys(%Data);
-    $r->print('number of labels = '.scalar(@Labels));
     my @PlotData = @Data{@Labels};
-    $r->print('number of PlotData = '.scalar(@PlotData));
-    my $graph = 
-        &Apache::loncommon::DrawXYGraph('Correct Answer Distribution',
-                                        'Correct Answer',
-                                        'Number of students',
-                                        $max_students,
-                                        undef,
-                                        \@Labels,
-                                        [\@PlotData],
-                                        (xskip=>10));
-    $r->print($graph);
+    #
+    my $width  = 500; 
+    my $height = 100;
+    my $plot = &one_dimensional_plot($r,500,100,scalar(@$Students),
+                                     \@Labels,\@PlotData);
+    $r->print($plot);
     return;
 }
 
-sub GetStudentAnswers {
-    my ($r,$problem,$Students) = @_;
-    my %Answers;
-    my ($resource,$partid,$respid) = ($problem->{'resource'},
-                                      $problem->{'part'},
-                                      $problem->{'respid'});
-    # Open progress window
-    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
-        ($r,'Student Answer Compilation Status',
-         'Student Answer Compilation Progress', scalar(@$Students));
-    $r->print("<table>\n");
-    $r->rflush();
-    foreach my $student (@$Students) {
-        my $sname = $student->{'username'};
-        my $sdom = $student->{'domain'};
-        my $answer = &Apache::lonstathelpers::analyze_problem_as_student
-            ($resource,$sname,$sdom,$partid,$respid);
-        &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
-                                                 &mt('last student'));
-        $student->{'answer'} = $answer;
+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);
     }
-    $r->print("</table>\n");
-    $r->rflush();
-    # close progress window
-    &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
-    return;
+    #
+    # 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;
+}
+
+##
+## 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';
+    }
+    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 {
@@ -304,13 +376,14 @@ sub build_student_data_worksheet {
 #########################################################
 #########################################################
 sub RadioResponseAnalysis {
-    my ($r,$problem,$ProblemData,$Students) = @_;
+    my ($r,$problem,$problem_data,$Students) = @_;
     my ($resource,$respid) = ($problem->{'resource'},
                               $problem->{'respid'});
     my $analysis_html;
-    my $PerformanceData = 
-        &Apache::loncoursedata::get_response_data
-        ($Students,$resource->{'symb'},$respid);
+    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>'.
@@ -321,13 +394,13 @@ sub RadioResponseAnalysis {
     }
     if (exists($ENV{'form.ExcelOutput'})) {
         $analysis_html .= &RR_Excel_output($r,$problem->{'resource'},
-                                           $PerformanceData,$ProblemData);
+                                           $PerformanceData,$problem_data);
     } elsif ($ENV{'form.AnalyzeOver'} eq 'Tries') {
         $analysis_html .= &RR_Tries_Analysis($r,$problem->{'resource'},
-                                             $PerformanceData,$ProblemData);
+                                             $PerformanceData,$problem_data);
     } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') {
         $analysis_html .= &RR_Time_Analysis($r,$problem->{'resource'},
-                                            $PerformanceData,$ProblemData);
+                                            $PerformanceData,$problem_data);
     } else {
         $analysis_html .= '<h2>'.
            &mt('The analysis you have selected is not supported at this time').
@@ -337,35 +410,26 @@ sub RadioResponseAnalysis {
 }
 
 sub RR_Excel_output   { 
-    my ($r,$PerformanceData,$ProblemData) = @_;
+    my ($r,$PerformanceData,$problem_data) = @_;
     return '<h1>No!</h1>';
 }
 
 sub RR_Tries_Analysis { 
-    my ($r,$resource,$PerformanceData,$ProblemData) = @_;
+    my ($r,$resource,$PerformanceData,$problem_data) = @_;
     my $analysis_html;
     my $mintries = 1;
     my $maxtries = $ENV{'form.NumPlots'};
-    my ($table,$Foils,$Concepts) = &build_foil_index($ProblemData);
-    if ((! defined($Concepts)) || ((@$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';
     }
     $analysis_html .= $table;
     my @TryData = &RR_tries_data_analysis($r,$PerformanceData);
-#    if ($ENV{'form.AnalyzeAs'} eq 'Foils') {
         $analysis_html .= &RR_Tries_Foil_Analysis($mintries,$maxtries,$Foils,
-                                                 \@TryData,$ProblemData);
-#    } else {
-#        $analysis_html = &RR_Tries_Concept_Analysis($mintries,$maxtries,
-#                                                    $Concepts,
-#                                                    \@TryData,
-#                                                    $ProblemData);
-#    }
+                                                 \@TryData,$problem_data);
     return $analysis_html;
 }
 
@@ -381,13 +445,13 @@ sub RR_tries_data_analysis {
 }
 
 sub RR_Time_Analysis  { 
-    my ($r,$PerformanceData,$ProblemData) = @_;
+    my ($r,$PerformanceData,$problem_data) = @_;
     my $html;
     return $html;
 }
 
 sub RR_Tries_Foil_Analysis {
-    my ($min,$max,$Foils,$TryData,$ProblemData) = @_;
+    my ($min,$max,$Foils,$TryData,$problem_data) = @_;
     my $html;
     #
     # Compute the data neccessary to make the plots
@@ -406,7 +470,7 @@ sub RR_Tries_Foil_Analysis {
                 push (@PlotData_Correct,0);
                 push (@PlotData_Incorrect,0);
             } else {
-                if ($ProblemData->{'_Foils'}->{$foilid}->{'value'} eq 'true') {
+                if ($problem_data->{'_Foils'}->{$foilid}->{'value'} eq 'true') {
                     push (@PlotData_Correct,
                           int(100*$DataSet{$foilid}/$total));
                     push (@PlotData_Incorrect,0);
@@ -432,19 +496,19 @@ sub RR_Tries_Foil_Analysis {
 }
 
 sub RR_Tries_Concept_Analysis {
-    my ($min,$max,$Concepts,$ResponseData,$ProblemData) = @_;
+    my ($min,$max,$Concepts,$ResponseData,$problem_data) = @_;
     my $html;
     return $html;
 }
 
 sub RR_Time_Foil_Analysis {
-    my ($min,$max,$Foils,$ResponseData,$ProblemData) = @_;
+    my ($min,$max,$Foils,$ResponseData,$problem_data) = @_;
     my $html;
     return $html;
 }
 
 sub RR_Time_Concept_Analysis {
-    my ($min,$max,$Concepts,$ResponseData,$ProblemData) = @_;
+    my ($min,$max,$Concepts,$ResponseData,$problem_data) = @_;
     my $html;
     return $html;
 }
@@ -489,13 +553,14 @@ sub get_Radio_problem_data {
 #########################################################
 #########################################################
 sub OptionResponseAnalysis {
-    my ($r,$problem,$ProblemData,$Students) = @_;
+    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
-        ($Students,$resource->{'symb'},$respid);
+    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>'.
@@ -506,19 +571,19 @@ sub OptionResponseAnalysis {
         if (exists($ENV{'form.ExcelOutput'})) {
             my $result = &OR_excel_sheet($r,$resource,
                                          $PerformanceData,
-                                         $ProblemData);
+                                         $problem_data);
             $r->print($result);
             $r->rflush();
         } else {
             if ($ENV{'form.AnalyzeOver'} eq 'Tries') {
                 my $analysis_html = &OR_tries_analysis($r,
                                                     $PerformanceData,
-                                                    $ProblemData);
+                                                    $problem_data);
                 $r->print($analysis_html);
                 $r->rflush();
             } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') {
                 my $analysis_html = &OR_time_analysis($PerformanceData,
-                                                   $ProblemData);
+                                                   $problem_data);
                 $r->print($analysis_html);
                 $r->rflush();
             } else {
@@ -541,173 +606,146 @@ sub OR_tries_analysis {
     my $mintries = 1;
     my $maxtries = $ENV{'form.NumPlots'};
     my ($table,$Foils,$Concepts) = &build_foil_index($ORdata);
-    if ((@$Concepts < 2) && ($ENV{'form.AnalyzeAs'} ne 'Foils')) {
-        $table = '<h3>'.
-            &mt('Not enough data for concept analysis.  '.
-                'Performing Foil Analysis').
-            '</h3>'.$table;
-        $ENV{'form.AnalyzeAs'} = 'Foils';
-    }
-    my %ResponseData = &OR_analyze_by_tries($r,$PerformanceData,
+    my %response_data = &OR_analyze_by_tries($r,$PerformanceData,
                                                      $mintries,$maxtries);
     my $analysis = '';
-    if ($ENV{'form.AnalyzeAs'} eq 'Foils') {
-        $analysis = &OR_Tries_Foil_Analysis($mintries,$maxtries,$Foils,
-                                         \%ResponseData,$ORdata);
-    } else {
-        $analysis = &OR_Tries_Concept_Analysis($mintries,$maxtries,
-                                            $Concepts,\%ResponseData,$ORdata);
-    }
-    $table .= $analysis;
-    return $table;
-}
-
-sub OR_Tries_Foil_Analysis {
-    my ($mintries,$maxtries,$Foils,$respdat,$ORdata) = @_;
-    my %ResponseData = %$respdat;
     #
-    # Compute the data neccessary to make the plots
-    my @PlotData; 
-    foreach my $foilid (@$Foils) {
-        for (my $i=$mintries;$i<=$maxtries;$i++) {
-            if ($ResponseData{$foilid}->[$i]->{'_total'} == 0) {
-                push(@{$PlotData[$i]->{'_correct'}},0);
-            } else {
-                push(@{$PlotData[$i]->{'_correct'}},
-                     100*$ResponseData{$foilid}->[$i]->{'_correct'}/
-                     $ResponseData{$foilid}->[$i]->{'_total'});
-            }
-            foreach my $option (@{$ORdata->{'_Options'}}) {
-                push(@{$PlotData[$i]->{'_total'}},
-                     $ResponseData{$foilid}->[$i]->{'_total'});
-                if ($ResponseData{$foilid}->[$i]->{'_total'} == 0) {
-                    push (@{$PlotData[$i]->{$option}},0);
+    # 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 {
-                    if ($ResponseData{$foilid}->[$i]->{'_total'} ==
-                        $ResponseData{$foilid}->[$i]->{'_correct'}) {
-                        push(@{$PlotData[$i]->{$option}},0);
+                    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 {
-                        push (@{$PlotData[$i]->{$option}},
-                              100 * $ResponseData{$foilid}->[$i]->{$option} / 
-                              ($ResponseData{$foilid}->[$i]->{'_total'} - 
-                               $ResponseData{$foilid}->[$i]->{'_correct'}));
+                        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 $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 $optionkey = &build_option_index($ORdata);
+    my $num_concepts = 1;
+    if (defined($Concepts)) { $num_concepts = scalar(@$Concepts); }
+    #
+    for (my $try=$mintries;$try<=$maxtries;$try++) {
+        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);
         }
-        my $title = 'Attempt '.$i.', '.$count;
+        #
+        # 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($PlotData[$i]->{$option}));
-            push(@Datasets,$PlotData[$i]->{$option});
+            next if (! exists($foil_plot[$try]->{$option}));
+            push(@Datasets,$foil_plot[$try]->{$option});
         }
-        my $correctgraph = &Apache::loncommon::DrawBarGraph
+        #
+        # 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,undef,$Datasets[0]);
-        $analysis_html.= '<tr><td>'.$correctgraph.'</td>';
-        ##
-        ##
+             100,$plotcolors,\@Labels,$Datasets[0]);
+        
+        #
+        #
         next if (! defined($Datasets[0]));
         for (my $i=0; $i< scalar(@{$Datasets[0]});$i++) {
             $Datasets[0]->[$i]=0;
         }
-        $count = $ResponseData{'_total'}->[$i]-$ResponseData{'_correct'}->[$i];
-        if ($count == 0) {
-            $count = 'no submissions';
-        } elsif ($count == 1) {
-            $count = '1 submission';
-        } else {
-            $count = $count.' submissions';
-        }
-        $title = 'Attempt '.$i.', '.$count;
-        my $incorrectgraph = &Apache::loncommon::DrawBarGraph
+        $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,undef,@Datasets);
-        $analysis_html.= '<td>'.$incorrectgraph.'</td>';
-        $analysis_html.= '<td>'.$foilkey."<td></tr>\n";
-    }
-    $analysis_html .= "</table>\n";
-    return $analysis_html;
-}
-
-sub OR_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
-    #
-    # 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);
-            } else {
-                push (@{$PlotData[$i]->{'_correct'}},
-                      100*$cdata->{'_correct'}/$cdata->{'_total'});
-                }
-        }
-    }
-    # 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';
-        }
-        $title = 'Attempt '.$i.', '.$count;
-        my $graphlink = &Apache::loncommon::DrawBarGraph
-            ($title,'Concept Number','Percent Correct',
-             100,$plotcolors,undef,$PlotData[$i]->{'_correct'});
-        $analysis_html.= '<tr><td>'.$graphlink."</td></tr>\n";
+             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 OR_analyze_by_tries {
@@ -739,17 +777,21 @@ sub OR_analyze_by_tries {
 #
 #########################################################
 sub OR_time_analysis {
-    my ($PerformanceData,$ORdata) = @_;
+    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";
@@ -761,16 +803,20 @@ sub OR_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
@@ -779,13 +825,13 @@ sub OR_time_analysis {
         my $begin_index;
         my $end_index;
         my $j;
-        while (++$j < scalar(@$PerformanceData)) {
-            last if (&get_time_from_row($PerformanceData->[$j]) 
+        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)) {
+            last if (&get_time_from_row($performance_data->[$j]) > $endtime);
         }
         $end_index = $j;
         ##
@@ -795,29 +841,44 @@ sub OR_time_analysis {
             startdateform => $startdateform,
             enddateform   => $enddateform,
         };
-        if ($ENV{'form.AnalyzeAs'} eq 'Foils') {
-            $table .= &OR_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 .= &OR_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 OR_Foil_Time_Analysis {
-    my ($PerformanceData,$ORdata,$Foils,$interval) = @_;
+    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_OR_Row($row);
         while (my ($foilid,$href) = each(%Row)) {
@@ -830,26 +891,34 @@ sub OR_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);
         }
     }
     #
@@ -863,15 +932,15 @@ sub OR_Foil_Time_Analysis {
     } else {
         $title = $count.' submissions';
     }
-    my $correctplot = &Apache::loncommon::DrawBarGraph($title,
+    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;
+                                                       $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) {
@@ -881,32 +950,19 @@ sub OR_Foil_Time_Analysis {
     } else {
         $title = $count.' submissions';
     }
-    my $incorrectplot = &Apache::loncommon::DrawBarGraph($title,
+    my $incorrect_plot = &Apache::loncommon::DrawBarGraph($title,
                                                  'Foil Number',
                                                  'Incorrect Option Choice',
                                                  100,
                                                  $plotcolors,
                                                  undef,
-                                                 @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;
+                                                 @plotdata);        
+
+    return ($correct_plot,$incorrect_plot);
 }
 
 sub OR_Concept_Time_Analysis {
-    my ($PerformanceData,$ORdata,$Concepts,$interval) = @_;
-    my $analysis_html;
+    my ($performance_data,$ORdata,$Concepts,$interval) = @_;
     ##
     ## Determine starttime, endtime, startindex, endindex
     my ($begin_index,$end_index) = ($interval->{'begin_index'},
@@ -915,7 +971,7 @@ sub OR_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_OR_Row($row);
         while (my ($foilid,$href) = each(%Row)) {
@@ -930,7 +986,7 @@ sub OR_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'}}) {
@@ -938,32 +994,21 @@ sub OR_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::DrawBarGraph($title,
-                                                    'Concept Number',
-                                                    'Percent Correct',
-                                                    100,
-                                                    $plotcolors,
-                                                    undef,
-                                                    \@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);
 }
 
 #########################################################
@@ -974,7 +1019,7 @@ sub OR_Concept_Time_Analysis {
 #########################################################
 #########################################################
 sub OR_excel_sheet {
-    my ($r,$resource,$PerformanceData,$ORdata) = @_;
+    my ($r,$resource,$performance_data,$ORdata) = @_;
     my $response = '';
     my (undef,$Foils,$Concepts) = &build_foil_index($ORdata);
     #
@@ -1012,7 +1057,7 @@ sub OR_excel_sheet {
         # Do something useful
     }
     $result = &OR_build_response_data_worksheet($response_data_sheet,$format,
-                                             $PerformanceData,$Foils,
+                                             $performance_data,$Foils,
                                              $ORdata);
     if ($result ne 'okay') {
         # Do something useful
@@ -1100,7 +1145,7 @@ sub OR_build_problem_data_worksheet {
 }
 
 sub OR_build_response_data_worksheet {
-    my ($worksheet,$format,$PerformanceData,$Foils,$ORdata)=@_;
+    my ($worksheet,$format,$performance_data,$Foils,$ORdata)=@_;
     my $rows_output = 3;
     my $cols_output = 0;
     $worksheet->write($rows_output++,0,'Response Data',$format->{'h3'});
@@ -1113,18 +1158,18 @@ sub OR_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++,
@@ -1133,9 +1178,9 @@ sub OR_build_response_data_worksheet {
         $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;
@@ -1220,18 +1265,18 @@ sub build_foil_index {
         if (@Concepts > 1) {
             $table .= '<tr>'.
                 '<td>'.$conceptindex.'</td>'.
-                '<td>'.&HTML::Entities::encode($concept->{'name'}).'</td>'.
+                '<td>'.&HTML::Entities::encode($concept->{'name'},'<>&"').'</td>'.
                 '<td>'.$foilindex++.'</td>'.
-                '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'}).'</td>'.
+                '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'},'<>&"').'</td>'.
                 '<td>'.$Foildata{$firstfoil}->{'text'}.'</td>'.
-                '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'}).'</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>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'},'<>&"').'</td>'.
                 '<td>'.$Foildata{$firstfoil}->{'text'}.'</td>'.
-                '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'}).'</td>'.
+                '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'},'<>&"').'</td>'.
                 "</tr>\n";
         }
         foreach my $foilid (@FoilsInConcept) {
@@ -1240,16 +1285,16 @@ sub build_foil_index {
                     '<td></td>'.
                     '<td></td>'.
                     '<td>'.$foilindex.'</td>'.
-                    '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'name'}).'</td>'.
+                    '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'name'},'<>&"').'</td>'.
                     '<td>'.$Foildata{$foilid}->{'text'}.'</td>'.
-                    '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'value'}).'</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>'.&HTML::Entities::encode($Foildata{$foilid}->{'name'},'<>&"').'</td>'.
                     '<td>'.$Foildata{$foilid}->{'text'}.'</td>'.
-                    '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'value'}).'</td>'.
+                    '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'value'},'<>&"').'</td>'.
                     "</tr>\n";
             }                
         } continue {
@@ -1274,7 +1319,7 @@ sub build_option_index {
               '<tr>'.
               '<td bgcolor="'.$plotcolors->[$optionindex++].'">'.
               ('&nbsp;'x4).'</td>'.
-              '<td>'.&HTML::Entities::encode($option).'</td>'.
+              '<td>'.&HTML::Entities::encode($option,'<>&"').'</td>'.
               "</tr>\n");
     }
     shift(@Rows); # Throw away 'correct option chosen' color
@@ -1351,26 +1396,7 @@ sub CreateInterface {
             $Str .= '</nobr><br />';
         }
         {
-            $Str .= '<nobr>'.&mt('Analyze as ');
-            $Str .= &Apache::loncommon::help_open_topic
-                                                  ('Analysis_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 .= &Apache::loncommon::help_open_topic
-                                                  ('Analysis_num_plots');
+            $Str .= '<nobr>'.&mt('Number of Plots:');
             $Str .= '<select name="NumPlots">';
             if (! exists($ENV{'form.NumPlots'}) 
                 || $ENV{'form.NumPlots'} < 1 
@@ -1382,7 +1408,14 @@ sub CreateInterface {
                 if ($ENV{'form.NumPlots'} == $i) { $Str.=' selected '; }
                 $Str .= '>'.$i.'</option>';
             }
-            $Str .= '</select></nobr>';
+            $Str .= '</select></nobr><br />';
+        }
+        {
+            $Str .= '<nobr>'.&mt('Status: [_1]',
+                                 '<input type="text" '.
+                                 'name="stats_status" size="60" value="" />'
+                                 ).
+                    '</nobr><br />';
         }
     }
     $Str .= '</td>';