[BACK]Return to classcalc.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface / spreadsheet

Diff for /loncom/interface/spreadsheet/classcalc.pm between versions 1.9 and 1.10.2.1

version 1.9, 2003/06/23 16:06:11 version 1.10.2.1, 2003/12/05 22:24:20
Line 109  sub parent_link { Line 109  sub parent_link {
 sub outsheet_html {  sub outsheet_html {
     my $self = shift;      my $self = shift;
     my ($r) = @_;      my ($r) = @_;
       ####################################
       # Report any calculation errors    #
       ####################################
       $r->print($self->html_report_error());
     ###################################      ###################################
     # Determine table structure      # Determine table structure
     ###################################      ###################################
       my $importcolor = '#88FF88';
       my $exportcolor = '#BBBBFF';
     my $num_uneditable = 26;      my $num_uneditable = 26;
     my $num_left = 52-$num_uneditable;      my $num_left = 52-$num_uneditable;
     my $tableheader =<<"END";      my $tableheader =<<"END";
Line 119  sub outsheet_html { Line 125  sub outsheet_html {
 <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">Course</font></th>
   <td bgcolor="#FFDDDD" colspan="$num_uneditable">    <td bgcolor="$importcolor" colspan="$num_uneditable">
       <b><font size="+1">Import</font></b></td>        <b><font size="+1">Import</font></b></td>
   <td colspan="$num_left">    <td colspan="$num_left">
       <b><font size="+1">Calculations</font></b></td>        <b><font size="+1">Calculations</font></b></td>
Line 128  END Line 134  END
     my $label_num = 0;      my $label_num = 0;
     foreach (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz')){      foreach (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz')){
         if ($label_num<$num_uneditable) {           if ($label_num<$num_uneditable) { 
             $tableheader.='<th bgcolor="#FFDDDD">';              $tableheader.='<th bgcolor="'.$importcolor.'">';
         } else {          } else {
             $tableheader.='<th>';              $tableheader.='<th>';
         }          }
Line 141  END Line 147  END
     #      #
     # Print out template row      # Print out template row
     $r->print('<tr><td>Template</td><td>&nbsp;</td>'.      $r->print('<tr><td>Template</td><td>&nbsp;</td>'.
       $self->html_template_row($num_uneditable)."</tr>\n");        $self->html_template_row($num_uneditable,$importcolor).
                 "</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>Summary</td><td>0</td>'.
       $self->html_export_row()."</tr>\n");        $self->html_export_row($exportcolor)."</tr>\n");
     #      #
     # Prepare to output rows      # Prepare to output rows
     $tableheader =<<"END";      $tableheader =<<"END";
Line 157  END Line 164  END
 END  END
     foreach (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz')){      foreach (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz')){
  if ($label_num<$num_uneditable) {    if ($label_num<$num_uneditable) { 
             $tableheader.='<th bgcolor="#FFDDDD">';              $tableheader.='<th bgcolor="'.$importcolor.'">';
         } else {          } else {
             $tableheader.='<th>';              $tableheader.='<th>';
         }          }
Line 180  END Line 187  END
   '<td>'.$student->{'domain'}  .'</td>'.    '<td>'.$student->{'domain'}  .'</td>'.
   '<td>'.$student->{'section'} .'</td>'.    '<td>'.$student->{'section'} .'</td>'.
   '<td>'.$student->{'status'}  .'</td>'.    '<td>'.$student->{'status'}  .'</td>'.
   $self->html_row($num_uneditable,$rownum)."</tr>\n");    $self->html_row($num_uneditable,$rownum,$exportcolor,
                                     $importcolor).
                     "</tr>\n");
     }      }
     $r->print("</table></p>\n");      $r->print("</table></p>\n");
     return;      return;
Line 266  sub compute { Line 275  sub compute {
  my $studentsheet = Apache::studentcalc->new   my $studentsheet = Apache::studentcalc->new
     ($student->{'username'},$student->{'domain'},undef);      ($student->{'username'},$student->{'domain'},undef);
  my @exportdata = $studentsheet->export_data();   my @exportdata = $studentsheet->export_data();
           if ($studentsheet->badcalc()) {
               $self->set_calcerror($sname.' : '.
                                    $studentsheet->calcerror());
           }
  my $rownum = $self->get_row_number_from_key($sname);   my $rownum = $self->get_row_number_from_key($sname);
         $f{'A'.$rownum} = $sname;          $f{'A'.$rownum} = $sname;
         $self->{'row_source'}->{$rownum} = $sname;          $self->{'row_source'}->{$rownum} = $sname;
Removed from v.1.9  
changed lines
  Added in v.1.10.2.1

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