diff --git a/src/Controller/ActivityController.php b/src/Controller/ActivityController.php index 0a43b01..6ca187a 100644 --- a/src/Controller/ActivityController.php +++ b/src/Controller/ActivityController.php @@ -2,6 +2,8 @@ namespace App\Controller; use Symfony\Component\HttpFoundation\Response; +use App\Repository\ActivityRepository; +use App\Entity\ActivityEntity; /** * Controller for activity related pages @@ -16,6 +18,15 @@ */ public function activities(): Response { - return $this->render('activity/activities.html.twig'); + // Get repositories + $entityManager = $this->getDoctrine()->getManager(); + /** @var ActivityRepository $actorRepository */ + $activityRepository = $entityManager->getRepository(ActivityEntity::class); + + $activities = $activityRepository->findAll(); + + return $this->render('activity/activities.html.twig', [ + 'activities' => $activities, + ]); } } \ No newline at end of file diff --git a/src/Entity/ActivityEntity.php b/src/Entity/ActivityEntity.php index dd00b68..66a4b70 100644 --- a/src/Entity/ActivityEntity.php +++ b/src/Entity/ActivityEntity.php @@ -209,4 +209,29 @@ return $this; } + + /** + * Get the status of the activity + * + * @return string + * @see StatusEnum + */ + public function getStatus(): string + { + return $this->status; + } + + /** + * Set a new status for the activity + * + * @param string $status + * @return self + * @see StatusEnum + */ + public function setStatus(string $status): self + { + $this->status = $status; + + return $this; + } } \ No newline at end of file diff --git a/templates/_includes/html/arrays/activity.html.twig b/templates/_includes/html/arrays/activity.html.twig index 7f016ad..414b5d1 100644 --- a/templates/_includes/html/arrays/activity.html.twig +++ b/templates/_includes/html/arrays/activity.html.twig @@ -1,3 +1,6 @@ +{% import '_includes/macros/status.html.twig' as statusTools %} +{% import '_includes/macros/date.html.twig' as dateTools %} +
Début planifié | Début réél | Fin planifiée | -Fin rééle | +Fin réele | Actions | ||
{{ activity.name }} | +{{ statusTools.statusName(activity.status) }} | +{% if activity.actor is not null %} + {{ activity.actor.displayName }} + {% endif %} | +{% if activity.startDate is not null %} {{ dateTools.euro(activity.startDate) }} + {% endif %} | +{% if activity.realStartDate is not null %} {{ dateTools.euro(activity.realStartDate) }} + {% endif %} | +{% if activity.endDate is not null %} {{ dateTools.euro(activity.endDate) }} + {% endif %} | +{% if activity.realEndDate is not null %} {{ dateTools.euro(activity.realEndDate) }} + {% endif %} | ++ |