Merge remote-tracking branch 'origin/master' into issue502_user_in_actions

src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/create.html.twig

@@ -0,0 +1,26 @@
+{% extends '@ChillPerson/Household/layout.html.twig' %}
+
+{% block title 'household_composition.create'|trans %}
+
+{% block block_post_menu %}
+    <div class="post-menu"></div>
+{% endblock %}
+
+{% block content %}
+
+<h1>{{ 'household_composition.Create'|trans }}</h1>
+
+    <div>
+        {{ form_start(form) }}
+
+        {{ form_widget(form) }}
+
+        <ul class="record_actions">
+            <li>
+                <button type="submit" class="btn btn-create">{{ 'Save'|trans }}</button>
+            </li>
+        </ul>
+        {{ form_end(form) }}
+    </div>
+
+{% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/index.html.twig

@@ -15,7 +15,7 @@
     {% else %}
         <div class="flex-table">
             {% for c in compositions %}
-                {% if c.id != editId %}
+                {# {% if c.id != editId %} #}
                     <div class="item-bloc">
                         <div class="item-row">
                             <div class="item-col">
@@ -42,7 +42,7 @@
                             <div class="item-row">
                                 <ul class="record_actions">
                                     <li>
-                                        <a href="{{ path('chill_person_household_composition_index', {'id': c.household.id, 'edit': c.id}) }}" class="btn btn-edit"></a>
+                                        <a href="{{ path('chill_person_household_composition_new', {'id': c.household.id, 'edit': c.id}) }}" class="btn btn-edit"></a>
                                     </li>
                                     <li>
                                         <a href="{{ chill_path_add_return_path('chill_person_household_composition_delete', {'composition_id': c.id,
@@ -54,45 +54,17 @@
                             </div>
                         {% endif %}
                     </div>
-                {% else %}
-                    {{ form_start(form) }}
-
-                    {{ form_widget(form) }}
-
-                    <ul class="record_actions">
-                        <li class="cancel" style="margin-right: auto;">
-                            <a class="btn btn-cancel" href="{{ path('chill_person_household_composition_index', {'id': c.household.id}) }}">{{ 'Cancel'|trans }}</a>
-                        </li>
-                        <li>
-                            <button type="submit" class="btn btn-create">{{ 'Save'|trans }}</button>
-                        </li>
-                    </ul>
-                    {{ form_end(form) }}
-                {% endif %}
             {% endfor %}
         </div>
     {% endif %}
 
-    <div id="collapseForm" class="{% if not isPosted %}collapse{% endif %}">
-        {{ form_start(form) }}
-
-        {{ form_widget(form) }}
-
-        <ul class="record_actions">
-           <li>
-               <button type="submit" class="btn btn-create">{{ 'Save'|trans }}</button>
-           </li>
-        </ul>
-        {{ form_end(form) }}
-    </div>
-
-    {% if editId == -1 %}
+    {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
         <ul class="record_actions sticky-form-buttons">
-                <li>
-                    <button class="btn btn-primary btn-create change-icon" type="button" data-bs-toggle="collapse" data-bs-target="#collapseForm" aria-expanded="false" aria-controls="collapseForm">
-                        {{ 'Create'|trans }}
-                    </button>
-                </li>
+            <li>
+                <a href="{{ chill_path_add_return_path('chill_person_household_composition_new', {'id': household.id,}) }}"
+                        class="btn btn-new"
+                        title="{{ 'Create'|trans }}">{{ 'Create'|trans }}</a>
+            </li>
         </ul>
     {% endif %}
 </div>

src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig

@@ -1,15 +1,25 @@
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
+
+{% set activeRouteKey = 'chill_person_resource_list' %}
+
+{% block title %}{{ 'Person resources'|trans|capitalize ~ ' ' ~ person|chill_entity_render_string }}{% endblock %}
+
+{% block js %}
+    {{ encore_entry_script_tags('page_person_resource_showhide_input') }}
+    {{ encore_entry_script_tags('mod_pickentity_type') }}
+{% endblock %}
+
+{% block css %}
+    {{ encore_entry_link_tags('page_person_resource_showhide_input') }}
+    {{ encore_entry_link_tags('mod_pickentity_type') }}
+{% endblock %}
+
+{% block personcontent %}
+
+<h1 style="margin-bottom: 2rem;">{{ 'Add a person resource'|trans }}</h1>
+
 <div class="col-md col-xxl">
-    <div id="collapseForm" class="{% if not form.vars.submitted %}collapse{% endif %}">
         <h3 style="margin-bottom: 2rem;">{{ 'Add a person resource'|trans }}</h3>
         {% include "@ChillPerson/PersonResource/form.html.twig" %}
-    </div>
-
-    <ul class="record_actions sticky-form-buttons">
-        <li>
-            <button class="btn btn-primary btn-create change-icon" type="button" data-bs-toggle="collapse" data-bs-target="#collapseForm" aria-expanded="false" aria-controls="collapseForm">
-                {{ 'Add a person resource'|trans }}
-            </button>
-        </li>
-    </ul>
-
-</div>
+</div>
+{% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig

@@ -85,8 +85,14 @@
     <p class="chill-no-data-statement">{{ 'There are no available resources'|trans }}</p>
 {% endif %}
 
-<h1 style="margin-bottom: 2rem;">{{ 'Add a person resource'|trans }}</h1>
-
-{% include "@ChillPerson/PersonResource/create.html.twig" %}
+{% if is_granted('CHILL_PERSON_UPDATE', person) %}
+<ul class="record_actions sticky-form-buttons">
+    <li>
+        <a href="{{ chill_path_add_return_path('chill_person_resource_new', {'person_id': person.id,}) }}"
+                class="btn btn-new"
+                title="{{ 'Create'|trans }}">{{ 'Create'|trans }}</a>
+    </li>
+</ul>
+{% endif %}
 
 {% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig

@@ -49,7 +49,12 @@
                                         <li>
                                             <i class="fa fa-li fa-home"></i>
                                             <span class="item-key">{{ "Address of"|trans}} </span>
-                                            <span class="chill-entity entity-person badge-person">{{ a.hostPerson|chill_entity_render_box }}</span>
+                                                {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                                                    action: 'show', displayBadge: true,
+                                                    targetEntity: { name: 'person', id: a.hostPerson.id },
+                                                    buttonText: a.hostPerson|chill_entity_render_string,
+                                                    isDead: a.hostPerson.deathdate is not null
+                                                } %}
                                         </li>
                                         <li>
                                             {% set address_date = date(a.startDate|date("m/d/Y")) %}
@@ -62,7 +67,12 @@
                                         <li>
                                             <i class="fa fa-li fa-home"></i>
                                             <span class="item-key">{{ "Address of"|trans}}</span>
-                                            <span class="chill-entity entity-person badge-thirdparty">{{ a.hostThirdParty|chill_entity_render_box }}</span>
+                                            {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                                                action: 'show', displayBadge: true,
+                                                targetEntity: { name: 'thirdparty', id: a.hostThirdParty.id },
+                                                buttonText: a.hostThirdParty|chill_entity_render_string,
+                                                isDead: false,
+                                            } %}
                                         </li>
                                         <li>
                                             {% if a.hostThirdParty.address is not null %}

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

@@ -1,5 +1,10 @@
+{%- import "@ChillDocStore/Macro/macro.html.twig" as m -%}
+
 <div class="flex-table accompanying_course_work-list">
     <div class="item-bloc evaluation-item bg-chill-llight-gray">
+        <div class="item-row mb-2">
+            <h1>{{ doc.title }}</h1>
+        </div>
         <div class="item-row mb-2">
             <h2 class="badge-title">
                 <span class="title_label"></span>
@@ -20,6 +25,24 @@
                 </span>
             </h2>
         </div>
+        <div class="item-row mb-2">
+            <div class="item-col" style="width: 17%;">
+                <h4 class="title_label">
+                    {{ 'Participants'|trans }}
+                </h4>
+            </div>
+            <div class="item-col list">
+                {% for p in evaluation.accompanyingPeriodWork.persons %}
+                    {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                        targetEntity: { name: 'person', id: p.id },
+                        action: 'show',
+                        displayBadge: true,
+                        buttonText: p|chill_entity_render_string,
+                        isDead: p.deathdate is not null
+                    } %}
+                {% endfor %}
+            </div>
+        </div>
         <div class="item-row column">
             <table class="obj-res-eval my-3" style="font-size: 110% !important;">
                 <thead>
@@ -92,12 +115,19 @@
 </div>
 
 {% if display_action is defined and display_action == true %}
-    {# TODO add acl #}
+    {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', evaluation.accompanyingPeriodWork) %}
     <ul class="record_actions">
+        <li>{{ m.download_button(doc.storedObject, doc.title) }}</li>
+        {% if chill_document_is_editable(doc.storedObject) %}
+            <li>
+                {{ doc.storedObject|chill_document_edit_button }}
+            </li>
+        {% endif %}
         <li>
             <a class="btn btn-show" href="{{ path('chill_person_accompanying_period_work_edit', {'id': evaluation.accompanyingPeriodWork.id}) }}">
                 {{ 'Show'|trans }}
             </a>
         </li>
     </ul>
+    {% endif %}
 {% endif %}