--- loncom/interface/spreadsheet/classcalc.pm 2010/12/03 21:33:56 1.30
+++ loncom/interface/spreadsheet/classcalc.pm 2011/12/21 21:25:46 1.31
@@ -1,5 +1,5 @@
#
-# $Id: classcalc.pm,v 1.30 2010/12/03 21:33:56 www Exp $
+# $Id: classcalc.pm,v 1.31 2011/12/21 21:25:46 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -91,16 +91,10 @@ sub html_header {
$toprow .= '
'.&mt($name).' | ';
$bottomrow .= ''.$selector.' | ';
}
- my $status .= ''
- .&mt('Status: [_1]',
- '')
- .'
';
-
return "\n
\n".
"".$toprow."
\n".
"".$bottomrow."
\n".
- "
\n".$status."\n".
+ "\n".
"";
}
@@ -386,16 +380,6 @@ END
return;
}
-sub update_status {
- my ($r,$message) = @_;
- $r->print('');
- $r->rflush();
- return;
-}
-
sub compute {
my $self = shift;
my ($r) = @_;
@@ -404,14 +388,9 @@ sub compute {
$self->initialize_safe_space();
my %c = $self->constants();
my %f = $self->formulas();
- &update_status($r,'Initializing Course Structure');
&Apache::studentcalc::initialize_package();
- my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
- ($r,&mt('Spreadsheet Computation Status'),
- &mt('Spreadsheet Computation'), scalar(@Students),'inline',undef,
- 'sheet','spreadsheet_status');
- &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
- &mt('Processing first student'));
+ my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,scalar(@Students));
+ &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Processing first student'));
foreach my $student (@Students) {
if ($connection->aborted()) { $self->cleanup(); return; }
my $sname = $student->{'username'}.':'.$student->{'domain'};
@@ -437,17 +416,14 @@ sub compute {
$c{$cell} = $data;
}
}
- &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);
- &update_status($r,'Done computing student sheets');
$r->rflush();
$self->constants(\%c);
$self->formulas(\%f);
$self->calcsheet();
$self->save() if ($self->need_to_save());
- &update_status($r,'Done!');
}
1;