Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 11 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,17 @@ $dataSource = $this->queryObjectDataSourceFactory->create($qo, "id")
}
})
->setFilterCallback(function ($queryObject, array $filter) {
foreach ($filter as $field => $value) {
$queryObject->{'by' . $field}($value);
foreach ($filter as $field => $value) {
switch ($column) {
case 'dateRange':
$queryObject->byDateRange(QueryObjectDataSource::parseFilterDateRange($fieldSet));
break;
case 'date':
$queryObject->byDate(QueryObjectDataSource::parseFilterDate($fieldSet));
break;
default:
$queryObject->{'by' . $field}($value);
}
}
});

Expand Down
43 changes: 43 additions & 0 deletions src/QueryObjectDataSource.php
Original file line number Diff line number Diff line change
Expand Up @@ -148,4 +148,47 @@ public function sort(\Ublaboo\DataGrid\Utils\Sorting $sorting) {
return $this;
}

/**
* @param FilterDateRange $filter
* @return array
*/
public static function parseFilterDateRange(FilterDateRange $filter) {

$conditions = $filter->getCondition();

$value_from = $conditions[$filter->getColumn()]['from'];
$value_to = $conditions[$filter->getColumn()]['to'];

if ($value_from) {
$date_from = DateTimeHelper::tryConvertToDate($value_from, [$filter->getPhpFormat()]);
$date_from->setTime(0, 0, 0);
} else {
$date_from = NULL;
}

if ($value_to) {
$date_to = DateTimeHelper::tryConvertToDate($value_to, [$filter->getPhpFormat()]);
$date_to->setTime(23, 59, 59);
} else {
$date_to = NULL;
}

return [
'from' => $date_from,
'to' => $date_to,
];
}

/**
* @param FilterDate $filter
* @return \DateTime|null
*/
public static function parseFilterDate(FilterDate $filter) {
foreach ($filter->getCondition() as $column => $value) {
$date = DateTimeHelper::tryConvertToDateTime($value, [$filter->getPhpFormat()]);
$date->setTime(0, 0, 0);
return $date;
}
}

}