Skip to content

Commit

Permalink
Merge pull request #2335 from MTES-MCT/fix/2292-query-error
Browse files Browse the repository at this point in the history
[QA] Correction export csv avec filtre visite activé
  • Loading branch information
numew committed Mar 15, 2024
2 parents 0914ad2 + d800094 commit 897f782
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/Service/SearchFilterService.php
Original file line number Diff line number Diff line change
Expand Up @@ -374,25 +374,25 @@ public function applyFilters(QueryBuilder $qb, array $filters): QueryBuilder
->setParameter('cities', $filters['cities']);
}
if (!empty($filters['visites'])) {
$qb->leftJoin('s.interventions', 'i');
$qb->leftJoin('s.interventions', 'intervSearch');
$queryVisites = '';

foreach ($filters['visites'] as $visiteFilter) {
$queryVisites .= ('' !== $queryVisites) ? ' OR ' : '';
switch ($visiteFilter) {
case VisiteStatus::NON_PLANIFIEE->value:
$queryVisites .= '(i.id IS NULL)';
$queryVisites .= '(intervSearch.id IS NULL)';
break;
case VisiteStatus::PLANIFIEE->value:
$todayDatetime = new \DateTime();
$queryVisites .= '(i.status = \''.Intervention::STATUS_PLANNED.'\' AND i.scheduledAt > '.$todayDatetime->format('Y-m-d').')';
$queryVisites .= '(intervSearch.status = \''.Intervention::STATUS_PLANNED.'\' AND intervSearch.scheduledAt > '.$todayDatetime->format('Y-m-d').')';
break;
case VisiteStatus::CONCLUSION_A_RENSEIGNER->value:
$todayDatetime = new \DateTime();
$queryVisites .= '(i.status = \''.Intervention::STATUS_PLANNED.'\' AND i.scheduledAt <= '.$todayDatetime->format('Y-m-d').')';
$queryVisites .= '(intervSearch.status = \''.Intervention::STATUS_PLANNED.'\' AND intervSearch.scheduledAt <= '.$todayDatetime->format('Y-m-d').')';
break;
case VisiteStatus::TERMINEE->value:
$queryVisites .= '(i.status = \''.Intervention::STATUS_DONE.'\')';
$queryVisites .= '(intervSearch.status = \''.Intervention::STATUS_DONE.'\')';
break;
}
}
Expand Down

0 comments on commit 897f782

Please sign in to comment.