--- loncom/interface/Attic/lonspreadsheet.pm 2003/02/17 16:29:51 1.172 +++ loncom/interface/Attic/lonspreadsheet.pm 2003/03/03 22:00:03 1.173 @@ -1,5 +1,5 @@ # -# $Id: lonspreadsheet.pm,v 1.172 2003/02/17 16:29:51 matthew Exp $ +# $Id: lonspreadsheet.pm,v 1.173 2003/03/03 22:00:03 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -3198,20 +3198,12 @@ sub loadcourse { foreach ($self->rows()) { $total++ if ($formulas{'A'.$_} !~ /^[!~-]/); } - my $now=0; - my $since=time; - $r->print(< - popwin=open('','popwin','width=400,height=100'); - popwin.document.writeln(''+ - '

Spreadsheet Calculation Progress

'+ - '
'+ - '
'+ - ''); - popwin.document.close(); - -ENDPOP - $r->rflush(); + + my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r, + 'Spreadsheet Status','Spreadsheet Calculation Progress', $total); + &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state, + 'Processing Course Assessment Data'); + # It would be nice to load in the classlist and assessment info at this # point, before attacking the student spreadsheets. foreach my $row ($self->rows()) { @@ -3225,13 +3217,8 @@ ENDPOP my @studentdata=$self->exportsheet($sname,$sdom,'studentcalc', undef,undef,$r); undef %userrdatas; - $now++; - $r->print(''); - $r->rflush(); - # + &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, + 'last student'); my $index=0; foreach ('A','B','C','D','E','F','G','H','I','J','K','L','M', 'N','O','P','Q','R','S','T','U','V','W','X','Y','Z') { @@ -3251,8 +3238,7 @@ ENDPOP } $self->formulas(\%formulas); $self->constants(\%constants); - $r->print(''); - $r->rflush(); + &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); } # ------------------------------------------------ Load data for one assessment