Merge branch 'signature-app-master' into 'master'

Signature app master

Closes #307

See merge request Chill-Projet/chill-bundles!743

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig

@@ -211,7 +211,7 @@
         <h3 class="chill-beige">Public</h3>
         {% if w.note is not empty %}
             <blockquote class="chill-user-quote">
-                {{ w.note|chill_entity_render_box({'metadata': true }) }}
+                {{ w.note }}
             </blockquote>
         {% else %}
             <span class="chill-no-data-statement">{{ 'No comment associated'|trans }}</span>

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig

@@ -237,8 +237,7 @@
                         {% if displayContent is defined and displayContent == 'long' %}
 
                             {% if e.comment is not empty %}
-                                <blockquote
-                                    class="chill-user-quote">{{ e.comment|chill_entity_render_box }}</blockquote>
+                                <blockquote class="chill-user-quote">{{ e.comment }}</blockquote>
                             {% endif %}
 
                             {% import "@ChillDocStore/Macro/macro.html.twig" as m %}

src/Bundle/ChillPersonBundle/Resources/views/GenericDoc/evaluation_document.html.twig

@@ -60,9 +60,11 @@
                     {{ document.storedObject|chill_document_button_group(document.title, is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', document.accompanyingPeriodWorkEvaluation.accompanyingPeriodWork)) }}
                 </li>
             {% endif %}
-            {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_SEE', w)%}
+            {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', w) %}
                 <li>
-                    <a href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_show', {'id': w.id, 'docId': document.id}) }}" class="btn btn-show"></a>
+                    <form method="post" action="{{ chill_path_add_return_path('chill_person_accompanying_period_work_evaluation_document_duplicate', {id: document.id}) }}">
+                        <button type="submit" class="btn btn-duplicate" title="{{ 'crud.view.link_duplicate'|trans }}"></button>
+                    </form>
                 </li>
             {% endif %}
             {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', w) %}
@@ -70,6 +72,11 @@
                     <a href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', {'id': w.id, 'docId': document.id}) }}" class="btn btn-edit"></a>
                 </li>
             {% endif %}
+            {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_SEE', w)%}
+                <li>
+                    <a href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_show', {'id': w.id, 'docId': document.id}) }}" class="btn btn-show"></a>
+                </li>
+            {% endif %}
         </ul>
 
     </div>

src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig

@@ -328,8 +328,33 @@
                             </div>
                         </div>
                     {% endif %}
-
-
+                    {% if person.signaturesPending|length > 0 %}
+                    <div class="item-row separator">
+                        <div class="wrap-list periods-list">
+                            <div class="wl-row">
+                                <div class="wl-col title">
+                                    <h3>{{ 'workflow.pending_signatures'|trans({nb_signatures: person.signaturesPending|length}) }}</h3>
+                                </div>
+                                <div class="wl-col list">
+                                    {% for signature in person.signaturesPending %}
+                                        {% set entityWorkflow = signature.step.entityWorkflow %}
+                                        {{ entityWorkflow|chill_entity_render_string }}
+                                        <ul class="record_actions small slim">
+                                            <li>
+                                                <a href="{{ chill_path_force_return_path(path('chill_main_workflow_show', {id: entityWorkflow.id}), 'chill_main_workflow_signature_metadata', {signature_id: signature.id}) }}" class="btn btn-misc">
+                                                    <i class="fa fa-pencil"></i>
+                                                </a>
+                                            </li>
+                                            <li>
+                                                <a href="{{ chill_path_add_return_path('chill_main_workflow_show', {id: entityWorkflow.id}) }}" class="btn btn-show"></a>
+                                            </li>
+                                        </ul>
+                                    {% endfor %}
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    {% endif %}
                 </div>
             {% endfor %}
         </div>

src/Bundle/ChillPersonBundle/Resources/views/Person/signature_list.html.twig

@@ -0,0 +1,44 @@
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
+{% set activeRouteKey = 'chill_person_signature_list' %}
+
+{% block title %}{{ 'Person signatures'|trans ~ ' ' ~ person|chill_entity_render_string }}{% endblock %}
+
+{% block dam %}
+    <a class="btn btn-misc" href="{{ chill_path_add_return_path('chill_main_workflow_signature_metadata', { 'signature_id': s.signature.id}) }}"><i class="fa fa-pencil-square-o"></i> {{ 'workflow.signature_zone.button_sign'|trans }}</a>
+{% endblock %}
+
+{% block content %}
+
+    <h1>{{ 'workflow.signature_list.title'|trans }}</h1>
+
+    <div class="container">
+        <div class="row align-items-center">
+            {% for s in signatures %}
+                {% set signature = s.signature %}
+                {% set workflow = s.workflow %}
+                {% set document = s.document %}
+
+                <div class="item-bloc">
+                        <div class="item-row">
+                            <div class="item-col flex-grow-1">
+                                {% include workflow.handler_template with workflow.handler_template_data|merge({'display_action': true, 'display_action_more': [block('dam')|raw] }) %}
+                            </div>
+                        </div>
+                </div>
+            {% endfor %}
+        </div>
+    </div>
+
+{% endblock %}
+
+{% block css %}
+    {{ parent() }}
+    {{ encore_entry_link_tags('mod_async_upload') }}
+    {{ encore_entry_script_tags('mod_document_action_buttons_group') }}
+{% endblock css %}
+
+{% block js %}
+    {{ parent() }}
+    {{ encore_entry_script_tags('mod_async_upload') }}
+    {{ encore_entry_link_tags('mod_document_action_buttons_group') }}
+{% endblock js %}

src/Bundle/ChillPersonBundle/Resources/views/Workflow/_accompanying_period_work.html.twig

@@ -13,6 +13,11 @@
     </div>
     {% if display_action is defined and display_action == true %}
         <ul class="record_actions">
+            {% for dam in display_action_more|default([]) %}
+                <li>
+                    {{ dam|raw }}
+                </li>
+            {% endfor %}
             <li>
                 <a class="btn btn-update"
                    href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': work.id }) }}">

src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation.html.twig

@@ -94,6 +94,11 @@
 {% if display_action is defined and display_action == true %}
     {# TODO add acl #}
     <ul class="record_actions">
+        {% for dam in display_action_more|default([]) %}
+            <li>
+                {{ dam|raw }}
+            </li>
+        {% endfor %}
         <li>
             <a class="btn btn-show" href="{{ path('chill_person_accompanying_period_work_edit', {'id': evaluation.accompanyingPeriodWork.id}) }}">
                 {{ 'Show'|trans }}

src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig

@@ -121,6 +121,11 @@
 
     {% if display_action is defined and display_action == true %}
         <ul class="record_actions">
+            {% for dam in display_action_more|default([]) %}
+                <li>
+                    {{ dam|raw }}
+                </li>
+            {% endfor %}
             <li>{{ doc.storedObject|chill_document_button_group(doc.title, is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', evaluation.accompanyingPeriodWork)) }}</li>
             <li>
                 <a class="btn btn-show" href="{{ path('chill_person_accompanying_period_work_edit', {'id': evaluation.accompanyingPeriodWork.id, 'doc_id': doc.id}) }}">