Diff for /loncom/interface/spreadsheet/classcalc.pm between versions 1.13 and 1.14

version 1.13, 2003/09/10 14:47:42 version 1.14, 2003/10/14 18:36:54
Line 58  use HTML::Entities(); Line 58  use HTML::Entities();
 use Spreadsheet::WriteExcel;  use Spreadsheet::WriteExcel;
 use Apache::lonnet;  use Apache::lonnet;
 use Time::HiRes;  use Time::HiRes;
   use Apache::lonlocal;
   
 @Apache::classcalc::ISA = ('Apache::Spreadsheet');  @Apache::classcalc::ISA = ('Apache::Spreadsheet');
   
Line 86  sub html_header { Line 87  sub html_header {
              ['Enrollment Status',&Apache::lonhtmlcommon::StatusOptions(undef,undef,3)],               ['Enrollment Status',&Apache::lonhtmlcommon::StatusOptions(undef,undef,3)],
              ['Output Format',&Apache::Spreadsheet::output_selector()]) {               ['Output Format',&Apache::Spreadsheet::output_selector()]) {
         my ($name,$selector) = @{$_};          my ($name,$selector) = @{$_};
         $toprow .= '<th align="center"><b>'.$name.'</b></th>';          $toprow .= '<th align="center"><b>'.&mt($name).'</b></th>';
         $bottomrow .= '<td>'.$selector.'</td>';          $bottomrow .= '<td>'.$selector.'</td>';
     }      }
     return "<p>\n<table>\n".      return "<p>\n<table>\n".
Line 98  sub html_header { Line 99  sub html_header {
 sub get_title {  sub get_title {
     my $self = shift;      my $self = shift;
     # Section info should be included      # Section info should be included
     my @title = ($self->{'coursedesc'}, scalar(localtime(time)) );      my @title = ($self->{'coursedesc'}, &Apache::lonlocal::locallocaltime(time) );
     return @title;      return @title;
 }  }
   
Line 123  sub outsheet_html { Line 124  sub outsheet_html {
     my $exportcolor = '#BBBBFF';      my $exportcolor = '#BBBBFF';
     my $num_uneditable = 26;      my $num_uneditable = 26;
     my $num_left = 52-$num_uneditable;      my $num_left = 52-$num_uneditable;
       my %lt=&Apache::lonlocal::texthash(
          'co' => 'Course',
          'im' => 'Import',
          'ca' => 'Calculations',
          'stu' => 'Student',
          'sta' => 'Status',
          'usr' => 'Username',
          'dom' => 'Domain',
          'sec' => 'Section',
          );
     my $tableheader =<<"END";      my $tableheader =<<"END";
 <p>  <p>
 <table border="2">  <table border="2">
 <tr>  <tr>
   <th colspan="2" rowspan="2"><font size="+2">Course</font></th>    <th colspan="2" rowspan="2"><font size="+2">$lt{'co'}</font></th>
   <td bgcolor="$importcolor" colspan="$num_uneditable">    <td bgcolor="$importcolor" colspan="$num_uneditable">
       <b><font size="+1">Import</font></b></td>        <b><font size="+1">$lt{'im'}</font></b></td>
   <td colspan="$num_left">    <td colspan="$num_left">
       <b><font size="+1">Calculations</font></b></td>        <b><font size="+1">$lt{'ca'}</font></b></td>
 </tr><tr>  </tr><tr>
 END  END
     my $label_num = 0;      my $label_num = 0;
Line 149  END Line 160  END
     $r->print($tableheader);      $r->print($tableheader);
     #      #
     # Print out template row      # Print out template row
     $r->print('<tr><td>Template</td><td>&nbsp;</td>'.      $r->print('<tr><td>'.&mt('Template').'</td><td>&nbsp;</td>'.
       $self->html_template_row($num_uneditable,$importcolor).        $self->html_template_row($num_uneditable,$importcolor).
               "</tr>\n");                "</tr>\n");
     #      #
     # Print out summary/export row      # Print out summary/export row
     $r->print('<tr><td>Summary</td><td>0</td>'.      $r->print('<tr><td>'.&mt('Summary').'</td><td>0</td>'.
       $self->html_export_row($exportcolor)."</tr>\n");        $self->html_export_row($exportcolor)."</tr>\n");
     #      #
     # Prepare to output rows      # Prepare to output rows
     $tableheader =<<"END";      $tableheader =<<"END";
 </p><p>  </p><p>
 <table border="2">  <table border="2">
 <tr><th>Row</th>  <tr><th>$lt{'ro'}</th>
   <th>student</th><th>username</th><th>domain</th>    <th>$lt{'stu'}</th><th>$lt{'usr'}</th><th>$lt{'dom'}</th>
   <th>section</th><th>status</th>    <th>$lt{'sec'}</th><th>$lt{'sta'}</th>
 END  END
     foreach (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz')){      foreach (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz')){
  if ($label_num<$num_uneditable) {    if ($label_num<$num_uneditable) { 
Line 206  sub excel_rows { Line 217  sub excel_rows {
     #      #
     # 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++,$value);          $worksheet->write($rows_output,$cols_output++,&mt($value));
     }      }
     $rows_output++;          $rows_output++;    
     #      #
Line 238  sub csv_rows { Line 249  sub csv_rows {
     # Write a header row      # Write a header row
   
     $self->csv_output_row($filehandle,undef,      $self->csv_output_row($filehandle,undef,
                    ('fullname','username','domain','section','status','id'));                     (&mt('Fullname'),&mt('Username'),&mt('Domain'),&mt('Section'),&mt('Status'),&mt('ID')));
     #      #
     # Write each students row      # Write each students row
     foreach my $student (@Students) {      foreach my $student (@Students) {
Line 270  sub compute { Line 281  sub compute {
     my %c = $self->constants();      my %c = $self->constants();
     my %f = $self->formulas();      my %f = $self->formulas();
     my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin      my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
         ($r,'Spreadsheet Computation Status',          ($r,&mt('Spreadsheet Computation Status'),
          'Spreadsheet Computation', scalar(@Students));           &mt('Spreadsheet Computation'), scalar(@Students));
     &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,      &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
                                           'Processing course structure');                                            &mt('Processing course structure'));
     &Apache::studentcalc::initialize_package();      &Apache::studentcalc::initialize_package();
     &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,      &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
                                           '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'};

Removed from v.1.13  
changed lines
  Added in v.1.14


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