Diff for /loncom/interface/spreadsheet/classcalc.pm between versions 1.19 and 1.22

version 1.19, 2004/04/26 14:06:00 version 1.22, 2005/03/10 17:33:57
Line 90  sub html_header { Line 90  sub html_header {
         $toprow .= '<th align="center"><b>'.&mt($name).'</b></th>';          $toprow .= '<th align="center"><b>'.&mt($name).'</b></th>';
         $bottomrow .= '<td>'.$selector.'</td>';          $bottomrow .= '<td>'.$selector.'</td>';
     }      }
       my $status .= '<nobr>'.&mt('Status: [_1]',
                               '<input type="text" '.
                               'name="spreadsheet_status" size="60" value="" />'
                               ).'</nobr>';
   
     return "<p>\n<table>\n".      return "<p>\n<table>\n".
         "<tr>".$toprow."</tr>\n".          "<tr>".$toprow."</tr>\n".
         "<tr>".$bottomrow."</tr>\n".          "<tr>".$bottomrow."</tr>\n".
         "</table>\n</p>";          "</table>\n".$status."\n".
           "</p>";
 }  }
   
 sub get_title {  sub get_title {
Line 222  sub excel_rows { Line 228  sub excel_rows {
     # writes the meat of the spreadsheet to an excel worksheet.  Called      # writes the meat of the spreadsheet to an excel worksheet.  Called
     # by Spreadsheet::outsheet_excel;      # by Spreadsheet::outsheet_excel;
     my $self = shift;      my $self = shift;
     my ($connection,$worksheet,$cols_output,$rows_output) = @_;      my ($connection,$worksheet,$cols_output,$rows_output,$format) = @_;
     #      #
     # Write a header row      # Write a header row
     $cols_output = 0;      $cols_output = 0;
     foreach my $value ('Fullname','Username','Domain','Section','Status','ID') {      foreach my $value ('Fullname','Username','Domain','Section','Status','ID') {
         $worksheet->write($rows_output,$cols_output++,&mt($value));          $worksheet->write($rows_output,$cols_output++,&mt($value),$format->{'h4'});
     }      }
     $rows_output++;          $rows_output++;    
     #      #
Line 368  END Line 374  END
     return;      return;
 }  }
   
   sub update_status {
       my ($r,$message) = @_;
       $r->print('<script>'.
                 'window.document.sheet.spreadsheet_status.value="'.
                 $message.
                 '";</script>');
       $r->rflush();
       return;
   }
   
 sub compute {  sub compute {
     my $self = shift;      my $self = shift;
     my ($r) = @_;      my ($r) = @_;
Line 376  sub compute { Line 392  sub compute {
     $self->initialize_safe_space();      $self->initialize_safe_space();
     my %c = $self->constants();      my %c = $self->constants();
     my %f = $self->formulas();      my %f = $self->formulas();
       &update_status($r,'Initializing Course Structure');
       &Apache::studentcalc::initialize_package();
     my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin      my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
         ($r,&mt('Spreadsheet Computation Status'),          ($r,&mt('Spreadsheet Computation Status'),
          &mt('Spreadsheet Computation'), scalar(@Students));           &mt('Spreadsheet Computation'), scalar(@Students),'inline',undef,
     &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,           'sheet','spreadsheet_status');
                                           &mt('Processing course structure'));  
     &Apache::studentcalc::initialize_package();  
     &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,      &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
                                           &mt('Processing first student'));                                            &mt('Processing first student'));
     foreach my $student (@Students) {      foreach my $student (@Students) {
Line 412  sub compute { Line 428  sub compute {
                                                  'last student');                                                   'last student');
     }      }
     &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);      &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
       &update_status($r,'Done computing student sheets');
     $r->rflush();      $r->rflush();
     $self->constants(\%c);      $self->constants(\%c);
     $self->formulas(\%f);      $self->formulas(\%f);
     $self->calcsheet();      $self->calcsheet();
     $self->save() if ($self->need_to_save());      $self->save() if ($self->need_to_save());
       &update_status($r,'Done!');
 }  }
   
 1;  1;

Removed from v.1.19  
changed lines
  Added in v.1.22


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>