mirror of
https://github.com/PHPOffice/PhpSpreadsheet.git
synced 2026-08-30 20:18:00 +00:00
Merge pull request #3522 from PHPOffice/Examples-Improve-Reader-Display
Improve web-rendering of Reader Examples by displaying the loaded wor…
This commit is contained in:
@@ -7,5 +7,6 @@ require __DIR__ . '/../Header.php';
|
||||
$inputFileName = __DIR__ . '/sampleData/example1.xls';
|
||||
$helper->log('Loading file ' . /** @scrutinizer ignore-type */ pathinfo($inputFileName, PATHINFO_BASENAME) . ' using IOFactory to identify the format');
|
||||
$spreadsheet = IOFactory::load($inputFileName);
|
||||
|
||||
$sheetData = $spreadsheet->getActiveSheet()->toArray(null, true, true, true);
|
||||
var_dump($sheetData);
|
||||
$helper->displayGrid($sheetData);
|
||||
|
||||
@@ -10,4 +10,4 @@ $reader = new Xls();
|
||||
$spreadsheet = $reader->load($inputFileName);
|
||||
|
||||
$sheetData = $spreadsheet->getActiveSheet()->toArray(null, true, true, true);
|
||||
var_dump($sheetData);
|
||||
$helper->displayGrid($sheetData);
|
||||
|
||||
@@ -12,4 +12,4 @@ $reader = IOFactory::createReader($inputFileType);
|
||||
$spreadsheet = $reader->load($inputFileName);
|
||||
|
||||
$sheetData = $spreadsheet->getActiveSheet()->toArray(null, true, true, true);
|
||||
var_dump($sheetData);
|
||||
$helper->displayGrid($sheetData);
|
||||
|
||||
+1
-1
@@ -14,4 +14,4 @@ $reader = IOFactory::createReader($inputFileType);
|
||||
$spreadsheet = $reader->load($inputFileName);
|
||||
|
||||
$sheetData = $spreadsheet->getActiveSheet()->toArray(null, true, true, true);
|
||||
var_dump($sheetData);
|
||||
$helper->displayGrid($sheetData);
|
||||
|
||||
@@ -14,4 +14,4 @@ $reader->setReadDataOnly(true);
|
||||
$spreadsheet = $reader->load($inputFileName);
|
||||
|
||||
$sheetData = $spreadsheet->getActiveSheet()->toArray(null, true, true, true);
|
||||
var_dump($sheetData);
|
||||
$helper->displayGrid($sheetData);
|
||||
|
||||
@@ -15,8 +15,8 @@ class MyReadFilter implements IReadFilter
|
||||
{
|
||||
public function readCell($columnAddress, $row, $worksheetName = '')
|
||||
{
|
||||
// Read rows 1 to 7 and columns A to E only
|
||||
if ($row >= 1 && $row <= 7) {
|
||||
// Read rows 9 to 15 and columns A to E only
|
||||
if ($row >= 9 && $row <= 15) {
|
||||
if (in_array($columnAddress, range('A', 'E'))) {
|
||||
return true;
|
||||
}
|
||||
@@ -29,6 +29,7 @@ class MyReadFilter implements IReadFilter
|
||||
$filterSubset = new MyReadFilter();
|
||||
|
||||
$helper->log('Loading file ' . /** @scrutinizer ignore-type */ pathinfo($inputFileName, PATHINFO_BASENAME) . ' using IOFactory with a defined reader type of ' . $inputFileType);
|
||||
$helper->log('Filter range is A9:E15');
|
||||
$reader = IOFactory::createReader($inputFileType);
|
||||
$helper->log('Loading Sheet "' . $sheetname . '" only');
|
||||
$reader->setLoadSheetsOnly($sheetname);
|
||||
@@ -36,5 +37,6 @@ $helper->log('Loading Sheet using filter');
|
||||
$reader->setReadFilter($filterSubset);
|
||||
$spreadsheet = $reader->load($inputFileName);
|
||||
|
||||
$sheetData = $spreadsheet->getActiveSheet()->toArray(null, true, true, true);
|
||||
var_dump($sheetData);
|
||||
$activeRange = $spreadsheet->getActiveSheet()->calculateWorksheetDataDimension();
|
||||
$sheetData = $spreadsheet->getActiveSheet()->rangeToArray($activeRange, null, true, true, true);
|
||||
$helper->displayGrid($sheetData);
|
||||
|
||||
@@ -41,6 +41,7 @@ class MyReadFilter implements IReadFilter
|
||||
$filterSubset = new MyReadFilter(9, 15, range('G', 'K'));
|
||||
|
||||
$helper->log('Loading file ' . /** @scrutinizer ignore-type */ pathinfo($inputFileName, PATHINFO_BASENAME) . ' using IOFactory with a defined reader type of ' . $inputFileType);
|
||||
$helper->log('Filter range is G9:K15');
|
||||
$reader = IOFactory::createReader($inputFileType);
|
||||
$helper->log('Loading Sheet "' . $sheetname . '" only');
|
||||
$reader->setLoadSheetsOnly($sheetname);
|
||||
@@ -48,5 +49,6 @@ $helper->log('Loading Sheet using configurable filter');
|
||||
$reader->setReadFilter($filterSubset);
|
||||
$spreadsheet = $reader->load($inputFileName);
|
||||
|
||||
$sheetData = $spreadsheet->getActiveSheet()->toArray(null, true, true, true);
|
||||
var_dump($sheetData);
|
||||
$activeRange = $spreadsheet->getActiveSheet()->calculateWorksheetDataDimension();
|
||||
$sheetData = $spreadsheet->getActiveSheet()->rangeToArray($activeRange, null, true, true, true);
|
||||
$helper->displayGrid($sheetData);
|
||||
|
||||
+3
-2
@@ -59,6 +59,7 @@ for ($startRow = 2; $startRow <= 240; $startRow += $chunkSize) {
|
||||
|
||||
// Do some processing here
|
||||
|
||||
$sheetData = $spreadsheet->getActiveSheet()->toArray(null, true, true, true);
|
||||
var_dump($sheetData);
|
||||
$activeRange = $spreadsheet->getActiveSheet()->calculateWorksheetDataDimension();
|
||||
$sheetData = $spreadsheet->getActiveSheet()->rangeToArray($activeRange, null, true, true, true);
|
||||
$helper->displayGrid($sheetData);
|
||||
}
|
||||
|
||||
+3
-2
@@ -62,6 +62,7 @@ for ($startRow = 2; $startRow <= 240; $startRow += $chunkSize) {
|
||||
|
||||
// Do some processing here
|
||||
|
||||
$sheetData = $spreadsheet->getActiveSheet()->toArray(null, true, true, true);
|
||||
var_dump($sheetData);
|
||||
$activeRange = $spreadsheet->getActiveSheet()->calculateWorksheetDataDimension();
|
||||
$sheetData = $spreadsheet->getActiveSheet()->rangeToArray($activeRange, null, true, true, true);
|
||||
$helper->displayGrid($sheetData);
|
||||
}
|
||||
|
||||
@@ -23,6 +23,8 @@ $loadedSheetNames = $spreadsheet->getSheetNames();
|
||||
foreach ($loadedSheetNames as $sheetIndex => $loadedSheetName) {
|
||||
$helper->log('<b>Worksheet #' . $sheetIndex . ' -> ' . $loadedSheetName . '</b>');
|
||||
$spreadsheet->setActiveSheetIndexByName($loadedSheetName);
|
||||
$sheetData = $spreadsheet->getActiveSheet()->toArray(null, true, true, true);
|
||||
var_dump($sheetData);
|
||||
|
||||
$activeRange = $spreadsheet->getActiveSheet()->calculateWorksheetDataDimension();
|
||||
$sheetData = $spreadsheet->getActiveSheet()->rangeToArray($activeRange, null, true, true, true);
|
||||
$helper->displayGrid($sheetData);
|
||||
}
|
||||
|
||||
+4
-2
@@ -80,6 +80,8 @@ $loadedSheetNames = $spreadsheet->getSheetNames();
|
||||
foreach ($loadedSheetNames as $sheetIndex => $loadedSheetName) {
|
||||
$helper->log('<b>Worksheet #' . $sheetIndex . ' -> ' . $loadedSheetName . '</b>');
|
||||
$spreadsheet->setActiveSheetIndexByName($loadedSheetName);
|
||||
$sheetData = $spreadsheet->getActiveSheet()->toArray(null, false, false, true);
|
||||
var_dump($sheetData);
|
||||
|
||||
$activeRange = $spreadsheet->getActiveSheet()->calculateWorksheetDataDimension();
|
||||
$sheetData = $spreadsheet->getActiveSheet()->rangeToArray($activeRange, null, true, true, true);
|
||||
$helper->displayGrid($sheetData);
|
||||
}
|
||||
|
||||
+12
-6
@@ -21,20 +21,26 @@ $loadedSheetNames = $spreadsheet->getSheetNames();
|
||||
foreach ($loadedSheetNames as $sheetIndex => $loadedSheetName) {
|
||||
$helper->log('<b>Worksheet #' . $sheetIndex . ' -> ' . $loadedSheetName . ' (Formatted)</b>');
|
||||
$spreadsheet->setActiveSheetIndexByName($loadedSheetName);
|
||||
$sheetData = $spreadsheet->getActiveSheet()->toArray(null, true, true, true);
|
||||
var_dump($sheetData);
|
||||
|
||||
$activeRange = $spreadsheet->getActiveSheet()->calculateWorksheetDataDimension();
|
||||
$sheetData = $spreadsheet->getActiveSheet()->rangeToArray($activeRange, null, true, true, true);
|
||||
$helper->displayGrid($sheetData);
|
||||
}
|
||||
|
||||
foreach ($loadedSheetNames as $sheetIndex => $loadedSheetName) {
|
||||
$helper->log('<b>Worksheet #' . $sheetIndex . ' -> ' . $loadedSheetName . ' (Unformatted)</b>');
|
||||
$spreadsheet->setActiveSheetIndexByName($loadedSheetName);
|
||||
$sheetData = $spreadsheet->getActiveSheet()->toArray(null, true, false, true);
|
||||
var_dump($sheetData);
|
||||
|
||||
$activeRange = $spreadsheet->getActiveSheet()->calculateWorksheetDataDimension();
|
||||
$sheetData = $spreadsheet->getActiveSheet()->rangeToArray($activeRange, null, true, true, true);
|
||||
$helper->displayGrid($sheetData);
|
||||
}
|
||||
|
||||
foreach ($loadedSheetNames as $sheetIndex => $loadedSheetName) {
|
||||
$helper->log('<b>Worksheet #' . $sheetIndex . ' -> ' . $loadedSheetName . ' (Raw)</b>');
|
||||
$spreadsheet->setActiveSheetIndexByName($loadedSheetName);
|
||||
$sheetData = $spreadsheet->getActiveSheet()->toArray(null, false, false, true);
|
||||
var_dump($sheetData);
|
||||
|
||||
$activeRange = $spreadsheet->getActiveSheet()->calculateWorksheetDataDimension();
|
||||
$sheetData = $spreadsheet->getActiveSheet()->rangeToArray($activeRange, null, true, true, true);
|
||||
$helper->displayGrid($sheetData);
|
||||
}
|
||||
|
||||
@@ -22,6 +22,8 @@ $loadedSheetNames = $spreadsheet->getSheetNames();
|
||||
foreach ($loadedSheetNames as $sheetIndex => $loadedSheetName) {
|
||||
$helper->log('<b>Worksheet #' . $sheetIndex . ' -> ' . $loadedSheetName . ' (Formatted)</b>');
|
||||
$spreadsheet->setActiveSheetIndexByName($loadedSheetName);
|
||||
$sheetData = $spreadsheet->getActiveSheet()->toArray(null, true, true, true);
|
||||
var_dump($sheetData);
|
||||
|
||||
$activeRange = $spreadsheet->getActiveSheet()->calculateWorksheetDataDimension();
|
||||
$sheetData = $spreadsheet->getActiveSheet()->rangeToArray($activeRange, null, true, true, true);
|
||||
$helper->displayGrid($sheetData);
|
||||
}
|
||||
|
||||
Binary file not shown.
@@ -51,7 +51,7 @@ class TextGrid
|
||||
$this->gridDisplay = $this->isCli ? '' : '<pre>';
|
||||
|
||||
$maxRow = max($this->rows);
|
||||
$maxRowLength = strlen((string) $maxRow) + 1;
|
||||
$maxRowLength = mb_strlen((string) $maxRow) + 1;
|
||||
$columnWidths = $this->getColumnWidths();
|
||||
|
||||
$this->renderColumnHeader($maxRowLength, $columnWidths);
|
||||
@@ -75,9 +75,9 @@ class TextGrid
|
||||
private function renderCells(array $rowData, array $columnWidths): void
|
||||
{
|
||||
foreach ($rowData as $column => $cell) {
|
||||
$cell = ($this->isCli) ? (string) $cell : htmlentities((string) $cell);
|
||||
$displayCell = ($this->isCli) ? (string) $cell : htmlentities((string) $cell);
|
||||
$this->gridDisplay .= '| ';
|
||||
$this->gridDisplay .= str_pad($cell, $columnWidths[$column] + 1, ' ');
|
||||
$this->gridDisplay .= $displayCell . str_repeat(' ', $columnWidths[$column] - mb_strlen($cell ?? '') + 1);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -126,12 +126,12 @@ class TextGrid
|
||||
|
||||
foreach ($columnData as $columnValue) {
|
||||
if (is_string($columnValue)) {
|
||||
$columnWidth = max($columnWidth, strlen($columnValue));
|
||||
$columnWidth = max($columnWidth, mb_strlen($columnValue));
|
||||
} elseif (is_bool($columnValue)) {
|
||||
$columnWidth = max($columnWidth, strlen($columnValue ? 'TRUE' : 'FALSE'));
|
||||
$columnWidth = max($columnWidth, mb_strlen($columnValue ? 'TRUE' : 'FALSE'));
|
||||
}
|
||||
|
||||
$columnWidth = max($columnWidth, strlen((string) $columnWidth));
|
||||
$columnWidth = max($columnWidth, mb_strlen((string) $columnWidth));
|
||||
}
|
||||
|
||||
return $columnWidth;
|
||||
|
||||
Reference in New Issue
Block a user