From 23cee274a59d99c2ac72a2c6096e03b5756be3d8 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Fri, 24 Feb 2023 12:31:46 +0100 Subject: [PATCH 1/4] FEATURE [documents][listing] show document titles in activity listing if there are any and user has see_detail rights --- .../views/Activity/_list_item.html.twig | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig index b7f13210b..8faa68b6b 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig @@ -165,6 +165,22 @@ documents attendee #} + + {% if is_granted('CHILL_ACTIVITY_SEE_DETAILS', activity) and activity.documents|length > 0 %} +
+
+

{{ 'Documents'|trans }}

+
+
+
    + {% for d in activity.documents %} +
  • {{ d.title }}
    • + {% endfor %} +
+
+
+ {% endif %} + From 3aac4d5d35b9a52c83d031310990d5ede3d11bc1 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Tue, 7 Mar 2023 14:25:17 +0100 Subject: [PATCH 2/4] FEATURE add download button to document listing --- .../Resources/public/chill/chillactivity.scss | 14 ++++++++++++++ .../Resources/views/Activity/_list_item.html.twig | 12 ++---------- .../Activity/listAccompanyingCourse.html.twig | 2 ++ .../Resources/views/Activity/listPerson.html.twig | 2 ++ 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss index 5c1c83d06..01364717e 100644 --- a/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss +++ b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss @@ -88,3 +88,17 @@ div.flex-bloc.concerned-groups { font-size: 120%; } } + +/// DOCUMENT LIST IN ACTIVITY ITEM + +li.document-list-item { + display: flex; + width: 100%; + justify-content: space-between; + margin-bottom: 0.3rem; + + .dropdown-toggle { + border-radius: 5px; + line-height: 1rem; + } +} diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig index 8faa68b6b..dc8415659 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig @@ -157,15 +157,7 @@ {% endif %} - - {# Only if ACL SEE_DETAILS AND/OR only on template SHOW ?? - durationTime - travelTime - comment - documents - attendee - #} - + {% if is_granted('CHILL_ACTIVITY_SEE_DETAILS', activity) and activity.documents|length > 0 %}
@@ -174,7 +166,7 @@
    {% for d in activity.documents %} -
  • {{ d.title }}
    • +
  • {{ d.title }} {{ d|chill_document_button_group() }}
    • {% endfor %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig index a666f183d..bdf55d86f 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig @@ -8,11 +8,13 @@ {% block js %} {{ parent() }} {{ encore_entry_script_tags('mod_notification_toggle_read_status') }} + {{ encore_entry_script_tags('mod_document_action_buttons_group') }} {% endblock %} {% block css %} {{ parent() }} {{ encore_entry_link_tags('mod_notification_toggle_read_status') }} + {{ encore_entry_link_tags('mod_document_action_buttons_group') }} {% endblock %} {% block content %} diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig index 0514284a2..0c1afdac9 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig @@ -23,11 +23,13 @@ {% block js %} {{ parent() }} {{ encore_entry_script_tags('mod_notification_toggle_read_status') }} + {{ encore_entry_script_tags('mod_document_action_buttons_group') }} {% endblock %} {% block css %} {{ parent() }} {{ encore_entry_link_tags('mod_notification_toggle_read_status') }} + {{ encore_entry_link_tags('mod_document_action_buttons_group') }} {% endblock %} {% block content %} From 83e0a50b572375d65b57ed970c2cc647fc49a9e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Thu, 9 Mar 2023 17:47:32 +0100 Subject: [PATCH 3/4] Fixed: do not alter layout for bootstrap --- .../Resources/public/chill/chillactivity.scss | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss index 01364717e..d70bd28c3 100644 --- a/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss +++ b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss @@ -90,15 +90,9 @@ div.flex-bloc.concerned-groups { } /// DOCUMENT LIST IN ACTIVITY ITEM - li.document-list-item { display: flex; width: 100%; justify-content: space-between; margin-bottom: 0.3rem; - - .dropdown-toggle { - border-radius: 5px; - line-height: 1rem; - } } From 6e812b54e140aa7c64c8e885eb91e24a8efd29c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Thu, 9 Mar 2023 17:47:52 +0100 Subject: [PATCH 4/4] Fixed: add small button and ACL on document edit --- .../Resources/views/Activity/_list_item.html.twig | 4 ++-- .../Resources/views/Activity/show.html.twig | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig index dc8415659..f2430c200 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig @@ -157,7 +157,7 @@
{% endif %} - + {% if is_granted('CHILL_ACTIVITY_SEE_DETAILS', activity) and activity.documents|length > 0 %}
@@ -166,7 +166,7 @@
    {% for d in activity.documents %} -
  • {{ d.title }} {{ d|chill_document_button_group() }}
    • +
  • {{ d.title }} {{ d|chill_document_button_group(d.title, is_granted('CHILL_ACTIVITY_UPDATE', activity), {small: true}) }}
    • {% endfor %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig index 5fe93a3b8..b7a9d7239 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig @@ -170,7 +170,7 @@ {% if entity.documents|length > 0 %}
    {% for d in entity.documents %} -
  • {{ d.title }} {{ d|chill_document_button_group() }}
    • +
  • {{ d.title }} {{ d|chill_document_button_group(d.title, is_granted('CHILL_ACTIVITY_UPDATE', entity), {small: true}) }}
    • {% endfor %}
{% else %}