From b361ab2d74f9cc4763f1915f2e945b19e911d254 Mon Sep 17 00:00:00 2001 From: nobohan Date: Wed, 30 Mar 2022 11:10:23 +0200 Subject: [PATCH 1/5] workflow: add div for delete workflow form --- .../ChillMainBundle/Resources/views/Workflow/delete.html.twig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/delete.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/delete.html.twig index 64da4ea76..d11165fc6 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Workflow/delete.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/delete.html.twig @@ -3,6 +3,7 @@ {% block title 'workflow.Delete workflow ?'|trans %} {% block display_content %} +

{{ handler.entityTitle(entityWorkflow) }}

@@ -10,6 +11,7 @@ {% include handler.template(entityWorkflow) with handler.templateData(entityWorkflow)|merge({ 'display_action': false }) %} + {% endblock %} {% block content %} @@ -25,5 +27,5 @@ 'form' : delete_form } ) }}
- + {% endblock %} From f29ead4961a8201b3c80754bc9d7ad79fcec0b6e Mon Sep 17 00:00:00 2001 From: nobohan Date: Wed, 30 Mar 2022 11:26:19 +0200 Subject: [PATCH 2/5] accompanying course: fix display bug in accompanying course resume --- .../_join_household.html.twig | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_join_household.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_join_household.html.twig index fda36da85..888ab8d43 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_join_household.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_join_household.html.twig @@ -1,16 +1,19 @@
-
-
- +
+
+ +
+ +
+

{{ 'Some peoples does not belong to any household currently. Add them to an household soon'|trans }}

- {{ 'Some peoples does not belong to any household currently. Add them to an household soon'|trans }} -
+
From 1d6d8dc002bb54e317326079efce28cd3f079253 Mon Sep 17 00:00:00 2001 From: nobohan Date: Wed, 30 Mar 2022 12:01:35 +0200 Subject: [PATCH 3/5] accompanyingcourse work: add ACL rights for create and edit buttons --- .../views/AccompanyingCourseWork/_item.html.twig | 12 +++++++----- .../views/AccompanyingCourseWork/index.html.twig | 4 ++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig index 6287b158d..8ff8a0617 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig @@ -128,11 +128,13 @@ 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', w.id, [], suppEvaluations) }} -
  • - -
    • + {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', w) %} +
  • + +
    • + {% endif %} {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_DELETE', w) %}
  • {{ block('title') }} {% if works|length == 0 %} + {#% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_CREATE') %#}

    {{ 'accompanying_course_work.Any work'|trans }}

    + {#% endif %#} {% else %}
    @@ -35,6 +37,7 @@ {{ chill_pagination(paginator) }} + {#% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_CREATE') %#} + {#% endif %#}
    {% endblock %} From 5477a70c8425c7b13d4b695df79e1c3561000bcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 6 Apr 2022 12:41:50 +0200 Subject: [PATCH 4/5] add ACL around creation of work in course --- .../views/AccompanyingCourseWork/index.html.twig | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig index 50301f90c..6956a1497 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig @@ -18,15 +18,7 @@

    {{ block('title') }}

    {% if works|length == 0 %} - {#% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_CREATE') %#} -

    {{ 'accompanying_course_work.Any work'|trans }} - -

    - {#% endif %#} - +

    {{ 'accompanying_course_work.Any work'|trans }}

    {% else %}
    {% for w in works %} @@ -37,7 +29,7 @@ {{ chill_pagination(paginator) }} - {#% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_CREATE') %#} + {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_CREATE') %} - {#% endif %#} + {% endif %}
    {% endblock %} From 95b114a144d35678c00f64d6abc73452d3dc3e08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 6 Apr 2022 12:42:12 +0200 Subject: [PATCH 5/5] do not show button to send notification on draft courses --- .../views/AccompanyingCourse/index.html.twig | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig index 0a021997d..7a4f18b1d 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig @@ -184,25 +184,27 @@
    • {% endif %} - -
    -
    -

    {{ 'notification.Notifications'|trans }}

    - {% set notif_counter = chill_count_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod', accompanyingCourse.id) %} - {% if notif_counter.total > 0 %} -
    - - {{ chill_counter_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod', accompanyingCourse.id) }} + + {% if accompanyingCourse.step != 'DRAFT' %} +
    +
    +

    {{ 'notification.Notifications'|trans }}

    + {% set notif_counter = chill_count_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod', accompanyingCourse.id) %} + {% if notif_counter.total > 0 %} +
    + + {{ chill_counter_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod', accompanyingCourse.id) }} + +
    + {% endif %} +
    + + {{ 'notification.Notify'|trans }}
    - {% endif %} -
    - - {{ 'notification.Notify'|trans }} -
    -
    + {% endif %}
    {% endblock %} - +
    {% set notifications = chill_list_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod', accompanyingCourse.id) %} {% if notifications is not empty %}