Diff for /loncom/interface/spreadsheet/classcalc.pm between versions 1.20 and 1.26

version 1.20, 2004/06/04 21:43:36 version 1.26, 2006/04/06 20:24:13
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 279  sub output_options { Line 285  sub output_options {
     my $self = shift();      my $self = shift();
     return  ({value       => 'htmlclasslist',      return  ({value       => 'htmlclasslist',
               description => 'Student Sheet Links'},                description => 'Student Sheet Links'},
                {value       => 'source',
                 description => 'Show Source'},
              {value       => 'html',               {value       => 'html',
               description => 'HTML'},                description => 'HTML'},
              {value       => 'excel',               {value       => 'excel',
Line 301  sub outsheet_htmlclasslist { Line 309  sub outsheet_htmlclasslist {
     #      #
     # Determine if we should output expire caches links...      # Determine if we should output expire caches links...
     my $show_expire_link = 0;      my $show_expire_link = 0;
     if (exists($ENV{'user.role.dc./'.$ENV{'request.role.domain'}.'/'})){      if (exists($env{'user.role.dc./'.$env{'request.role.domain'}.'/'})){
         $show_expire_link = 1;          $show_expire_link = 1;
     }      }
     #      #
Line 368  END Line 376  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 394  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();      &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,
            'sheet','spreadsheet_status');
     &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) {
         if ($connection->aborted()) { $self->cleanup(); return; }          if ($connection->aborted()) { $self->cleanup(); return; }
         my $sname = $student->{'username'}.':'.$student->{'domain'};          my $sname = $student->{'username'}.':'.$student->{'domain'};
  my $studentsheet = Apache::studentcalc->new   my $studentsheet = Apache::studentcalc->new
     ($student->{'username'},$student->{'domain'},undef);      ($student->{'username'},$student->{'domain'},undef,undef,
        $student->{'section'},$student->{'group'} );
         if ($connection->aborted()) { $self->cleanup(); return; }          if ($connection->aborted()) { $self->cleanup(); return; }
  my @exportdata = $studentsheet->export_data($r);   my @exportdata = $studentsheet->export_data($r);
         if ($studentsheet->badcalc()) {          if ($studentsheet->badcalc()) {
Line 410  sub compute { Line 431  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.20  
changed lines
  Added in v.1.26


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