Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-21 15:13:50 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'master' into 'issue289_person_extraPhoneNumbers'

Browse Source 
# Conflicts:
#   CHANGELOG.md
This commit is contained in:
Julien Fastré
2021-11-15 11:22:17 +00:00
parent a7dd15a411 87c83dd7a0
commit 9816ac8ad7
79 changed files with 3379 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/delete.html.twig Normal file
View File

@@ -0,0 +1,34 @@
{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig" %}
{% set activeRouteKey = 'chill_person_accompanying_period_work_list' %}
{% block title 'accompanying_course_work.remove'|trans %}
{% block content %}
<div class="accompanying_course_work-list">
<h2 class="badge-title">
<span class="title_label">{{ 'accompanying_course_work.action'|trans }}</span>
<span class="title_action">{{ work.socialAction|chill_entity_render_string }}</span>
</h2>
<div>
<h3>{{ "Associated peoples"|trans }}</h3>
<ul>
{% for p in work.persons %}
{{ p|chill_entity_render_box }}
{% endfor %}
</ul>
</div>
</div>
{{ include('@ChillMain/Util/confirmation_template.html.twig',
{
'title' : 'accompanying_course_work.remove'|trans,
'confirm_question' : 'Are you sure you want to remove this work of the accompanying period %name% ?'|trans({ '%name%' : accompanyingCourse.id } ),
'cancel_route' : 'chill_person_accompanying_period_work_list',
'cancel_parameters' : {'id' : accompanyingCourse.id},
'form' : delete_form
} ) }}
{% endblock %}

5
src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig
View File

@@ -103,6 +103,11 @@
href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': w.id }) }}"
>{% if buttonText is not defined or buttonText == true %}{{ 'Edit'|trans }}{% endif %}</a>
</li>
<li>
<a class="btn btn-delete" title="{{ 'Delete'|trans }}"
href="{{ path('chill_person_accompanying_period_work_delete', { 'id': w.id } ) }}"
>{% if buttonText is not defined or buttonText == true %}{{ 'Delete'|trans }}{% endif %}</a>
</li>
</ul>
</div>

36
src/Bundle/ChillPersonBundle/Resources/views/Household/relationship.html.twig
View File

@@ -2,26 +2,34 @@
{% block title 'household.Relationship'|trans %}
{% block content %}
<h1>{{ block('title') }}</h1>
<div id="graph-relationship"></div>
{#
Give more space to graph:
* use parent twig block (layout_wvm_content)
* hide title (d-none)
* apply negative margin-top
#}
{% block layout_wvm_content %}
<div class="row justify-content-center">
{% for m in household.members %}
{% if m.endDate is null %}
{{ dump(m) }}
{% endif %}
{% endfor %}
<div class="col-md-10 col-xxl d-none">
<h1>{{ block('title') }}</h1>
</div>
<div id="relationship-graph"
style="margin-top: -3rem"
data-persons="{{ persons|e('html_attr') }}">
</div>
</div>
{% endblock %}
{% block block_post_menu %}
<div id="visgraph-legend"></div>
{% endblock %}
{% block js %}
{{ parent() }}
{{ encore_entry_script_tags('page_vis') }}
{{ encore_entry_script_tags('vue_visgraph') }}
{% endblock %}
{% block css %}
{{ parent() }}
{{ encore_entry_link_tags('page_vis') }}
{{ encore_entry_link_tags('vue_visgraph') }}
{% endblock %}
{% block block_post_menu %}{% endblock %}