diff --git a/config/routes/activity.yaml b/config/routes/activity.yaml index e671ae5..856985b 100644 --- a/config/routes/activity.yaml +++ b/config/routes/activity.yaml @@ -1,3 +1,6 @@ activity_activities: path: /activities - controller: App\Controller\ActivityController::activities \ No newline at end of file + controller: App\Controller\ActivityController::activities +activity_activity: + path: /activities/edit/{id} + controller: App\Controller\ActivityController::activity \ No newline at end of file diff --git a/src/Controller/ActivityController.php b/src/Controller/ActivityController.php index e3f8128..1ed1e58 100644 --- a/src/Controller/ActivityController.php +++ b/src/Controller/ActivityController.php @@ -86,4 +86,24 @@ 'activityAddForm' => $activityAddForm, ]); } + + /** + * Page for editing activity + * + * @param String $id + * @param Request $request + * @return Response + */ + public function activity(string $id, Request $request): Response + { + // Get repositories + $entityManager = $this->getDoctrine()->getManager(); + /** @var ActivityRepository $actorRepository */ + $activityRepository = $entityManager->getRepository(ActivityEntity::class); + + $activity = $activityRepository->find($id); + return $this->render('activity/activity.html.twig', [ + 'activity' => $activity, + ]); + } } \ No newline at end of file diff --git a/src/Controller/ActorController.php b/src/Controller/ActorController.php index 2d386c2..d799651 100644 --- a/src/Controller/ActorController.php +++ b/src/Controller/ActorController.php @@ -90,11 +90,11 @@ /** * Actor edition page * - * @param Request $request * @param string $id + * @param Request $request * @return Response */ - public function actor(Request $request, string $id): Response + public function actor(string $id, Request $request): Response { // Get repositories $entityManager = $this->getDoctrine()->getManager(); @@ -145,8 +145,8 @@ ]); } } - - // Update fields + + // Update fields $actorEditForm->updateFields($actor); return $this->render('actor/actor.html.twig', [ diff --git a/templates/_includes/html/arrays/activity.html.twig b/templates/_includes/html/arrays/activity.html.twig index 5a233aa..135d468 100644 --- a/templates/_includes/html/arrays/activity.html.twig +++ b/templates/_includes/html/arrays/activity.html.twig @@ -11,7 +11,7 @@ Fin planifiée Début réél Fin réele - Actions + Actions @@ -29,8 +29,10 @@ {% endif %} {% if activity.realEndDate is not null %} {{ dateTools.euro(activity.realEndDate) }} {% endif %} - {% if activityDeleteForm is defined %} - {% include '_includes/html/genericForm.html.twig' with {'form': activityDeleteForm, 'data': {activity: activity, variant: 'icon'}} only %} + Editer + {% if activityDeleteForm is defined %} {% include '_includes/html/genericForm.html.twig' with {'form': activityDeleteForm, 'data': {activity: activity, variant: 'icon'}} only %} {% endif %} {% endfor %} diff --git a/templates/activity/activity.html.twig b/templates/activity/activity.html.twig new file mode 100644 index 0000000..f6db2a4 --- /dev/null +++ b/templates/activity/activity.html.twig @@ -0,0 +1,8 @@ +{% extends '_includes/html/base.html.twig' %} + +{% set pageName='Activités - '~activity.name %} +{% set page='Activités - '~activity.name %} +{% set returnPath=[{label: 'Activités', url: url('activity_activities', {}, false), title: 'Liste des activités'}] %} + +{% block pageContent %} +{% endblock %} \ No newline at end of file