--- loncom/interface/statistics/lonstathelpers.pm 2009/05/06 16:19:42 1.59 +++ 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 2009/05/06 16:19:42 bisitz 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\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 .= ''. - qq{}. + $seq_str .= &Apache::loncommon::start_data_table_row(). + ($symbmode? + '' + :qq{}). ''. '\n"; + $seq_str .= "". &Apache::loncommon::end_data_table_row()."\n"; $rb_count++; } } } } if ($seq_str ne '') { - $Str .= ''. - ''. - "\n".$seq_str; + $Str .= &Apache::loncommon::start_data_table_header_row(). + ''. + &Apache::loncommon::end_data_table_header_row()."\n".$seq_str; if (defined($sequence_addendum)) { - $Str .= ''. + $Str .= &Apache::loncommon::start_data_table_header_row(). (''x2). ''. - "\n"; + &Apache::loncommon::end_data_table_header_row()."\n"; } } } - $Str .= "
'; if (scalar(@response_ids) > 1) { @@ -174,25 +176,25 @@ sub problem_selector { my $link = $res->link.'?symb='.&escape($res->shown_symb); $seq_str .= (' 'x2). ''.&mt('view').''; - $seq_str .= "
 '.$seq->compTitle.'
'.$seq->compTitle.'
 '.$sequence_addendum.'
\n"; + $Str .= &Apache::loncommon::end_data_table()."\n"; return $Str; } @@ -464,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, @@ -609,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; }