diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_accompanying_period_work.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_accompanying_period_work.html.twig index 57cf503b8..17ecb9072 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_accompanying_period_work.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_accompanying_period_work.html.twig @@ -1,17 +1,23 @@ -
- {% include '@ChillPerson/AccompanyingCourseWork/_item.html.twig' with { - 'w': work, - 'itemBlocClass': 'bg-chill-llight-gray' - } %} -
+{% if work is null %} +
+ {{ 'workflow.SocialAction deleted'|trans }} +
+{% else %} +
+ {% include '@ChillPerson/AccompanyingCourseWork/_item.html.twig' with { + 'w': work, + 'itemBlocClass': 'bg-chill-llight-gray' + } %} +
-{% if display_action is defined and display_action == true %} - -{% endif %} \ No newline at end of file + {% if display_action is defined and display_action == true %} + + {% endif %} +{% endif %} diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php index 776eb1462..b6829ab77 100644 --- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php +++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php @@ -56,6 +56,10 @@ class AccompanyingPeriodWorkWorkflowHandler implements EntityWorkflowHandlerInte { $work = $this->getRelatedEntity($entityWorkflow); + if (null === $work) { + return $this->translator->trans('workflow.SocialAction deleted'); + } + return $this->translator->trans('workflow.Work (n°%w%)', ['%w%' => $entityWorkflow->getRelatedEntityId()]) . ' - ' . $this->translatableStringHelper->localize($work->getSocialAction()->getTitle()); diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml index 7c9afba48..d76d7c2a9 100644 --- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml @@ -967,6 +967,7 @@ Number of periods: Nombre de parcours workflow: Doc for evaluation (n°%eval%): Document de l'évaluation n°%eval% doc for evaluation deleted: Document supprimé dans une évaluation + SocialAction deleted: Action sociale supprimée period_by_user_list: Period by user: Parcours d'accompagnement par utilisateur