Merge branch 'master' into 232_resources_comment

src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig

@@ -215,3 +215,8 @@
         {{ form_widget(form.center) }}
     {% endif %}
 {% endblock %}
+
+{% block pick_user_dynamic_widget %}
+    <input type="hidden" {{ block('widget_attributes') }} {% if value is not empty %}value="{{ value }}" {% endif %} data-input-uniqid="{{ form.vars['uniqid'] }}"/>
+    <div data-module="pick-dynamic" data-types="{{ form.vars['types']|json_encode }}" data-multiple="{{ form.vars['multiple'] }}" data-uniqid="{{ form.vars['uniqid'] }}"></div>
+{% endblock %}

src/Bundle/ChillMainBundle/Resources/views/Notification/_list_item.html.twig

@@ -0,0 +1,88 @@
+<div class="item-bloc {% if not notification.isReadBy(app.user) %}unread{% else %}read{% endif %}">
+    <div class="item-row title">
+        <h2 class="notification-title">
+            <a href="{{ chill_path_add_return_path('chill_main_notification_show', {'id': notification.id}) }}">
+                {{ notification.title }}
+            </a>
+        </h2>
+    </div>
+    <div class="item-row mt-2 header">
+
+        <div class="item-col">
+            <ul class="small_in_title">
+                {% if step is not defined or step == 'inbox' %}
+                    <li class="notification-from">
+                        <span class="item-key">
+                            <abbr title="{{ 'notification.received_from'|trans }}">
+                                {{ 'notification.from'|trans }} :
+                            </abbr>
+                        </span>
+                        {% if not notification.isSystem %}
+                            <span class="badge-user">
+                                {{ notification.sender|chill_entity_render_string }}
+                            </span>
+                        {% else %}
+                            <span class="badge-user system">{{ 'notification.is_system'|trans }}</span>
+                        {% endif %}
+                    </li>
+                {% endif %}
+                {% if notification.addressees|length > 0 %}
+                    <li class="notification-to">
+                        <span class="item-key">
+                            <abbr title="{{ 'notification.sent_to'|trans }}">
+                                {{ 'notification.to'|trans }} :
+                            </abbr>
+                        </span>
+                        {% for a in notification.addressees %}
+                            <span class="badge-user">
+                                {{ a|chill_entity_render_string }}
+                            </span>
+                        {% endfor %}
+                    </li>
+                {% endif %}
+            </ul>
+        </div>
+
+        <div class="item-col">
+            {{ notification.date|format_datetime('long', 'short') }}
+        </div>
+
+    </div>
+    <div class="item-row separator">
+        <div class="mx-3 flex-grow-1">
+            {% include data.template with data.template_data %}
+        </div>
+    </div>
+    <div class="item-row row">
+        <div>
+            <blockquote class="chill-user-quote">
+                {{ notification.message|u.truncate(250, '…', false)|chill_markdown_to_html }}
+            </blockquote>
+        </div>
+    </div>
+    {% if action_button is not defined or action_button != 'false' %}
+        <div class="item-row separator">
+            <ul class="record_actions">
+                <li>
+                    {# Vue component #}
+                    <span class="notification_toggle_read_status"
+                          data-notification-id="{{ notification.id }}"
+                          data-notification-current-is-read="{{ notification.isReadBy(app.user) }}"
+                    ></span>
+                </li>
+                {% if is_granted('CHILL_MAIN_NOTIFICATION_UPDATE', notification) %}
+                    <li>
+                        <a href="{{ chill_path_add_return_path('chill_main_notification_edit', {'id': notification.id}) }}"
+                           class="btn btn-edit" title="{{ 'Edit'|trans }}"></a>
+                    </li>
+                {% endif %}
+                {% if is_granted('CHILL_MAIN_NOTIFICATION_SEE', notification) %}
+                    <li>
+                        <a href="{{ chill_path_add_return_path('chill_main_notification_show', {'id': notification.id}) }}"
+                           class="btn btn-show" title="{{ 'Show'|trans }}"></a>
+                    </li>
+                {% endif %}
+            </ul>
+        </div>
+    {% endif %}
+</div>

src/Bundle/ChillMainBundle/Resources/views/Notification/create.html.twig

@@ -0,0 +1,46 @@
+{% extends "@ChillMain/layout.html.twig"  %}
+
+{% block title 'notification.Notify'|trans %}
+
+{% block js %}
+    {{ parent() }}
+    {{ encore_entry_script_tags('mod_pickentity_type') }}
+{% endblock %}
+
+{% block css %}
+    {{ parent() }}
+    {{ encore_entry_link_tags('mod_pickentity_type') }}
+{% endblock %}
+
+{% block content %}
+<div class="col-8 notification notification-new">
+    <h1 class="mb-5">{{ block('title') }}</h1>
+
+    {{ form_start(form, { 'attr': { 'id': 'notification' }}) }}
+
+    {{ form_row(form.title, { 'label': 'notification.subject'|trans }) }}
+    {{ form_row(form.addressees, { 'label': 'notification.sent_to'|trans }) }}
+
+    {% include handler.template(notification) with handler.templateData(notification) %}
+
+    <div class="mb-3 row">
+        <label class="col-form-label col-sm-4" for="notification_message">{{ form_label(form.message) }}</label>
+        <div class="col-12">
+            {{ form_widget(form.message) }}
+        </div>
+    </div>
+
+    {{ form_end(form) }}
+
+    <ul class="record_actions sticky-form-buttons">
+        <li class="cancel">
+            <a href="{{ chill_return_path_or('chill_main_homepage') }}" class="btn btn-cancel">{{ 'Cancel'|trans|chill_return_path_label }}</a>
+        </li>
+        <li>
+            <button type="submit" form="notification" class="btn btn-save change-icon">
+                <i class="fa fa-paper-plane fa-fw"></i> {{ 'notification.Send'|trans }}
+            </button>
+        </li>
+    </ul>
+</div>
+{% endblock %}

src/Bundle/ChillMainBundle/Resources/views/Notification/edit.html.twig

@@ -0,0 +1,44 @@
+{% extends "@ChillMain/layout.html.twig"  %}
+
+{% block title 'notification.Edit notification'|trans %}
+
+{% block js %}
+    {{ parent() }}
+    {{ encore_entry_script_tags('mod_pickentity_type') }}
+{% endblock %}
+
+{% block css %}
+    {{ parent() }}
+    {{ encore_entry_link_tags('mod_pickentity_type') }}
+{% endblock %}
+
+{% block content %}
+<div class="col-8 notification notification-edit">
+    <h1 class="mb-5">{{ block('title') }}</h1>
+
+    {{ form_start(form, { 'attr': { 'id': 'notification' }}) }}
+
+    {{ form_row(form.title, { 'label': 'notification.subject'|trans }) }}
+    {{ form_row(form.addressees, { 'label': 'notification.sent_to'|trans }) }}
+
+    {% include handler.template(notification) with handler.templateData(notification) %}
+
+    <div class="mb-3 row">
+        <label class="col-form-label col-sm-4" for="notification_message">{{ form_label(form.message) }}</label>
+        <div class="col-12">
+            {{ form_widget(form.message) }}
+        </div>
+    </div>
+
+    {{ form_end(form) }}
+
+    <ul class="record_actions sticky-form-buttons">
+        <li class="cancel">
+            <a href="{{ chill_return_path_or('chill_main_homepage') }}" class="btn btn-cancel">{{ 'Cancel'|trans|chill_return_path_label }}</a>
+        </li>
+        <li>
+            <button type="submit" form="notification" class="btn btn-save">{{ 'Save'|trans }}</button>
+        </li>
+    </ul>
+</div>
+{% endblock %}

src/Bundle/ChillMainBundle/Resources/views/Notification/email_non_system_notification_content.fr.md.twig

@@ -0,0 +1,20 @@
+{{ dest.label }},
+
+{{ notification.sender.label }} a créé une notification pour vous:
+
+> {{ notification.title }}
+>
+>
+{%- for line in notification.message|split("\n") %}
+> {{ line }}
+{%- if not loop.last %}
+>
+{%- endif %}
+{%- endfor %}
+
+Vous pouvez visualiser la notification et y répondre ici:
+
+{{ absolute_url(path('chill_main_notification_show', {'_locale': 'fr', 'id': notification.id }, false)) }}
+
+--
+Le logiciel Chill

src/Bundle/ChillMainBundle/Resources/views/Notification/email_notification_comment_persist.fr.md.twig

@@ -0,0 +1,19 @@
+{{ dest.label }},
+
+{{ comment.createdBy.label }} a créé un commentaire sur la notification "{{ comment.notification.title }}".
+
+Commentaire:
+
+{% for line in comment.content|split("\n") %}
+> {{ line }}
+{%- if not loop.last %}
+>
+{%- endif %}
+{%- endfor %}
+
+Vous pouvez visualiser la notification et y répondre ici:
+
+{{ absolute_url(path('chill_main_notification_show', {'_locale': 'fr', 'id': comment.notification.id }, false)) }}
+
+--
+Le logiciel Chill

src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig

@@ -0,0 +1,45 @@
+<div class="list-group my-2 notification notification-box">
+    <div class="list-group-item">
+        <h4>{{ 'notification.Sent'|trans }}</h4>
+    </div>
+    {# TODO pagination or limit #}
+    {% for notification in notifications %}
+        <div class="list-group-item {% if notification.isReadBy(app.user) %}read{% else %}unread{% endif %}">
+
+            {% if not notification.isSystem %}
+                {% if notification.sender == app.user %}
+
+                    <h6 class="notification-title">
+                        <abbr title="{{ 'Le ' ~ notification.date|format_date('long') ~ '\n' ~ notification.title }}">
+                            {{ notification.date|format_datetime('short','short') }}
+                        </abbr>
+                        {# Vue component #}
+                        <span class="notification_toggle_read_status"
+                            data-notification-id="{{ notification.id }}"
+                            data-notification-current-is-read="{{ notification.isReadBy(app.user) }}"
+                            data-show-button-url="{{ chill_path_add_return_path('chill_main_notification_show', {'id': notification.id}) }}"
+                            data-button-class="btn-outline-primary"
+                            data-button-text="false"
+                        ></span>
+                    </h6>
+
+                    {% if notification.addressees|length > 0 %}
+                        <abbr title="{{ 'notification.sent_to'|trans }}">{{ 'notification.to'|trans }}:</abbr>
+                    {% endif %}
+
+                    {% for a in notification.addressees %}
+                        <span class="badge-user">
+                            {{ a|chill_entity_render_string }}
+                        </span>
+                    {% endfor %}
+
+                {% else %}
+                    <div>{{ 'notification.you were notified by %sender%'|trans({'%sender%': notification.sender|chill_entity_render_string }) }}</div>
+                {% endif %}
+            {% else %}
+                <div>{{ 'notification.you were notified by system'|trans }}</div>
+            {% endif %}
+
+        </div>
+    {% endfor %}
+</div>

src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig

@@ -0,0 +1,57 @@
+{% extends "@ChillMain/layout.html.twig"  %}
+
+{% block title 'notification.My own notifications'|trans %}
+
+{% block js %}
+  {{ parent() }}
+  {{ encore_entry_script_tags('mod_notification_toggle_read_status') }}
+{% endblock %}
+
+{% block css %}
+    {{ parent() }}
+    {{ encore_entry_link_tags('mod_notification_toggle_read_status') }}
+{% endblock %}
+
+{% block content %}
+<div class="col-10 notification notification-list">
+    <h1>{{ block('title') }}</h1>
+
+    <ul class="nav nav-pills justify-content-center">
+        <li class="nav-item">
+            <a class="nav-link {% if step == 'inbox' %}active{% endif %}" href="{{ path('chill_main_notification_my') }}">
+                {{ 'notification.Notifications received'|trans }}
+                {% if unreads['inbox'] > 0 %}
+                    <span class="badge rounded-pill bg-danger">
+                        {{ unreads['inbox'] }}
+                    </span>
+                {% endif %}
+            </a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link {% if step == 'sent' %}active{% endif %}" href="{{ path('chill_main_notification_sent') }}">
+                {{ 'notification.Notifications sent'|trans }}
+                {% if unreads['sent'] > 0 %}
+                    <span class="badge rounded-pill bg-danger">
+                        {{ unreads['sent'] }}
+                    </span>
+                {% endif %}
+            </a>
+        </li>
+    </ul>
+
+    {% if datas|length == 0 %}
+        {% if step == 'inbox' %}
+            <p class="chill-no-data-statement">{{ 'notification.Any notification received'|trans }}</p>
+        {% else %}
+            <p class="chill-no-data-statement">{{ 'notification.Any notification sent'|trans }}</p>
+        {% endif %}
+    {% else %}
+        <div class="flex-table">
+            {% for data in datas %}
+                {% set notification = data.notification %}
+                {% include 'ChillMainBundle:Notification:_list_item.html.twig' %}
+            {% endfor %}
+        </div>
+    {% endif %}
+</div>
+{% endblock content %}

src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig

@@ -1,42 +1,121 @@
 {% extends "@ChillMain/layout.html.twig"  %}
 
+{% block title 'notification.show notification from %sender%'|trans(
+    { '%sender%': notification.sender|chill_entity_render_string }
+) ~ ' ' ~ notification.title %}
+
+{% block js %}
+    {{ parent() }}
+    {{ encore_entry_script_tags('mod_notification_toggle_read_status') }}
+{% endblock %}
+
+{% block css %}
+    {{ parent() }}
+    {{ encore_entry_link_tags('mod_notification_toggle_read_status') }}
+{% endblock %}
+
+{% import '@ChillPerson/AccompanyingCourse/Comment/macro_showItem.html.twig' as m %}
+
+{% macro recordAction(comment) %}
+    {% if is_granted('CHILL_MAIN_NOTIFICATION_COMMENT_EDIT', comment) %}
+    <li>
+        <a href="{{ chill_path_forward_return_path('chill_main_notification_show', {
+            '_fragment': 'comment-' ~ comment.id,
+            'edit': comment.id,
+            'id': comment.notification.id
+        }) }}" class="btn btn-edit" title="{{ 'Edit'|trans }}"
+        ></a>
+    </li>
+    {% endif %}
+{% endmacro %}
+
 {% block content %}
-    <div id="container content">
-        <div class="grid-8 centered">
-            <h1>{{ "Notifications list" | trans }}</h1>
-            <!-- TODO : UNREAD & READ -->
+<div class="col-10 notification notification-show">
 
-            {%for data in datas %}
-                {% set notification = data.notification %}
+    <h1>{{ 'notification.Notification'|trans }}</h1>
 
-                <dl class="chill_view_data">
-                    <dt class="inline">{{ 'Message'|trans }}</dt>
-                    <dd>{{ notification.message }}</dd>
-                </dl>
+    <div class="flex-table">
+        {% include 'ChillMainBundle:Notification:_list_item.html.twig' with {
+            'data': {
+                 'template': handler.getTemplate(notification),
+                 'template_data': handler.getTemplateData(notification)
+            },
+            'action_button': 'false'
+        } %}
+    </div>
 
-                <dl class="chill_view_data">
-                    <dt class="inline">{{ 'Date'|trans }}</dt>
-                    <dd>{{ notification.date | date('long') }}</dd>
-                </dl>
+    <div class="notification-comment-list my-5">
+        <h2 class="chill-blue">{{ 'notification.comments_list'|trans }}</h2>
 
+        {% if notification.comments|length > 0 %}
+            <div class="flex-table">
+                {% for comment in notification.comments %}
 
-                <dl class="chill_view_data">
-                    <dt class="inline">{{ 'Sender'|trans }}</dt>
-                    <dd>{{ notification.sender }}</dd>
-                </dl>
+                    {% if editedCommentForm is null or editedCommentId != comment.id %}
+                        {{ m.show_comment(comment, {
+                            'recordAction': _self.recordAction(comment)
+                        }) }}
+                    {% else %}
+                        <div class="item-bloc">
+                            <div class="item-row row">
+                                <a id="comment-{{ comment.id }}"></a>
 
-                <dl class="chill_view_data">
-                    <dt class="inline">{{ 'Addressees'|trans }}</dt>
-                    <dd>{{ notification.addressees |join(', ')  }}</dd>
-                </dl>
+                                {{ form_start(editedCommentForm) }}
+                                {{ form_errors(editedCommentForm) }}
+                                {{ form_widget(editedCommentForm.content) }}
+                                <input type="hidden" name="form" value="edit" />
+                                <ul class="record_actions">
+                                    <li class="cancel">
+                                        <a href="{{ chill_path_forward_return_path('chill_main_notification_show', {
+                                            '_fragment': 'comment-' ~ comment.id,
+                                            'id': notification.id }) }}" class="btn btn-cancel">
+                                            {{ 'cancel'|trans }}
+                                        </a>
+                                    </li>
+                                    <li>
+                                        <button class="btn btn-save" type="submit">{{ 'Save'|trans }}</button>
+                                    </li>
+                                </ul>
+                                {{ form_end(editedCommentForm) }}
+
+                            </div>
+                        </div>
+                    {% endif %}
+
+                {% endfor %}
+            </div>
+        {% endif %}
+
+        <div class="new-comment my-5">
+            <h2 class="chill-blue">{{ 'Write a new comment'|trans }}</h2>
+
+            {{ form_start(appendCommentForm) }}
+            {{ form_errors(appendCommentForm) }}
+            {{ form_widget(appendCommentForm.content) }}
+            <input type="hidden" name="form" value="append" />
+            <ul class="record_actions">
+                <li>
+                    <button class="btn btn-create" type="submit">{{ 'notification.append_comment'|trans }}</button>
+                </li>
+            </ul>
+            {{ form_end(appendCommentForm) }}
 
-                <dl class="chill_view_data">
-                    <dt class="inline">{{ 'Entity'|trans }}</dt>
-                    <dd>
-                        {% include data.template with data.template_data %}
-                    </dd>
-                </dl>
-            {% endfor %}
         </div>
     </div>
+
+    <ul class="record_actions sticky-form-buttons">
+        <li class="cancel">
+            <a href="{{ chill_return_path_or('chill_main_notification_my') }}" class="btn btn-cancel">
+                {{ 'Cancel'|trans|chill_return_path_label }}
+            </a>
+        </li>
+        <li>
+            {# Vue component #}
+            <span class="notification_toggle_read_status"
+                data-notification-id="{{ notification.id }}"
+                data-notification-current-is-read="1"
+            ></span>
+        </li>
+    </ul>
+</div>
 {% endblock content %}

src/Bundle/ChillMainBundle/Resources/views/layout.html.twig

@@ -106,6 +106,6 @@
         });
     </script>
 
-    {% block js%}<!-- nothing added to js -->{% endblock %}
+    {% block js %}<!-- nothing added to js -->{% endblock %}
 </body>
 </html>