loncom/interface/statistics/lonproblemanalysis.pm - diff

Return to lonproblemanalysis.pm CVS log

Up to [LON-CAPA] / loncom / interface / statistics

Diff for /loncom/interface/statistics/lonproblemanalysis.pm between versions 1.42 and 1.111

-version 1.42, 2003/10/17 22:05:45
+version 1.111, 2005/02/16 17:43:20
  Line 24
  #
  # http://www.lon-capa.org/
  #
  package Apache::lonproblemanalysis;
  use strict;
- Line 34  use Apache::lonhtmlcommon();
+ Line 33  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 capa;
  my $plotcolors = ['#33ff00',
                    '#0033cc', '#990000', '#aaaa66', '#663399', '#ff9933',
                    '#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' });
  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'}) ||
+     if (@Students < 1 && exists($ENV{'form.firstrun'})) {
-         exists($ENV{'form.updatecaches'}) ||
+         $r->print('<h2>There are no students in the sections selected</h2>');
-         (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)';
      if (exists($ENV{'form.problemchoice'}) &&
          ! exists($ENV{'form.SelectAnother'})) {
-         $r->print('<input type="submit" name="ProblemAnalysis" value="'.
+         foreach my $button (@SubmitButtons) {
-                   &mt('Analyze Problem Again').'" />');
+             if ($button->{'name'} eq 'break') {
-         $r->print('&nbsp;'x5);
+                 $r->print("<br />\n");
-         $r->print('<input type="submit" name="ClearCache" value="'.
+             } else {
-                   &mt('Clear Caches').'" />');
+                 $r->print('<input type="submit" name="'.$button->{'name'}.'" '.
-         $r->print('&nbsp;'x5);
+                           'value="'.&mt($button->{'text'}).'" />');
-         $r->print('<input type="submit" name="updatecaches" value="'.
+                 $r->print('&nbsp;'x5);
-                   &mt('Update Student Data').'" />');
+             }
-         $r->print('&nbsp;'x5);
+         }
-         $r->print('<input type="hidden" name="problemchoice" value="'.
+         foreach my $html (@CacheButtonHTML) {
-                   $ENV{'form.problemchoice'}.'" />');
+             $r->print($html.('&nbsp;'x5));
-         $r->print('<input type="submit" name="SelectAnother" value="'.
+         }
-                   &mt('Choose a different resource').'" />');
-         $r->print('&nbsp;'x5);
          #
          $r->print('<hr />');
+         $r->rflush();
+         #
+         # Determine which problem we are to analyze
+         my $current_problem = &Apache::lonstathelpers::get_target_from_id
+             ($ENV{'form.problemchoice'});
          #
-         my ($symb,$part,$resid) = &get_problem_symb(
+         my ($prev,$curr,$next) =
-                      &Apache::lonnet::unescape($ENV{'form.problemchoice'})
+             &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;
+         }
          #
-         my $resource = &get_resource_from_symb($symb);
+         # Store the current problem choice and send it out in the form
-         if (defined($resource)) {
+         $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>');
-             my %Data = &get_problem_data($resource->{'src'});
+             if ($ENV{'form.show_prob'} eq 'true') {
-             my $ORdata = $Data{$part.'.'.$resid};
+                 $r->print(&Apache::lonstathelpers::render_resource($resource));
-             ##
+             }
-             ## Render the problem
+             $r->rflush();
-             my $base;
+             my %Data = &Apache::lonstathelpers::get_problem_data
-             ($base,undef) = ($resource->{'src'} =~ m|(.*/)[^/]*$|);
+                 ($resource->{'src'});
-             $base = "http://".$ENV{'SERVER_NAME'}.$base;
+             my $problem_data = $Data{$current_problem->{'part'}.
-             my $rendered_problem =
+                                     '.'.
-                 &Apache::lonnet::ssi_body($resource->{'src'});
+                                     $current_problem->{'respid'}};
-             $rendered_problem =~ s/<\s*form\s*/<nop /g;
+             if ($current_problem->{'resptype'} eq 'option') {
-             $rendered_problem =~ s|(<\s*/form\s*>)|<\/nop>|g;
+                 &OptionResponseAnalysis($r,$current_problem,
-             $r->print('<table bgcolor="ffffff"><tr><td>'.
+                                         $problem_data,
-                       '<base href="'.$base.'" />'.
+                                         \@Students);
-                       $rendered_problem.
+             } elsif ($current_problem->{'resptype'} eq 'radiobutton') {
-                       '</td></tr></table>');
+                 &radio_response_analysis($r,$current_problem,
-             ##
+                                          $problem_data,
-             ## Analyze the problem
+                                          \@Students);
-             my $PerformanceData =
+             } elsif ($current_problem->{'resptype'} eq 'numerical') {
-                 &Apache::loncoursedata::get_optionresponse_data
+                 &numerical_response_analysis($r,$current_problem,
-                                            (\@Students,$symb,$resid);
+                                              $problem_data,\@Students);
-             if (defined($PerformanceData) &&
-                 ref($PerformanceData) eq 'ARRAY') {
-                 if ($ENV{'form.AnalyzeOver'} eq 'Tries') {
-                     my $analysis_html = &tries_analysis($PerformanceData,
-                                                          $ORdata);
-                     $r->print($analysis_html);
-                 } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') {
-                     my $analysis_html = &time_analysis($PerformanceData,
-                                                          $ORdata);
-                 $r->print($analysis_html);
-                 } else {
-                     $r->print('<h2>'.
-                               &mt('The analysis you have selected is '.
-                                          'not supported at this time').
-                               '</h2>');
-                 }
              } else {
-                 $r->print('<h2>'.
+                 $r->print('<h2>Analysis of '.$current_problem->{'resptype'}.' is not supported</h2>');
-                           &mt('There is no student data for this problem.').
-                           '</h2>');
              }
-         } else {
-             $r->print('resource is undefined');
          }
          $r->print('<hr />');
      } else {
- Line 137  sub BuildProblemAnalysisPage {
+ Line 159  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 {
+ sub numerical_response_analysis {
-     my ($ORdata) = @_;
+     my ($r,$problem,$problem_analysis,$students) = @_;
-     return if (! exists($ORdata->{'Foils'}));
+     my $c = $r->connection();
-     my %Foildata = %{$ORdata->{'Foils'}};
+     #
-     my @Foils = sort(keys(%Foildata));
+     if ($ENV{'form.AnalyzeOver'} !~ /^(tries|time)$/) {
-     my %Concepts;
+         $r->print('Bad request');
-     foreach my $foilid (@Foils) {
-         push(@{$Concepts{$Foildata{$foilid}->{'Concept'}}},
-              $foilid);
      }
-     undef(@Foils);
+     #
-     # Having gathered the concept information in a hash, we now translate it
+     my ($resource,$partid,$respid) = ($problem->{'resource'},
-     # into an array because we need to be consistent about order.
+                                       $problem->{'part'},
-     # Also put the foils in order, too.
+                                       $problem->{'respid'});
-     my $sortfunction = sub {
+     # Gather student data
-         my %Numbers = (one   => 1,
+     my $response_data = &Apache::loncoursedata::get_response_data
-                        two   => 2,
+         (\@Apache::lonstatistics::SelectedSections,
-                        three => 3,
+          $Apache::lonstatistics::enrollment_status,
-                        four  => 4,
+          $resource->{'symb'},$respid);
-                        five  => 5,
+     #
-                        six   => 6,
+     $problem_analysis->{'answercomputed'} = 1;
-                        seven => 7,
+     if ($problem_analysis->{'answercomputed'}) {
-                        eight => 8,
+         my $answers =
-                        nine  => 9,
+             &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$students,
-                        ten   => 10,);
+                                                        'Statistics',
-         my $a1 = $a;
+                                                        'stats_status');
-         my $b1 = $b;
+         $r->print(&numerical_one_dimensional_plot($r,600,150,$answers));
-         if (exists($Numbers{lc($a)})) {
+     }
-             $a1 = $Numbers{lc($a)};
+     #
+     if (ref($response_data) ne 'ARRAY') {
+         $r->print('<h2>'.
+                   &mt('There is no submission data for this resource').
+                   '</h2>');
+         return;
+     }
+     my $analysis_html = '<table>';
+     for (my $plot_num = 1;$plot_num<=$ENV{'form.NumPlots'};$plot_num++) {
+         my $restriction_function;
+         my $header_message;
+         my $stats_message;
+         my $post_message; # passed through &mt sooner rather than later
+         my $no_data_message;
+         my @extra_data;
+         if ($ENV{'form.AnalyzeOver'} eq 'tries') {
+             $restriction_function = sub {($_[0]->{'tries'} == $plot_num?1:0)};
+             $header_message = 'Attempt [_1]';
+             $stats_message =
+                 '[_1] submissions, [_2] correct, [_3] incorrect';
+             $post_message = '';
+             $no_data_message = 'No data exists for attempt [_1]';
+         } else {
+             my $starttime = &Apache::lonhtmlcommon::get_date_from_form
+                 ('startdate_'.$plot_num);
+             my $endtime = &Apache::lonhtmlcommon::get_date_from_form
+                 ('enddate_'.$plot_num);
+             ($starttime,$endtime) = &ensure_start_end_times
+                 ($starttime,$endtime,
+                  &get_time_from_row($response_data->[0]),
+                  &get_time_from_row($response_data->[-1]),
+                  $plot_num);
+             $header_message = 'Data from [_2] to [_3]';
+             $extra_data[0] = &Apache::lonlocal::locallocaltime($starttime);
+             $extra_data[1] = &Apache::lonlocal::locallocaltime($endtime);
+             #
+             $stats_message =
+                 '[_1] submissions from [_4] students, [_2] correct, [_3] incorrect';
+             #
+             $post_message =
+                 &mt('Start time: [_1]',
+                     &Apache::lonhtmlcommon::date_setter
+                     ('Statistics','startdate_'.$plot_num,$starttime)).
+                 '<br />'.
+                 &mt('End time: [_1]',
+                     &Apache::lonhtmlcommon::date_setter
+                     ('Statistics','enddate_'.$plot_num,$endtime));
+             $restriction_function =
+                 sub {
+                     my $t = $_[0]->{'timestamp'};
+                     if ($t >= $starttime && $t < $endtime) {
+                         return 1;
+                     } else {
+                         return 0;
+                     }
+                 };
+             $no_data_message = 'No data for [_2] to [_3]';
          }
-         if (exists($Numbers{lc($b)})) {
+         #
-             $b1 = $Numbers{lc($b)};
+         my ($correct,$answers) =
+             &numerical_determine_answers($r,$resource,$partid,
+                                          $respid,$students);
+         if ($c->aborted()) { return; };
+         #
+         my $responses = &numerical_classify_responses($response_data,$correct,
+                                                       $restriction_function);
+         if ($responses->{'_count'} == 0) {
+             $analysis_html.=
+                 '<tr><td colspan="2"><font size="+1"><b>'.
+                 &mt($no_data_message,$plot_num,@extra_data).
+                 '</b></font></td></tr>';
+         } else {
+             $analysis_html.=
+                 '<tr><td colspan="2" align="center"><font size="+1"><b>'.
+                 &mt($header_message,$plot_num,@extra_data).
+                 '</b></font></td></tr>'.
+                 '<tr><td colspan="2" align="center">'.
+                 &mt($stats_message,
+                     $responses->{'_count'},
+                     $responses->{'_correct'},
+                     $responses->{'_count'}-$responses->{'_correct'},
+                     $responses->{'_students'},
+                     @extra_data).
+                     '</td></tr>'.
+                     '<tr>'.'<td valign="top" align="center">'.
+                     &numerical_plot_percent($r,$responses).'</td>'.
+                     '<td align="center" valign="top">'.
+                     &numerical_plot_differences($r,$responses).'</td>'.
+                     '</tr>';
+         }
+         if ($post_message ne '') {
+             $analysis_html .=
+                 '<tr><td colspan="2">'.$post_message.'</td></tr>';
          }
-         $a1 cmp $b1;
-     };
-     my @Concepts;
-     foreach my $concept (sort $sortfunction (keys(%Concepts))) {
-         push(@Concepts,{ name => $concept,
-                         foils => [@{$Concepts{$concept}}]});
-         push(@Foils,(@{$Concepts{$concept}}));
      }
+     $analysis_html.='</table>';
+     $r->print($analysis_html);
      #
-     # Build up the table of row labels.
+     return;
-     my $table = '<table border="1" >'."\n";
+ }
-     if (@Concepts > 1) {
-         $table .= '<tr>'.
+ sub numerical_plot_percent {
-             '<th>'.&mt('Concept Number').'</th>'.
+     my ($r,$responses) = @_;
-             '<th>'.&mt('Concept').'</th>'.
+     #
-             '<th>'.&mt('Foil Number').'</th>'.
+     my $total = $responses->{'_count'};
-             '<th>'.&mt('Foil Name').'</th>'.
+     return '' if ($total == 0);
-             '<th>'.&mt('Foil Text').'</th>'.
+     my $minbin = 5;
-             '<th>'.&mt('Correct Value').'</th>'.
+     while (my ($interval,$submissions) = each(%$responses)) {
-             "</tr>\n";
+         next if ($interval =~ /^_/);
+         my ($ans,$ans_low,$ans_high) = split(" ",$interval);
+         my $low_percent  = abs(100*($ans-$ans_low)/$ans);
+         my $high_percent = abs(100*($ans_high-$ans)/$ans);
+         if ($minbin > $high_percent) { $minbin = $high_percent; }
+         if ($minbin > $low_percent) { $minbin = $low_percent; }
+     }
+     #
+     my @bins;
+     if ($minbin < 1) {
+         @bins = ('0.1','0.5','1.0','1.5','2.0','2.5','3.0','4.0','5.0',10,20,50,100);
+     } elsif ($minbin < 2) {
+         @bins = ('0.5','1.0','1.5','2.0','2.5','3.0','4.0','5.0',10,20,50,100);
+     } elsif ($minbin < 5) {
+         @bins = (1,2,3,4,5,10,25,50,75,100,200);
+     } elsif ($minbin < 10) {
+         @bins = (2,4,6,8,10,12,15,20,25,30,50,75,100,200);
      } else {
-         $table .= '<tr>'.
+         @bins = (5,10,15,20,25,30,50,75,100,200);
-             '<th>'.&mt('Foil Number').'</th>'.
+     }
-             '<th>'.&mt('Foil Name').'</th>'.
+     my @labels = (1..scalar(@bins));
-             '<th>'.&mt('Foil Text').'</th>'.
+     #
-             '<th>'.&mt('Correct Value').'</th>'.
+     my @correct;
-             "</tr>\n";
+     my @incorrect;
-     }
+     my @count;
-     my $conceptindex = 1;
+     while (my ($interval,$submissions) = each(%$responses)) {
-     my $foilindex = 1;
+         next if ($interval =~ /^_/);
-     foreach my $concept (@Concepts) {
+         my ($ans,$ans_low,$ans_high) = split(" ",$interval);
-         my @FoilsInConcept = @{$concept->{'foils'}};
+         while (my ($submission,$counts) = each(%$submissions)) {
-         my $firstfoil = shift(@FoilsInConcept);
+             my ($correct_count,$incorrect_count) = @$counts;
-         if (@Concepts > 1) {
+             my $scaled_value = abs(($submission-$ans)/$ans);
-             $table .= '<tr>'.
+             my $bin=0;
-                 '<td>'.$conceptindex.'</td>'.
+             for ($bin=0;$bin<$#bins;$bin++) { # not <= for a reason
-                 '<td>'.$concept->{'name'}.'</td>'.
+                 last if ($bins[$bin]>$scaled_value);
-                 '<td>'.$foilindex++.'</td>'.
+             }
-                 '<td>'.$Foildata{$firstfoil}->{'name'}.'</td>'.
+             $correct[$bin]+=$correct_count;
-                 '<td>'.$Foildata{$firstfoil}->{'text'}.'</td>'.
+             $incorrect[$bin]+=$incorrect_count;
-                 '<td>'.$Foildata{$firstfoil}->{'value'}.'</td>'.
+             $count[$bin]+=$correct_count+$incorrect_count;
-                 "</tr>\n";
+         }
+     }
+     #
+     my @plot_correct;
+     my @plot_incorrect;
+     for (my $i=0;$i<=$#bins;$i++) {
+         $plot_correct[$i] = $correct[$i]*100/$total;
+         $plot_incorrect[$i] = $incorrect[$i]*100/$total;
+     }
+     my $title = &mt('Distribution by Percent');
+     my $graph = &Apache::loncommon::DrawBarGraph
+         ($title,'Percent difference from correct','Number of answers',
+,['#33FF00','#FF3300'],\@labels,\@plot_correct,\@plot_incorrect,
+          {xskip=>1});
+     #
+     my $table = $graph.$/.
+         &numerical_bin_table(\@bins,\@labels,\@incorrect,\@correct,\@count).$/;
+     return $table;
+ }
+ sub numerical_plot_differences {
+     my ($r,$responses) = @_;
+     #
+     my $total = $responses->{'_count'};
+     return '' if ($total == 0);
+     my $minbin = undef;
+     my $maxbin = undef;
+     while (my ($interval,$submissions) = each(%$responses)) {
+         next if ($interval =~ /^_/);
+         my ($ans,$ans_low,$ans_high) = split(" ",$interval);
+         my $low_diff  = abs($ans-$ans_low);
+         my $high_diff = abs($ans_high-$ans);
+         if (! defined($maxbin)) { $maxbin = $low_diff;}
+         if (! defined($minbin)) { $minbin = $low_diff;}
+         #
+         if ($minbin > $high_diff) { $minbin = $high_diff; }
+         if ($minbin > $low_diff ) { $minbin = $low_diff; }
+         #
+         if ($maxbin < $high_diff) { $maxbin = $high_diff; }
+         if ($maxbin < $low_diff ) { $maxbin = $low_diff; }
+     }
+     #
+     my @bins;
+     my @labels;
+     # Hmmmm, should switch to absolute difference
+     for (my $i=1;$i<=20;$i++) {
+         push(@bins,$i*$minbin/2);
+         push(@labels,$i);
+     }
+     #
+     my @correct;
+     my @incorrect;
+     my @count;
+     while (my ($interval,$submissions) = each(%$responses)) {
+         next if ($interval =~ /^_/);
+         my ($ans,$ans_low,$ans_high) = split(" ",$interval);
+         while (my ($submission,$counts) = each(%$submissions)) {
+             my ($correct_count,$incorrect_count) = @$counts;
+             my $value = abs($submission-$ans);
+             my $bin=0;
+             for ($bin=0;$bin<$#bins;$bin++) { # not <= for a reason
+                 last if ($bins[$bin]>$value);
+             }
+             $correct[$bin]+=$correct_count;
+             $incorrect[$bin]+=$incorrect_count;
+             $count[$bin]+=$correct_count+$incorrect_count;
+         }
+     }
+     #
+     my @plot_correct;
+     my @plot_incorrect;
+     for (my $i=0;$i<=$#bins;$i++) {
+         $plot_correct[$i]   =   $correct[$i]*100/$total;
+         $plot_incorrect[$i] = $incorrect[$i]*100/$total;
+     }
+     my $title = &mt('Distribution by Magnitude');
+     my $graph = &Apache::loncommon::DrawBarGraph
+         ($title,'magnitude difference from correct','Number of answers',
+,['#33FF00','#FF3300'],\@labels,\@plot_correct,\@plot_incorrect,
+          {xskip=>1});
+     #
+     my $table = $graph.$/.
+         &numerical_bin_table(\@bins,\@labels,\@incorrect,\@correct,\@count).$/;
+     return $table;
+ }
+ sub numerical_classify_responses {
+     &Apache::lonnet::logthis('--------------');
+     my ($full_row_data,$correct,$function) = @_;
+     my %submission_data;
+     my %students;
+     my $max=0;
+     foreach my $row (@$full_row_data) {
+ #        &Apache::lonnet::logthis(' row = '.join(',',@$row));
+         my %subm = &hashify_attempt($row);
+         if (ref($correct) eq 'HASH') {
+             $subm{'correct'} = $correct->{$subm{'student'}}->{'answer'};
+             $subm{'unit'} = $correct->{$subm{'student'}}->{'unit'};
+         } else { # This probably never happens....
+             $subm{'correct'} = $correct->{'answer'};
+             $subm{'unit'} = $correct->{'unit'};
+         }
+         $subm{'submission'} =~ s/=\d+\s*$//;
+         if (&$function(\%subm)) {
+             my $scaled = '1';
+             my ($sname,$sdom) = split(':',$subm{'student'});
+             # Note that $subm{'unit'} is modified by the following call
+             # We do not use it again but you should be aware just in case.
+             my ($myunit,$mysub) = ($subm{'unit'},$subm{'submission'});
+             my $result =
+                 &capa::caparesponse_get_real_response($myunit,
+                                                       $mysub,
+                                                       \$scaled);
+             next if (! defined($scaled));
+             next if ($result ne '6');
+             my $submission = $scaled;
+             $students{$subm{'student'}}++;
+             if (&numerical_submission_is_correct($subm{'award'})) {
+                 &Apache::lonnet::logthis('correct:'.$submission.':'.$subm{'correct'});
+                 $submission_data{'_correct'}++;
+                 $submission_data{'_count'}++;
+                 $submission_data{$subm{'correct'}}->{$submission}->[0]++;
+             } elsif (&numerical_submission_is_incorrect($subm{'award'})) {
+                 &Apache::lonnet::logthis('incorrect:'.$submission.':'.$subm{'correct'});
+                 $submission_data{'_count'}++;
+                 $submission_data{$subm{'correct'}}->{$submission}->[1]++;
+             }
+             my $value =
+                 $submission_data{$subm{'correct'}}->{$submission}->[0]+
+                 $submission_data{$subm{'correct'}}->{$submission}->[1];
+             if ($max < $value) { $max = $value; }
+         }
+     }
+     $submission_data{'_max'} = $max;
+     $submission_data{'_students'}=scalar(keys(%students));
+     return \%submission_data;
+ }
+ sub numerical_submission_is_correct {
+     my ($award) = @_;
+     &Apache::lonnet::logthis('award = "'.$award.'"');
+     if ($award =~ /^(APPROX_ANS|EXACT_ANS)$/) {
+         return 1;
+     } else {
+         return 0;
+     }
+ }
+ sub numerical_submission_is_incorrect {
+     my ($award) = @_;
+     if ($award =~ /^(INCORRECT)$/) {
+         return 1;
+     } else {
+         return 0;
+     }
+ }
+ sub numerical_bin_table {
+     my ($bins,$labels,$incorrect,$correct,$count)=@_;
+     my $table =
+         '<table><tr><th>'.&mt('Bar').'</th>'.
+         '<th colspan="3">'.&mt('Range').'</th>'.
+         '<th>'.&mt('Incorrect').'</th>'.
+         '<th>'.&mt('Correct').'</th>'.
+         '<th>'.&mt('Count').'</th>'.
+         '</tr>'.$/;
+     for (my $i=0;$i<scalar(@{$bins});$i++) {
+         my $lownum;
+         if ($i == 0) {
+             $lownum = 0;
          } else {
-             $table .= '<tr>'.
+             $lownum = $bins->[$i-1];
-                 '<td>'.$foilindex++.'</td>'.
-                 '<td>'.$Foildata{$firstfoil}->{'name'}.'</td>'.
-                 '<td>'.$Foildata{$firstfoil}->{'text'}.'</td>'.
-                 '<td>'.$Foildata{$firstfoil}->{'value'}.'</td>'.
-                 "</tr>\n";
          }
-         foreach my $foilid (@FoilsInConcept) {
+         my $highnum = $bins->[$i];
-             if (@Concepts > 1) {
+         $table .=
-                 $table .= '<tr>'.
+             '<tr>'.
-                     '<td></td>'.
+             '<td>'.$labels->[$i].'</td>'.
-                     '<td></td>'.
+             '<td align="right">'.$lownum.'</td>'.
-                     '<td>'.$foilindex.'</td>'.
+             '<td>&nbsp;-&nbsp;</td>'.
-                     '<td>'.$Foildata{$foilid}->{'name'}.'</td>'.
+             '<td align="right">'.$highnum.'</td>'.
-                     '<td>'.$Foildata{$foilid}->{'text'}.'</td>'.
+             '<td align="right">'.$incorrect->[$i].'</td>'.
-                     '<td>'.$Foildata{$foilid}->{'value'}.'</td>'.
+             '<td align="right">'.$correct->[$i].'</td>'.
-                     "</tr>\n";
+             '<td align="right">'.$count->[$i].'</td>'.
-             } else {
+             '</tr>'.$/;
-                 $table .= '<tr>'.
+     }
-                     '<td>'.$foilindex.'</td>'.
+     $table.= '</table>';
-                     '<td>'.$Foildata{$foilid}->{'name'}.'</td>'.
+     return $table;
-                     '<td>'.$Foildata{$foilid}->{'text'}.'</td>'.
+ }
-                     '<td>'.$Foildata{$foilid}->{'value'}.'</td>'.
-                     "</tr>\n";
+ sub numerical_determine_answers {
-             }
+     my ($r,$resource,$partid,$respid,$students)=@_;
-         } continue {
+     my $c = $r->connection();
-             $foilindex++;
+     #
+     # FIX ME: May need progress dialog updates
+     #
+     # Read in the cache (if it exists) before we start timing things.
+     &Apache::lonstathelpers::ensure_proper_cache($resource->{'symb'});
+     #
+     my $correct;
+     my %answers;
+     foreach my $student (@$students) {
+         last if ($c->aborted());
+         my $sname = $student->{'username'};
+         my $sdom = $student->{'domain'};
+         # analyze problem
+         my $analysis =
+             &Apache::lonstathelpers::analyze_problem_as_student($resource,
+                                                                 $sname,
+                                                                 $sdom);
+         # make the key
+         my $key = $partid.'.'.$respid;
+         $correct->{$sname.':'.$sdom}->{'answer'} =
+             $analysis->{$key.'.answer'}->[0];
+         $correct->{$sname.':'.$sdom}->{'unit'} =
+             $analysis->{$key.'.unit'}->[0];
+         $answers{$analysis->{$key.'.answer'}->[0]}++;
+     }
+     &Apache::lonstathelpers::write_analysis_cache();
+     return ($correct,\%answers);
+ }
+ #
+ # Inputs: $r, $width, $height, $data
+ #         $n = number of students
+ #         $data = hashref of $answer => $frequency pairs
+ sub numerical_one_dimensional_plot {
+     my ($r,$width,$height,$data)=@_;
+     #
+     # Compute data -> image scaling factors
+     my $max_y = 0;
+     my $min_x = undef;
+     my $max_x = undef;
+     my $n = 0;
+     while (my ($answer,$count) = each(%$data)) {
+         $n+=$count;
+         $max_y = $count if ($max_y < $count);
+         if (! defined($min_x) || $answer < $min_x) {
+             $min_x = $answer;
+         }
+         if (! defined($max_x) || $answer > $max_x) {
+             $max_x = $answer;
          }
-     } continue {
-         $conceptindex++;
      }
-     $table .= "</table>\n";
      #
-     # Build option index with color stuff
+     my $min_max_difference = $max_x - $min_x;
-     return ($table,\@Foils,\@Concepts);
+     if (! defined($min_max_difference) || $min_max_difference == 0) {
+         $min_max_difference = 1;
+     }
+     my $h_scale = ($width-10)/$min_max_difference;
+     #
+     my $ticscale = 5;
+     if ($max_y * $ticscale > $height/2) {
+         $ticscale = int($height/2/$max_y);
+         $ticscale = 1 if ($ticscale < 1);
+     }
+     #
+     # Create the plot
+     my $plot =
+         qq{<drawimage width="$width" height="$height" bgcolor="transparent" >};
+     while (my ($answer,$count) = each(%$data)) {
+         my $xloc = 5+$h_scale*($answer - $min_x);
+         my $top    = $height/2-$count*$ticscale;
+         my $bottom = $height/2+$count*$ticscale;
+         $plot .= &line($xloc,$top,$xloc,$bottom,'888888',1);
+     }
+     #
+     # Put the scale on last to ensure it is on top of the data.
+     if ($min_x < 0 && $max_x > 0) {
+         my $circle_x = 5+$h_scale*abs($min_x);  # '0' in data coordinates
+         my $r = 4;
+         $plot .= &line(5,$height/2,$circle_x-$r,$height/2,'000000',1);
+         $plot .= &circle($circle_x,$height/2,$r+1,'000000');
+         $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 $result = '<table>'.
+         '<tr><td colspan="3" align="center">'.
+         '<font size="+2">'.&mt('Distribution of correct answers').'</font>'.
+         '<br />'.&mt('[_1] students, [_2] distinct correct answers',
+                      $n,scalar(keys(%$data))).
+         '<br />'.&mt('Maximum number of coinciding values: [_1]',$max_y).
+         '</td></tr>'.
+         '<tr>'.
+         '<td valign="center">'.$min_x.'</td>'.
+         '<td>'.$plotresult.'</td>'.
+         '<td valign="center">'.$max_x.'</td>'.
+         '</tr>'.
+         '</table>';
+     return $result;
  }
- sub build_option_index {
+ ##
-     my ($ORdata)= @_;
+ ## Helper subroutines for <drawimage>.
-     my $table = "<table>\n";
+ ## These should probably go somewhere more suitable soon.
-     my $optionindex = 0;
+ sub line {
-     my @Rows;
+     my ($x1,$y1,$x2,$y2,$color,$thickness) = @_;
-     foreach my $option (&mt('correct option chosen'),@{$ORdata->{'Options'}}) {
+     return qq{<line x1="$x1" y1="$y1" x2="$x2" y2="$y2" color="$color" thickness="$thickness" />};
-         push (@Rows,
+ }
-               '<tr>'.
-               '<td bgcolor="'.$plotcolors->[$optionindex++].'">'.
+ sub text {
-               ('&nbsp;'x4).'</td>'.
+     my ($x,$y,$color,$text,$font,$direction) = @_;
-               '<td>'.$option.'</td>'.
+     if (! defined($font) || $font !~ /^(tiny|small|medium|large|giant)$/) {
-               "</tr>\n");
+         $font = 'medium';
      }
-     shift(@Rows); # Throw away 'correct option chosen' color
+     if (! defined($direction) || $direction ne 'vertical') {
-     $table .= join('',reverse(@Rows));
+         $direction = '';
-     $table .= "</table>\n";
+     }
+     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);
  }
  #########################################################
  #########################################################
  ##
- ##         Tries Analysis
+ ##      Radio Response Routines
  ##
  #########################################################
  #########################################################
- sub tries_analysis {
+ sub radio_response_analysis {
-     my ($PerformanceData,$ORdata) = @_;
+     my ($r,$problem,$problem_analysis,$students) = @_;
-     my $mintries = 1;
+     #
-     my $maxtries = $ENV{'form.NumPlots'};
+     if ($ENV{'form.AnalyzeOver'} !~ /^(tries|time)$/) {
-     my ($table,$Foils,$Concepts) = &build_foil_index($ORdata);
+         $r->print('Bad request');
-     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 = &analyze_option_data_by_tries($PerformanceData,
+     #
-                                                      $mintries,$maxtries);
+     my ($resource,$partid,$respid) = ($problem->{'resource'},
-     my $analysis = '';
+                                       $problem->{'part'},
-     if ($ENV{'form.AnalyzeAs'} eq 'Foils') {
+                                       $problem->{'respid'});
-         $analysis = &Tries_Foil_Analysis($mintries,$maxtries,$Foils,
+     #
-                                          \%ResponseData,$ORdata);
+     my $analysis_html;
+     my $foildata = $problem_analysis->{'_Foils'};
+     my ($table,$foils,$concepts) = &build_foil_index($problem_analysis);
+     if (! defined($concepts)) {
+         $concepts = [];
+     }
+     #
+     my %true_foils;
+     my $num_true = 0;
+     if (! $problem_analysis->{'answercomputed'}) {
+         foreach my $foil (@$foils) {
+             if ($foildata->{$foil}->{'value'} eq 'true') {
+                 $true_foils{$foil}++;
+             }
+         }
+         $num_true = scalar(keys(%true_foils));
+     }
+     #
+     $analysis_html .= $table;
+     # Gather student data
+     my $response_data = &Apache::loncoursedata::get_response_data
+         (\@Apache::lonstatistics::SelectedSections,
+          $Apache::lonstatistics::enrollment_status,
+          $resource->{'symb'},$respid);
+     my $correct;   # either a hash reference or a scalar
+     if ($problem_analysis->{'answercomputed'} || scalar(@$concepts) > 1) {
+         # This takes a while for large classes...
+         &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$students,
+                                                    'Statistics',
+                                                    'stats_status');
+         foreach my $student (@$students) {
+             my ($idx,@remainder) = split('&',$student->{'answer'});
+             my ($answer) = ($remainder[$idx]=~/^(.*)=([^=]*)$/);
+             $correct->{$student->{'username'}.':'.$student->{'domain'}}=
+                 &Apache::lonnet::unescape($answer);
+         }
      } else {
-         $analysis = &Tries_Concept_Analysis($mintries,$maxtries,
+         foreach my $foil (keys(%$foildata)) {
-                                             $Concepts,\%ResponseData,$ORdata);
+             if ($foildata->{$foil}->{'value'} eq 'true') {
+                 $correct = $foildata->{$foil}->{'name'};
+             }
+         }
      }
-     $table .= $analysis;
+     #
-     return $table;
+     if (! defined($response_data) || ref($response_data) ne 'ARRAY' ) {
+         $analysis_html = '<h2>'.
+             &mt('There is no submission data for this resource').
+             '</h2>';
+         $r->print($analysis_html);
+         return;
+     }
+     #
+     $analysis_html.='<table>';
+     for (my $plot_num = 1;$plot_num<=$ENV{'form.NumPlots'};$plot_num++) {
+         # classify data ->correct foil -> selected foil
+         my ($restriction_function,
+             $correct_foil_title,$incorrect_foil_title,
+             $pre_graph_text,$post_graph_text,
+             $no_data_text,@extra_data);
+         if ($ENV{'form.AnalyzeOver'} eq 'tries') {
+             $restriction_function = sub {($_[0]->{'tries'} == $plot_num?1:0)};
+             $correct_foil_title = 'Attempt '.$plot_num;
+             $incorrect_foil_title = 'Attempt '.$plot_num;
+             $pre_graph_text =
+                 'Attempt [_1], [_2] submissions, [_3] correct, [_4] incorrect';
+             $post_graph_text = '';
+             $no_data_text = 'No data exists for attempt [_1]';
+         } elsif ($ENV{'form.AnalyzeOver'} eq 'time') {
+             my $starttime = &Apache::lonhtmlcommon::get_date_from_form
+                 ('startdate_'.$plot_num);
+             my $endtime = &Apache::lonhtmlcommon::get_date_from_form
+                 ('enddate_'.$plot_num);
+             ($starttime,$endtime) = &ensure_start_end_times
+                 ($starttime,$endtime,
+                  &get_time_from_row($response_data->[0]),
+                  &get_time_from_row($response_data->[-1]),
+                  $plot_num);
+             $pre_graph_text =
+                 'Data from [_6] to [_7]<br /> [_2] submissions from [_5] students, [_3] correct, [_4] incorrect';
+             $extra_data[0] = &Apache::lonlocal::locallocaltime($starttime);
+             $extra_data[1] = &Apache::lonlocal::locallocaltime($endtime);
+             #
+             $post_graph_text =
+                 &mt('Start time: [_1]',
+                     &Apache::lonhtmlcommon::date_setter
+                     ('Statistics','startdate_'.$plot_num,$starttime)).
+                 '<br />'.
+                 &mt('End time: [_1]',
+                     &Apache::lonhtmlcommon::date_setter
+                     ('Statistics','enddate_'.$plot_num,$endtime));
+             $restriction_function =
+                 sub {
+                     my $t = $_[0]->{'timestamp'};
+                     if ($t >= $starttime && $t < $endtime) {
+                         return 1;
+                     } else {
+                         return 0;
+                     }
+                 };
+             $no_data_text = 'No data for [_5] to [_6]';
+         }
+         my $foil_choice_data =
+             &classify_response_data($response_data,$correct,
+                                     $restriction_function);
+         # &Apache::lonstathelpers::log_hash_ref($foil_choice_data);
+         my $answers;
+         if (ref($correct)) {
+             my %tmp;
+             foreach my $foil (values(%$correct)) {
+                 $tmp{$foil}++;
+             }
+             $answers = [keys(%tmp)];
+         } else {
+             $answers = [$correct];
+         }
+         # Concept Plot
+         my $concept_plot = '';
+         if (scalar(@$concepts) > 1) {
+             $concept_plot = &RR_concept_plot($concepts,$foil_choice_data,
+                                              'Correct Concepts');
+         }
+         # % Choosing plot
+         my $choice_plot = &RR_create_percent_selected_plot
+             ($concepts,$foils,$foil_choice_data,$correct_foil_title);
+         # for each correct foil, how did they mark it? (stacked bar graph)
+         my ($stacked_plot,$count_by_foil);
+         if ($problem_analysis->{'answercomputed'} || $num_true > 1) {
+             ($stacked_plot,$count_by_foil) =
+                 &RR_create_stacked_selection_plot($foils,$foil_choice_data,
+                                                   $incorrect_foil_title,
+                                                   \%true_foils);
+         }
+         #
+         if ($concept_plot ne '' ||
+             $choice_plot  ne '' ||
+             $stacked_plot ne '') {
+             my $correct = $foil_choice_data->{'_correct'};
+             if (! defined($correct) || $correct eq '') {
+                 $correct = 0;
+             }
+             my $incorrect =
+             $analysis_html.= '<tr><td colspan="4" align="center">'.
+                 '<font size="+1">'.
+                 &mt($pre_graph_text,
+                     $plot_num,$foil_choice_data->{'_count'},
+                     $correct,
+                     $foil_choice_data->{'_count'}-$correct,
+                     $foil_choice_data->{'_students'},
+                     @extra_data).
+                     '</td></tr>'.$/;
+             $analysis_html.=
+                 '<tr>'.
+                 '<td>'.$concept_plot.'</td>'.
+                 '<td>'.$choice_plot.'</td>';
+             if ($stacked_plot ne '') {
+                 $analysis_html .=
+                     '<td>'.$stacked_plot.'</td>'.
+                     '<td>'.&build_foil_key($foils,$count_by_foil).'</td>';
+             } else {
+                 $analysis_html .= ('<td></td>'x2);
+             }
+             $analysis_html.='</tr>'.$/;
+             if (defined($post_graph_text)) {
+                 $analysis_html.= '<tr><td colspan="4" align="center">'.
+                     $post_graph_text.'</td></tr>'.$/;
+             }
+         } elsif ($no_data_text ne '') {
+             $analysis_html.='<tr><td colspan="4" align="center">'.
+                 &mt($no_data_text,
+                     $plot_num,$foil_choice_data->{'_count'},
+                     $correct,
+                     $foil_choice_data->{'_count'}-$correct,
+                     @extra_data);
+             if (defined($post_graph_text)) {
+                 $analysis_html.='<br />'.$post_graph_text;
+             }
+             $analysis_html.='</td></tr>'.$/;
+         }
+     } # end of loop for plots
+     $analysis_html.='</table>';
+     $r->print($analysis_html);
  }
- sub Tries_Foil_Analysis {
+ sub ensure_start_end_times {
-     my ($mintries,$maxtries,$Foils,$respdat,$ORdata) = @_;
+     my ($start,$end,$first,$last,$plot_num) = @_;
-     my %ResponseData = %$respdat;
+     if (! defined($start) || ! defined($end)) {
-     #
+         my $sec_in_day = 86400;
-     # Compute the data neccessary to make the plots
+         my ($sday,$smon,$syear) =
-     my @PlotData;
+             (localtime($last - $sec_in_day*($plot_num-1)))[3..5];
-     foreach my $foilid (@$Foils) {
+         $start = &Time::Local::timelocal(0,0,0,$sday,$smon,$syear);
-         for (my $i=$mintries;$i<=$maxtries;$i++) {
+         $end   = $start + $sec_in_day;
-             if ($ResponseData{$foilid}->[$i]->{'_total'} == 0) {
+         if ($plot_num == $ENV{'form.NumPlots'}) {
-                 push(@{$PlotData[$i]->{'_correct'}},0);
+             $start = $first;
-             } else {
+         }
-                 push(@{$PlotData[$i]->{'_correct'}},
+     }
-*$ResponseData{$foilid}->[$i]->{'_correct'}/
+     return ($start,$end);
-                      $ResponseData{$foilid}->[$i]->{'_total'});
+ }
-             }
-             foreach my $option (@{$ORdata->{'Options'}}) {
+ sub RR_concept_plot {
-                 push(@{$PlotData[$i]->{'_total'}},
+     my ($concepts,$foil_data,$title) = @_;
-                      $ResponseData{$foilid}->[$i]->{'_total'});
+     &Apache::lonnet::logthis('got to RR_concept_plot');
-                 if ($ResponseData{$foilid}->[$i]->{'_total'} == 0) {
+     #
-                     push (@{$PlotData[$i]->{$option}},0);
+     my %correct_by_concept;
+     my %incorrect_by_concept;
+     my %true;
+     foreach my $concept (@$concepts) {
+         foreach my $foil (@{$concept->{'foils'}}) {
+             next if (! exists($foil_data->{$foil}));
+             foreach my $choice (keys(%{$foil_data->{$foil}})) {
+                 if ($choice eq $foil) {
+                     $correct_by_concept{$concept->{'name'}} +=
+                         $foil_data->{$foil}->{$choice};
                  } else {
-                     if ($ResponseData{$foilid}->[$i]->{'_total'} ==
+                     $incorrect_by_concept{$concept->{'name'}} +=
-                         $ResponseData{$foilid}->[$i]->{'_correct'}) {
+                         $foil_data->{$foil}->{$choice};
-                         push(@{$PlotData[$i]->{$option}},0);
-                     } else {
-                         push (@{$PlotData[$i]->{$option}},
-* $ResponseData{$foilid}->[$i]->{$option} /
-                               ($ResponseData{$foilid}->[$i]->{'_total'} -
-                                $ResponseData{$foilid}->[$i]->{'_correct'}));
-                     }
                  }
              }
          }
      }
      #
-     # Build a table for the plots
+     # need arrays for incorrect and correct because we want to use different
-     my $analysis_html = "<table>\n";
+     # colors for them
-     my $foilkey = &build_option_index($ORdata);
+     my @correct;
-     for (my $i=$mintries;$i<=$maxtries;$i++) {
+     #
-         my $count = $ResponseData{'_total'}->[$i];
+     my $total =0;
-         if ($count == 0) {
+     for (my $i=0;$i<scalar(@$concepts);$i++) {
-             $count = 'no submissions';
+         my $concept = $concepts->[$i];
-         } elsif ($count == 1) {
+         $correct[$i]   =   $correct_by_concept{$concept->{'name'}};
-             $count = '1 submission';
+         $total += $correct_by_concept{$concept->{'name'}}+
+             $incorrect_by_concept{$concept->{'name'}};
+     }
+     if ($total == 0) { return ''; };
+     for (my $i=0;$i<=$#correct;$i++) {
+         $correct[$i] = sprintf('%0f',$correct[$i]/$total*100);
+     }
+     my $xlabel = 'concept';
+     my $plot=  &Apache::loncommon::DrawBarGraph($title,
+                                                 $xlabel,
+                                                 'Percent Choosing',
+,
+                                                 ['#33ff00','#ff3300'],
+                                                 undef,
+                                                 \@correct);
+     return $plot;
+ }
+ sub RR_create_percent_selected_plot {
+     my ($concepts,$foils,$foil_data,$title) = @_;
+     &Apache::lonnet::logthis('got to RR_create_percent_selected_plot');
+     #
+     if ($foil_data->{'_count'} == 0) { return ''; };
+     my %correct_selections;
+     my %incorrect_selections;
+     foreach my $foil (@$foils) {
+         # foil_data has format $foil_data->{true_foil}->{selected foil}=count
+         next if (! exists($foil_data->{$foil}));
+         while (my ($f,$count)= each(%{$foil_data->{$foil}})) {
+             if ($f eq $foil) {
+                 $correct_selections{$foil} += $count;
+             } else {
+                 $incorrect_selections{$f} += $count;
+             }
+         }
+     }
+     #
+     # need arrays for incorrect and correct because we want to use different
+     # colors for them
+     my @correct;
+     my @incorrect;
+     #
+     my $total = $foil_data->{'_count'};
+     for (my $i=0;$i<scalar(@$foils);$i++) {
+         my $foil = $foils->[$i];
+         $correct[$i]   = $correct_selections{$foil};
+         $incorrect[$i] = $incorrect_selections{$foil};
+     }
+     for (my $i=0;$i<=$#correct;$i++) {
+         $correct[$i] = sprintf('%2f',$correct[$i]/$total*100);
+     }
+     for (my $i=0;$i<=$#incorrect;$i++) {
+         $incorrect[$i] = sprintf('%2f',$incorrect[$i]/$total*100);
+     }
+     #
+     # Put a blank in the data sets between concepts, if there are concepts
+     my @labels;
+     if (defined($concepts) && scalar(@$concepts) > 1) {
+         my @new_correct;
+         my @new_incorrect;
+         my $foil_count = 0;
+         foreach my $concept (@$concepts) {
+             foreach (@{$concept->{'foils'}}) {
+                 push(@new_correct,  $correct[$foil_count]);
+                 push(@new_incorrect,$incorrect[$foil_count]);
+                 push(@labels,++$foil_count);
+             }
+             push(@new_correct,'');
+             push(@new_incorrect,'');
+             push(@labels,'');
+         }
+         @correct = @new_correct;
+         @incorrect = @new_incorrect;
+     } else {
+         @labels = (1 .. scalar(@correct));
+     }
+     #
+     my $xlabel = 'foil chosen';
+     my $plot=  &Apache::loncommon::DrawBarGraph($title,
+                                                 $xlabel,
+                                                 'Percent Choosing',
+,
+                                                 ['#33ff00','#ff3300'],
+                                                 \@labels,
+                                                 \@correct,
+                                                 \@incorrect);
+     return $plot;
+ }
+ sub RR_create_stacked_selection_plot {
+     my ($foils,$foil_data,$title,$true_foils)=@_;
+     #
+     &Apache::lonnet::logthis('got to RR_create_stacked_selection_plot');
+     my @dataset; # array of array refs - multicolor rows $datasets[row]->[col]
+     my @labels;
+     my $count;
+     my %column; # maps foil name to column in @datasets
+     for (my $i=0;$i<scalar(@$foils);$i++) {
+         my $foil = $foils->[$i];
+         if (defined($true_foils) && scalar(keys(%$true_foils)) > 0 ) {
+             next if (! $true_foils->{$foil} );
+             push(@labels,$i+1);
          } else {
-             $count = $count.' submissions';
+             next if (! exists($foil_data->{$foil}));
+             push(@labels,$i+1);
          }
-         my $title = 'Attempt '.$i.', '.$count;
+         next if (! exists($foil_data->{$foils->[$i]}));
-         my @Datasets;
+         $column{$foil}= $count++;
-         foreach my $option ('_correct',@{$ORdata->{'Options'}}) {
+         for (my $j=0;$j<scalar(@$foils);$j++) {
-             next if (! exists($PlotData[$i]->{$option}));
+             my $value = 0;
-             push(@Datasets,$PlotData[$i]->{$option});
+             if ($i != $j ) {
-         }
+                 $value += $foil_data->{$foil}->{$foils->[$j]};
-         my $correctgraph = &Apache::loncommon::DrawGraph
+             }
-             ($title,'Foil Number','Percent Correct',
+             $dataset[$j]->[$column{$foil}]=$value;
-,$plotcolors,$Datasets[0]);
-         $analysis_html.= '<tr><td>'.$correctgraph.'</td>';
-         ##
-         ##
-         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::DrawGraph
-             ($title,'Foil Number','% Option Chosen Incorrectly',
-,$plotcolors,@Datasets);
-         $analysis_html.= '<td>'.$incorrectgraph.'</td>';
-         $analysis_html.= '<td>'.$foilkey."<td></tr>\n";
      }
-     $analysis_html .= "</table>\n";
+     #
-     return $analysis_html;
+     return '' if (! scalar(keys(%column)));
+     #
+     my $grand_total = 0;
+     my %count_per_foil;
+     while (my ($foil,$bar) = each (%column)) {
+         my $bar_total = 0;
+         for (my $j=0;$j<scalar(@dataset);$j++) {
+             $bar_total += $dataset[$j]->[$bar];
+         }
+         next if ($bar_total == 0);
+         for (my $j=0;$j<scalar(@dataset);$j++) {
+             $dataset[$j]->[$bar] =
+                 sprintf('%2f',$dataset[$j]->[$bar]/$bar_total * 100);
+         }
+         $count_per_foil{$foil}=' ( '.$bar_total.' )';
+         $grand_total += $bar_total;
+     }
+     if ($grand_total == 0) {
+         return ('',undef);
+     }
+     my @empty_row = ();
+     foreach (@{$dataset[0]}) {
+         push(@empty_row,0);
+     }
+     #
+     my $graph = &Apache::loncommon::DrawBarGraph
+         ($title,'Correct Foil','foils chosen Incorrectly',
+,$plotcolors,\@labels,\@empty_row,@dataset);
+     return ($graph,\%count_per_foil);
  }
- sub Tries_Concept_Analysis {
-     my ($mintries,$maxtries,$Concepts,$respdat,$ORdata) = @_;
+ #########################################################
-     my %ResponseData = %$respdat;
+ #########################################################
-     my $analysis_html = "<table>\n";
+ ##
-     #
+ ##       Misc routines
-     # Compute the data neccessary to make the plots
+ ##
-     my @PlotData;
+ #########################################################
-     # Concept analysis
+ #########################################################
-     #
-     # Note: we do not bother with characterizing the students incorrect
+ # if $correct is a hash ref, it is assumed to be indexed by student names.
-     # answers at the concept level because an incorrect answer for one foil
+ #    the values are assumed to be hash refs with a key of 'answer'.
-     # may be a correct answer for another foil.
+ sub classify_response_data {
-     my %ConceptData;
+     my ($full_row_data,$correct,$function) = @_;
-     foreach my $concept (@{$Concepts}) {
+     my %submission_data;
-         for (my $i=$mintries;$i<=$maxtries;$i++) {
+     my %students;
-             #
+     my $max=0;
-             # Gather the per-attempt data
+     foreach my $row (@$full_row_data) {
-             my $cdata = $ConceptData{$concept}->[$i];
+         my %subm = &hashify_attempt($row);
-             foreach my $foilid (@{$concept->{'foils'}}) {
+         if (ref($correct) eq 'HASH') {
-                 $cdata->{'_correct'} +=
+             $subm{'correct'} = $correct->{$subm{'student'}};
-                     $ResponseData{$foilid}->[$i]->{'_correct'};
+         } else {
-                 $cdata->{'_total'}   +=
+             $subm{'correct'} = $correct;
-                     $ResponseData{$foilid}->[$i]->{'_total'};
+         }
-             }
+         $subm{'submission'} =~ s/=\d+\s*$//;
-             push (@{$PlotData[$i]->{'_total'}},$cdata->{'_total'});
+         if (&$function(\%subm)) {
-             if ($cdata->{'_total'} == 0) {
+             $students{$subm{'student'}}++;
-                 push (@{$PlotData[$i]->{'_correct'}},0);
+             $submission_data{'_count'}++;
-             } else {
+             if (&submission_is_correct($subm{'award'})) {
-                 push (@{$PlotData[$i]->{'_correct'}},
+                 $submission_data{'_correct'}++;
-*$cdata->{'_correct'}/$cdata->{'_total'});
+             }
-                 }
+             if($max<++$submission_data{$subm{'correct'}}->{$subm{'submission'}}) {
+                 $max=$submission_data{$subm{'correct'}}->{$subm{'submission'}};
+             }
+         }
+     }
+     $submission_data{'_max'} = $max;
+     $submission_data{'_students'}=scalar(keys(%students));
+     return \%submission_data;
+ }
+ #########################################################
+ #########################################################
+ ##
+ ##      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 ($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>');
          }
      }
+ }
+ #########################################################
+ #
+ #       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);
+     if (! defined($Concepts)) {
+         $Concepts = [];
+     }
+     my %response_data = &OR_analyze_by_tries($r,$PerformanceData,
+                                                      $mintries,$maxtries);
+     my $analysis = '';
+     #
+     # 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]->[$try]->{'_correct'} +=
+                     $response_data{$foilid}->[$try]->{'_correct'};
+                 $concept_data[$j]->[$try]->{'_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'}},
+*$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}},
+*
+                                   $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
-     for (my $i=$mintries;$i<=$maxtries;$i++) {
+     my $analysis_html = "<br /><table>\n";
-         my $minstu = $PlotData[$i]->{'_total'}->[0];
+     my $optionkey = &build_option_index($ORdata);
-         my $maxstu = $PlotData[$i]->{'_total'}->[0];
+     my $num_concepts = 1;
-         foreach my $count (@{$PlotData[$i]->{'_total'}}) {
+     if (defined($Concepts)) { $num_concepts = scalar(@$Concepts); }
-             if ($minstu > $count) {
+     #
-                 $minstu = $count;
+     for (my $try=$mintries;$try<=$maxtries;$try++) {
-             }
+         if (! defined($response_data{'_total'}->[$try]) ||
-             if ($maxstu < $count) {
+             $response_data{'_total'}->[$try] == 0) {
-                 $maxstu = $count;
+             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).
-         $maxstu = 0 if (! defined($maxstu));
+                     '</b></td></tr>';
-         $minstu = 0 if (! defined($minstu));
+             } else {
-         my $title;
+                 $analysis_html.= '<tr><td colspan="4" align="center"><b>'.
-         my $count = $ResponseData{'_total'}->[$i];
+                     &mt('None of the selected students have attempted the problem').'</b></td></tr>';
-         if ($count == 0) {
+             }
-             $count = 'no submissions';
+             last;
-         } elsif ($count == 1) {
+         }
-             $count = '1 submission';
+         my $concept_graph='';
-         } else {
+         if ($num_concepts > 1) {
-             $count = $count.' submissions';
+             #
-         }
+             # Create concept plot
-         $title = 'Attempt '.$i.', '.$count;
+             my @concept_plot_data;
-         my $graphlink = &Apache::loncommon::DrawGraph
+             for (my $j=0;$j<=$#concept_data;$j++) {
-             ($title,'Concept Number','Percent Correct',
+                 my $total = $concept_data[$j]->[$try]->{'_total'};
-,$plotcolors,$PlotData[$i]->{'_correct'});
+                 if ($total == 0) {
-         $analysis_html.= '<tr><td>'.$graphlink."</td></tr>\n";
+                     $concept_plot_data[$j] = 0;
+                 } else {
+                     $concept_plot_data[$j] = 100 *
+                         sprintf('%0.3f',
+                                 $concept_data[$j]->[$try]->{'_correct'} /
+                                 $total);
+                 }
+             }
+             #
+             $concept_graph = &Apache::loncommon::DrawBarGraph
+                 ('Correct Concepts','Concept Number','Percent Correct',
+,$plotcolors,undef,\@concept_plot_data,{xskip=>1});
+         }
+         #
+         # Create Foil Plots
+         my $data_count = $response_data{'_total'}->[$try];
+         my $correct = $response_data{'_correct'}->[$try];
+         my @Datasets;
+         foreach my $option ('_correct',@{$ORdata->{'_Options'}}) {
+             next if (! exists($foil_plot[$try]->{$option}));
+             push(@Datasets,$foil_plot[$try]->{$option});
+         }
+         #
+         # 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
+             ('Correct Statements','Statement','% Answered Correct',
+,$plotcolors,\@Labels,$Datasets[0],{xskip=>1});
+         #
+         #
+         next if (! defined($Datasets[0]));
+         for (my $i=0; $i< scalar(@{$Datasets[0]});$i++) {
+             $Datasets[0]->[$i]=0;
+         }
+         my $count = $response_data{'_total'}->[$try] -
+                                            $response_data{'_correct'}->[$try];
+         my $incorrect_graph = &Apache::loncommon::DrawBarGraph
+             ('Incorrect Statements','Statement','% Chosen Incorrectly',
+,$plotcolors,\@Labels,@Datasets,{xskip=>1});
+         $analysis_html.=
+             '<tr><td colspan="4" align="center">'.
+             '<font size="+1">'.
+             &mt('Attempt [_1], [_2] submissions, [_3] correct, [_4] incorrect',
+                 $try,$data_count,$correct,$data_count-$correct).
+             '</font>'.'</td></tr>'.$/.
+             '<tr>'.
+             '<td>'.$concept_graph.'</td>'.
+             '<td>'.$correct_graph.'</td>'.
+             '<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 ($PerformanceData,$mintries,$maxtries) = @_;
+     my ($r,$PerformanceData,$mintries,$maxtries) = @_;
      my %Trydata;
      $mintries = 1         if (! defined($mintries) || $mintries < 1);
      $maxtries = $mintries if (! defined($maxtries) || $maxtries < $mintries);
+     my @students;
      foreach my $row (@$PerformanceData) {
          next if (! defined($row));
          my $tries = &get_tries_from_row($row);
-         my %Row   = &Process_Row($row);
+         my %Row   = &Process_OR_Row($row);
+         next if (! %Row);
+         my $student_id = $row->[&Apache::loncoursedata::RD_student_id()];
+         $students[$tries]->{$student_id}++;
          while (my ($foilid,$href) = each(%Row)) {
              if (! ref($href)) {
                  $Trydata{$foilid}->[$tries] += $href;
- Line 478  sub analyze_option_data_by_tries {
+ Line 1341  sub analyze_option_data_by_tries {
              }
          }
      }
+     for (my $try=$mintries;$try<=$maxtries;$try++) {
+         $Trydata{'_studentcount'}->[$try] = scalar(keys(%{$students[$try]}));
+     }
      return %Trydata;
  }
  #########################################################
+ #
+ #     Option Response: Time Analysis
+ #
  #########################################################
- ##
+ sub OR_time_analysis {
- ##                 Time Analysis
+     my ($performance_data,$ORdata) = @_;
- ##
- #########################################################
- #########################################################
- sub time_analysis {
-     my ($PerformanceData,$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;
+                 '</h3>'.$table;
-         $ENV{'form.AnalyzeAs'} = 'Foils';
      }
+     #
      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);
      #
+     my $current_index;
      $table .= "<table>\n";
      for (my $i=0;$i<$num_plots;$i++) {
          ##
- Line 511  sub time_analysis {
+ Line 1379  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);
+             my ($sday,$smon,$syear) =
-             (undef,undef,undef,$sday,$smon,$syear) =
+                 (localtime($last_sub_time - $sec_in_day*$i))[3..5];
-                 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"><font size="+1">'.
+             &mt('Data from [_1] to [_2]',
+                 &Apache::lonlocal::locallocaltime($starttime),
+                 &Apache::lonlocal::locallocaltime($endtime)).
+                 '</font></td></tr>'.$/;
          my $startdateform = &Apache::lonhtmlcommon::date_setter
              ('Statistics','startdate_'.$i,$starttime);
          my $enddateform = &Apache::lonhtmlcommon::date_setter
- Line 529  sub time_analysis {
+ Line 1401  sub time_analysis {
          my $begin_index;
          my $end_index;
          my $j;
-         while (++$j < scalar(@$PerformanceData)) {
+         while (++$j < scalar(@$performance_data)) {
-             last if (&get_time_from_row($PerformanceData->[$j]) > $starttime);
+             last if (&get_time_from_row($performance_data->[$j])
+                                                               > $starttime);
          }
          $begin_index = $j;
-         while (++$j < scalar(@$PerformanceData)) {
+         while ($j < scalar(@$performance_data)) {
-             last if (&get_time_from_row($PerformanceData->[$j]) > $endtime);
+             if (&get_time_from_row($performance_data->[$j]) > $endtime) {
+                 last;
+             } else {
+                 $j++;
+             }
          }
          $end_index = $j;
          ##
-         my $interval = {
+         my ($processed_time_data,$correct,$data_count,$student_count) =
-             begin_index => $begin_index,
+             &OR_time_process_data($performance_data,$begin_index,$end_index);
-             end_index   => $end_index,
+         ##
-             startdateform => $startdateform,
+         $table .= '<tr><td colspan="4" align="center"><font size="+1">'.
-             enddateform   => $enddateform,
+             &mt('[_1] submissions from [_2] students, [_3] correct, [_4] incorrect',
-         };
+                 $data_count,$student_count,$correct,$data_count-$correct).
-         if ($ENV{'form.AnalyzeAs'} eq 'Foils') {
+                 '</font></td></tr>'.$/;
-             $table .= &Foil_Time_Analysis($PerformanceData,$ORdata,$Foils,
+         my $concept_correct_plot = '';
-                                           $interval);
+         if ($num_concepts > 1) {
-         } else {
+             $concept_correct_plot =
-             $table .= &Concept_Time_Analysis($PerformanceData,$ORdata,
+                 &OR_Concept_Time_Analysis($processed_time_data,
-                                              $Concepts,$interval);
+                                           $correct,$data_count,$student_count,
-         }
+                                           $ORdata,$Concepts);
+         }
+         my ($foil_correct_plot,$foil_incorrect_plot) =
+             &OR_Foil_Time_Analysis($processed_time_data,
+                                    $correct,$data_count,$student_count,
+                                    $ORdata,$Foils,$Concepts);
+         $table .= '<tr>'.
+             '<td>'.$concept_correct_plot.'</td>'.
+             '<td>'.$foil_correct_plot.'</td>'.
+             '<td>'.$foil_incorrect_plot.'</td>'.
+             '<td align="left" valign="top">'.$foilkey.'</td></tr>'.$/;
+         $table .= '<tr><td colspan="4" align="center">'.
+             &mt('Start time: [_1]',$startdateform).'<br />'.
+             &mt('End time: [_1]',$enddateform).'</td></tr>'.$/;
+         $table.= '<tr><td colspan="4">&nbsp</td></tr>'.$/;
      }
+     $table .= '</table>';
      #
      return $table;
  }
- sub Foil_Time_Analysis {
+ sub OR_Foil_Time_Analysis {
-     my ($PerformanceData,$ORdata,$Foils,$interval) = @_;
+     my ($processed_time_data,$correct,$data_count,$student_count,
+         $ORdata,$Foils,$Concepts) = @_;
+     if ($data_count <= 0) {
+         return ('<h2>'.&mt('There is no data to plot').'</h2>','');
+     }
      my $analysis_html;
-     my $foilkey = &build_option_index($ORdata);
+     my @plotdata;
-     my ($begin_index,$end_index) = ($interval->{'begin_index'},
+     my @labels;
-                                     $interval->{'end_index'});
+     foreach my $concept (@{$Concepts}) {
-     my %TimeData;
+         foreach my $foil (@{$concept->{'foils'}}) {
-     #
+             push(@labels,scalar(@labels)+1);
-     # Compute the number getting the foils correct or incorrects
+             my $total = $processed_time_data->{$foil}->{'_total'};
-     for (my $j=$begin_index;$j<=$end_index;$j++) {
+             if ($total == 0) {
-         my $row = $PerformanceData->[$j];
+                 push(@{$plotdata[0]},0);
-         next if (! defined($row));
+             } else {
-         my %Row = &Process_Row($row);
+                 push(@{$plotdata[0]},
-         while (my ($foilid,$href) = each(%Row)) {
+* $processed_time_data->{$foil}->{'_correct'} / $total);
-             if (! ref($href)) {
-                 $TimeData{$foilid} += $href;
-                 next;
              }
-             while (my ($option,$value) = each(%$href)) {
+             my $total_incorrect = $total - $processed_time_data->{$foil}->{'_correct'};
-                 $TimeData{$foilid}->{$option}+=$value;
+             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]},
+* $processed_time_data->{$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);
+         }
      }
-     my @Plotdata;
+     #
-     foreach my $foil (@$Foils) {
+     # Create the plot
-         my $total = $TimeData{$foil}->{'_total'};
+     my $correct_plot = &Apache::loncommon::DrawBarGraph('Correct Statements',
+                                                         'Statement Number',
+                                                         'Percent Correct',
+,
+                                                         $plotcolors,
+                                                         undef,
+                                                         $plotdata[0],
+                                                         {xskip=>1});
+     for (my $j=0; $j< scalar(@{$plotdata[0]});$j++) {
+         $plotdata[0]->[$j]=0;
+     }
+     my $incorrect_plot =
+         &Apache::loncommon::DrawBarGraph('Incorrect Statements',
+                                          'Statement Number',
+                                          'Incorrect Option Choice',
+,
+                                          $plotcolors,
+                                          undef,
+                                          @plotdata,{xskip=>1});
+     return ($correct_plot,$incorrect_plot);
+ }
+ sub OR_Concept_Time_Analysis {
+     my ($processed_time_data,$correct,$data_count,$student_count,
+         $ORdata,$Concepts) = @_;
+     return '' if ($data_count == 0);
+     #
+     # Put the data in plottable form
+     my @plotdata;
+     foreach my $concept (@$Concepts) {
+         my ($total,$correct);
+         foreach my $foil (@{$concept->{'foils'}}) {
+             $total += $processed_time_data->{$foil}->{'_total'};
+             $correct += $processed_time_data->{$foil}->{'_correct'};
+         }
          if ($total == 0) {
-             push(@{$Plotdata[0]},0);
+             push(@plotdata,0);
          } else {
-             push(@{$Plotdata[0]},
+             push(@plotdata,100 * $correct / $total);
-* $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);
-             } else {
-                 push(@{$Plotdata[$optionidx]},
-* $TimeData{$foil}->{$option} / $total_incorrect);
-             }
-         } continue {
-             $optionidx++;
          }
      }
      #
      # Create the plot
-     my $count = $end_index-$begin_index;
+     return &Apache::loncommon::DrawBarGraph('Correct Concepts',
-     my $title;
+                                             'Concept Number',
-     if ($count == 0) {
+                                             'Percent Correct',
-         $title = 'no submissions';
+,
-     } elsif ($count == 1) {
+                                             $plotcolors,
-         $title = 'one submission';
+                                             undef,
-     } else {
+                                             \@plotdata,{xskip=>1});
-         $title = $count.' submissions';
-     }
-     my $correctplot = &Apache::loncommon::DrawGraph($title,
-                                                     'Foil Number',
-                                                     'Percent Correct',
-,
-                                                     $plotcolors,
-                                                     $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 == 1) {
-         $title = 'one submission';
-     } else {
-         $title = $count.' submissions';
-     }
-     my $incorrectplot = &Apache::loncommon::DrawGraph($title,
-                                                  'Foil Number',
-                                                  'Incorrect Option Choice',
-,
-                                                  $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;
  }
- sub Concept_Time_Analysis {
+ sub OR_time_process_data {
-     my ($PerformanceData,$ORdata,$Concepts,$interval) = @_;
+     my ($performance_data,$begin_index,$end_index)=@_;
-     my $analysis_html;
+     my %processed_time_data;
-     ##
+     my %distinct_students;
-     ## Determine starttime, endtime, startindex, endindex
+     my ($correct,$data_count);
-     my ($begin_index,$end_index) = ($interval->{'begin_index'},
+     if (($begin_index == $end_index) &&
-                                     $interval->{'end_index'});
+         ($end_index != scalar(@$performance_data)-1)) {
-     my %TimeData;
+         return undef;
-     #
+     }
-     # Compute the number getting the foils correct or incorrects
+     # Be sure we include the last one if we are asked for it.
-     for (my $j=$begin_index;$j<=$end_index;$j++) {
+     # That we have to correct here (and not when $end_index is
-         my $row = $PerformanceData->[$j];
+     # given a value) should probably be considered a bug.
-         next if (! defined($row));
+     if ($end_index == scalar(@$performance_data)-1) {
-         my %Row = &Process_Row($row);
+         $end_index++;
-         while (my ($foilid,$href) = each(%Row)) {
+     }
+     my $count;
+     for (my $i=$begin_index;$i<$end_index;$i++) {
+         my $attempt = $performance_data->[$i];
+         $count++;
+         next if (! defined($attempt));
+         my %attempt = &Process_OR_Row($attempt);
+         $data_count++;
+         $correct += $attempt{'_correct'};
+         $distinct_students{$attempt->[&Apache::loncoursedata::RD_student_id()]}++;
+         while (my ($foilid,$href) = each(%attempt)) {
              if (! ref($href)) {
-                 $TimeData{$foilid} += $href;
+                 $processed_time_data{$foilid} += $href;
                  next;
              }
              while (my ($option,$value) = each(%$href)) {
-                 $TimeData{$foilid}->{$option}+=$value;
+                 $processed_time_data{$foilid}->{$option}+=$value;
              }
          }
      }
-     #
+     return (\%processed_time_data,$correct,$data_count,
-     # Put the data in plottable form
+             scalar(keys(%distinct_students)));
-     my @Plotdata;
+ }
-     foreach my $concept (@$Concepts) {
-         my ($total,$correct);
+ sub build_foil_index {
-         foreach my $foil (@{$concept->{'foils'}}) {
+     my ($ORdata) = @_;
-             $total += $TimeData{$foil}->{'_total'};
+     return if (! exists($ORdata->{'_Foils'}));
-             $correct += $TimeData{$foil}->{'_correct'};
+     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};
          }
-         if ($total == 0) {
+         if (exists($Numbers{$b1})) {
-             push(@Plotdata,0);
+             $b1 = $Numbers{$b1};
+         }
+         if (($a1 =~/^\d+$/) && ($b1 =~/^\d+$/)) {
+             return $a1 <=> $b1;
          } else {
-             push(@Plotdata,100 * $correct / $total);
+             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}}));
      }
      #
-     # Create the plot
+     # Build up the table of row labels.
-     my $title = ($end_index - $begin_index).' submissions';
+     my $table = '<table border="1" >'."\n";
-     my $correctplot = &Apache::loncommon::DrawGraph($title,
+     if (@Concepts > 1) {
-                                                     'Concept Number',
+         $table .= '<tr>'.
-                                                     'Percent Correct',
+             '<th>'.&mt('Concept Number').'</th>'.
-,
+             '<th>'.&mt('Concept').'</th>'.
-                                                     $plotcolors,
+             '<th>'.&mt('Foil Number').'</th>'.
-                                                     \@Plotdata);
+             '<th>'.&mt('Foil Name').'</th>'.
-     $analysis_html.='<tr>'.
+             '<th>'.&mt('Foil Text').'</th>'.
-         '<td>'.$correctplot.'</td>'.
+             '<th>'.&mt('Correct Value').'</th>'.
-         '<td align="left" valign="top">'.
+             "</tr>\n";
-         '<b>Start Time</b>: &nbsp;'.$interval->{'startdateform'}.'<br />'.
+     } else {
-         '<b>End Time</b>&nbsp;&nbsp;: '.
+         $table .= '<tr>'.
-            '&nbsp;'.$interval->{'enddateform'}.'<br />'.
+             '<th>'.&mt('Foil Number').'</th>'.
- #        '<b>Plot Title</b>&nbsp;&nbsp;:'.("&nbsp;"x3).
+             '<th>'.&mt('Foil Name').'</th>'.
- #            $interval->{'titleform'}.
+             '<th>'.&mt('Foil Text').'</th>'.
-         '</td>'.
+             '<th>'.&mt('Correct Value').'</th>'.
-         "</tr>\n";
+             "</tr>\n";
-     return $analysis_html;
+     }
+     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";
+         }
+         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";
- ##             Excel output
+     my $optionindex = 0;
- ##
+     my @Rows;
- #########################################################
+     foreach my $option (&mt('correct option chosen'),@{$ORdata->{'_Options'}}) {
- #########################################################
+         my $color = $plotcolors->[$optionindex++];
- sub prepare_excel_sheet {
+         push (@Rows,
-     my ($PerformanceData,$ORdata) = @_;
+               '<tr>'.
-     my (undef,$Foils,$Concepts) = &build_foil_index($ORdata);
+               '<td bgcolor="'.$color.'">'.
+               '<font color="'.$color.'">'.('*'x3).'</font>'.'</td>'.
+               '<td>'.&HTML::Entities::encode($option,'<>&"').'</td>'.
+               "</tr>\n");
+     }
+     shift(@Rows); # Throw away 'correct option chosen' color
+     $table .= join('',reverse(@Rows));
+     $table .= "</table>\n";
  }
- sub process_data_for_excel_sheet {
+ sub build_foil_key {
-     my ($PerformanceData,$Foils,$Concepts,$ORdata)=@_;
+     my ($foils,$extra_data)= @_;
+     if (! defined($extra_data)) { $extra_data = {}; }
+     my $table = "<table>\n";
+     my $foil_index = 0;
+     my @rows;
+     foreach my $foil (&mt('correct foil chosen'),@{$foils}) {
+         my $color = $plotcolors->[$foil_index++];
+         push (@rows,
+               '<tr>'.
+               '<td bgcolor="'.$color.'" class="key">'.
+               '<font color="'.$color.'">'.('*'x4).'</font></td>'.
+               '<td>'.&HTML::Entities::encode($foil,'<>&"').
+               ('&nbsp;'x2).$extra_data->{$foil}.'</td>'.
+               "</tr>\n");
+     }
+     shift(@rows); # Throw away 'correct foil chosen' color
+     $table .= join('',reverse(@rows));
+     $table .= "</table>\n";
  }
  #########################################################
  #########################################################
  ##
- ##             Interface
+ ##   Generic Interface Routines
  ##
  #########################################################
  #########################################################
- Line 739  sub CreateInterface {
+ Line 1749  sub CreateInterface {
      ##
      ## Environment variable initialization
      if (! exists$ENV{'form.AnalyzeOver'}) {
-         $ENV{'form.AnalyzeOver'} = 'Tries';
+         $ENV{'form.AnalyzeOver'} = 'tries';
      }
      ##
      ## 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>';
- Line 775  sub CreateInterface {
+ Line 1787  sub CreateInterface {
      ##
      ##
      $Str .= '<td>';
-     { # These braces are here to organize the code, not scope it.
+     ##
-         {
+     my $showprob_checkbox =
-             $Str .= '<nobr>'.&mt('Analyze Over ');
+         '<input type="checkbox" name="show_prob" value="true" ';
-             $Str .='<select name="AnalyzeOver" >';
+     if ($ENV{'form.show_prob'} eq 'true') {
-             $Str .= '<option value="Tries" ';
+         $showprob_checkbox .= 'checked ';
-             if (! exists($ENV{'form.AnalyzeOver'}) ||
+     }
-                 $ENV{'form.AnalyzeOver'} eq 'Tries'){
+     $showprob_checkbox.= ' />';
-                 # Default to Tries
+     $Str.= '<nobr><label>'.
-                 $Str .= ' selected ';
+         &mt('Show problem [_1]',$showprob_checkbox).
-             }
+         '</label></nobr><br />';
-             $Str .= '>'.&mt('Tries').'</option>';
+     ##
-             $Str .= '<option value="Time" ';
+     my $analyze_selector = '<select name="AnalyzeOver" >';
-             $Str .= ' selected ' if ($ENV{'form.AnalyzeOver'} eq 'Time');
+     $analyze_selector .= '<option value="tries" ';
-             $Str .= '>'.&mt('Time').'</option>';
+     if (! exists($ENV{'form.AnalyzeOver'}) ||
-             $Str .= '</select></nobr><br />';
+         $ENV{'form.AnalyzeOver'} eq 'tries'){
-         }
+         # Default to tries
-         {
+         $analyze_selector .= ' selected ';
-             $Str .= '<nobr>'.&mt('Analyze as ');
+     }
-             $Str .='<select name="AnalyzeAs" >';
+     $analyze_selector .= '>'.&mt('Tries').'</option>';
-             $Str .= '<option value="Concepts" ';
+     $analyze_selector .= '<option value="time" ';
-             if (! exists($ENV{'form.AnalyzeAs'}) ||
+     $analyze_selector .= ' selected ' if ($ENV{'form.AnalyzeOver'} eq 'time');
-                 $ENV{'form.AnalyzeAs'} eq 'Concepts'){
+     $analyze_selector .= '>'.&mt('Time').'</option>';
-                 # Default to Concepts
+     $analyze_selector .= '</select>';
-                 $Str .= ' selected ';
+     $Str .= '<nobr><label>'.
-             }
+         &mt('Analyze Over [_1] [_2]',
-             $Str .= '>'.&mt('Concepts').'</option>';
+             $analyze_selector,
-             $Str .= '<option value="Foils" ';
+             &Apache::loncommon::help_open_topic('Analysis_Analyze_Over')).
-             $Str .= ' selected ' if ($ENV{'form.AnalyzeAs'} eq 'Foils');
+             '</label></nobr><br />'.$/;
-             $Str .= '>'.&mt('Foils').'</option>';
+     ##
-             $Str .= '</select></nobr><br />';
+     my $numplots_selector = '<select name="NumPlots">';
-         }
+     if (! exists($ENV{'form.NumPlots'})
-         {
+         || $ENV{'form.NumPlots'} < 1
-             $Str .= '<br /><nobr>'.&mt('Number of Plots:');
+         || $ENV{'form.NumPlots'} > 20) {
-             $Str .= '<select name="NumPlots">';
+         $ENV{'form.NumPlots'} = 5;
-             if (! exists($ENV{'form.NumPlots'})
+     }
-                 || $ENV{'form.NumPlots'} < 1
+     foreach my $i (1,2,3,4,5,6,7,8,10,15,20) {
-                 || $ENV{'form.NumPlots'} > 20) {
+         $numplots_selector .= '<option value="'.$i.'" ';
-                 $ENV{'form.NumPlots'} = 5;
+         if ($ENV{'form.NumPlots'} == $i) { $numplots_selector.=' selected '; }
-             }
+         $numplots_selector .= '>'.$i.'</option>';
-             foreach my $i (1,2,3,4,5,6,7,8,10,15,20) {
+     }
-                 $Str .= '<option value="'.$i.'" ';
+     $numplots_selector .= '</select></nobr><br />';
-                 if ($ENV{'form.NumPlots'} == $i) { $Str.=' selected '; }
+     $Str .= '<nobr><label>'.&mt('Number of Plots [_1]',$numplots_selector).
-                 $Str .= '>'.$i.'</option>';
+         '</label></nobr>';
-             }
+     ##
-             $Str .= '</select></nobr>';
+     $Str .= '<nobr><label>'.&mt('Status: [_1]',
-         }
+                                  '<input type="text" '.
-     }
+                                  'name="stats_status" size="60" value="" />'
+                                  ).
+                     '</label></nobr>';
      $Str .= '</td>';
      ##
      ##
- Line 830  sub CreateInterface {
+ Line 1844  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;
  }
- Line 910  sub get_time_from_row {
+ Line 1862  sub get_time_from_row {
  sub get_tries_from_row {
      my ($row) = @_;
      if (ref($row)) {
-         return $row->[4];
+         return $row->[&Apache::loncoursedata::RD_tries()];
      }
      return undef;
  }
- sub Process_Row {
+ sub hashify_attempt {
+     my ($row) = @_;
+     my %attempt;
+     $attempt{'student'}    = $row->[&Apache::loncoursedata::RD_sname()];
+     $attempt{'tries'}      = $row->[&Apache::loncoursedata::RD_tries()];
+     $attempt{'submission'} = &Apache::lonnet::unescape($row->[&Apache::loncoursedata::RD_submission()]);
+     $attempt{'award'}      = $row->[&Apache::loncoursedata::RD_awarddetail()];
+     $attempt{'timestamp'}  = $row->[&Apache::loncoursedata::RD_timestamp()];
+     return %attempt;
+ }
+ sub Process_OR_Row {
      my ($row) = @_;
      my %RowData;
-     my ($award,$grading,$submission,$time,$tries) = @$row;
+ #    my $student_id = $row->[&Apache::loncoursedata::RD_student_id()];
-     next if ($award eq 'MISSING_ANSWER');
+     my $award      = $row->[&Apache::loncoursedata::RD_awarddetail()];
-     if ($award =~ /(APPROX_ANS|EXACT_ANS)/) {
+     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 (&submission_is_correct($award)) {
          $RowData{'_correct'} = 1;
      }
      $RowData{'_total'} = 1;
- Line 928  sub Process_Row {
+ Line 1896  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'}++;
          } else {
              $submission = &Apache::lonnet::unescape($submission);
-             $submission =~ s/\%20/ /g;
              $RowData{$foilid}->{$submission}++;
          }
          $RowData{$foilid}->{'_total'}++;
- Line 941  sub Process_Row {
+ Line 1909  sub Process_Row {
      return %RowData;
  }
- ##
+ sub submission_is_correct {
- ## get problem data and put it into a useful data structure.
+     my ($award) = @_;
- ## note: we must force each foil and option to not begin or end with
+     if ($award =~ /(APPROX_ANS|EXACT_ANS)/) {
- ##       spaces as they are stored without such data.
+         return 1;
- ##
+     } else {
- sub get_problem_data {
+         return 0;
-     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;
-                     $Partdata{$part}->{'Foils'}->{$foil}->{'text'}=$value;
-                 } elsif ($key =~ /^foil\.value\.(.*)$/) {
-                     my $foil = $1;
-                     $Partdata{$part}->{'Foils'}->{$foil}->{'value'}=$value;
-                 }
-             }
-         }
      }
-     return %Partdata;
  }
 ;

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.42
changed lines
	Added in v.1.111