Commit 32c051d

authored

Merge pull request #65 from rylxes/excluded-columns

[3.0] Implemented the 'exclude column from export'

2 parents d7ee45d + d9f4c5b commit 32c051dCopy full SHA for 32c051d

File tree

1 file changed

+42

-10

lines changed

src/Services
- DataTable.php

1 file changed

+42

-10

lines changed

`‎src/Services/DataTable.php‎`

Lines changed: 42 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,20 @@ abstract class DataTable implements DataTableButtons`
`26`	`26`	`*/`
`27`	`27`	`protected $dataTableVariable = 'dataTable';`
`28`	`28`
	`29`	`+ /**`
	`30`	`+ * List of columns to be excluded from export.`
	`31`	`+ *`
	`32`	`+ * @var string\|array`
	`33`	`+ */`
	`34`	`+ protected $excludeFromExport = [];`
	`35`	`+`
	`36`	`+ /**`
	`37`	`+ * List of columns to be excluded from printing.`
	`38`	`+ *`
	`39`	`+ * @var string\|array`
	`40`	`+ */`
	`41`	`+ protected $excludeFromPrint = [];`
	`42`	`+`
`29`	`43`	`/**`
`30`	`44`	`* List of columns to be exported.`
`31`	`45`	`*`
`@@ -107,8 +121,8 @@ abstract class DataTable implements DataTableButtons`
`107`	`121`	`* Process dataTables needed render output.`
`108`	`122`	`*`
`109`	`123`	`* @param string $view`
`110`		`- * @param array $data`
`111`		`- * @param array $mergeData`
	`124`	`+ * @param array $data`
	`125`	`+ * @param array $mergeData`
`112`	`126`	`* @return mixed`
`113`	`127`	`*/`
`114`	`128`	`public function render($view, $data = [], $mergeData = [])`
`@@ -198,7 +212,27 @@ protected function getDataForPrint()`
`198`	`212`	`*/`
`199`	`213`	`protected function printColumns()`
`200`	`214`	`{`
`201`		`- return is_array($this->printColumns) ? $this->printColumns : $this->getColumnsFromBuilder();`
	`215`	`+ return is_array($this->printColumns) ? $this->printColumns : $this->getPrintColumnsFromBuilder();`
	`216`	`+ }`
	`217`	`+`
	`218`	`+ /**`
	`219`	`+ * Get filtered print columns definition from html builder.`
	`220`	`+ *`
	`221`	`+ * @return \Illuminate\Support\Collection`
	`222`	`+ */`
	`223`	`+ protected function getPrintColumnsFromBuilder()`
	`224`	`+ {`
	`225`	`+ return $this->html()->removeColumn(...$this->excludeFromPrint)->getColumns();`
	`226`	`+ }`
	`227`	`+`
	`228`	`+ /**`
	`229`	`+ * Get filtered export columns definition from html builder.`
	`230`	`+ *`
	`231`	`+ * @return \Illuminate\Support\Collection`
	`232`	`+ */`
	`233`	`+ protected function getExportColumnsFromBuilder()`
	`234`	`+ {`
	`235`	`+ return $this->html()->removeColumn(...$this->excludeFromExport)->getColumns();`
`202`	`236`	`}`
`203`	`237`
`204`	`238`	`/**`
`@@ -234,7 +268,7 @@ public function builder()`
`234`	`268`	`/**`
`235`	`269`	`* Map ajax response to columns definition.`
`236`	`270`	`*`
`237`		`- * @param mixed $columns`
	`271`	`+ * @param mixed $columns`
`238`	`272`	`* @param string $type`
`239`	`273`	`* @return array`
`240`	`274`	`*/`
`@@ -395,7 +429,7 @@ protected function getDataForExport()`
`395`	`429`	`*/`
`396`	`430`	`private function exportColumns()`
`397`	`431`	`{`
`398`		`- return is_array($this->exportColumns) ? $this->exportColumns : $this->getColumnsFromBuilder();`
	`432`	`+ return is_array($this->exportColumns) ? $this->exportColumns : $this->getExportColumnsFromBuilder();`
`399`	`433`	`}`
`400`	`434`
`401`	`435`	`/**`
`@@ -434,11 +468,9 @@ public function snappyPdf()`
`434`	`468`	`$options = config('datatables-buttons.snappy.options');`
`435`	`469`	`$orientation = config('datatables-buttons.snappy.orientation');`
`436`	`470`
`437`		`- $snappy->setOptions($options)`
`438`		`- ->setOrientation($orientation);`
	`471`	`+ $snappy->setOptions($options)->setOrientation($orientation);`
`439`	`472`
`440`		`- return $snappy->loadHTML($this->printPreview())`
`441`		`- ->download($this->getFilename() . '.pdf');`
	`473`	`+ return $snappy->loadHTML($this->printPreview())->download($this->getFilename() . '.pdf');`
`442`	`474`	`}`
`443`	`475`
`444`	`476`	`/**`
`@@ -470,7 +502,7 @@ public function addScopes(array $scopes)`
`470`	`502`	`/**`
`471`	`503`	`* Set a custom class attribute.`
`472`	`504`	`*`
`473`		`- * @param mixed $key`
	`505`	`+ * @param mixed $key`
`474`	`506`	`* @param mixed\|null $value`
`475`	`507`	`* @return $this`
`476`	`508`	`*/`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 32c051d

File tree

1 file changed

1 file changed

`‎src/Services/DataTable.php‎`

0 commit comments