diff --git a/src/Controller/ActivityController.php b/src/Controller/ActivityController.php index f845d66..a5b4591 100644 --- a/src/Controller/ActivityController.php +++ b/src/Controller/ActivityController.php @@ -25,7 +25,7 @@ { // Get repositories $entityManager = $this->getDoctrine()->getManager(); - /** @var ActivityRepository $actorRepository */ + /** @var ActivityRepository $activityRepository */ $activityRepository = $entityManager->getRepository(ActivityEntity::class); // Activity add form diff --git a/src/Controller/ActorController.php b/src/Controller/ActorController.php index 8882fe2..a164c39 100644 --- a/src/Controller/ActorController.php +++ b/src/Controller/ActorController.php @@ -11,6 +11,8 @@ use Symfony\Component\Routing\Generator\UrlGenerator; use App\Form\Actors\ActorEditForm; use App\Repository\ActivityRepository; +use Doctrine\Common\Collections\Criteria; +use App\Enum\StatusEnum; class ActorController extends AbstractExtendedController { @@ -105,11 +107,14 @@ /** @var ActivityRepository $activityRepository */ $activityRepository = $entityManager->getRepository(ActivityEntity::class); - // Get information + // Get actor $actor = $actorRepository->find($id); - $activities = $activityRepository->findBy([ - 'actor' => $actor, - ]); + + // Get activities + $activityCriteria = new Criteria(); + $activityCriteria->andWhere($activityCriteria->expr()->eq('actor', $actor)); + $activityCriteria->andWhere($activityCriteria->expr()->in('status', StatusEnum::ACTIVE_STATUS)); + $activities = $activityRepository->matching($activityCriteria); // Actor edit form /** @var ActorEditForm $actorEditForm */ diff --git a/src/Enum/StatusEnum.php b/src/Enum/StatusEnum.php index 24c647a..09b7b01 100644 --- a/src/Enum/StatusEnum.php +++ b/src/Enum/StatusEnum.php @@ -30,4 +30,11 @@ 'planified' => 'Planifié', 'closed' => 'Clos', ]; + + /** @var array Status considered active */ + public const ACTIVE_STATUS = [ + self::OPEN, + self::IN_PROGRESS, + self::PLANIFIED, + ]; } \ No newline at end of file diff --git a/templates/actor/actor.html.twig b/templates/actor/actor.html.twig index 63becfc..746abd7 100644 --- a/templates/actor/actor.html.twig +++ b/templates/actor/actor.html.twig @@ -28,7 +28,7 @@
-

Activités

+

Activités en cours

{% include "_includes/html/arrays/activity.html.twig" with {activities: activities, hideActor: true} only %}