--- loncom/interface/statistics/lonstudentassessment.pm 2011/10/05 18:56:00 1.164 +++ loncom/interface/statistics/lonstudentassessment.pm 2012/12/16 16:59:34 1.171 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstudentassessment.pm,v 1.164 2011/10/05 18:56:00 raeburn Exp $ +# $Id: lonstudentassessment.pm,v 1.171 2012/12/16 16:59:34 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -364,10 +364,6 @@ sub CreateInterface { $Str .= &CreateAndParseOutputDataSelector(); $Str .= ''."\n"; $Str .= ''."\n"; - $Str .= '
' - .&mt('Status:').' ' - .'' - .'
'; $Str .= ''; $Str .= ' 'x5; @@ -751,8 +747,6 @@ NEW_WINDOW_CHECKBOX $total_sum_width = length($total_count)+1; $Str .= " total\n"; $Str .= ""; - $r->print($Str); - $r->rflush(); $r->print(<@@ -813,13 +807,13 @@ JS } # # Initialize progress window - %prog_state=&Apache::lonhtmlcommon::Create_PrgWin - ($r,'HTML Chart Status', - 'HTML Chart Progress', $studentcount, - 'inline',undef,'Statistics','stats_status'); # + %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$studentcount); &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state, 'Processing first student'); + $r->print($Str); + $r->rflush(); + return; } @@ -844,6 +838,7 @@ sub html_outputstudent { if ($field eq 'comments') { $title = ''.&mt('Comments').''; } + utf8::decode($title); my $base = length($title); my $width=$Apache::lonstatistics::StudentData{$field}->{'width'}; $Str .= $title.' 'x($width-$base).$padding; @@ -1125,7 +1120,7 @@ sub excel_initialize { } my $too_many_cols_error_message = ' '.&mt('Unable to Complete Request').'
'.$/. - ''.&mt('LON-CAPA is unable to produce your Excel spreadsheet because your selections will result in more than 255 columns. Excel allows only 255 columns in a spreadsheet.').'
'.$/. + ''.&mt('LON-CAPA is unable to produce your Excel spreadsheet because your selections will result in more than 255 columns. Excel allows only 255 columns in a spreadsheet.').'
'.$/. ''.&mt('You may consider reducing the number of Sequences or Folders you have selected.').'
'.$/. ''.&mt('LON-CAPA can produce CSV files of this data or Excel files of the Scores Summary data.').'
'.$/; if ($chosen_output->{'base'} eq 'tries' && $total_columns > 255) { @@ -1184,7 +1179,7 @@ sub excel_initialize { my $sectionstring = ''; my @Sections = &Apache::lonstatistics::get_selected_sections(); $excel_sheet->write($header_row,$cols_output++, - &Apache::lonstatistics::section_and_enrollment_description('plaintext'), + &Apache::lonstatistics::section_and_enrollment_description('localized'), $format->{'h3'}); # # Put the date in there too @@ -1208,7 +1203,7 @@ sub excel_initialize { # Add the student headers $cols_output = 0; foreach my $field (&get_student_fields_to_show()) { - $excel_sheet->write($resource_name_row,$cols_output++,$field, + $excel_sheet->write($resource_name_row,$cols_output++,&mt($field), $format->{'bold'}); } # @@ -1457,10 +1452,7 @@ sub excel_initialize { $r->rflush(); # # Initialize progress window - %prog_state=&Apache::lonhtmlcommon::Create_PrgWin - ($r,'Excel File Compilation Status', - 'Excel File Compilation Progress', $studentcount, - 'inline',undef,'Statistics','stats_status'); + %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$studentcount); # &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state, 'Processing first student'); @@ -1662,22 +1654,20 @@ sub csv_initialize{ # Deal with unimplemented requests $request_aborted = undef; if ($chosen_output->{'base'} =~ /final table/) { - $r->print(<Unable to Complete Request - -The Summary Table (Scores) option is not available for non-HTML output. -
-END + $r->print( + ''.&mt('Unable to Complete Request').'
' + .'' + .&mt('The [_1]Summary Table (Scores)[_2] option' + .' is not available for non-HTML output.','','') + .'
' + ); $request_aborted = 1; } return if ($request_aborted); # # Initialize progress window my $studentcount = scalar(@Apache::lonstatistics::Students); - %prog_state=&Apache::lonhtmlcommon::Create_PrgWin - ($r,'CSV File Compilation Status', - 'CSV File Compilation Progress', $studentcount, - 'inline',undef,'Statistics','stats_status'); + %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$studentcount); # # Open a file ($outputfile,$filename) = &Apache::loncommon::create_text_file($r,'csv');