Diff for /loncom/interface/Attic/lonspreadsheet.pm between versions 1.157 and 1.158

version 1.157, 2002/12/09 16:06:56 version 1.158, 2002/12/09 21:11:12
Line 961  ENDDEFS Line 961  ENDDEFS
 sub templaterow {  sub templaterow {
     my $sheet = shift;      my $sheet = shift;
     my @cols=();      my @cols=();
     my $rowlabel = 'Template';      my $rowlabel = 'Template</td><td>&nbsp;';
     foreach ('A','B','C','D','E','F','G','H','I','J','K','L','M',      foreach ('A','B','C','D','E','F','G','H','I','J','K','L','M',
      'N','O','P','Q','R','S','T','U','V','W','X','Y','Z',       'N','O','P','Q','R','S','T','U','V','W','X','Y','Z',
      'a','b','c','d','e','f','g','h','i','j','k','l','m',       'a','b','c','d','e','f','g','h','i','j','k','l','m',
Line 989  sub outrowassess { Line 989  sub outrowassess {
         } else {           } else { 
             $rowlabel = '';              $rowlabel = '';
         }          }
       } elsif ($ENV{'request.role'} =~ /^st\./) {
           $rowlabel = 'Summary</td><td>0';
     } else {      } else {
         $rowlabel = 'Export';          $rowlabel = 'Export</td><td>0';
     }      }
     foreach ('A','B','C','D','E','F','G','H','I','J','K','L','M',      foreach ('A','B','C','D','E','F','G','H','I','J','K','L','M',
      'N','O','P','Q','R','S','T','U','V','W','X','Y','Z',       'N','O','P','Q','R','S','T','U','V','W','X','Y','Z',
Line 1011  sub outrow { Line 1013  sub outrow {
         $rowlabel = $sheet->{'rowlabel'}->{$sheet->{'f'}->{'A'.$n}};          $rowlabel = $sheet->{'rowlabel'}->{$sheet->{'f'}->{'A'.$n}};
     } else {      } else {
         if ($sheet->{'sheettype'} eq 'classcalc') {          if ($sheet->{'sheettype'} eq 'classcalc') {
             $rowlabel = 'Summary';              $rowlabel = 'Summary</td><td>0';
         } else {          } else {
             $rowlabel = 'Export';              $rowlabel = 'Export</td><td>0';
         }          }
     }      }
     foreach ('A','B','C','D','E','F','G','H','I','J','K','L','M',      foreach ('A','B','C','D','E','F','G','H','I','J','K','L','M',
Line 1259  sub html_editable_cell { Line 1261  sub html_editable_cell {
     } elsif ($value =~ /^\s*$/ ) {      } elsif ($value =~ /^\s*$/ ) {
         $value = '<font color="'.$bgcolor.'">#</font>';          $value = '<font color="'.$bgcolor.'">#</font>';
     } else {      } else {
         $value = &HTML::Entities::encode($value);          $value = &HTML::Entities::encode($value) if ($value !~/&nbsp;/);
     }      }
     # Make the formula safe for outputting      # Make the formula safe for outputting
     $formula =~ s/\'/\"/g;      $formula =~ s/\'/\"/g;
Line 1277  sub html_editable_cell { Line 1279  sub html_editable_cell {
 sub html_uneditable_cell {  sub html_uneditable_cell {
     my ($cell,$bgcolor) = @_;      my ($cell,$bgcolor) = @_;
     my $value = (defined($cell) ? $cell->{'value'} : '');      my $value = (defined($cell) ? $cell->{'value'} : '');
     $value = &HTML::Entities::encode($value);      $value = &HTML::Entities::encode($value) if ($value !~/&nbsp;/);
     return '&nbsp;'.$value.'&nbsp;';      return '&nbsp;'.$value.'&nbsp;';
 }  }
   
Line 1307  sub outsheet_html  { Line 1309  sub outsheet_html  {
     my $tabledata =<<"END";      my $tabledata =<<"END";
 <table border="2">  <table border="2">
 <tr>  <tr>
   <th colspan="1" rowspan="2"><font size="+2">$realm</font></th>    <th colspan="2" rowspan="2"><font size="+2">$realm</font></th>
   <td bgcolor="#FFDDDD" colspan="$num_uneditable">    <td bgcolor="#FFDDDD" 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">
Line 1353  END Line 1355  END
     # Print out summary/export row      # Print out summary/export row
     ####################################      ####################################
     ($rowlabel,@rowdata) = &get_row($sheet,'0');      ($rowlabel,@rowdata) = &get_row($sheet,'0');
     $row_html = '<tr><td>'.&format_html_rowlabel($sheet,'Summary').'</td>';      $row_html = '<tr><td>'.&format_html_rowlabel($sheet,$rowlabel).'</td>';
     $num_cols_output = 0;      $num_cols_output = 0;
     foreach my $cell (@rowdata) {      foreach my $cell (@rowdata) {
         if ($num_cols_output++ < 26 && ! $requester_is_student) {          if ($num_cols_output++ < 26 && ! $requester_is_student) {
Line 3275  ENDSCRIPT Line 3277  ENDSCRIPT
     }      }
     $r->print('>');      $r->print('>');
     #      #
     # CSV format checkbox (classcalc sheets only)      # output format select box 
     $r->print(' Output as <select name="output" size="1" onClick="submit()">'.      $r->print(' Output as <select name="output" size="1" onChange="submit()">'.
               "\n");                "\n");
     foreach my $mode (qw/HTML CSV Excel/) {      foreach my $mode (qw/HTML CSV Excel/) {
         $r->print('<option value="'.$mode.'"');          $r->print('<option value="'.$mode.'"');

Removed from v.1.157  
changed lines
  Added in v.1.158


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