@@ 249-270 (lines=22) @@ | ||
246 | $values = $condition[$filter->getColumn()]; |
|
247 | $row_value = $row[$filter->getColumn()]; |
|
248 | ||
249 | if ($values['from'] !== null && $values['from'] !== '') { |
|
250 | $date_from = DateTimeHelper::tryConvertToDate($values['from'], [$format]); |
|
251 | $date_from->setTime(0, 0, 0); |
|
252 | ||
253 | if (!($row_value instanceof \DateTime)) { |
|
254 | /** |
|
255 | * Try to convert string to DateTime object |
|
256 | */ |
|
257 | try { |
|
258 | $row_value = DateTimeHelper::tryConvertToDate($row_value); |
|
259 | } catch (DataGridDateTimeHelperException $e) { |
|
260 | /** |
|
261 | * Otherwise just return raw string |
|
262 | */ |
|
263 | return false; |
|
264 | } |
|
265 | } |
|
266 | ||
267 | if ($row_value->getTimeStamp() < $date_from->getTimeStamp()) { |
|
268 | return false; |
|
269 | } |
|
270 | } |
|
271 | ||
272 | if ($values['to'] !== null && $values['to'] !== '') { |
|
273 | $date_to = DateTimeHelper::tryConvertToDate($values['to'], [$format]); |
|
@@ 272-293 (lines=22) @@ | ||
269 | } |
|
270 | } |
|
271 | ||
272 | if ($values['to'] !== null && $values['to'] !== '') { |
|
273 | $date_to = DateTimeHelper::tryConvertToDate($values['to'], [$format]); |
|
274 | $date_to->setTime(23, 59, 59); |
|
275 | ||
276 | if (!($row_value instanceof \DateTime)) { |
|
277 | /** |
|
278 | * Try to convert string to DateTime object |
|
279 | */ |
|
280 | try { |
|
281 | $row_value = DateTimeHelper::tryConvertToDate($row_value); |
|
282 | } catch (DataGridDateTimeHelperException $e) { |
|
283 | /** |
|
284 | * Otherwise just return raw string |
|
285 | */ |
|
286 | return false; |
|
287 | } |
|
288 | } |
|
289 | ||
290 | if ($row_value->getTimeStamp() > $date_to->getTimeStamp()) { |
|
291 | return false; |
|
292 | } |
|
293 | } |
|
294 | ||
295 | return true; |
|
296 | } |