');
- $r->print(&Apache::loncommon::start_data_table().&Apache::loncommon::start_data_table_header_row());
+ $r->print(&Apache::loncommon::start_data_table());
$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);
@@ -827,7 +825,7 @@ 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);
@@ -931,14 +929,16 @@ sub statistics_table_header {
next if ($options =~ /no $field->{'name'}/);
next if ($field->{'selected'} ne 'yes');
$header_row .= '
';
+ my $Str .= &Apache::loncommon::start_data_table_header_row();
foreach my $field (@SeqFields) {
# next if ($field->{'selected'} ne 'yes');
$Str .= '
';
+ $Str .= &Apache::loncommon::end_data_table_header_row();
return $Str;
}
@@ -969,7 +969,7 @@ sub sequence_html_header {
sub sequence_html_output {
my ($seq) = @_;
my $data = $SeqStat{$seq->symb};
- my $row = '
';
+ my $row = &Apache::loncommon::start_data_table_row();
foreach my $field (@SeqFields) {
next if ($field->{'selected'} ne 'yes');
$row .= '
write($rows_output,$cols_output++,$time_string);
@@ -1364,7 +1365,7 @@ sub Excel_output {
#
# Put the date in there too
$excel_sheet->write($rows_output,$cols_output++,
- 'Compiled on '.localtime(time));
+ &mt('Compiled on [_1]',&Apache::lonlocal::locallocaltime(time)));
#
$rows_output++;
$cols_output=0;
@@ -1469,8 +1470,9 @@ sub write_headers {
##################################################
sub compute_statistics_on_sequence {
my ($seq) = @_;
+ my $include_tools = 1;
my @Data;
- foreach my $res (&Apache::lonstathelpers::get_resources($navmap,$seq)) {
+ foreach my $res (&Apache::lonstathelpers::get_resources($navmap,$seq,$include_tools)) {
foreach my $part (@{$res->parts}) {
next if (($res->is_survey($part)) || ($res->is_anonsurvey($part))) ;
#
@@ -1648,9 +1650,10 @@ Returns: integer between -1 and 1
###############################################
sub compute_discrimination_factor {
my ($resource,$part,$seq) = @_;
+ my $include_tools = 1;
my $symb = $resource->symb;
my @Resources;
- foreach my $res (&Apache::lonstathelpers::get_resources($navmap,$seq)){
+ foreach my $res (&Apache::lonstathelpers::get_resources($navmap,$seq,$include_tools)){
next if ($res->symb eq $symb);
push (@Resources,$res->symb);
}
@@ -1714,10 +1717,11 @@ sub compute_discrimination_factor {
###############################################
sub compute_sequence_statistics {
my ($seq) = @_;
+ my $include_tools = 1;
my $symb = $seq->symb;
my @Resources;
my $part_count;
- foreach my $res (&Apache::lonstathelpers::get_resources($navmap,$seq)) {
+ foreach my $res (&Apache::lonstathelpers::get_resources($navmap,$seq,$include_tools)) {
push (@Resources,$res->symb);
$part_count += scalar(@{$res->parts});
}