--- loncom/interface/statistics/lonsurveyreports.pm	2005/06/28 20:01:17	1.9
+++ loncom/interface/statistics/lonsurveyreports.pm	2006/08/18 15:15:38	1.14
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonsurveyreports.pm,v 1.9 2005/06/28 20:01:17 albertel Exp $
+# $Id: lonsurveyreports.pm,v 1.14 2006/08/18 15:15:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,6 +37,9 @@ use Apache::lonstathelpers;
 use Spreadsheet::WriteExcel;
 use HTML::Entities();
 use Time::Local();
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+ 
 
 my @SubmitButtons = (
                      { name => 'break'},
@@ -201,12 +204,12 @@ sub SurveyProblemSelector {
             $checked = 'checked ';
         }
         my $link = $problem->{'res'}->src.
-            '?symb='.&Apache::lonnet::escape($problem->{'res'}->symb);
+            '?symb='.&escape($problem->{'res'}->symb);
         $Str .= '<tr><td>'.
             '<input type="radio" name="problemchoice" id="'.$id.'" '.
                    'value="'.$value.'" '.$checked.'/>'.'</td>'.
             '<td><nobr>'.
-            '<label for="'.$id.'">'.$problem->{'res'}->compTitle.'('.$problem->{'seq'}->compTitle.')'.'</lablel>'.
+            '<label for="'.$id.'">'.$problem->{'res'}->compTitle.'('.$problem->{'seq'}->compTitle.')'.'</label>'.
             ('&nbsp;'x2).
             qq{<a target="preview" href="$link">view</a>}.'</td></tr>'.$/;
     }
@@ -249,13 +252,13 @@ sub compile_student_answers {
                     foreach my $response (@responses) {
                         my ($foilid,$option) = 
                             map { 
-                                &Apache::lonnet::unescape($_); 
+                                &unescape($_); 
                             } split('=',$response);
                         $data->{'foil_count'}->{$foilid}++;
                         $data->{'foil_responses'}->{$foilid}->{$option}++;
                     }
                 } elsif ($resptype =~ /^(radiobutton)$/) {
-                    my ($foil,$value) = map { &Apache::lonnet::unescape($_); } split('=',$student_response);
+                    my ($foil,$value) = map { &unescape($_); } split('=',$student_response);
                     $value += 1;  # explicitly increment it...
                     $data->{'foil_responses'}->{$foil}++;
                     $data->{'foil_values'}->{$value}++;
@@ -606,13 +609,13 @@ sub CreateInterface {
         $output_selector.= '>'.$output_format->{'text'}.'</option>'.$/;
     }
     $output_selector .= '</select>'.$/;
-    $Str .= &Apache::lonhtmlcommon::breadcrumbs
-        (undef,'Student Submission Reports');
+    $Str .= &Apache::lonhtmlcommon::breadcrumbs('Student Submission Reports');
     $Str .= '<p>';
     $Str .= '<table cellspacing="5">'."\n";
     $Str .= '<tr>';
     $Str .= '<th>'.&mt('Sections').'</th>';
-    $Str .= '<th>'.&mt('Enrollment Status').'</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";
@@ -621,6 +624,10 @@ sub CreateInterface {
     $Str .= &Apache::lonstatistics::SectionSelect('Section','multiple',5);
     $Str .= '</td>';
     #
+    $Str .= '<td align="center">'."\n";
+    $Str .= &Apache::lonstatistics::GroupSelect('Group','multiple',5);
+    $Str .= '</td>';
+    #
     $Str .= '<td align="center">';
     $Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5);
     $Str .= '</td>';