mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-09-18 12:44:59 +00:00
Compare commits
3 Commits
v3.0.0-RC6
...
v3.0.0-RC7
Author | SHA1 | Date | |
---|---|---|---|
a46e987f81 | |||
81220b5b22 | |||
5b0019cde7 |
3
.changes/v2.23.1.md
Normal file
3
.changes/v2.23.1.md
Normal file
@@ -0,0 +1,3 @@
|
||||
## v2.23.1 - 2024-07-25
|
||||
### Fixed
|
||||
* Fix export activities linked to accompanying period between two dates
|
@@ -73,13 +73,15 @@ final readonly class PeriodHavingActivityBetweenDatesFilter implements FilterInt
|
||||
|
||||
$qb->andWhere(
|
||||
$qb->expr()->exists(
|
||||
'SELECT 1 FROM '.Activity::class." {$alias} WHERE {$alias}.date >= :{$from} AND {$alias}.date < :{$to} AND {$alias}.accompanyingPeriod = acp"
|
||||
'SELECT 1 FROM '.Activity::class." {$alias} WHERE {$alias}.date >= :{$from} AND {$alias}.date < :{$to} AND {$alias}.accompanyingPeriod = activity.accompanyingPeriod AND {$alias}.id = activity.id"
|
||||
)
|
||||
);
|
||||
|
||||
$qb
|
||||
->setParameter($from, $this->rollingDateConverter->convert($data['start_date']))
|
||||
->setParameter($to, $this->rollingDateConverter->convert($data['end_date']));
|
||||
|
||||
dump($qb->getQuery()->getResult());
|
||||
}
|
||||
|
||||
public function applyOn()
|
||||
|
@@ -32,7 +32,7 @@ abstract class AbstractSearch implements SearchInterface
|
||||
{
|
||||
try {
|
||||
return new \DateTime($string);
|
||||
} catch (ParsingException $ex) {
|
||||
} catch (\Exception $ex) {
|
||||
$exception = new ParsingException('The date is '
|
||||
.'not parsable', 0, $ex);
|
||||
|
||||
|
Reference in New Issue
Block a user