Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

Fixed: show list of workflow, event if some social action associated to a workflow are deleted

Browse Source
This commit is contained in:
Julien Fastré 2022-12-14 13:37:49 +01:00
parent 2dec6a017d
commit 58ede06dfe
Signed by: julienfastre
GPG Key ID: BDE2190974723FCB
3 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/Bundle/ChillPersonBundle/Resources/views/Workflow/_accompanying_period_work.html.twig
View File

@ -1,17 +1,23 @@
<div class="flex-table accompanying_course_work-list"> {% if work is null %}
{% include '@ChillPerson/AccompanyingCourseWork/_item.html.twig' with { <div class="alert alert-warning">
'w': work, {{ 'workflow.SocialAction deleted'|trans }}
'itemBlocClass': 'bg-chill-llight-gray' </div>
} %} {% else %}
</div> <div class="flex-table accompanying_course_work-list">
{% include '@ChillPerson/AccompanyingCourseWork/_item.html.twig' with {
'w': work,
'itemBlocClass': 'bg-chill-llight-gray'
} %}
</div>
{% if display_action is defined and display_action == true %} {% if display_action is defined and display_action == true %}
<ul class="record_actions"> <ul class="record_actions">
<li> <li>
<a class="btn btn-update" <a class="btn btn-update"
href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': work.id }) }}"> href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': work.id }) }}">
{{ 'Edit'|trans }} {{ 'Edit'|trans }}
</a> </a>
</li> </li>
</ul> </ul>
{% endif %} {% endif %}
{% endif %}

4
src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
View File

@ -56,6 +56,10 @@ class AccompanyingPeriodWorkWorkflowHandler implements EntityWorkflowHandlerInte
{ {
$work = $this->getRelatedEntity($entityWorkflow); $work = $this->getRelatedEntity($entityWorkflow);
if (null === $work) {
return $this->translator->trans('workflow.SocialAction deleted');
}
return return
$this->translator->trans('workflow.Work (n°%w%)', ['%w%' => $entityWorkflow->getRelatedEntityId()]) $this->translator->trans('workflow.Work (n°%w%)', ['%w%' => $entityWorkflow->getRelatedEntityId()])
. ' - ' . $this->translatableStringHelper->localize($work->getSocialAction()->getTitle()); . ' - ' . $this->translatableStringHelper->localize($work->getSocialAction()->getTitle());

1
src/Bundle/ChillPersonBundle/translations/messages.fr.yml
View File

@ -967,6 +967,7 @@ Number of periods: Nombre de parcours
workflow: workflow:
Doc for evaluation (n°%eval%): Document de l'évaluation n°%eval% Doc for evaluation (n°%eval%): Document de l'évaluation n°%eval%
doc for evaluation deleted: Document supprimé dans une évaluation doc for evaluation deleted: Document supprimé dans une évaluation
SocialAction deleted: Action sociale supprimée
period_by_user_list: period_by_user_list:
Period by user: Parcours d'accompagnement par utilisateur Period by user: Parcours d'accompagnement par utilisateur