Preparing Excel Spreadsheet
"); + $r->print(''.&mt('Preparing Excel Spreadsheet').'
'); &output_excel($r); } else { - $r->print("Not implemented
"); + $r->print(''.&mt('Not implemented').'
'); } return; } @@ -598,9 +515,9 @@ sub output_excel { # Check for errors if (! defined($excel_workbook)) { $r->log_error("Error creating excel spreadsheet $filename: $!"); - $r->print("Problems creating new Excel file. ". + $r->print(&mt("Problems creating new Excel file. ". "This error has been logged. ". - "Please alert your LON-CAPA administrator"); + "Please alert your LON-CAPA administrator.")); return ; } # @@ -615,7 +532,9 @@ sub output_excel { if (length($sheetname) > 31) { $sheetname = substr($sheetname,0,31); } - $excel_sheet = $excel_workbook->addworksheet($sheetname); + $excel_sheet = $excel_workbook->addworksheet( + &Apache::loncommon::clean_excel_name($sheetname) + ); # # Put the course description in the header $excel_sheet->write($rows_output,$cols_output++, @@ -649,9 +568,23 @@ sub output_excel { $rows_output++; $cols_output=0; # - # Add the headers + # Long Headersheaders + foreach my $field (@Fields) { + next if ($field->{'name'} eq 'problem_num'); + if (exists($field->{'long_title'})) { + $excel_sheet->write($rows_output,$cols_output++, + $field->{'long_title'}); + } else { + $excel_sheet->write($rows_output,$cols_output++,''); + } + } + $rows_output++; + $cols_output=0; + # Brief headers foreach my $field (@Fields) { next if ($field->{'name'} eq 'problem_num'); + # Use english for excel as I am not sure how well excel handles + # other character sets.... $excel_sheet->write($rows_output,$cols_output++,$field->{'title'}); } $rows_output++; @@ -685,7 +618,8 @@ sub output_excel { $excel_workbook->close(); # Tell the user where to get their excel file $r->print(''. - 'Your Excel spreadsheet.'."\n"); + ''. + &mt('Your Excel Spreadsheet').''."\n"); $r->rflush(); return; } @@ -714,8 +648,7 @@ sub statistics_html_table_data { } $row .= '>'; if (exists($field->{'special'}) && $field->{'special'} eq 'link') { - $row .= ''; + $row .= ''; } if (exists($field->{'format'})) { $row .= sprintf($field->{'format'},$data->{$field->{'name'}}); @@ -742,7 +675,7 @@ sub statistics_table_header { 'document.Statistics.sortby.value='."'".$field->{'name'}."'". ';document.Statistics.submit();">'; } - $header_row .= $field->{'title'}; + $header_row .= &mt($field->{'title'}); if ($options =~ /sortable/) { $header_row.= ''; } @@ -753,7 +686,7 @@ sub statistics_table_header { $header_row .= ''; - $header_row .= 'plot)'; + $header_row .= &mt('plot').')'; } $header_row .= ''; } @@ -786,7 +719,6 @@ sub plot_statistics { } } return if (! defined($sortfield) || $sortfield eq ''); - &Apache::lonnet::logthis('data field = '.$datafield); # my $Max = 0; my $problem_num = 0; @@ -836,8 +768,13 @@ sub plot_statistics { } } - $r->print("
".&DrawGraph(\@Data,$title,'Problem Number',$yaxis, - $Max)."
\n"); + $r->print("".&Apache::loncommon::DrawBarGraph($title, + 'Problem Number', + $yaxis, + $Max, + undef, # colors + undef, # labels + \@Data)."
\n"); # # Print out the data $ENV{'form.sortby'} = 'Contents'; @@ -845,52 +782,22 @@ sub plot_statistics { return; } -############################################### -############################################### - -=pod - -=item &DrawGraph() - -=cut - -############################################### -############################################### -sub DrawGraph { - my ($values,$title,$xaxis,$yaxis,$Max)=@_; - $title = '' if (! defined($title)); - $xaxis = '' if (! defined($xaxis)); - $yaxis = '' if (! defined($yaxis)); - # - my $sendValues = join(',', @$values); - my $sendCount = scalar(@$values); - $Max =1 if ($Max < 1); - if ( int($Max) < $Max ) { - $Max++; - $Max = int($Max); - } - my @GData = ($title,$xaxis,$yaxis,$Max,$sendCount,$sendValues); - return ').')
';
-}
-
sub get_statistics {
my ($sequence,$resource,$part,$problem_num) = @_;
#
my $symb = $resource->{'symb'};
my $courseid = $ENV{'request.course.id'};
#
- my $students = \@Apache::lonstatistics::Students;
- if ($Apache::lonstatistics::SelectedSections[0] eq 'all') {
- $students = undef;
- }
my $data = &Apache::loncoursedata::get_problem_statistics
- ($students,$symb,$part,$courseid);
+ (\@Apache::lonstatistics::SelectedSections,
+ $Apache::lonstatistics::enrollment_status,
+ $symb,$part,$courseid);
$data->{'part'} = $part;
$data->{'problem_num'} = $problem_num;
$data->{'container'} = $sequence->{'title'};
$data->{'title'} = $resource->{'title'};
- $data->{'title.link'} = $resource->{'src'};
+ $data->{'title.link'} = $resource->{'src'}.'?symb='.
+ &Apache::lonnet::escape($resource->{'symb'});
#
return $data;
}
@@ -902,6 +809,8 @@ sub get_statistics {
=item &ProblemStatisticsLegend()
+HELP This needs to be localized, or at least generated automatically.
+
=cut
###############################################