diff --git a/src/Controller/ActivityController.php b/src/Controller/ActivityController.php index 6fad908..e0a6cfd 100644 --- a/src/Controller/ActivityController.php +++ b/src/Controller/ActivityController.php @@ -9,7 +9,6 @@ use App\Entity\ActivityEntity; use App\Entity\ActorEntity; use App\Entity\TaskEntity; -use App\Enum\StatusEnum; use App\Form\Activity\ActivityAddForm; use App\Form\Activity\ActivityDeleteForm; use App\Form\Activity\ActivityEditForm; @@ -188,7 +187,6 @@ // Get tasks $tasks = $taskRepository->findBy([ 'activity' => $activity, - 'status' => StatusEnum::ACTIVE_STATUS, ]); return $this->render('activity/activity.html.twig', [ diff --git a/src/Entity/TaskEntity.php b/src/Entity/TaskEntity.php index 3b6b074..c7eb860 100644 --- a/src/Entity/TaskEntity.php +++ b/src/Entity/TaskEntity.php @@ -134,7 +134,7 @@ */ public function getExecutionDate(): ?DateTime { - return $this->planifiedDate; + return $this->executionDate; } /**