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

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

version 1.13, 2003/06/12 21:17:11 version 1.14, 2003/06/23 19:58:18
Line 371  sub outsheet_html { Line 371  sub outsheet_html {
     ###################################      ###################################
     # Determine table structure      # Determine table structure
     ###################################      ###################################
       my $importcolor = '#FFFFFF';
       my $exportcolor = '#FFFF66';
     my $num_uneditable = 1;      my $num_uneditable = 1;
     my $num_left = 52-$num_uneditable;      my $num_left = 52-$num_uneditable;
     my $tableheader =<<"END";      my $tableheader =<<"END";
 <table border="2">  <table border="2">
 <tr>  <tr>
   <th colspan="2" rowspan="2"><font size="+2">Assessment</font></th>    <th colspan="2" rowspan="2"><font size="+2">Assessment</font></th>
   <td bgcolor="#FFDDDD" colspan="$num_uneditable">&nbsp;</td>    <td bgcolor="$importcolor" colspan="$num_uneditable">&nbsp;</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>
 </tr><tr>  </tr><tr>
Line 385  END Line 387  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 .= '<td bgcolor="#FFDDDD">';              $tableheader .= '<td bgcolor="'.$importcolor.'">';
         } else {          } else {
             $tableheader .= '<td>';              $tableheader .= '<td>';
         }          }
Line 398  END Line 400  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>Export</td><td>0</td>'.      $r->print('<tr><td>Export</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 411  END Line 414  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 424  END Line 427  END
     $r->print("</table>\n".$tableheader);      $r->print("</table>\n".$tableheader);
  }   }
  $r->print('<tr><td>'.$rownum.'</td>'.   $r->print('<tr><td>'.$rownum.'</td>'.
                   $self->assess_html_row($rownum)."</tr>\n");                    $self->assess_html_row($rownum,$importcolor)."</tr>\n");
     }      }
     $r->print("</table>\n");      $r->print("</table>\n");
     return;      return;
Line 432  END Line 435  END
   
 sub assess_html_row {  sub assess_html_row {
     my $self = shift();      my $self = shift();
     my ($row) = @_;      my ($row,$importcolor) = @_;
     my $parameter_name = $self->{'formulas'}->{'A'.$row};      my $parameter_name = $self->{'formulas'}->{'A'.$row};
     my @rowdata = $self->get_row($row);      my @rowdata = $self->get_row($row);
     my $num_cols_output = 0;      my $num_cols_output = 0;
Line 446  sub assess_html_row { Line 449  sub assess_html_row {
     }      }
     foreach my $cell (@rowdata) {      foreach my $cell (@rowdata) {
         if ($num_cols_output < 1) {          if ($num_cols_output < 1) {
             $row_html .= '<td bgcolor="#FFDDDD">';              $row_html .= '<td bgcolor="'.$importcolor.'">';
             $row_html .= &Apache::Spreadsheet::html_uneditable_cell($cell,              $row_html .= &Apache::Spreadsheet::html_uneditable_cell($cell,
                                                                     '#FFDDDD');                                                                      '#FFDDDD');
         } else {          } else {
Removed from v.1.13  
changed lines
  Added in v.1.14

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