--- loncom/interface/statistics/lonstudentassessment.pm 2011/10/05 18:56:00 1.164 +++ loncom/interface/statistics/lonstudentassessment.pm 2012/05/12 03:42:01 1.169.2.1 @@ -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.169.2.1 2012/05/12 03:42:01 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -51,7 +51,6 @@ package Apache::lonstudentassessment; use strict; use Apache::lonstatistics(); -use Apache::lonquickgrades(); use Apache::lonhtmlcommon(); use Apache::loncommon(); use Apache::loncoursedata; @@ -168,7 +167,6 @@ sub BuildStudentAssessmentPage { return; } $r->print(&Apache::lonhtmlcommon::breadcrumbs('Chart','Chart_Description:Chart_Sections:Chart_Student_Data:Chart_Enrollment_Status:Chart_Sequences:Chart_Output_Formats:Chart_Output_Data')); - &Apache::lonquickgrades::startGradeScreen($r,'chart'); # # Print out the HTML headers for the interface @@ -364,10 +362,6 @@ sub CreateInterface { $Str .= &CreateAndParseOutputDataSelector(); $Str .= ''."\n"; $Str .= ''."\n"; - $Str .= '

' - .&mt('Status:').' ' - .'' - .'

'; $Str .= ''; $Str .= ' 'x5; @@ -751,8 +745,6 @@ NEW_WINDOW_CHECKBOX $total_sum_width = length($total_count)+1; $Str .= " total\n"; $Str .= "
";
-    $r->print($Str);
-    $r->rflush();
 
     $r->print(<
@@ -813,13 +805,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 +836,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;
@@ -1184,7 +1177,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 +1201,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 +1450,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');
@@ -1674,10 +1664,7 @@ END
     #
     # 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');