--- loncom/interface/statistics/lonstudentsubmissions.pm 2011/11/22 01:34:39 1.63.2.3
+++ loncom/interface/statistics/lonstudentsubmissions.pm 2011/12/21 21:25:51 1.66
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstudentsubmissions.pm,v 1.63.2.3 2011/11/22 01:34:39 raeburn Exp $
+# $Id: lonstudentsubmissions.pm,v 1.66 2011/12/21 21:25:51 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -30,6 +30,7 @@ use strict;
use Apache::lonnet;
use Apache::loncommon();
use Apache::lonhtmlcommon();
+use Apache::lonquickgrades();
use Apache::loncoursedata();
use Apache::lonstatistics;
use Apache::lonlocal;
@@ -62,6 +63,8 @@ sub BuildStudentSubmissionsPage {
#
&Apache::lonstatistics::PrepareClasslist();
#
+ $r->print( &Apache::lonhtmlcommon::breadcrumbs('Student Submission Reports'));
+ &Apache::lonquickgrades::startGradeScreen($r,'statistics');
$r->print(&CreateInterface());
#
my @Students = @Apache::lonstatistics::Students;
@@ -872,10 +875,7 @@ sub prepare_excel_output {
}
#
# Populate the worksheet with the student data
- my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
- ($r,'Excel File Compilation Status',
- 'Excel File Compilation Progress',
- scalar(@$Students),'inline',undef,'Statistics','stats_status');
+ my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,scalar(@$Students));
my $max_row = $rows_output;
foreach my $student (@$Students) {
last if ($c->aborted());
@@ -952,8 +952,7 @@ sub prepare_excel_output {
}
}
}
- &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
- 'last student');
+ &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student');
}
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
#
@@ -1066,10 +1065,7 @@ sub prepare_csv_output {
&mt('Generating CSV report of student responses').'');
#
# Progress window
- my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
- ($r,'CSV File Compilation Status',
- 'CSV File Compilation Progress',
- scalar(@$students),'inline',undef,'Statistics','stats_status');
+ my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,scalar(@$students));
$r->rflush();
#
@@ -1219,8 +1215,7 @@ sub prepare_csv_output {
print $outputfile $/;
}
undef(@rows);
- &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
- 'last student');
+ &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student');
}
close($outputfile);
#
@@ -1265,7 +1260,6 @@ sub CreateInterface {
##
## Environment variable initialization
my $Str = '';
- $Str .= &Apache::lonhtmlcommon::breadcrumbs('Student Submission Reports');
$Str .= '
';
$Str .= &Apache::loncommon::start_data_table();
$Str .= &Apache::loncommon::start_data_table_header_row();
@@ -1345,17 +1339,11 @@ sub CreateInterface {
$Str .= &Apache::loncommon::end_data_table_row();
$Str .= &Apache::loncommon::end_data_table();
#
- $Str .= '
' - .&mt('Status: [_1]', - '') - .'
'; - ## return $Str; } sub get_student_columns { - my ($show_named) = @_; + my ($show_named) = @_; my @student_columns; if ($show_named) { @student_columns = @Apache::lonstatistics::SelectedStudentData; @@ -1366,7 +1354,7 @@ sub get_student_columns { @student_columns = ('username'); } return @student_columns; -} +} 1;