RetailCRM-Mirror/PHPExcel
1
0
Fork 0
mirror of https://github.com/retailcrm/PHPExcel.git synced 2024-11-22 13:26:07 +03:00
Code Issues Projects Releases Wiki Activity

Fix to HTML generation with charts that fall outside of the main data area, and fix to show trailing / in folders for the jpgraph in examples

Browse Source
This commit is contained in:
MarkBaker 2015-08-03 19:40:16 +01:00
parent 8f7c2fd464
commit 663d942205
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Classes/PHPExcel/Writer/HTML.php
View File

@ -577,9 +577,10 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
} }
} }
} }
$html = ''; $html = '';
$colMax++; $colMax++;
while ($row < $rowMax) { while ($row <= $rowMax) {
$html .= '<tr>'; $html .= '<tr>';
for ($col = 'A'; $col != $colMax; ++$col) { for ($col = 'A'; $col != $colMax; ++$col) {
$html .= '<td>'; $html .= '<td>';

2
Examples/36chartreadwriteHTML.php
View File

@ -46,7 +46,7 @@ include 'PHPExcel/IOFactory.php';
// Change these values to select the Rendering library that you wish to use // Change these values to select the Rendering library that you wish to use
// and its directory location on your server // and its directory location on your server
$rendererName = PHPExcel_Settings::CHART_RENDERER_JPGRAPH; $rendererName = PHPExcel_Settings::CHART_RENDERER_JPGRAPH;
$rendererLibrary = 'jpgraph3.5.0b1/src'; $rendererLibrary = 'jpgraph3.5.0b1/src/';
$rendererLibraryPath = '/php/libraries/Charts/' . $rendererLibrary; $rendererLibraryPath = '/php/libraries/Charts/' . $rendererLibrary;

2
Examples/36chartreadwritePDF.php
View File

@ -69,7 +69,7 @@ if (!PHPExcel_Settings::setPdfRenderer(
// Change these values to select the Rendering library that you wish to use // Change these values to select the Rendering library that you wish to use
// for Chart images, and its directory location on your server // for Chart images, and its directory location on your server
$rendererName = PHPExcel_Settings::CHART_RENDERER_JPGRAPH; $rendererName = PHPExcel_Settings::CHART_RENDERER_JPGRAPH;
$rendererLibrary = 'jpgraph3.5.0b1/src'; $rendererLibrary = 'jpgraph3.5.0b1/src/';
$rendererLibraryPath = '/php/libraries/Charts/' . $rendererLibrary; $rendererLibraryPath = '/php/libraries/Charts/' . $rendererLibrary;