Skip to content

Improvements #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thorewi merged 2 commits into from
Dec 2, 2020
Merged

Improvements #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
312d2d9
Update IQueryObject.php
thorewi Dec 2, 2020
bfba4be
Update QueryObjectDataSource.php
thorewi Dec 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/IQueryObject.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ interface IQueryObject
{
function orderBy(string $column, string $order = 'ASC');

function addOrderBy(string $column, string $order = 'ASC');

function searchIn($column, $value, bool $strict = false);

function getEntityManager();
Expand Down
29 changes: 13 additions & 16 deletions src/QueryObjectDataSource.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,26 +135,23 @@ public function setData($data) {
* @param array $filters
* @return static
*/
public function filter(array $filters): void {
foreach ($filters as $filter) {
if ($filter->isValueSet()) {
if ($filter->getConditionCallback()) {
call_user_func($filter->getConditionCallback(), $this->queryObject, $filter->getValue());
} else {
if ($this->queryObject instanceof IQueryObject) {
if ($filter instanceof FilterText) {
$this->queryObject->searchIn($filter->getKey(), $filter->getValue());
} else {
$this->queryObject->equalIn($filter->getKey(), $filter->getValue());
}
public function filter(array $filters): void
{
if (is_callable($this->filterCallback)) {
call_user_func($this->filterCallback, $this->queryObject, $filters);
}
else {
foreach ($filters as $filter) {
if ($filter->isValueSet()) {
if ($filter->getConditionCallback()) {
call_user_func($filter->getConditionCallback(), $this->queryObject, $filter->getValue());
}
elseif ($this->queryObject instanceof IQueryObject) {
$this->queryObject->searchIn($filter->getKey(), $filter->getValue(), !$filter instanceof FilterText);
}
}
}
}

if (is_callable($this->filterCallback)) {
call_user_func_array($this->filterCallback, [$this->queryObject, $filters]);
}
}

/**
Expand Down