@@ -52,7 +52,7 @@ |
||
| 52 | 52 | |
| 53 | 53 | /** |
| 54 | 54 | * @return Doctrine\ORM\Query |
| 55 | - */ |
|
| 55 | + */ |
|
| 56 | 56 | public function getQuery() |
| 57 | 57 | { |
| 58 | 58 | return $this->data_source->getQuery(); |
@@ -65,7 +65,7 @@ |
||
| 65 | 65 | return $column; |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | - return current($this->data_source->getRootAliases()) . '.' . $column; |
|
| 68 | + return current($this->data_source->getRootAliases()).'.'.$column; |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | |
@@ -1928,7 +1928,7 @@ |
||
| 1928 | 1928 | $parent = parent::getParent(); |
| 1929 | 1929 | if (!$parent instanceof PresenterComponent) { |
| 1930 | 1930 | throw new DataGridHasToBeAttachedToPresenterComponentException( |
| 1931 | - "DataGrid is attached to: '" . get_class($parent) . "', but instance of PresenterComponent is needed." |
|
| 1931 | + "DataGrid is attached to: '".get_class($parent)."', but instance of PresenterComponent is needed." |
|
| 1932 | 1932 | ); |
| 1933 | 1933 | } |
| 1934 | 1934 | |
@@ -1195,7 +1195,6 @@ discard block |
||
| 1195 | 1195 | |
| 1196 | 1196 | /** |
| 1197 | 1197 | * If we want to sent some initial filter |
| 1198 | - * @param array $filter |
|
| 1199 | 1198 | * @param bool $use_on_reset |
| 1200 | 1199 | * @return static |
| 1201 | 1200 | */ |
@@ -2041,7 +2040,7 @@ discard block |
||
| 2041 | 2040 | |
| 2042 | 2041 | /** |
| 2043 | 2042 | * Set options of select "items_per_page" |
| 2044 | - * @param array $items_per_page_list |
|
| 2043 | + * @param integer[] $items_per_page_list |
|
| 2045 | 2044 | * @return static |
| 2046 | 2045 | */ |
| 2047 | 2046 | public function setItemsPerPageList(array $items_per_page_list, $include_all = TRUE) |
@@ -2348,7 +2347,7 @@ discard block |
||
| 2348 | 2347 | |
| 2349 | 2348 | /** |
| 2350 | 2349 | * Get items detail parameters |
| 2351 | - * @return array |
|
| 2350 | + * @return Column\ItemDetail |
|
| 2352 | 2351 | */ |
| 2353 | 2352 | public function getItemsDetail() |
| 2354 | 2353 | { |
@@ -2422,7 +2421,7 @@ discard block |
||
| 2422 | 2421 | |
| 2423 | 2422 | |
| 2424 | 2423 | /** |
| 2425 | - * @return Nette\Forms\Container|NULL |
|
| 2424 | + * @return Utils\ItemDetailForm|null |
|
| 2426 | 2425 | */ |
| 2427 | 2426 | public function getItemDetailForm() |
| 2428 | 2427 | { |
@@ -2524,7 +2523,7 @@ discard block |
||
| 2524 | 2523 | |
| 2525 | 2524 | |
| 2526 | 2525 | /** |
| 2527 | - * @return InlineEdit|null |
|
| 2526 | + * @return InlineEdit |
|
| 2528 | 2527 | */ |
| 2529 | 2528 | public function getInlineEdit() |
| 2530 | 2529 | { |
@@ -2572,7 +2571,7 @@ discard block |
||
| 2572 | 2571 | |
| 2573 | 2572 | |
| 2574 | 2573 | /** |
| 2575 | - * @return InlineEdit|null |
|
| 2574 | + * @return InlineEdit |
|
| 2576 | 2575 | */ |
| 2577 | 2576 | public function getInlineAdd() |
| 2578 | 2577 | { |
@@ -292,7 +292,7 @@ |
||
| 292 | 292 | |
| 293 | 293 | /** |
| 294 | 294 | * @var array|NULL |
| 295 | - **/ |
|
| 295 | + **/ |
|
| 296 | 296 | protected $rows; |
| 297 | 297 | |
| 298 | 298 | |
@@ -410,8 +410,9 @@ discard block |
||
| 410 | 410 | */ |
| 411 | 411 | public function getRows($refresh = FALSE) |
| 412 | 412 | { |
| 413 | - if (is_array($this->rows) && !$refresh) |
|
| 414 | - return $this->rows; |
|
| 413 | + if (is_array($this->rows) && !$refresh) { |
|
| 414 | + return $this->rows; |
|
| 415 | + } |
|
| 415 | 416 | /** |
| 416 | 417 | * Prepare data for rendering (datagrid may render just one item) |
| 417 | 418 | */ |
@@ -423,8 +424,9 @@ discard block |
||
| 423 | 424 | } else { |
| 424 | 425 | if (empty($this->sort_callback) && !empty($this->sort)) { |
| 425 | 426 | $column = $this->getColumn(array_keys($this->sort)[0]); |
| 426 | - if ($column->isSortable() AND Nette\Utils\Validators::isCallable($column->getSortableCallback())) |
|
| 427 | - $this->sort_callback = $column->getSortableCallback(); |
|
| 427 | + if ($column->isSortable() AND Nette\Utils\Validators::isCallable($column->getSortableCallback())) { |
|
| 428 | + $this->sort_callback = $column->getSortableCallback(); |
|
| 429 | + } |
|
| 428 | 430 | } |
| 429 | 431 | |
| 430 | 432 | $items = Nette\Utils\Callback::invokeArgs( |
@@ -10,7 +10,6 @@ |
||
| 10 | 10 | |
| 11 | 11 | use Nette\Utils\Html; |
| 12 | 12 | use Ublaboo\DataGrid\DataGrid; |
| 13 | -use Ublaboo\DataGrid\Exception\DataGridHasToBeAttachedToPresenterComponentException; |
|
| 14 | 13 | use Ublaboo\DataGrid\Exception\DataGridException; |
| 15 | 14 | use Ublaboo\DataGrid\Row; |
| 16 | 15 | |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | /** |
| 186 | 186 | * Set icon |
| 187 | 187 | * @param string|callable $icon |
| 188 | - * @return static|callable |
|
| 188 | + * @return Action |
|
| 189 | 189 | * @throws DataGridException |
| 190 | 190 | */ |
| 191 | 191 | public function setIcon($icon) |
@@ -270,7 +270,8 @@ discard block |
||
| 270 | 270 | |
| 271 | 271 | /** |
| 272 | 272 | * Check whether given property is string or callable |
| 273 | - * @param mixed $property |
|
| 273 | + * @param callable $property |
|
| 274 | + * @param string $name |
|
| 274 | 275 | * @return void |
| 275 | 276 | * @throws DataGridException |
| 276 | 277 | */ |
@@ -10,7 +10,6 @@ |
||
| 10 | 10 | |
| 11 | 11 | use Nette\Utils\Html; |
| 12 | 12 | use Ublaboo\DataGrid\DataGrid; |
| 13 | -use Ublaboo\DataGrid\Exception\DataGridHasToBeAttachedToPresenterComponentException; |
|
| 14 | 13 | use Ublaboo\DataGrid\Exception\DataGridException; |
| 15 | 14 | use Ublaboo\DataGrid\Row; |
| 16 | 15 | |
@@ -90,7 +90,7 @@ |
||
| 90 | 90 | ]); |
| 91 | 91 | |
| 92 | 92 | if ($this->icon) { |
| 93 | - $a->add(Html::el('span')->class(DataGrid::$icon_prefix . $this->icon)); |
|
| 93 | + $a->add(Html::el('span')->class(DataGrid::$icon_prefix.$this->icon)); |
|
| 94 | 94 | |
| 95 | 95 | if (strlen($this->text)) { |
| 96 | 96 | $a->add(' '); |
@@ -9,7 +9,6 @@ |
||
| 9 | 9 | namespace Ublaboo\DataGrid\DataSource; |
| 10 | 10 | |
| 11 | 11 | use DibiFluent; |
| 12 | -use Nette\Utils\Callback; |
|
| 13 | 12 | use Nette\Utils\Strings; |
| 14 | 13 | use Ublaboo\DataGrid\Filter; |
| 15 | 14 | |
@@ -8,9 +8,7 @@ |
||
| 8 | 8 | |
| 9 | 9 | namespace Ublaboo\DataGrid\DataSource; |
| 10 | 10 | |
| 11 | -use DibiFluent; |
|
| 12 | 11 | use Nette\Utils\Callback; |
| 13 | -use Nette\Utils\Strings; |
|
| 14 | 12 | use Ublaboo\DataGrid\Filter; |
| 15 | 13 | |
| 16 | 14 | abstract class FilterableDataSource |
@@ -48,7 +48,7 @@ |
||
| 48 | 48 | |
| 49 | 49 | $this->key = $key; |
| 50 | 50 | |
| 51 | - $this->setTemplate(__DIR__ . '/../templates/column_status.latte'); |
|
| 51 | + $this->setTemplate(__DIR__.'/../templates/column_status.latte'); |
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | |
@@ -10,7 +10,6 @@ |
||
| 10 | 10 | |
| 11 | 11 | use Ublaboo\DataGrid\DataGrid; |
| 12 | 12 | use Nette\Utils\Html; |
| 13 | -use Ublaboo\DataGrid\Row; |
|
| 14 | 13 | |
| 15 | 14 | trait ButtonIconTrait |
| 16 | 15 | { |
@@ -10,9 +10,7 @@ |
||
| 10 | 10 | |
| 11 | 11 | use Ublaboo\DataGrid\Filter\Filter; |
| 12 | 12 | use Ublaboo\DataGrid\Filter\FilterDate; |
| 13 | -use Nette\Utils\Callback; |
|
| 14 | 13 | use Nette\Utils\Strings; |
| 15 | -use Ublaboo\DataGrid\Exception\DataGridException; |
|
| 16 | 14 | use Ublaboo\DataGrid\Exception\DataGridArrayDataSourceException; |
| 17 | 15 | use Ublaboo\DataGrid\Utils\DateTimeHelper; |
| 18 | 16 | use Ublaboo\DataGrid\Exception\DataGridDateTimeHelperException; |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | * Filter by multi select value |
| 170 | 170 | * @param mixed $row |
| 171 | 171 | * @param FilterMultiSelect $filter |
| 172 | - * @return void |
|
| 172 | + * @return boolean |
|
| 173 | 173 | */ |
| 174 | 174 | public function applyFilterMultiSelect($row, FilterMultiSelect $filter) |
| 175 | 175 | { |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | /** |
| 184 | 184 | * @param mixed $row |
| 185 | 185 | * @param FilterRange $filter |
| 186 | - * @return void |
|
| 186 | + * @return boolean |
|
| 187 | 187 | */ |
| 188 | 188 | public function applyFilterRange($row, FilterRange $filter) |
| 189 | 189 | { |
@@ -209,7 +209,7 @@ discard block |
||
| 209 | 209 | /** |
| 210 | 210 | * @param mixed $row |
| 211 | 211 | * @param FilterDateRange $filter |
| 212 | - * @return void |
|
| 212 | + * @return boolean |
|
| 213 | 213 | */ |
| 214 | 214 | public function applyFilterDateRange($row, FilterDateRange $filter) |
| 215 | 215 | { |
@@ -270,7 +270,7 @@ discard block |
||
| 270 | 270 | * Apply fitler date and tell whether row value matches or not |
| 271 | 271 | * @param mixed $row |
| 272 | 272 | * @param Filter $filter |
| 273 | - * @return mixed |
|
| 273 | + * @return boolean|null |
|
| 274 | 274 | */ |
| 275 | 275 | protected function applyFilterDate($row, FilterDate $filter) |
| 276 | 276 | { |