--- loncom/interface/statistics/lonproblemanalysis.pm	2004/09/29 14:38:35	1.90
+++ loncom/interface/statistics/lonproblemanalysis.pm	2004/10/25 18:30:20	1.95
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemanalysis.pm,v 1.90 2004/09/29 14:38:35 matthew Exp $
+# $Id: lonproblemanalysis.pm,v 1.95 2004/10/25 18:30:20 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -56,7 +56,6 @@ my @SubmitButtons = ({ name => 'PrevProb
                      { name => 'ExcelOutput',
                        text => 'Produce Excel Output' });
 
-
 sub BuildProblemAnalysisPage {
     my ($r,$c)=@_;
     #
@@ -87,7 +86,7 @@ sub BuildProblemAnalysisPage {
     # Support for numerical and radio response isn't complete enough to
     # include in 1.2 release.
     # my $problem_types = '(option|radiobutton|numerical)';
-    my $problem_types = '(option)';
+    my $problem_types = '.';#(option)';
     if (exists($ENV{'form.problemchoice'}) && 
         ! exists($ENV{'form.SelectAnother'})) {
         foreach my $button (@SubmitButtons) {
@@ -135,7 +134,9 @@ sub BuildProblemAnalysisPage {
             my $resource = $current_problem->{'resource'};
             $r->print('<h1>'.$resource->{'title'}.'</h1>');
             $r->print('<h3>'.$resource->{'src'}.'</h3>');
-            $r->print(&Apache::lonstathelpers::render_resource($resource));
+            if ($ENV{'form.show_prob'} eq 'true') {
+                $r->print(&Apache::lonstathelpers::render_resource($resource));
+            }
             $r->rflush();
             my %Data = &Apache::lonstathelpers::get_problem_data
                 ($resource->{'src'});
@@ -221,10 +222,9 @@ sub NumericalResponseAnalysis {
     }
     #
     # This next call causes all the waiting around that people complain about
-    my ($max,$min) = 
-        &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$Students,
-                                                   'Statistics',
-                                                   'stats_status');
+    &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$Students,
+                                               'Statistics',
+                                               'stats_status');
     return if ($c->aborted());
     #
     # Collate the data
@@ -376,35 +376,370 @@ sub build_student_data_worksheet {
 #########################################################
 #########################################################
 sub RadioResponseAnalysis {
-    my ($r,$problem,$problem_data,$Students) = @_;
-    my ($resource,$respid) = ($problem->{'resource'},
-                              $problem->{'respid'});
+    my ($r,$problem,$problem_analysis,$students) = @_;
+    if ($ENV{'form.AnalyzeOver'} eq 'tries') {
+        &RR_tries_analysis($r,$problem,$problem_analysis,$students);
+    } elsif ($ENV{'form.AnalyzeOver'} eq 'time') {
+        &RR_static_time_analysis($r,$problem,$problem_analysis,$students);
+    } else {
+        $r->print('Bad request');
+    }
+    return;
+}
+
+sub RR_computed_tries_analysis {
+    my ($r,$problem,$problem_analysis) = @_;
+    my ($resource,$partid,$respid) = ($problem->{'resource'},
+                                      $problem->{'part'},
+                                      $problem->{'respid'});
+    $r->print('The tries answer you seek must be computed');
+    # Gather student data
+    # for each try
+    #    loop through data, classifying it by
+    #         correct foil -> selected foil
+    #    if there is concept data
+    #         make a concept correct plot
+    #    for each correct foil
+    #         make a plot of the data
+}
+
+sub RR_computed_time_analysis {
+    my ($r,$problem,$problem_analysis) = @_;
+    my ($resource,$partid,$respid) = ($problem->{'resource'},
+                                      $problem->{'part'},
+                                      $problem->{'respid'});
+    $r->print('The time answer you seek must be computed');
+    # Gather student data
+    # for time division
+    #    limit to between start time & end time
+    #    loop through data, classifying it by
+    #         correct foil -> selected foil
+    #    if there is concept data
+    #         make a concept correct plot
+    #    for each correct foil
+    #         make a plot of the data
+}
+
+sub RR_tries_analysis {
+    my ($r,$problem,$problem_analysis,$students) = @_;
+    my ($resource,$partid,$respid) = ($problem->{'resource'},
+                                      $problem->{'part'},
+                                      $problem->{'respid'});
+    #
     my $analysis_html;
-    my $PerformanceData = &Apache::loncoursedata::get_response_data
+    my $foildata = $problem_analysis->{'_Foils'};
+    my ($table,$foils,$concepts) = &build_foil_index($problem_analysis);
+    $analysis_html .= $table;
+    # Gather student data
+    my $response_data = &Apache::loncoursedata::get_response_data
         (\@Apache::lonstatistics::SelectedSections,
          $Apache::lonstatistics::enrollment_status,
          $resource->{'symb'},$respid);
-    if (! defined($PerformanceData) || 
-        ref($PerformanceData) ne 'ARRAY' ) {
+    my $correct;   # either a hash reference or a scalar
+    if ($problem_analysis->{'answercomputed'} || scalar(@$concepts) > 1) {
+        # This takes a while for large classes...
+        &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$students,
+                                                   'Statistics',
+                                                   'stats_status');
+        foreach my $student (@$students) {
+            my ($idx,@remainder) = split('&',$student->{'answer'});
+            my ($answer) = ($remainder[$idx]=~/^(.*)=([^=]*)$/);
+            $correct->{$student->{'username'}.':'.$student->{'domain'}}=
+                &Apache::lonnet::unescape($answer);
+        }
+    } else {
+        foreach my $foil (keys(%$foildata)) {
+            if ($foildata->{$foil}->{'value'} eq 'true') {
+                $correct = $foildata->{$foil}->{'name'};
+                last;
+            }
+        }
+    }
+    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 $try = 1;$try<=$ENV{'form.NumPlots'};$try++) {
+        # classify data ->correct foil -> selected foil
+        my $attempt_restriction_function = 
+        my $foil_choice_data = 
+            &RR_classify_response_data($response_data,$correct,
+                                       sub {($_[0]->{'tries'} == $try?1:0)});
+        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,
+                                             '% choosing');
+        }
+        # % Choosing plot
+        my $choice_plot = &RR_create_percent_selected_plot
+            ($foils,$foil_choice_data,'Attempt '.$try);
+        # for each correct foil, how did they mark it? (stacked bar graph)
+        my ($stacked_plot,$count_by_foil) = 
+            &RR_create_stacked_selection_plot($foils,$foil_choice_data,'');
+        #
+        if ($concept_plot ne '' ||
+            $choice_plot ne '' ||
+            $stacked_plot ne '') {
+            $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>'.$/;
+        }
+    }
+    $analysis_html.='</table>';
+    $r->print($analysis_html);
+}
+
+
+sub RR_concept_plot {
+    my ($concepts,$foil_data,$title) = @_;
+    #
+    my %correct_by_concept;
+    my %incorrect_by_concept;
+    my %true;
+    foreach my $concept (@$concepts) {
+        foreach my $foil (@{$concept->{'foils'}}) {
+            next if (! exists($foil_data->{$foil}));
+            foreach my $choice (keys(%{$foil_data->{$foil}})) {
+                if ($choice eq $foil) {
+                    $correct_by_concept{$concept->{'name'}} +=
+                        $foil_data->{$foil}->{$choice};
+                } else {
+                    $incorrect_by_concept{$concept->{'name'}} +=
+                        $foil_data->{$foil}->{$choice};
+                    
+                }
+            }
+        }
+    }
+    # 
+    # need arrays for incorrect and correct because we want to use different
+    # colors for them
+    my @correct;
+    #
+    my $total =0;
+    for (my $i=0;$i<scalar(@$concepts);$i++) {
+        my $concept = $concepts->[$i];
+        $correct[$i]   =   $correct_by_concept{$concept->{'name'}};
+        $total += $correct_by_concept{$concept->{'name'}}+
+            $incorrect_by_concept{$concept->{'name'}};
+    }
+    if ($total == 0) { return ''; };
+    for (my $i=0;$i<=$#correct;$i++) { 
+        $correct[$i] = sprintf('%0f',$correct[$i]/$total*100);
+    }
+    my $xlabel = 'concept';
+    $title.= ' (N='.$total.')';
+    my $plot=  &Apache::loncommon::DrawBarGraph($title,
+                                                $xlabel,
+                                                'Percent Choosing',
+                                                100,
+                                                ['#33ff00','#ff3300'],
+                                                undef,
+                                                \@correct);
+    return $plot;
+}
+
+
+sub RR_create_percent_selected_plot {
+    my ($foils,$foil_data,$title) = @_;
+    #
+    my %foil_selections;
+    my %true;
+    foreach my $foil (@$foils) {
+        # foil_data has format $foil_data->{true_foil}->{selected foil}
+        next if (! exists($foil_data->{$foil}));
+        $true{$foil}++;
+        while (my ($f,$count)= each(%{$foil_data->{$foil}})) {
+            $foil_selections{$f}+=$count;
+        }
+    }
+    # 
+    # need arrays for incorrect and correct because we want to use different
+    # colors for them
+    my @correct;
+    my @incorrect;
+    #
+    my $total =0;
+    for (my $i=0;$i<scalar(@$foils);$i++) {
+        my $foil = $foils->[$i];
+        if ($true{$foil}) {
+            $correct[$i]   = $foil_selections{$foil};
+            $incorrect[$i] = 0;
+        } else {
+            $correct[$i]   = 0;
+            $incorrect[$i] = $foil_selections{$foil};
+        }
+        $total+=$foil_selections{$foil};
+    }
+    if ($total == 0) { return ''; };
+    for (my $i=0;$i<=$#correct;$i++) { 
+        $correct[$i] = sprintf('%0f',$correct[$i]/$total*100);
+    }
+    for (my $i=0;$i<=$#incorrect;$i++) {
+        $incorrect[$i] = sprintf('%0f',$incorrect[$i]/$total*100);
+    }
+    my $xlabel = 'foil chosen';
+    $title.= ' (N='.$total.')';
+    my $plot=  &Apache::loncommon::DrawBarGraph($title,
+                                                $xlabel,
+                                                'Percent Choosing',
+                                                100,
+                                                ['#33ff00','#ff3300'],
+                                                undef,
+                                                \@correct,
+                                                \@incorrect);
+    return $plot;
+}
+
+
+sub RR_create_stacked_selection_plot {
+    my ($foils,$foil_data,$title)=@_;
+    #
+    my @correct_choice; # the green row
+    my @dataset; # array of array refs - multicolor rows.
+    my %filled;
+    my @labels;
+    my $count=-1;
+    my %column;
+    for (my $i=0;$i<scalar(@$foils);$i++) {
+        next if (! exists($foil_data->{$foils->[$i]}));
+        my $correct_foil = $foils->[$i];
+        push(@labels,$i+1);
+        $column{$correct_foil}= ++$count;
+        for (my $j=0;$j<scalar(@$foils);$j++) {
+            my $value = 0;
+            if ($i != $j ) {
+                $value += $foil_data->{$correct_foil}->{$foils->[$j]};
+            }
+            $dataset[$j]->[$column{$correct_foil}]=$value;
+        }
+    }
+    #
+    return '' if (! scalar(keys(%column)));
+    #
+    my $grand_total = 0;
+    my %count_per_foil;
+    while (my ($foil,$bar) = each (%column)) {
+        my $bar_total = 0;
+        for (my $j=0;$j<scalar(@dataset);$j++) {
+            $bar_total += $dataset[$j]->[$bar];
+        }
+        next if ($bar_total == 0);
+        for (my $j=0;$j<scalar(@dataset);$j++) {
+            $dataset[$j]->[$bar] = 
+                sprintf('%2f',$dataset[$j]->[$bar]/$bar_total * 100);
+        }
+        $count_per_foil{$foil}=' (N='.$bar_total.')';
+        $grand_total += $bar_total;
+    }
+    if ($grand_total == 0) {
+        return ('',undef);
+    }
+    my @empty_row = ();
+    foreach (@{$dataset[0]}) {
+        push(@empty_row,0);
+    }
+    #
+    $title .= ' (N='.$grand_total.')';
+    my $graph = &Apache::loncommon::DrawBarGraph
+        ($title,'Correct Foil','foils chosen Incorrectly',
+         100,$plotcolors,\@labels,\@empty_row,@dataset);
+    return ($graph,\%count_per_foil);
+}
+
+
+# if $correct is a hash ref, it is assumed to be indexed by student names.
+#    the values are assumed to be hash refs with a key of 'answer'.
+sub RR_classify_response_data {
+    my ($full_row_data,$correct,$function) = @_;
+    my %submission_data;
+    foreach my $row (@$full_row_data) {
+        my %subm = &hashify_attempt($row);
+        if (ref($correct) eq 'HASH') {
+            $subm{'correct'} = $correct->{$subm{'student'}};
+        } else {
+            $subm{'correct'} = $correct;
+        }
+        $subm{'submission'} =~ s/=\d+\s*$//;
+        if (&$function(\%subm)) {
+            $submission_data{$subm{'correct'}}->{$subm{'submission'}}++;
+        }
+    }
+    return \%submission_data;
+}
+
+sub RR_static_time_analysis {
+    my ($r,$problem,$problem_analysis) = @_;
+    my ($resource,$partid,$respid) = ($problem->{'resource'},
+                                      $problem->{'part'},
+                                      $problem->{'respid'});
+    $r->print('<h3>The time answer you seek is static</h3>');
+    my $analysis_html;
+    # Gather student data
+    my $response_data = &Apache::loncoursedata::get_response_data
+        (\@Apache::lonstatistics::SelectedSections,
+         $Apache::lonstatistics::enrollment_status,
+         $resource->{'symb'},$respid);
+    if (! defined($response_data) || 
+        ref($response_data) ne 'ARRAY' ) {
         $analysis_html = '<h2>'.
             &mt('There is no submission data for this resource').
             '</h2>';
         $r->print($analysis_html);
         return;
     }
-    if (exists($ENV{'form.ExcelOutput'})) {
-        $analysis_html .= &RR_Excel_output($r,$problem->{'resource'},
-                                           $PerformanceData,$problem_data);
-    } elsif ($ENV{'form.AnalyzeOver'} eq 'Tries') {
-        $analysis_html .= &RR_Tries_Analysis($r,$problem->{'resource'},
+    # for time division
+
+    #    limit to between start time & end time
+    #    loop through data, classifying it by
+    #         correct foil -> selected foil
+    #    if there is concept data
+    #         make a concept correct plot
+    #    for each correct foil
+    #         make a plot of the data
+
+}
+
+
+=pod
+
+
+    } elsif ($ENV{'form.AnalyzeOver'} eq 'tries') {
+        $analysis_html .= &RR_tries_Analysis($r,$problem->{'resource'},
                                              $PerformanceData,$problem_data);
-    } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') {
-        $analysis_html .= &RR_Time_Analysis($r,$problem->{'resource'},
+    } elsif ($ENV{'form.AnalyzeOver'} eq 'time') {
+        $analysis_html .= &RR_time_Analysis($r,$problem->{'resource'},
                                             $PerformanceData,$problem_data);
     } else {
         $analysis_html .= '<h2>'.
            &mt('The analysis you have selected is not supported at this time').
-           '</h2>';
+            '</h2>';
     }
     $r->print($analysis_html);
 }
@@ -414,7 +749,7 @@ sub RR_Excel_output   {
     return '<h1>No!</h1>';
 }
 
-sub RR_Tries_Analysis { 
+sub RR_tries_Analysis { 
     my ($r,$resource,$PerformanceData,$problem_data) = @_;
     my $analysis_html;
     my $mintries = 1;
@@ -428,7 +763,7 @@ sub RR_Tries_Analysis {
     }
     $analysis_html .= $table;
     my @TryData = &RR_tries_data_analysis($r,$PerformanceData);
-        $analysis_html .= &RR_Tries_Foil_Analysis($mintries,$maxtries,$Foils,
+        $analysis_html .= &RR_tries_Foil_Analysis($mintries,$maxtries,$Foils,
                                                  \@TryData,$problem_data);
     return $analysis_html;
 }
@@ -444,13 +779,13 @@ sub RR_tries_data_analysis {
     return @TryData;
 }
 
-sub RR_Time_Analysis  { 
+sub RR_time_Analysis  { 
     my ($r,$PerformanceData,$problem_data) = @_;
     my $html;
     return $html;
 }
 
-sub RR_Tries_Foil_Analysis {
+sub RR_tries_Foil_Analysis {
     my ($min,$max,$Foils,$TryData,$problem_data) = @_;
     my $html;
     #
@@ -481,8 +816,8 @@ sub RR_Tries_Foil_Analysis {
                 }
             }
         }
-        my $title='Attempt '.$try;
-        my $xlabel = $total.' Submissions';
+        my $title='Attempt '.$try.' (N='.$total.')';
+        my $xlabel = 'Foil Chosen';
         $html.=  &Apache::loncommon::DrawBarGraph($title,
                                                   $xlabel,
                                                   'Percent Choosing',
@@ -495,19 +830,19 @@ sub RR_Tries_Foil_Analysis {
     return $html;
 }
 
-sub RR_Tries_Concept_Analysis {
+sub RR_tries_Concept_Analysis {
     my ($min,$max,$Concepts,$ResponseData,$problem_data) = @_;
     my $html;
     return $html;
 }
 
-sub RR_Time_Foil_Analysis {
+sub RR_time_Foil_Analysis {
     my ($min,$max,$Foils,$ResponseData,$problem_data) = @_;
     my $html;
     return $html;
 }
 
-sub RR_Time_Concept_Analysis {
+sub RR_time_Concept_Analysis {
     my ($min,$max,$Concepts,$ResponseData,$problem_data) = @_;
     my $html;
     return $html;
@@ -545,6 +880,8 @@ sub get_Radio_problem_data {
     return %Partdata;
 }
 
+=cut
+
 #########################################################
 #########################################################
 ##
@@ -575,13 +912,13 @@ sub OptionResponseAnalysis {
             $r->print($result);
             $r->rflush();
         } else {
-            if ($ENV{'form.AnalyzeOver'} eq 'Tries') {
+            if ($ENV{'form.AnalyzeOver'} eq 'tries') {
                 my $analysis_html = &OR_tries_analysis($r,
                                                     $PerformanceData,
                                                     $problem_data);
                 $r->print($analysis_html);
                 $r->rflush();
-            } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') {
+            } elsif ($ENV{'form.AnalyzeOver'} eq 'time') {
                 my $analysis_html = &OR_time_analysis($PerformanceData,
                                                    $problem_data);
                 $r->print($analysis_html);
@@ -598,7 +935,7 @@ sub OptionResponseAnalysis {
 
 #########################################################
 #
-#       Option Response:  Tries Analysis
+#       Option Response:  tries Analysis
 #
 #########################################################
 sub OR_tries_analysis {
@@ -618,9 +955,9 @@ sub OR_tries_analysis {
         foreach my $foilid (@{$concept->{'foils'}}) {
             for (my $try=$mintries;$try<=$maxtries;$try++) {
                 # concept analysis data
-                $concept_data[$j]->{'_correct'} +=
+                $concept_data[$j]->[$try]->{'_correct'} +=
                     $response_data{$foilid}->[$try]->{'_correct'};
-                $concept_data[$j]->{'_total'} +=
+                $concept_data[$j]->[$try]->{'_total'} +=
                     $response_data{$foilid}->[$try]->{'_total'};
                 #
                 # foil analysis data
@@ -662,19 +999,32 @@ sub OR_tries_analysis {
     if (defined($Concepts)) { $num_concepts = scalar(@$Concepts); }
     #
     for (my $try=$mintries;$try<=$maxtries;$try++) {
+        if (! defined($response_data{'_total'}->[$try]) ||
+            $response_data{'_total'}->[$try] == 0) { 
+            if ($try > 1) {
+                $analysis_html.= '<tr><td align="center" colspan="4"><b>'.
+                    &mt('None of the selected students attempted the problem more than [_1] times.',$try-1).
+                    '</b></td></tr>';
+            } else {
+                $analysis_html.= '<tr><td colspan="4" align="center"><b>'.
+                    &mt('None of the selected students have attempted the problem').'</b></td></tr>';
+            }
+            last;
+        }
         my $concept_graph='';
         if ($num_concepts > 1) {
             #
             # Create concept plot
             my @concept_plot_data;
             for (my $j=0;$j<=$#concept_data;$j++) {
-                my $total = $concept_data[$j]->{'_total'};
+                my $total = $concept_data[$j]->[$try]->{'_total'};
                 if ($total == 0) {
                     $concept_plot_data[$j] = 0;
                 } else {
                     $concept_plot_data[$j] = 100 * 
                         sprintf('%0.3f',
-                                $concept_data[$j]->{'_correct'} / $total);
+                                $concept_data[$j]->[$try]->{'_correct'} / 
+                                $total);
                 }
             }
             #
@@ -720,7 +1070,7 @@ sub OR_tries_analysis {
         }
         #
         my $correct_graph = &Apache::loncommon::DrawBarGraph
-            ($title,'Foil Number','Percent Correct',
+            ($title,'Statement','% Answered Correct',
              100,$plotcolors,\@Labels,$Datasets[0]);
         
         #
@@ -733,7 +1083,7 @@ sub OR_tries_analysis {
                                            $response_data{'_correct'}->[$try];
         $title = 'Attempt '.$try.' (N='.$count.')';
         my $incorrect_graph = &Apache::loncommon::DrawBarGraph
-            ($title,'Foil Number','% Option Chosen Incorrectly',
+            ($title,'Statement','% Chosen Incorrectly',
              100,$plotcolors,\@Labels,@Datasets);
         $analysis_html.= 
             '<tr>'.
@@ -830,8 +1180,12 @@ sub OR_time_analysis {
                                                               > $starttime);
         }
         $begin_index = $j;
-        while (++$j < scalar(@$performance_data)) {
-            last if (&get_time_from_row($performance_data->[$j]) > $endtime);
+        while ($j < scalar(@$performance_data)) {
+            if (&get_time_from_row($performance_data->[$j]) > $endtime) {
+                last;
+            } else {
+                $j++;
+            }
         }
         $end_index = $j;
         ##
@@ -924,12 +1278,13 @@ sub OR_Foil_Time_Analysis {
     #
     # Create the plot
     my $count = $end_index-$begin_index;
+    return ('No data','') if ($count <= 0);
     my $title;
     if ($count == 0) {
         $title = 'no submissions';
     } elsif ($count == 1) {
         $title = 'one submission';
-    } else {
+    } elsif ($count > 1) {
         $title = $count.' submissions';
     }
     my $correct_plot = &Apache::loncommon::DrawBarGraph($title,
@@ -945,6 +1300,8 @@ sub OR_Foil_Time_Analysis {
     $count = $end_index-$begin_index-$TimeData{'_correct'};
     if ($count == 0) {
         $title = 'no submissions';
+    } elsif ($count < 0) {
+        return ($correct_plot,'');
     } elsif ($count == 1) {
         $title = 'one submission';
     } else {
@@ -956,8 +1313,7 @@ sub OR_Foil_Time_Analysis {
                                                  100,
                                                  $plotcolors,
                                                  undef,
-                                                 @plotdata);        
-
+                                                 @plotdata);
     return ($correct_plot,$incorrect_plot);
 }
 
@@ -1315,10 +1671,11 @@ sub build_option_index {
     my $optionindex = 0;
     my @Rows;
     foreach my $option (&mt('correct option chosen'),@{$ORdata->{'_Options'}}) {
+        my $color = $plotcolors->[$optionindex++];
         push (@Rows,
               '<tr>'.
-              '<td bgcolor="'.$plotcolors->[$optionindex++].'">'.
-              ('&nbsp;'x4).'</td>'.
+              '<td bgcolor="'.$color.'">'.
+              '<font color="'.$color.'">'.('*'x3).'</font>'.'</td>'.
               '<td>'.&HTML::Entities::encode($option,'<>&"').'</td>'.
               "</tr>\n");
     }
@@ -1327,6 +1684,27 @@ sub build_option_index {
     $table .= "</table>\n";
 }
 
+sub build_foil_key {
+    my ($foils,$extra_data)= @_;
+    if (! defined($extra_data)) { $extra_data = {}; }
+    my $table = "<table>\n";
+    my $foil_index = 0;
+    my @rows;
+    foreach my $foil (&mt('correct foil chosen'),@{$foils}) {
+        my $color = $plotcolors->[$foil_index++];
+        push (@rows,
+              '<tr>'.
+              '<td bgcolor="'.$color.'" class="key">'.
+              '<font color="'.$color.'">'.('*'x4).'</font></td>'.
+              '<td>'.&HTML::Entities::encode($foil,'<>&"').
+              ('&nbsp;'x2).$extra_data->{$foil}.'</td>'.
+              "</tr>\n");
+    }
+    shift(@rows); # Throw away 'correct foil chosen' color
+    $table .= join('',reverse(@rows));
+    $table .= "</table>\n";
+}
+
 #########################################################
 #########################################################
 ##
@@ -1338,7 +1716,7 @@ sub CreateInterface {
     ##
     ## Environment variable initialization
     if (! exists$ENV{'form.AnalyzeOver'}) {
-        $ENV{'form.AnalyzeOver'} = 'Tries';
+        $ENV{'form.AnalyzeOver'} = 'tries';
     }
     ##
     ## Build the menu
@@ -1376,23 +1754,34 @@ sub CreateInterface {
     ##
     ##
     $Str .= '<td>';
+    ##
+    my $showprob_checkbox = 
+        '<input type="checkbox" name="show_prob" value="true" ';
+    if ($ENV{'form.show_prob'} eq 'true') {
+        $showprob_checkbox .= 'checked ';
+    }
+    $showprob_checkbox.= ' />';
+    $Str.= '<nobr><label>'.
+        &mt('Show problem [_1]',$showprob_checkbox).
+        '</label></nobr><br />';
+    ##
     my $analyze_selector = '<select name="AnalyzeOver" >';
-    $analyze_selector .= '<option value="Tries" ';
+    $analyze_selector .= '<option value="tries" ';
     if (! exists($ENV{'form.AnalyzeOver'}) || 
-        $ENV{'form.AnalyzeOver'} eq 'Tries'){
-        # Default to Tries
+        $ENV{'form.AnalyzeOver'} eq 'tries'){
+        # Default to tries
         $analyze_selector .= ' selected ';
     }
     $analyze_selector .= '>'.&mt('Tries').'</option>';
-    $analyze_selector .= '<option value="Time" ';
-    $analyze_selector .= ' selected ' if ($ENV{'form.AnalyzeOver'} eq 'Time');
+    $analyze_selector .= '<option value="time" ';
+    $analyze_selector .= ' selected ' if ($ENV{'form.AnalyzeOver'} eq 'time');
     $analyze_selector .= '>'.&mt('Time').'</option>';
     $analyze_selector .= '</select>';
-    $Str .= '<nobr>'.
+    $Str .= '<nobr><label>'.
         &mt('Analyze Over [_1] [_2]',
             $analyze_selector,
             &Apache::loncommon::help_open_topic('Analysis_Analyze_Over')).
-            '</nobr><br />'.$/;
+            '</label></nobr><br />'.$/;
     ##
     my $numplots_selector = '<select name="NumPlots">';
     if (! exists($ENV{'form.NumPlots'}) 
@@ -1448,8 +1837,9 @@ sub get_tries_from_row {
 sub hashify_attempt {
     my ($row) = @_;
     my %attempt;
+    $attempt{'student'}    = $row->[&Apache::loncoursedata::RD_sname()];
     $attempt{'tries'}      = $row->[&Apache::loncoursedata::RD_tries()];
-    $attempt{'submission'} = $row->[&Apache::loncoursedata::RD_submission()];
+    $attempt{'submission'} = &Apache::lonnet::unescape($row->[&Apache::loncoursedata::RD_submission()]);
     $attempt{'award'}      = $row->[&Apache::loncoursedata::RD_awarddetail()];
     $attempt{'timestamp'}  = $row->[&Apache::loncoursedata::RD_timestamp()];
     return %attempt;