--- loncom/interface/statistics/lonsurveyreports.pm	2008/10/30 17:45:25	1.19
+++ loncom/interface/statistics/lonsurveyreports.pm	2012/05/12 03:59:53	1.26.4.1
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonsurveyreports.pm,v 1.19 2008/10/30 17:45:25 bisitz Exp $
+# $Id: lonsurveyreports.pm,v 1.26.4.1 2012/05/12 03:59:53 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -63,10 +63,12 @@ sub BuildSurveyReportsPage {
                                );
     &Apache::loncommon::store_course_settings('survey_reports',
                                               \%Saveable_Parameters);
-    &Apache::loncommon::restore_course_settings('survey_resports',
+    &Apache::loncommon::restore_course_settings('survey_reports',
                                                 \%Saveable_Parameters);
     #
     &Apache::lonstatistics::PrepareClasslist();
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Student Submission Reports'));
+
     #
     $r->print(&CreateInterface());
     #
@@ -98,7 +100,7 @@ sub BuildSurveyReportsPage {
         #
         $r->print('<hr />');
         $r->print('<h4>'.
-                  &Apache::lonlocal::locallocaltime(time).','.
+                  &Apache::lonlocal::locallocaltime(time).', '.
                   &Apache::lonstatistics::section_and_enrollment_description().
                   '</h4>');
         $r->rflush();
@@ -177,7 +179,7 @@ sub SurveyProblemSelector {
         my @resources = &Apache::lonstathelpers::get_resources($navmap,$seq);
         foreach my $res (@resources) {
             foreach my $part (@{$res->parts}) {
-                if ($res->is_survey($part)) {
+                if (($res->is_survey($part)) || ($res->is_anonsurvey($part))) {
                     push(@SurveyProblems,{res=>$res,seq=>$seq,part=>$part});
                     last;
                 }
@@ -211,10 +213,10 @@ sub SurveyProblemSelector {
         $Str .= '<tr><td>'.
             '<input type="radio" name="problemchoice" id="'.$id.'" '.
                    'value="'.$value.'" '.$checked.'/>'.'</td>'.
-            '<td><nobr>'.
+            '<td><span class="LC_nobreak">'.
             '<label for="'.$id.'">'.$problem->{'res'}->compTitle.' ('.$problem->{'seq'}->compTitle.')'.'</label>'.
             ('&nbsp;'x2).
-            '<a target="preview" href="'.$link.'">'.&mt('View survey').'</a>'.'</td></tr>'.$/;
+            '<a target="preview" href="'.$link.'">'.&mt('View survey').'</a></span></td></tr>'.$/;
     }
     $Str .= '</table>';
     return $Str;
@@ -230,10 +232,7 @@ sub SurveyProblemSelector {
 sub compile_student_answers {
     my ($r,$problem,$ProblemData,$Students) = @_;
     my $resource = $problem->{'resource'};
-    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
-        ($r,'Processing Student Submissions',
-         'Processing Student Submissions', 
-         scalar(@$Students),'inline',undef,'Statistics','stats_status');
+    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,scalar(@$Students));
     foreach my $student (@$Students) {
         foreach my $partid (@{$resource->parts}) {
             my @response_ids   = $resource->responseIds($partid);
@@ -275,8 +274,7 @@ sub compile_student_answers {
                 }
             }
         }
-        &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
-                                                 'last student');
+        &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student');
     }
     &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
     return;
@@ -339,7 +337,7 @@ sub make_text_report {
     } else {
         $r->print('<p class="LC_warning">'
                  .&mt('There is no essay or string response data to output for this survey.')
-                 .'</h2>');
+                 .'</p>');
     }
     $r->rflush();
     return;
@@ -569,15 +567,20 @@ sub make_HTML_report {
                             sprintf("%.2f",$count/$total*100).'%</td>'.
                         &Apache::loncommon::end_data_table_row().$/;
                 }
-                $Str .= &Apache::loncommon::start_data_table_row().
-                    '<th>'.&mt('Foil Name').'</th>'.
-                    '<th>'.&mt('Text').'</th>'.
-                    '<th>'.&mt('Freq').'</th>'.
-                    '<th>'.&mt('Percent').'</th>'.
-                    &Apache::loncommon::end_data_table_row().$/.
-                    $tmp;
+                $Str.='<tr>'
+                     .'<td colspan="3">'
+                     .&Apache::loncommon::start_data_table()
+                     .&Apache::loncommon::start_data_table_header_row()
+                     .'<th>'.&mt('Foil Name').'</th>'
+                     .'<th>'.&mt('Text').'</th>'
+                     .'<th>'.&mt('Frequency').'</th>'
+                     .'<th>'.&mt('Percent').'</th>'
+                     .&Apache::loncommon::end_data_table_header_row().$/
+                     .$tmp
+                     .&Apache::loncommon::end_data_table()
+                     .'</td></tr>';
             }
-            $Str.= &Apache::loncommon::end_data_table().'<hr />';
+            $Str.= '</table>';
             $r->print($Str);
             $r->rflush();
         }
@@ -621,7 +624,6 @@ sub CreateInterface {
         $output_selector.= '>'.$output_format->{'text'}.'</option>'.$/;
     }
     $output_selector .= '</select>'.$/;
-    $Str .= &Apache::lonhtmlcommon::breadcrumbs('Student Submission Reports');
     $Str .= '<p>';
     $Str .= &Apache::loncommon::start_data_table();
     $Str .= &Apache::loncommon::start_data_table_header_row();
@@ -653,20 +655,16 @@ sub CreateInterface {
         $prob_checkbox .= 'checked="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 .=
+        '<td valign="top">'
+       .'<label>'
+       .$prob_checkbox.&mt('Show problem')
+       .'</label>'
+       .'</td>';
     #
     $Str .= &Apache::loncommon::end_data_table_row();
     $Str .= &Apache::loncommon::end_data_table();
     #
-    $Str .= '<p><span class="LC_nobreak">'
-           .&mt('Status: [_1]',
-                    '<input type="text" name="stats_status"'
-                   .' size="60" value="" readonly="readonly" />')
-           .'</span></p>';
     $Str .= '</p>';
     ##
     return $Str;