Skip to content
Snippets Groups Projects
Commit cb693005 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Ajustement

parent 241c43ee
No related branches found
No related tags found
No related merge requests found
Pipeline #33912 failed
......@@ -95,7 +95,13 @@ class IndicateurService
switch ($indicateur->getPerimetre()) {
case Indicateur::PERIMETRE_STRUCTURE:
if ($userPerimetre !== null) $sql .= " WHERE perimetre_structure_id IN (" .implode(",", $userPerimetre).")";
if ($userPerimetre !== null) {
if (!empty($userPerimetre)) {
$sql .= " WHERE perimetre_structure_id IN (" . implode(",", $userPerimetre) . ")";
} else {
$sql .= " WHERE perimetre_structure_id IS NULL";
}
}
break;
case Indicateur::PERIMETRE_AUCUN:
default:
......@@ -350,6 +356,7 @@ class IndicateurService
*/
public function extractPerimetresValides(Indicateur $indicateur, ?array $perimetres = null): array
{
if ($perimetres === null) return [];
$indicateurPerimetre = $indicateur->getPerimetre();
$perimetreValides = array_filter($perimetres, function(string $p) use ($indicateurPerimetre) {
return (strtolower(explode('_', $p)[0]) === strtolower($indicateurPerimetre));
......
......@@ -6,14 +6,14 @@ use Application\Service\Perimetre\PerimetreService;
trait PerimetreServiceAwareTrait
{
private PerimetreService $perimetreService;
private $perimetreService;
public function getPerimetreService(): PerimetreService
public function getPerimetreService()
{
return $this->perimetreService;
}
public function setPerimetreService(PerimetreService $perimetreService): void
public function setPerimetreService( $perimetreService): void
{
$this->perimetreService = $perimetreService;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment