Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-21 07:03:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

fixes for budgets

Browse Source
This commit is contained in:
Julien Fastré
2022-03-03 10:37:10 +01:00
parent ac12e75714
commit 0833bb49ca
13 changed files with 97 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php
View File

@@ -30,8 +30,11 @@ class ResourceRepository extends EntityRepository
$entityStr = $entity instanceof Person ? 'person' : 'household';
$qb->where("c.{$entityStr} = :{$entityStr}")
->andWhere('c.startDate < :date')
->andWhere('c.startDate < :date OR c.startDate IS NULL');
// TODO: in controller, the budget and charges asked are also for future and actual
//->andWhere('c.startDate < :date')
// TODO: there is a misconception here, the end date must be lower or null. startDate are never null
//->andWhere('c.startDate < :date OR c.startDate IS NULL');
;
if (null !== $sort) {
$qb->orderBy($sort);
@@ -39,7 +42,7 @@ class ResourceRepository extends EntityRepository
$qb->setParameters([
$entityStr => $entity,
'date' => $date,
//'date' => $date,
]);
return $qb->getQuery()->getResult();