--- loncom/interface/statistics/lonproblemanalysis.pm	2004/09/28 20:45:40	1.89
+++ loncom/interface/statistics/lonproblemanalysis.pm	2004/10/05 14:03:45	1.93
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemanalysis.pm,v 1.89 2004/09/28 20:45:40 matthew Exp $
+# $Id: lonproblemanalysis.pm,v 1.93 2004/10/05 14:03:45 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)=@_;
     #
@@ -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'});
@@ -404,7 +405,7 @@ sub RadioResponseAnalysis {
     } else {
         $analysis_html .= '<h2>'.
            &mt('The analysis you have selected is not supported at this time').
-           '</h2>';
+            '</h2>';
     }
     $r->print($analysis_html);
 }
@@ -481,8 +482,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',
@@ -618,9 +619,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 +663,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);
                 }
             }
             #
@@ -830,8 +844,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 +942,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 +964,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 +977,7 @@ sub OR_Foil_Time_Analysis {
                                                  100,
                                                  $plotcolors,
                                                  undef,
-                                                 @plotdata);        
-
+                                                 @plotdata);
     return ($correct_plot,$incorrect_plot);
 }
 
@@ -1376,48 +1396,55 @@ sub CreateInterface {
     ##
     ##
     $Str .= '<td>';
-    { # These braces are here to organize the code, not scope it.
-        {
-            $Str .= '<nobr>'.&mt('Analyze Over ');
-            $Str .= &Apache::loncommon::help_open_topic
-                                                  ('Analysis_Analyze_Over');
-            $Str .='<select name="AnalyzeOver" >';
-            $Str .= '<option value="Tries" ';
-            if (! exists($ENV{'form.AnalyzeOver'}) || 
-                $ENV{'form.AnalyzeOver'} eq 'Tries'){
-                # Default to Tries
-                $Str .= ' selected ';
-            }
-            $Str .= '>'.&mt('Tries').'</option>';
-            $Str .= '<option value="Time" ';
-            $Str .= ' selected ' if ($ENV{'form.AnalyzeOver'} eq 'Time');
-            $Str .= '>'.&mt('Time').'</option>';
-            $Str .= '</select>';
-            $Str .= '</nobr><br />';
-        }
-        {
-            $Str .= '<nobr>'.&mt('Number of Plots:');
-            $Str .= '<select name="NumPlots">';
-            if (! exists($ENV{'form.NumPlots'}) 
-                || $ENV{'form.NumPlots'} < 1 
-                || $ENV{'form.NumPlots'} > 20) {
-                $ENV{'form.NumPlots'} = 5;
-            }
-            foreach my $i (1,2,3,4,5,6,7,8,10,15,20) {
-                $Str .= '<option value="'.$i.'" ';
-                if ($ENV{'form.NumPlots'} == $i) { $Str.=' selected '; }
-                $Str .= '>'.$i.'</option>';
-            }
-            $Str .= '</select></nobr><br />';
-        }
-        {
-            $Str .= '<nobr>'.&mt('Status: [_1]',
+    ##
+    my $showprob_checkbox = 
+        '<input type="checkbox" name="show_prob" value="true" ';
+    if ($ENV{'form.show_prob'} eq 'true') {
+        $showprob_checkbox .= 'checked ';
+    }
+    $showprob_checkbox.= ' />';
+    $Str.= '<nobr><label>'.
+        &mt('Show problem [_1]',$showprob_checkbox).
+        '</label></nobr><br />';
+    ##
+    my $analyze_selector = '<select name="AnalyzeOver" >';
+    $analyze_selector .= '<option value="Tries" ';
+    if (! exists($ENV{'form.AnalyzeOver'}) || 
+        $ENV{'form.AnalyzeOver'} eq 'Tries'){
+        # Default to Tries
+        $analyze_selector .= ' selected ';
+    }
+    $analyze_selector .= '>'.&mt('Tries').'</option>';
+    $analyze_selector .= '<option value="Time" ';
+    $analyze_selector .= ' selected ' if ($ENV{'form.AnalyzeOver'} eq 'Time');
+    $analyze_selector .= '>'.&mt('Time').'</option>';
+    $analyze_selector .= '</select>';
+    $Str .= '<nobr><label>'.
+        &mt('Analyze Over [_1] [_2]',
+            $analyze_selector,
+            &Apache::loncommon::help_open_topic('Analysis_Analyze_Over')).
+            '</label></nobr><br />'.$/;
+    ##
+    my $numplots_selector = '<select name="NumPlots">';
+    if (! exists($ENV{'form.NumPlots'}) 
+        || $ENV{'form.NumPlots'} < 1 
+        || $ENV{'form.NumPlots'} > 20) {
+        $ENV{'form.NumPlots'} = 5;
+    }
+    foreach my $i (1,2,3,4,5,6,7,8,10,15,20) {
+        $numplots_selector .= '<option value="'.$i.'" ';
+        if ($ENV{'form.NumPlots'} == $i) { $numplots_selector.=' selected '; }
+        $numplots_selector .= '>'.$i.'</option>';
+    }
+    $numplots_selector .= '</select></nobr><br />';
+    $Str .= '<nobr><label>'.&mt('Number of Plots [_1]',$numplots_selector).
+        '</label></nobr>';
+    ##
+    $Str .= '<nobr><label>'.&mt('Status: [_1]',
                                  '<input type="text" '.
                                  'name="stats_status" size="60" value="" />'
                                  ).
-                    '</nobr><br />';
-        }
-    }
+                    '</label></nobr>';
     $Str .= '</td>';
     ##
     ##