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

ajust list_with_period search with person render_box (and add new options to it)

Browse Source
This commit is contained in:
Mathieu Jaumotte 2021-08-01 15:21:03 +02:00
parent 4be4cd7279
commit 48873d15c9
11 changed files with 378 additions and 388 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss
View File

@ -87,6 +87,7 @@ div.flex-table {
div.item-row { div.item-row {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
&:not(:first-child) { &:not(:first-child) {
margin-top: 0.5em; margin-top: 0.5em;
border-top: 1px dotted $gray-900; border-top: 1px dotted $gray-900;
@ -100,13 +101,13 @@ div.flex-table {
} }
&:last-child { &:last-child {
flex-grow: 1; flex-shrink: 1; flex-basis: auto; flex-grow: 1; flex-shrink: 1; flex-basis: auto;
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
ul.record_actions { ul.record_actions {
margin: 0;
align-self: flex-start;
flex-grow: 1; flex-shrink: 0; flex-basis: auto; flex-grow: 1; flex-shrink: 0; flex-basis: auto;
align-self: flex-start;
margin: 0;
li { li {
margin-right: 5px; margin-right: 5px;
} }

12
src/Bundle/ChillPersonBundle/Resources/public/chill/scss/person_with_period.scss
View File

@ -1,10 +1,12 @@
/// complete and overwrite flex-table in chillmain.scss /// overwrite flex-table
div.list-with-period {
div.flex-table div.item-row div.item-col:first-child { flex-basis: 33%; }
}
///
div.list-with-period, div.list-with-period,
div.list-household-members { div.list-household-members {
div.comment {
// for the comment for household-members
}
div.periods { div.periods {
div.header, div.header,
div.list-content { div.list-content {
@ -13,7 +15,7 @@ div.list-household-members {
} }
div.header { div.header {
position: relative; position: relative;
a.sc-button { a.btn {
position: absolute; position: absolute;
width: 30px; width: 30px;
height: 30px; height: 30px;

6
src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue
View File

@ -22,8 +22,8 @@
class="item-bloc" class="item-bloc"
v-bind:key="conc.person.id" v-bind:key="conc.person.id"
> >
<div class="item-row person"> <div class="item-row">
<div class="item-col box-person"> <div class="item-col">
<div> <div>
<person :person="conc.person"></person> <person :person="conc.person"></person>
</div> </div>
@ -33,7 +33,7 @@
</div> </div>
</div> </div>
<div class="item-col box-where"> <div class="item-col">
<ul class="list-content fa-ul"> <ul class="list-content fa-ul">
<li> <li>
<i class="fa fa-li fa-map-marker"></i> <i class="fa fa-li fa-map-marker"></i>

6
src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="item-bloc"> <div class="item-bloc">
<div class="item-row person"> <div class="item-row">
<div class="item-col box-person"> <div class="item-col">
<div> <div>
<person :person="conc.person"></person> <person :person="conc.person"></person>
<span v-if="isHolder" class="badge bg-primary holder"> <span v-if="isHolder" class="badge bg-primary holder">
@ -10,7 +10,7 @@
</div> </div>
<div v-if="conc.person.birthdate !== null">{{ $t('person.born', {'gender': conc.person.gender} ) }}</div> <div v-if="conc.person.birthdate !== null">{{ $t('person.born', {'gender': conc.person.gender} ) }}</div>
</div> </div>
<div class="item-col box-where"> <div class="item-col">
<ul class="list-content fa-ul"> <ul class="list-content fa-ul">
<li> <li>
<i class="fa fa-li fa-map-marker"></i> <i class="fa fa-li fa-map-marker"></i>

16
src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
View File

@ -50,7 +50,8 @@
</div> </div>
<div class="item-row"> <div class="item-row">
<h3>{{ 'Participants'|trans }}</h3> <div class="item-col"><h3>{{ 'Participants'|trans }}</h3></div>
<div class="item-col">
{% if accompanying_period.participations.count > 0 %} {% if accompanying_period.participations.count > 0 %}
{% for p in accompanying_period.participations %} {% for p in accompanying_period.participations %}
<p> <p>
@ -62,21 +63,28 @@
{% else %} {% else %}
<span class="chill-no-data-statement">{{ 'No data given'|trans }}</span> <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
{% endif %} {% endif %}
</div>
</div> </div>
<div class="item-row"> <div class="item-row">
<h3>{{ 'Requestor'|trans }}</h3> <div class="item-col"><h3>{{ 'Requestor'|trans }}</h3></div>
<div class="item-col">
{% if accompanying_period.requestorPerson is not null or accompanying_period.requestorThirdParty is not null %} {% if accompanying_period.requestorPerson is not null or accompanying_period.requestorThirdParty is not null %}
{% if accompanying_period.requestorPerson is not null %} {% if accompanying_period.requestorPerson is not null %}
<p>{{ accompanying_period.requestorPerson.firstname ~ ' ' ~ accompanying_period.requestorPerson.lastname }}</p> <p>
{{ accompanying_period.requestorPerson.firstname ~ ' ' ~ accompanying_period.requestorPerson.lastname }}
</p>
{% endif %} {% endif %}
{% if accompanying_period.requestorThirdParty is not null %} {% if accompanying_period.requestorThirdParty is not null %}
<p>{{ accompanying_period.requestorThirdParty.name }}</p> <p>
{{ accompanying_period.requestorThirdParty.name }}
</p>
{% endif %} {% endif %}
{% else %} {% else %}
<span class="chill-no-data-statement">{{ 'No data given'|trans }}</span> <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
{% endif %} {% endif %}
</div>
</div> </div>
<div class="item-row"> <div class="item-row">

11
src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
View File

@ -8,7 +8,9 @@
* addId bool * addId bool
* addInfo bool * addInfo bool
* addAge bool * addAge bool
* addCenter bool
* hLevel integer * hLevel integer
* address_multiline bool
* customButtons [ * customButtons [
'before' Twig\Markup, (injected with macro) 'before' Twig\Markup, (injected with macro)
'replace' Twig\Markup, 'replace' Twig\Markup,
@ -89,10 +91,11 @@
</div> </div>
<div class="item-col"> <div class="item-col">
<ul class="list-content fa-ul"> <ul class="list-content fa-ul">
{% set multiline = (options['address_multiline']) ? true : false %}
{{ person.getLastAddress|chill_entity_render_box({ {{ person.getLastAddress|chill_entity_render_box({
'render': 'list', 'render': 'list',
'with_picto': true, 'with_picto': true,
'multiline': false, 'multiline': multiline,
'with_valid_from': false 'with_valid_from': false
}) }} }) }}
<li> <li>
@ -111,6 +114,12 @@
{% endif %} {% endif %}
{% endif %} {% endif %}
</li> </li>
{% if options['addCenter'] %}
<li>
<i class="fa fa-li fa-long-arrow-right"></i>
{{ person.center }}
</li>
{% endif %}
</ul> </ul>
<ul class="record_actions"> <ul class="record_actions">
{% if options['customButtons']['before'] is defined %} {% if options['customButtons']['before'] is defined %}

12
src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
View File

@ -85,8 +85,8 @@
<div class="flex-table list-household-members"> <div class="flex-table list-household-members">
{% for m in members %} {% for m in members %}
<div class="item-bloc"> <div class="item-bloc">
<div class="item-row person"> <div class="item-row">
<div class="item-col box-person"> <div class="item-col">
<div> <div>
{{ m.person|chill_entity_render_box({'addLink': true}) }} {{ m.person|chill_entity_render_box({'addLink': true}) }}
{% if m.holder %} {% if m.holder %}
@ -97,7 +97,7 @@
{{ 'Born the date'|trans({ 'gender': m.person.gender, 'birthdate': m.person.birthdate|format_date('long') }) }} {{ 'Born the date'|trans({ 'gender': m.person.gender, 'birthdate': m.person.birthdate|format_date('long') }) }}
</div> </div>
</div> </div>
<div class="item-col box-where"> <div class="item-col">
<ul class="list-content fa-ul"> <ul class="list-content fa-ul">
{% if m.startDate is not empty %} {% if m.startDate is not empty %}
<li>{{ 'Since %date%'|trans({'%date%': m.startDate|format_date('long') }) }}</li> <li>{{ 'Since %date%'|trans({'%date%': m.startDate|format_date('long') }) }}</li>
@ -155,8 +155,8 @@
<div class="flex-table list-household-members"> <div class="flex-table list-household-members">
{% for m in members %} {% for m in members %}
<div class="item-bloc"> <div class="item-bloc">
<div class="item-row person"> <div class="item-row">
<div class="item-col box-person"> <div class="item-col">
<div> <div>
{{ m.person|chill_entity_render_box({'addLink': true}) }} {{ m.person|chill_entity_render_box({'addLink': true}) }}
{% if m.holder %} {% if m.holder %}
@ -167,7 +167,7 @@
{{ 'Born the date'|trans({ 'gender': m.person.gender, 'birthdate': m.person.birthdate|format_date('long') }) }} {{ 'Born the date'|trans({ 'gender': m.person.gender, 'birthdate': m.person.birthdate|format_date('long') }) }}
</div> </div>
</div> </div>
<div class="item-col box-where"> <div class="item-col">
<ul class="list-content fa-ul"> <ul class="list-content fa-ul">
{% if m.startDate is not empty %} {% if m.startDate is not empty %}
<li>{{ 'Since %date%'|trans({'%date%': m.startDate|format_date('long') }) }}</li> <li>{{ 'Since %date%'|trans({'%date%': m.startDate|format_date('long') }) }}</li>

28
src/Bundle/ChillPersonBundle/Resources/views/Person/list.html.twig
View File

@ -14,24 +14,25 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
#} #}
<h2>{{ title|default('Person search results')|trans }}</h2> <div class="list-person">
<h2>{{ title|default('Person search results')|trans }}</h2>
<p> <p>
{{ '%total% persons matching the search pattern:'|transchoice( total, { '%total%' : total}) }} {{ '%total% persons matching the search pattern:'|transchoice( total, { '%total%' : total}) }}
<a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-sm"> <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-sm">
<i class="fa fa-search" aria-hidden="true"></i> {{ pattern }} <i class="fa fa-search" aria-hidden="true"></i> {{ pattern }}
</a> </a>
</p> </p>
<p>{{ 'Results %start%-%end% of %total%'|trans({ '%start%' : start, '%end%': start + persons|length, '%total%' : total } ) }}</p> <p>{{ 'Results %start%-%end% of %total%'|trans({ '%start%' : start, '%end%': start + persons|length, '%total%' : total } ) }}</p>
{% if persons|length > 0 %} {% if persons|length > 0 %}
<table> <table class="table table-bordered border-dark align-middle">
<thead> <thead>
<tr> <tr>
<th class="chill-red">{% trans %}Name{% endtrans %}</th> <th class="chill-orange">{% trans %}Name{% endtrans %}</th>
<th class="chill-green">{% trans %}Date of birth{% endtrans %}</th> <th class="chill-orange">{% trans %}Date of birth{% endtrans %}</th>
<th class="chill-orange">{% trans %}Nationality{% endtrans %}</th> <th class="chill-orange">{% trans %}Nationality{% endtrans %}</th>
<th>&nbsp;</th> <th>&nbsp;</th>
</tr> </tr>
@ -103,7 +104,7 @@
</li> </li>
{% endif %} {% endif %}
</ul> </ul>
{% else %} {% else %}
<ul class="record_actions"> <ul class="record_actions">
<li> <li>
<a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-action"> <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-action">
@ -111,8 +112,9 @@
</a> </a>
</li> </li>
</ul> </ul>
{% endif %} {% endif %}
{% if preview == false %} {% if preview == false %}
{{ chill_pagination(paginator) }} {{ chill_pagination(paginator) }}
{% endif %} {% endif %}
</div>

26
src/Bundle/ChillPersonBundle/Resources/views/Person/list_by_phonenumber.html.twig
View File

@ -14,24 +14,25 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
#} #}
<h2>{{ title|default('Person search results by phonenumber')|trans }}</h2> <div class="list-by-phonenumber">
<h2>{{ title|default('Person search results by phonenumber')|trans }}</h2>
<p> <p>
{{ '%total% persons matching the search pattern:'|transchoice( total, { '%total%' : total}) }} {{ '%total% persons matching the search pattern:'|transchoice( total, { '%total%' : total}) }}
<a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-sm"> <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-sm">
<i class="fa fa-search" aria-hidden="true"></i> {{ pattern }} <i class="fa fa-search" aria-hidden="true"></i> {{ pattern }}
</a> </a>
</p> </p>
<p>{{ 'Results %start%-%end% of %total%'|trans({ '%start%' : start, '%end%': start + persons|length, '%total%' : total } ) }}</p> <p>{{ 'Results %start%-%end% of %total%'|trans({ '%start%' : start, '%end%': start + persons|length, '%total%' : total } ) }}</p>
{% if persons|length > 0 %} {% if persons|length > 0 %}
<table class="person-list__--by-phonenumber"> <table class="table table-bordered border-dark align-middle">
<thead> <thead>
<tr> <tr>
<th class="chill-red">{% trans %}Name{% endtrans %}</th> <th class="chill-orange">{% trans %}Name{% endtrans %}</th>
<th class="chill-green">{% trans %}Date of birth{% endtrans %}</th> <th class="chill-orange">{% trans %}Date of birth{% endtrans %}</th>
<th class="chill-orange">{% trans %}Phonenumber{% endtrans %}</th> <th class="chill-orange">{% trans %}Phonenumber{% endtrans %}</th>
<th>&nbsp;</th> <th>&nbsp;</th>
</tr> </tr>
@ -100,8 +101,9 @@
</li> </li>
{% endif %} {% endif %}
</ul> </ul>
{% endif %} {% endif %}
{% if preview == false %} {% if preview == false %}
{{ chill_pagination(paginator) }} {{ chill_pagination(paginator) }}
{% endif %} {% endif %}
</div>

106
src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
View File

@ -1,15 +1,24 @@
<h2>{{ title|default('Person search results')|trans }}</h2> {% macro button_person(person) %}
<li>
<a href="{{ path('chill_person_accompanying_period_list', { 'person_id' : person.id }) }}"
class="btn btn-primary" title="{{ 'See accompanying periods'|trans }}"><i class="fa fa-random"></i></a>
</li>
{% endmacro %}
<p> <div class="list-with-period">
<h2>{{ title|default('Person search results')|trans }}</h2>
<p>
{{ '%total% persons matching the search pattern:'|transchoice( total, { '%total%' : total}) }} {{ '%total% persons matching the search pattern:'|transchoice( total, { '%total%' : total}) }}
<a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-sm"> <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-sm">
<i class="fa fa-fw fa-search" aria-hidden="true"></i> {{ pattern }} <i class="fa fa-fw fa-search" aria-hidden="true"></i> {{ pattern }}
</a> </a>
</p> </p>
<p>{{ 'Results %start%-%end% of %total%'|trans({ '%start%' : start, '%end%': start + persons|length, '%total%' : total } ) }}</p> <p>{{ 'Results %start%-%end% of %total%'|trans({ '%start%' : start, '%end%': start + persons|length, '%total%' : total } ) }}</p>
<ul class="record_actions"> <ul class="record_actions">
{% if is_granted('CHILL_PERSON_CREATE') %} {% if is_granted('CHILL_PERSON_CREATE') %}
<li> <li>
<a href="{{ path('chill_person_new') }}" class="btn btn-create"> <a href="{{ path('chill_person_new') }}" class="btn btn-create">
@ -32,68 +41,22 @@
</a> </a>
</li> </li>
{% endif %} {% endif %}
</ul> </ul>
{% if persons|length > 0 %}
{% if persons|length > 0 %} <div class="flex-table">
<div class="flex-table list-with-period">
{% for person in persons %} {% for person in persons %}
<div class="item-bloc"> <div class="item-bloc">
<div class="item-row person">
<div class="item-col box-person">
<div>
{{ person|chill_entity_render_box({ {{ person|chill_entity_render_box({
'render': 'label', 'addLink': true, 'addInfo': true 'render': 'bloc',
'addLink': true,
'addInfo': true,
'addAltNames': false,
'addCenter': true,
'address_multiline': true,
'customButtons': { 'after': _self.button_person(person) }
}) }} }) }}
</div>
</div>
<div class="item-col box-where">
<ul class="list-content fa-ul">
<li><i class="fa fa-li fa-long-arrow-right"></i>
{{ person.center }}
</li>
<li>
{% if person.mobilenumber is not empty %}
<i class="fa fa-li fa-mobile"></i> <a href="{{ 'tel:' ~ person.mobilenumber }}">{{ person.mobilenumber|chill_format_phonenumber }}</a>
{% else %}
<i class="fa fa-li fa-phone"></i>
{% if person.phonenumber is not empty %}
<a href="{{ 'tel:' ~ person.phonenumber }}">{{ person.phonenumber|chill_format_phonenumber }}</a>
{% else %}
<span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
{% endif %}
{% endif %}
</li>
<li>
<i class="fa fa-li fa-map-marker"></i>
{% if person.getLastAddress is not null %}
{{ person.getLastAddress|chill_entity_render_box({'with_valid_from': false}) }}
{% else %}
<span class="chill-no-data-statement">{{ 'No address'|trans }}</span>
{% endif %}
</li>
</ul>
<ul class="record_actions">
<li>
<a href="{{ path('chill_person_view', { 'person_id' : person.id }) }}" class="btn btn-show"
title="{{ 'Open person file'|trans }}"></a>
</li>
<li>
<a href="{{ path('chill_person_accompanying_period_list', { 'person_id' : person.id }) }}"
class="btn btn-primary" title="{{ 'See accompanying periods'|trans }}">
<i class="fa fa-random"></i></a>
</li>
</ul>
</div>
</div>
{#- 'apps' is for AccompanyingPeriodParticipationS #} {#- 'apps' is for AccompanyingPeriodParticipationS #}
{#- filter using acl -#} {#- filter using acl -#}
@ -105,15 +68,17 @@
{%- endfor %} {%- endfor %}
{% if apps|length > 0 %} {% if apps|length > 0 %}
{% for app in apps %}
<div class="item-row periods"> <div class="item-row periods">
{% for app in apps %}
<div class="header"> <div class="header">
<a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': app.accompanyingPeriod.id }) }}" <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': app.accompanyingPeriod.id }) }}"
class="btn btn-chill-green" title="{{ 'See accompanying period'|trans }}"> class="btn btn-chill-green" title="{{ 'See accompanying period'|trans }}">
<i class="fa fa-random"></i> <i class="fa fa-random"></i>
</a> </a>
<span>{{ 'Since %date%'|trans({'%date%': app.startDate|format_date('medium') }) }}</span> <span>
{{ 'Since %date%'|trans({'%date%': app.startDate|format_date('medium') }) }}
</span>
{% if app.accompanyingPeriod.user is not null %} {% if app.accompanyingPeriod.user is not null %}
<span class="user"> <span class="user">
<abbr class="referrer" title="{{ 'Referrer'|trans }}">ref:</abbr> <abbr class="referrer" title="{{ 'Referrer'|trans }}">ref:</abbr>
@ -126,19 +91,16 @@
{% for issue in app.accompanyingPeriod.socialIssues|slice(0,2) %} {% for issue in app.accompanyingPeriod.socialIssues|slice(0,2) %}
<span>{{ issue|chill_entity_render_box }}</span> <span>{{ issue|chill_entity_render_box }}</span>
{% endfor %} {% endfor %}
{% if app.accompanyingPeriod.socialIssues|length > 2 %} {% if app.accompanyingPeriod.socialIssues|length > 2 %}
<span class="more">{{ 'and %number% other'|transchoice(app.accompanyingPeriod.socialIssues|length-2) }}</span> <span class="more">{{ 'and %number% other'|transchoice(app.accompanyingPeriod.socialIssues|length-2) }}</span>
{% endif %} {% endif %}
</div> </div>
</div>
{% endfor %} {% endfor %}
</div>
{% endif %} {% endif %}
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
@ -165,8 +127,8 @@
</li> </li>
{% endif %} {% endif %}
</ul> </ul>
{% else %}
{% else %}
<ul class="record_actions"> <ul class="record_actions">
<li> <li>
<a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-action"> <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-action">
@ -174,8 +136,10 @@
</a> </a>
</li> </li>
</ul> </ul>
{% endif %} {% endif %}
{% if preview == false %} {% if preview == false %}
{{ chill_pagination(paginator) }} {{ chill_pagination(paginator) }}
{% endif %} {% endif %}
</div>

2
src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php
View File

@ -58,6 +58,8 @@ class PersonRender extends AbstractChillEntityRender
'addId' => $options['addId'] ?? false, 'addId' => $options['addId'] ?? false,
'addInfo' => $options['addInfo'] ?? false, 'addInfo' => $options['addInfo'] ?? false,
'addAge' => $options['addAge'] ?? false, 'addAge' => $options['addAge'] ?? false,
'addCenter' => $options['addCenter'] ?? false,
'address_multiline' => $options['address_multiline'] ?? false,
'hLevel' => $options['hLevel'] ?? 3, 'hLevel' => $options['hLevel'] ?? 3,
'customButtons' => $options['customButtons'] ?? [], 'customButtons' => $options['customButtons'] ?? [],
]; ];