--- loncom/interface/statistics/lonproblemstatistics.pm 2011/12/21 21:25:51 1.120 +++ loncom/interface/statistics/lonproblemstatistics.pm 2012/05/03 11:21:33 1.122 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonproblemstatistics.pm,v 1.120 2011/12/21 21:25:51 www Exp $ +# $Id: lonproblemstatistics.pm,v 1.122 2012/05/03 11:21:33 goltermann Exp $ # # Copyright Michigan State University Board of Trustees # @@ -741,17 +741,17 @@ sub BuildProblemStatisticsPage { return; } if (exists($env{'form.Excel'})) { - $r->print('

'. + $r->print('

'. &Apache::lonstatistics::section_and_enrollment_description(). - '

'); + '

'); &Excel_output($r); } else { $r->print(''.' 'x5); $r->rflush(); - $r->print('

'. + $r->print('

'. &Apache::lonstatistics::section_and_enrollment_description(). - '

'); + '

'); my $count = 0; foreach my $seq (@sequences) { my @resources = @@ -795,17 +795,15 @@ sub output_sequence_statistics { $r->print('

'.&mt('Sequence Statistics'). &Apache::loncommon::help_open_topic('Statistics_Sequence'). '

'); - $r->print('
'."\n". - ''."\n". - ''); + $r->print(&Apache::loncommon::start_data_table().&Apache::loncommon::start_data_table_header_row()); $r->print(&sequence_html_header()); + $r->print(&Apache::loncommon::end_data_table_header_row()); foreach my $seq (@sequences) { last if ($c->aborted); &compute_sequence_statistics($seq); $r->print(&sequence_html_output($seq)); } - $r->print('
'); - $r->print('
'); + $r->print(&Apache::loncommon::end_data_table()); $r->rflush(); return; } @@ -821,22 +819,22 @@ sub output_sequence_statistics { sub output_html_by_sequence { my ($r) = @_; my $c = $r->connection(); - $r->print(&html_preamble()); + $r->print('
'.&html_preamble()); # foreach my $seq (@sequences) { last if ($c->aborted); $r->print("

".$seq->compTitle."

". - '
'."\n". - ''."\n". - ''. - &statistics_table_header('no container')."\n"); + &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(). + &statistics_table_header('no container'). + &Apache::loncommon::end_data_table_header_row()."\n"); my @Data = &compute_statistics_on_sequence($seq); foreach my $data (@Data) { - $r->print(''.&statistics_html_table_data($data, - 'no container'). - "\n"); + $r->print(&Apache::loncommon::start_data_table_row(). + &statistics_html_table_data($data,'no container'). + &Apache::loncommon::end_data_table_row()."\n"); } - $r->print('
'."\n".'
'."\n"); + $r->print(&Apache::loncommon::end_data_table()."\n"); $r->rflush(); } return; @@ -851,17 +849,17 @@ sub output_html_stats { my $count=0; foreach my $data (@StatsArray) { if ($count++ % 50 == 0) { - $r->print("\n\n"); - $r->print('
'."\n". - ''."\n". - ''. - ''. - &statistics_table_header(). - "\n"); - } - $r->print(''.&statistics_html_table_data($data)."\n"); + $r->print(&Apache::loncommon::end_data_table()); + $r->print(&Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_row(). + &statistics_table_header(). + &Apache::loncommon::end_data_table_row()); + } + $r->print(&Apache::loncommon::start_data_table_row(). + &statistics_html_table_data($data). + &Apache::loncommon::end_data_table_row()); } - $r->print("
\n
\n"); + $r->print(&Apache::loncommon::end_data_table_row()); return; } @@ -878,8 +876,8 @@ sub html_preamble { &Apache::lonlocal::locallocaltime($endtime) ).''; } - $Str .= "

".&mt('Compiled on [_1]', - &Apache::lonlocal::locallocaltime(time))."

"; + $Str .= "

".&mt('Compiled on [_1]', + &Apache::lonlocal::locallocaltime(time))."

"; return $Str; } @@ -897,7 +895,7 @@ sub statistics_html_table_data { foreach my $field (@Fields) { next if ($options =~ /no $field->{'name'}/); next if ($field->{'selected'} ne 'yes'); - $row .= '{'color'}.'"'; if (exists($field->{'align'})) { $row .= ' align="'.$field->{'align'}.'"'; } @@ -1589,7 +1587,6 @@ sub get_statistics { $data->{'sections'}=$sections; $data->{'course'} = $env{'request.course.id'}; my $urlres=(&Apache::lonnet::decode_symb($resource->symb))[2]; - $data->{'urlres'}=$urlres; my %storestats = &LONCAPA::lonmetadata::dynamic_metadata_storage($data); my ($dom,$user) = ($urlres=~m{^($LONCAPA::domain_re)/($LONCAPA::username_re)});