--- loncom/interface/statistics/lonstathelpers.pm	2010/09/11 19:08:23	1.59.12.1
+++ loncom/interface/statistics/lonstathelpers.pm	2010/06/10 16:14:39	1.62
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstathelpers.pm,v 1.59.12.1 2010/09/11 19:08:23 raeburn Exp $
+# $Id: lonstathelpers.pm,v 1.62 2010/06/10 16:14:39 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -135,9 +135,9 @@ Skips 'survey' problems.
 ####################################################
 ####################################################
 sub problem_selector {
-    my ($AcceptedResponseTypes,$sequence_addendum) = @_;
+    my ($AcceptedResponseTypes,$sequence_addendum,$symbmode) = @_;
     my $Str;
-    $Str = "\n<table>\n";
+    $Str = &Apache::loncommon::start_data_table();
     my $rb_count =0;
     my ($navmap,@sequences) = 
         &Apache::lonstatistics::selected_sequences_with_assessments('all');
@@ -164,8 +164,10 @@ sub problem_selector {
                         if (! defined($title) || $title eq '') {
                             ($title) = ($res->src =~ m:/([^/]*)$:);
                         }
-                        $seq_str .= '<tr>'.
-                            qq{<td><input type="radio" id="$rb_count" name="problemchoice" value="$value"$checked /></td>}.
+                        $seq_str .=  &Apache::loncommon::start_data_table_row().
+                            ($symbmode?
+                             '<td><input type="radio" id="'.$rb_count.'" name="symb" value="'.&HTML::Entities::encode($res->symb,'<>&"').'" '.$checked.' /></td>'
+                            :qq{<td><input type="radio" id="$rb_count" name="problemchoice" value="$value"$checked /></td>}).
                             '<td><label for="'.$rb_count.'">'.$resptype.'</label></td>'.
                             '<td><label for="'.$rb_count.'">'.$title.'</label>';
                         if (scalar(@response_ids) > 1) {
@@ -174,25 +176,25 @@ sub problem_selector {
                         my $link = $res->link.'?symb='.&escape($res->shown_symb);
                         $seq_str .= ('&nbsp;'x2).
                             '<a target="preview" href="'.$link.'">'.&mt('view').'</a>';
-                        $seq_str .= "</td></tr>\n";
+                        $seq_str .= "</td>". &Apache::loncommon::end_data_table_row()."\n";
                         $rb_count++;
                     }
                 }
             }
         }
         if ($seq_str ne '') {
-            $Str .= '<tr><td>&nbsp;</td>'.
-                '<td colspan="2"><b>'.$seq->compTitle.'</b></td>'.
-                "</tr>\n".$seq_str;
+            $Str .= &Apache::loncommon::start_data_table_header_row().
+                '<th colspan="3">'.$seq->compTitle.'</th>'.
+                &Apache::loncommon::end_data_table_header_row()."\n".$seq_str;
             if (defined($sequence_addendum)) {
-                $Str .= '<tr>'.
+                $Str .= &Apache::loncommon::start_data_table_header_row().
                     ('<td>&nbsp;</td>'x2).
                     '<td align="right">'.$sequence_addendum.'</td>'.
-                    "</tr>\n";
+                    &Apache::loncommon::end_data_table_header_row()."\n";
             }
         }
     }
-    $Str .= "</table>\n";
+    $Str .= &Apache::loncommon::end_data_table()."\n";
     return $Str;
 }
 
@@ -262,29 +264,14 @@ END
         ('&nbsp;'x4).
         '<a href="javascript:checkall(false)">'.&mt('Unselect All').'</a>';
     $Str .= $/.'<table>'.$/;
-    my ($iterator,$sequence_string,@Accumulator);
+    my $iterator = $navmap->getIterator(undef, undef, undef, 1);
+    my $sequence_string;
     my $seq_id = 0;
-    if (&Apache::loncommon::needs_gci_custom()) {
-        my $cdom = $env{'course.'.$cid.'.domain'};
-        my $cnum = $env{'course.'.$cid.'.num'};
-        my $mapurl = "/uploaded/$cdom/$cnum/default_1261144274.sequence";
-        my $map = $navmap->getResourceByUrl($mapurl);
-        my $firstResource = $map->map_start();
-        my $lastResource = $map->map_finish();
-        $iterator = $navmap->getIterator($firstResource,$lastResource,undef,1);
-        @Accumulator = (&new_accumulator($map->compTitle,
-                                         $map->src,
-                                         $map->symb,
-                                         $seq_id++,
-                                         $inputname));
-    } else {
-        $iterator = $navmap->getIterator(undef, undef, undef, 1);
-        @Accumulator = (&new_accumulator($env{'course.'.$cid.'.description'},
-                                         '',
-                                         '',
-                                         $seq_id++,
-                                         $inputname));
-    }
+    my @Accumulator = (&new_accumulator($env{'course.'.$cid.'.description'},
+                                        '',
+                                        '',
+                                        $seq_id++,
+                                        $inputname));
     my @Sequence_Data;
     while (my $curRes = $iterator->next()) {
         if ($curRes == $iterator->END_MAP) {
@@ -479,7 +466,8 @@ sub get_prev_curr_next {
         my @resources = &get_resources($navmap,$seq);
         foreach my $res (@resources) {
             foreach my $part (@{$res->parts}) {
-                if ($res->is_survey($part) && ($granularity eq 'part_survey')){
+                if (($res->is_survey($part) || ($res->is_anonsurvey($part))) && 
+                    ($granularity eq 'part_survey')) {
                     push (@Resource,
                           { symb     => $res->symb,
                             part     => $part,
@@ -624,7 +612,7 @@ sub GetStudentAnswers {
         my $answer = &Apache::lonstathelpers::get_student_answer
             ($resource,$sname,$sdom,$partid,$respid);
         &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
-                                                 &mt('last student'));
+                                                     'last student');
         $answers{$answer}++;
         $student->{'answer'} = $answer;
     }