--- loncom/interface/statistics/lonsurveyreports.pm	2008/10/23 09:07:51	1.18
+++ loncom/interface/statistics/lonsurveyreports.pm	2011/12/21 21:25:51	1.26
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonsurveyreports.pm,v 1.18 2008/10/23 09:07:51 bisitz Exp $
+# $Id: lonsurveyreports.pm,v 1.26 2011/12/21 21:25:51 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,6 +30,7 @@ use strict;
 use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
+use Apache::lonquickgrades();
 use Apache::loncoursedata();
 use Apache::lonstatistics;
 use Apache::lonlocal;
@@ -63,10 +64,13 @@ 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'));
+    &Apache::lonquickgrades::startGradeScreen($r,'statistics');
+
     #
     $r->print(&CreateInterface());
     #
@@ -98,7 +102,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();
@@ -133,7 +137,10 @@ sub BuildSurveyReportsPage {
             $r->print('<h1>'.$resource->compTitle.'</h1>');
             $r->print('<h3>'.$resource->src.'</h3>');
             if ($env{'form.renderprob'} eq 'true') {
-                $r->print(&Apache::lonstathelpers::render_resource($resource));
+                $r->print('<hr />'
+                         .&Apache::lonstathelpers::render_resource($resource)
+                         .'<hr />'
+                );
             }
             $r->rflush();
             my %Data = &Apache::lonstathelpers::get_problem_data
@@ -174,7 +181,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;
                 }
@@ -201,17 +208,17 @@ sub SurveyProblemSelector {
               resptype=>undef});
         my $checked = '';
         if ($env{'form.problemchoice'} eq $value) {
-            $checked = 'checked ';
+            $checked = 'checked="checked" ';
         }
         my $link = $problem->{'res'}->link.
             '?symb='.&escape($problem->{'res'}->shown_symb);
         $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;
@@ -227,10 +234,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);
@@ -272,8 +276,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;
@@ -336,7 +339,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;
@@ -566,15 +569,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();
         }
@@ -613,23 +621,23 @@ sub CreateInterface {
                                 ) {
         $output_selector.='<option value="'.$output_format->{'name'}.'"';
         if ($env{'form.output'} eq $output_format->{'name'}) {
-            $output_selector.=' selected';
+            $output_selector.=' selected="selected"';
         }
         $output_selector.= '>'.$output_format->{'text'}.'</option>'.$/;
     }
     $output_selector .= '</select>'.$/;
-    $Str .= &Apache::lonhtmlcommon::breadcrumbs('Student Submission Reports');
     $Str .= '<p>';
-    $Str .= '<table cellspacing="5">'."\n";
-    $Str .= '<tr>';
+    $Str .= &Apache::loncommon::start_data_table();
+    $Str .= &Apache::loncommon::start_data_table_header_row();
     $Str .= '<th>'.&mt('Sections').'</th>';
     $Str .= '<th>'.&mt('Groups').'</th>';
     $Str .= '<th>'.&mt('Access Status').'</th>';
     $Str .= '<th>'.&mt('Output Format').'</th>';
-    $Str .= '<th>'.'&nbsp;'.'</th>';
-    $Str .= '</tr>'."\n";
+    $Str .= '<th>'.&mt('Options').'</th>';
+    $Str .= &Apache::loncommon::end_data_table_header_row();
     #
-    $Str .= '<tr><td align="center">'."\n";
+    $Str .= &Apache::loncommon::start_data_table_row();
+    $Str .= '<td align="center">'."\n";
     $Str .= &Apache::lonstatistics::SectionSelect('Section','multiple',5);
     $Str .= '</td>';
     #
@@ -646,23 +654,19 @@ sub CreateInterface {
     # 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 .= '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 .= '</tr>'."\n";
-    $Str .= '</table>'."\n";
-    #
-    $Str .= '<p><span class="LC_nobreak">'
-           .&mt('Status: [_1]',
-                    '<input type="text" name="stats_status"'
-                   .' size="60" value="" readonly="readonly" />')
-           .'</span></p>';
+    $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>';
     ##
     return $Str;