--- loncom/interface/statistics/lonsurveyreports.pm	2005/03/10 00:23:15	1.4
+++ loncom/interface/statistics/lonsurveyreports.pm	2005/03/17 19:02:45	1.6
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonsurveyreports.pm,v 1.4 2005/03/10 00:23:15 matthew Exp $
+# $Id: lonsurveyreports.pm,v 1.6 2005/03/17 19:02:45 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -91,6 +91,9 @@ sub BuildSurveyReportsPage {
         }
         #
         $r->print('<hr />');
+        $r->print('<h4>'.
+                  &Apache::lonstatistics::section_and_enrollment_description().
+                  '</h4>');
         $r->rflush();
         #
         # Determine which problem we are to analyze
@@ -122,10 +125,13 @@ sub BuildSurveyReportsPage {
             my $resource = $current_problem->{'resource'};
             $r->print('<h1>'.$resource->compTitle.'</h1>');
             $r->print('<h3>'.$resource->src.'</h3>');
-            $r->print(&Apache::lonstathelpers::render_resource($resource));
+            if ($ENV{'form.renderprob'} eq 'true') {
+                $r->print(&Apache::lonstathelpers::render_resource($resource));
+            }
             $r->rflush();
             my %Data = &Apache::lonstathelpers::get_problem_data
                 ($resource->src);
+            &Compile_Student_Answers($current_problem,\%Data,\@Students);
             if ($ENV{'form.output'} eq 'HTML' || 
                 ! defined($ENV{'form.output'})) {
                 &make_HTML_report($r,$current_problem,\%Data,\@Students);
@@ -265,7 +271,6 @@ sub Compile_Student_Answers {
 #########################################################
 sub make_Excel_report {
     my ($r,$problem,$problem_data,$students) = @_;
-    &Compile_Student_Answers($problem,$problem_data,$students);
     my ($workbook,$filename,$format) = &Apache::loncommon::create_workbook($r);
     if (! defined($workbook)) { return '';}
     $r->print('<script>'.
@@ -381,8 +386,6 @@ sub make_Excel_report {
 #########################################################
 sub make_HTML_report {
     my ($r,$problem,$ProblemData,$Students) = @_;
-    &Compile_Student_Answers($problem,$ProblemData,$Students);
-    # &output_hash('',$ProblemData);
     my $resource = $problem->{'resource'};
     foreach my $partid (@{$resource->parts}) {
         my @response_ids   = $resource->responseIds($partid);
@@ -529,9 +532,10 @@ sub CreateInterface {
     $Str .= '<p>';
     $Str .= '<table cellspacing="5">'."\n";
     $Str .= '<tr>';
-    $Str .= '<td align="center"><b>'.&mt('Sections').'</b></td>';
-    $Str .= '<td align="center"><b>'.&mt('Enrollment Status').'</b></td>';
-    $Str .= '<td align="center"><b>'.&mt('Output Format').'</b></td>';
+    $Str .= '<th>'.&mt('Sections').'</th>';
+    $Str .= '<th>'.&mt('Enrollment Status').'</th>';
+    $Str .= '<th>'.&mt('Output Format').'</th>';
+    $Str .= '<th>'.'&nbsp;'.'</th>';
     $Str .= '</tr>'."\n";
     #
     $Str .= '<tr><td align="center">'."\n";
@@ -544,6 +548,18 @@ sub CreateInterface {
     #
     $Str .= '<td align="center">'.$output_selector.'</td>';
     #
+    # Render problem checkbox
+    my $prob_checkbox = '<input type="checkbox" name="renderprob" ';
+    if (exists($ENV{'form.renderprob'}) && $ENV{'form.renderprob'} eq 'true') {
+        $prob_checkbox .= 'checked ';
+    }
+    $prob_checkbox .= 'value="true" />';
+    $Str .= '<td align="right" valign="top">'.
+        '<label><b>'.
+        &mt('Show problem [_1]',$prob_checkbox).'</b></label><br />'.
+        '<label><b>'.
+        '</td>';
+    #
     $Str .= '</tr>'."\n";
     $Str .= '</table>'."\n";
     #