@@ -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 | |
@@ -108,7 +108,7 @@ |
||
| 108 | 108 | $element = $a; |
| 109 | 109 | |
| 110 | 110 | if ($this->icon) { |
| 111 | - $a->addHtml(Html::el('span')->class(DataGrid::$icon_prefix . $this->icon)); |
|
| 111 | + $a->addHtml(Html::el('span')->class(DataGrid::$icon_prefix.$this->icon)); |
|
| 112 | 112 | |
| 113 | 113 | if (strlen($value)) { |
| 114 | 114 | $a->addHtml(' '); |
@@ -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 | |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | $value_from = $conditions[$filter->getColumn()]['from']; |
| 138 | 138 | $value_to = $conditions[$filter->getColumn()]['to']; |
| 139 | 139 | |
| 140 | - if ($value_from || $value_from != '') { |
|
| 140 | + if ($value_from || $value_from != '') { |
|
| 141 | 141 | $this->data_source->where('%n >= ?', $filter->getColumn(), $value_from); |
| 142 | 142 | } |
| 143 | 143 | |
@@ -164,11 +164,11 @@ discard block |
||
| 164 | 164 | continue; |
| 165 | 165 | } |
| 166 | 166 | |
| 167 | - if ($filter->hasSplitWordsSearch() === FALSE) { |
|
| 168 | - $words = [$value]; |
|
| 169 | - } else { |
|
| 170 | - $words = explode(' ', $value); |
|
| 171 | - } |
|
| 167 | + if ($filter->hasSplitWordsSearch() === FALSE) { |
|
| 168 | + $words = [$value]; |
|
| 169 | + } else { |
|
| 170 | + $words = explode(' ', $value); |
|
| 171 | + } |
|
| 172 | 172 | |
| 173 | 173 | foreach ($words as $word) { |
| 174 | 174 | $escaped = $this->data_source->getConnection()->getDriver()->escapeLike($word, 0); |
@@ -122,7 +122,7 @@ |
||
| 122 | 122 | $or = []; |
| 123 | 123 | |
| 124 | 124 | foreach ($condition as $column => $value) { |
| 125 | - if($filter->isExactSearch()){ |
|
| 125 | + if ($filter->isExactSearch()) { |
|
| 126 | 126 | $this->data_source->where("$column = %s", $value); |
| 127 | 127 | continue; |
| 128 | 128 | } |
@@ -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,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 | { |
@@ -152,10 +152,10 @@ |
||
| 152 | 152 | |
| 153 | 153 | foreach ($condition as $column => $value) { |
| 154 | 154 | if ($filter instanceof FilterText && $filter->isExactSearch()) { |
| 155 | - return $row[$column] == $value; |
|
| 156 | - } |
|
| 155 | + return $row[$column] == $value; |
|
| 156 | + } |
|
| 157 | 157 | |
| 158 | - if ($filter instanceof FilterText && $filter->hasSplitWordsSearch() === FALSE) { |
|
| 158 | + if ($filter instanceof FilterText && $filter->hasSplitWordsSearch() === FALSE) { |
|
| 159 | 159 | $words = [$value]; |
| 160 | 160 | } else { |
| 161 | 161 | $words = explode(' ', $value); |
@@ -8,8 +8,6 @@ |
||
| 8 | 8 | |
| 9 | 9 | namespace Ublaboo\DataGrid\GroupAction; |
| 10 | 10 | |
| 11 | -use Nette; |
|
| 12 | - |
|
| 13 | 11 | /** |
| 14 | 12 | * @method void onSelect() |
| 15 | 13 | */ |
@@ -39,7 +39,7 @@ |
||
| 39 | 39 | { |
| 40 | 40 | parent::__construct($key, $name, $options, $column); |
| 41 | 41 | |
| 42 | - $this->addAttribute('data-selected-icon-check', DataGrid::$icon_prefix . 'check'); |
|
| 42 | + $this->addAttribute('data-selected-icon-check', DataGrid::$icon_prefix.'check'); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | |
@@ -192,7 +192,7 @@ |
||
| 192 | 192 | */ |
| 193 | 193 | foreach ($sorting->getSort() as $column => $order) { |
| 194 | 194 | $this->sort_column = $column; |
| 195 | - $this->order_column = $order; |
|
| 195 | + $this->order_column = $order; |
|
| 196 | 196 | } |
| 197 | 197 | |
| 198 | 198 | return $this; |