wip render box person thirdparty display bloc

This commit is contained in:
Mathieu Jaumotte 2021-07-27 23:15:52 +02:00
parent 89dfea74b3
commit df3d32c653
12 changed files with 412 additions and 264 deletions

View File

@ -84,6 +84,7 @@ div.flex-table {
/*
* Bloc appearance
*/
/*
div.flex-bloc {
box-sizing: border-box;
display: flex;
@ -134,6 +135,8 @@ div.flex-bloc {
margin: auto 0;
}
}
*/
/*
* Table appearance

View File

@ -7,6 +7,7 @@ require('./scss/person_with_period.scss');
require('./scss/household_banner.scss');
require('./scss/accompanying_period_work.scss');
require('./scss/person_by_phonenumber.scss');
require('./scss/render_box.scss');
require('./svg/phone-alt-solid.svg');
require('./svg/mobile-alt-solid.svg');

View File

@ -2,19 +2,6 @@
div.list-with-period,
div.list-household-members {
.chill-entity__person {
.chill-entity__person__first-name,
.chill-entity__person__last-name {
font-size: 1.3em;
font-weight: 700;
}
}
.chill_denomination {
font-size: 1.3em;
font-weight: 700;
}
div.comment {
// for the comment for household-members
}
@ -51,3 +38,6 @@ div.list-household-members {
}
}
}

View File

@ -0,0 +1,20 @@
div.chill-entity {
&.person {
&.label {
h3.denomination {
font-size: 1.3em;
font-weight: 700;
a {
text-decoration: none;
}
span.firstname, span.lastname, span.altname {}
span.badge {
margin-left: 0.3em;
}
}
p.moreinfo {}
}
&.row {}
&.bloc {}
}
}

View File

@ -229,91 +229,16 @@
<div class="item-bloc">
{% if r.person %}
<div class="item-row">
<div class="item-col">
<h3>
{{ r.person.firstname ~ ' ' ~ r.person.lastname }}
<span class="badge rounded-pill bg-secondary">{{ 'Usager' }}</span>
</h3>
<p>
{% set born = (r.person.gender == 'woman') ? 'née': 'né' %}
{% set gender = (r.person.gender == 'woman') ? 'fa-venus' :
(r.person.gender == 'man') ? 'fa-mars' : 'fa-neuter' %}
{% set genderTitle = (r.person.gender == 'woman') ? 'femme' :
(r.person.gender == 'homme') ? 'fa-mars' : 'neutre' %}
<i class="fa fa-fw {{ gender }}" title="{{ genderTitle }}"></i>{{ born ~ ' le ' ~ r.person.birthdate|format_date('short') }}
</p>
</div>
<div class="item-col">
<ul class="list-content fa-ul">
<li>
{% if r.person.mobilenumber %}
<i class="fa fa-li fa-mobile"></i><a href="{{ 'tel:' ~ r.person.mobilenumber }}">{{ r.person.mobilenumber }}</a>
{% else %}
<i class="fa fa-li fa-phone"></i>
{% if r.person.phonenumber %}
<a href="{{ 'tel:' ~ r.person.phonenumber }}">{{ r.person.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 r.person.lastAddress is not empty -%}
{{ r.person.getLastAddress|chill_entity_render_box({'with_valid_from': false}) }}
{%- else -%}
<span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
{%- endif -%}
</li>
</ul>
<ul class="record_actions">
<li>
<a href="{{ path('chill_person_view', { person_id: r.person.id }) }}" class="btn btn-show" target="_blank" title="Voir"></a>
</li>
</ul>
</div>
</div>
{{ r.person|chill_entity_render_box({
'display': 'bloc', 'addLink': true, 'addEntity': true, 'addInfo': true
}) }}
{% endif %}
{% if r.thirdParty %}
<div class="item-row">
<div class="item-col">
<h3>
{{ r.thirdParty.name }}
<span class="badge rounded-pill bg-secondary">{{ 'Tiers' }}</span>
</h3>
</div>
<div class="item-col">
<ul class="list-content fa-ul">
<li><i class="fa fa-li fa-envelope-o"></i>
<a href="{{ 'mailto:' ~ r.thirdParty.email }}">
{{ r.thirdParty.email|chill_print_or_message("thirdparty.No_email") }}
</a>
</li>
<li><i class="fa fa-li fa-phone"></i>
{% if r.thirdParty.telephone %}
<a href="{{ 'tel:' ~ r.thirdParty.telephone }}">{{ r.thirdParty.telephone }}</a>
{% else %}
<span class="chill-no-data-statement">{{ 'thirdparty.No_phonenumber'|trans }}</span>
{% endif %}
</li>
<li><i class="fa fa-li fa-map-marker"></i>
{%- if r.thirdParty.address is not empty -%}
{{ r.thirdParty.getAddress|chill_entity_render_box({'with_valid_from': false}) }}
{%- else -%}
<span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
{%- endif -%}
</li>
</ul>
<ul class="record_actions">
<li>
<a href="{{ path('chill_3party_3party_show', { thirdparty_id: r.thirdParty.id }) }}" class="btn btn-show" target="_blank" title="Voir"></a>
</li>
</ul>
</div>
</div>
{{ r.thirdParty|chill_entity_render_box({
'display': 'bloc', 'addLink': true, 'addEntity': true, 'addInfo': true
}) }}
{% endif %}
</div>

View File

@ -1,17 +1,115 @@
<span class="chill-entity chill-entity__person">
{%- if addLink and is_granted('CHILL_PERSON_SEE', person) -%}
{%- set showLink = true -%}<a href="{{ chill_path_add_return_path('chill_person_view', { 'person_id': person.id }) }}">{%- endif -%}
<span class="chill_denomination">{{ person.firstName }}</span>
<span class="chill_denomination">{{ person.lastName }}</span>
{#
Template to render a person
OPTIONS
* display [raw|label|row|bloc]
* addAltNames bool
* addLink bool
* addEntity bool
* addInfo bool
#}
{% macro raw(person, addAltNames) %}
<span class="firstname">{{ person.firstName }}</span>
<span class="lastname">{{ person.lastName }}</span>
{%- if addAltNames -%}
{%- for n in person.altNames -%}
{%- if loop.first -%}({% else %} {%- endif -%}
<span class="chill-entity__person__alt-name chill-entity__person__altname--{{ n.key }}">
<span class="altname altname-{{ n.key }}">
{{- n.label -}}
</span>
{%- if loop.last -%}){%- endif -%}
{%- endfor -%}
{%- endif -%}
{%- if showLink is defined -%}</a>{%- endif -%}
{% endmacro raw %}
{% macro label(person, addLink, addAltNames, addEntity, addInfo) %}
<div class="chill-entity person label">
<h3 class="denomination">
{%- if addLink and is_granted('CHILL_PERSON_SEE', person) -%}
<a href="{{ chill_path_add_return_path('chill_person_view', { 'person_id': person.id }) }}">
{{ _self.raw(person, addAltNames) }}
</a>
{%- else -%}
{{ _self.raw(person, addAltNames) }}
{%- endif -%}
{%- if addEntity -%}
<span class="badge rounded-pill bg-secondary">{{ 'Person'|trans }}</span>
{%- endif -%}
</h3>
{%- if addInfo -%}
{% set born = (person.gender == 'woman') ? 'née le ': 'né le ' %}
{% set gender = (person.gender == 'woman') ? 'fa-venus' :
(person.gender == 'man') ? 'fa-mars' : 'fa-neuter' %}
{% set genderTitle = (person.gender == 'woman') ? 'woman' :
(person.gender == 'man') ? 'man' : 'neuter' %}
<p class="moreinfo">
<i class="fa fa-fw {{ gender }}" title="{{ genderTitle|trans }}"></i>
{{ born|trans }}
<time datetime="{{ person.birthdate|date('Y-m-d') }}">
{{ person.birthdate|format_date('medium') }}
</time>
{# TODO
{{ 'Born the %date%'|transchoice(person.genderNumeric, {
'%date%': person.birthdate|format_date("medium") }) }}
#}
</p>
{%- endif -%}
{#- tricks to remove easily whitespace after template -#}
{%- if true -%}</span>{%- endif -%}
{%- if true -%}</div>{%- endif -%}
{% endmacro label %}
{%- if display == 'raw' -%}
{{ _self.raw(person, addAltNames) }}
{%- endif -%}
{%- if display == 'label' -%}
{{ _self.label(person, addLink, addAltNames, addEntity, addInfo) }}
{%- endif -%}
{%- if display == 'row' -%}
<div class="chill-entity person row">
{{ _self.label(person, addLink, addAltNames, addEntity, addInfo) }}
</div>
{%- endif -%}
{%- if display == 'bloc' -%}
<div class="chill-entity person bloc">
<div class="item-row">
<div class="item-col">
{{ _self.label(person, addLink, addAltNames, addEntity, addInfo) }}
</div>
<div class="item-col">
<ul class="list-content fa-ul">
<li>
{% if person.mobilenumber %}
<i class="fa fa-li fa-mobile"></i><a href="{{ 'tel:' ~ person.mobilenumber }}">{{ person.mobilenumber }}</a>
{% else %}
<i class="fa fa-li fa-phone"></i>
{% if person.phonenumber %}
<a href="{{ 'tel:' ~ person.phonenumber }}">{{ person.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.lastAddress is not empty -%}
{{ person.getLastAddress|chill_entity_render_box({'with_valid_from': false}) }}
{%- else -%}
<span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
{%- endif -%}
</li>
</ul>
{%- if is_granted('CHILL_PERSON_SEE', person) -%}
<ul class="record_actions">
<li><a class="btn btn-show" target="_blank" title="{{ 'Show'|trans }}"
href="{{ path('chill_person_view', { person_id: person.id }) }}"></a>
</li>
</ul>
{%- endif -%}
</div>
</div>
</div>
{%- endif -%}

View File

@ -44,8 +44,11 @@
<div class="item-row person">
<div class="item-col box-person">
<div>{{ person|chill_entity_render_box({'addLink': true}) }}</div>
<div>{{ 'Born the %date%'|transchoice(person.genderNumeric, { '%date%': person.birthdate|format_date("medium") }) }}</div>
<div>
{{ person|chill_entity_render_box({
'display': 'label', 'addLink': true, 'addInfo': true
}) }}
</div>
</div>
<div class="item-col box-where">

View File

@ -56,7 +56,10 @@ class PersonRender extends AbstractChillEntityRender
[
'person' => $person,
'addAltNames' => $this->configAltNamesHelper->hasAltNames(),
'addLink' => $options['addLink'] ?? false
'addLink' => $options['addLink'] ?? false,
'addEntity' => $options['addEntity'] ?? false,
'addInfo' => $options['addInfo'] ?? false,
'display' => $options['display'] ?? 'raw'
]
);
}

View File

@ -1,16 +1,38 @@
div.chill-entity {
&.thirdparty {
&.label {
h3.denomination {
font-size: 1.3em;
font-weight: 700;
a {
text-decoration: none;
}
span.name {}
span.badge {
margin-left: 0.3em;
}
}
p.moreinfo {}
}
&.row {}
&.bloc {}
div.chill_contact {
/*
border: 1px solid black;
background-color: rgba(255, 255, 255, 0.65);
padding: 1em;
margin: 1em 0;
max-width: 500px;
div.chill_contact_name {
div.name {
font-variant: small-caps;
}
div.chill_contact_category {
div.category {
margin: 0.5em 0;
font-size: 85%;
span.category {
font-style: italic;
}
@ -22,10 +44,12 @@ div.chill_contact {
font-style: normal;
}
}
div.chill_contact_comment {
div.comment {
font-size: 85%;
font-style: italic;
}
div.chill_address {
div.chill_address_address::before {
margin-left: 0.5em;
@ -34,7 +58,8 @@ div.chill_contact {
content: '\f015';
}
}
div.chill_contact_contact {
div.contact {
font-variant: small-caps;
span::before {
margin-left: 0.5em;
@ -48,4 +73,7 @@ div.chill_contact {
content: '\f095';
}
}
*/
}
}

View File

@ -0,0 +1,130 @@
{#
Template to render a thirdparty
OPTIONS
* display [raw|label|row|bloc]
* with_valid_from bool
* addAltNames bool
* addLink bool
* addEntity bool
* addInfo bool
#}
{% macro raw(thirdparty) %}
<span class="name">{{ thirdparty.name }}</span>
{% endmacro raw %}
{% macro label(thirdparty, addLink, addEntity, addInfo, options) %}
<div class="chill-entity thirdparty label">
<h3 class="denomination">
{%- if addLink and is_granted('CHILL_3PARTY_3PARTY_SHOW', thirdparty) -%}
<a href="{{ chill_path_add_return_path('chill_3party_3party_show', { 'thirdparty_id': thirdparty.id }) }}">
{{ _self.raw(thirdparty) }}
</a>
{%- else -%}
{{ _self.raw(thirdparty) }}
{%- endif -%}
{%- if addEntity -%}
<span class="badge rounded-pill bg-secondary">{{ 'Third party'|trans }}</span>
{%- endif -%}
</h3>
{# AVANT
<div class="name">
{{ _self.raw(thirdparty) }}
</div>
<div class="category">
{% for type in thirdparty.type %}
<span class="category">
{{ ('chill_3party.key_label.'~type)|trans }}
</span>
{% endfor %}
</div>
{% if thirdparty.comment is not empty %}
<div class="comment">
{{ thirdparty.comment }}
</div>
{% endif %}
{% if thirdparty.address %}
<div class="chill_address">
<div class="chill_address_address">
{% if thirdparty.address.streetAddress1 %}<p class="street street1">{{ thirdparty.address.streetAddress1 }}</p>{% endif %}
{% if thirdparty.address.streetAddress2 is not empty %}<p class="street street2">{{ thirdparty.address.streetAddress2 }}</p>{% endif %}
{% if thirdparty.address.postCode is not empty %}
<p class="postalCode"><span class="code">{{ thirdparty.address.postCode.code }}</span> <span class="name">{{ thirdparty.address.postCode.name }}</span></p>
<p class="country">{{ thirdparty.address.postCode.country.name|localize_translatable_string }}</p>
{% endif %}
</div>
{%- if options['with_valid_from'] is defined and options['with_valid_from'] == true -%}
<span class="address_since">{{ 'Since %date%'|trans( { '%date%' : thirdparty.address.validFrom|format_date('long') } ) }}</span>
{%- endif -%}
</div>
{% endif %}
{% if thirdparty.email or thirdparty.telephone is not empty %}
<div class="contact">
<span class="email">
<a href="mailto:{{ thirdparty.email }}">{{ thirdparty.email }}</a>
</span>
<span class="telephone">
<a href="tel:{{ thirdparty.telephone }}">{{ thirdparty.telephone|chill_format_phonenumber }}</a>
</span>
</div>
{% endif %}
#}
{#- tricks to remove easily whitespace after template -#}
{%- if true -%}</div>{%- endif -%}
{% endmacro label %}
{%- if display == 'raw' -%}
{{ _self.raw(thirdparty) }}
{%- endif -%}
{%- if display == 'label' -%}
{{ _self.label(thirdparty, addLink, addEntity, addInfo, options) }}
{%- endif -%}
{%- if display == 'row' -%}
<div class="chill-entity thirdparty row">
{{ _self.label(thirdparty, addLink, addEntity, addInfo, options) }}
</div>
{%- endif -%}
{%- if display == 'bloc' -%}
<div class="chill-entity thirdparty bloc">
<div class="item-row">
<div class="item-col">
{{ _self.label(thirdparty, addLink, addEntity, addInfo, options) }}
</div>
<div class="item-col">
<ul class="list-content fa-ul">
<li><i class="fa fa-li fa-envelope-o"></i>
<a href="{{ 'mailto:' ~ thirdparty.email }}">
{{ thirdparty.email|chill_print_or_message("thirdparty.No_email") }}
</a>
</li>
<li><i class="fa fa-li fa-phone"></i>
{% if thirdparty.telephone %}
<a href="{{ 'tel:' ~ thirdparty.telephone }}">{{ thirdparty.telephone|chill_format_phonenumber }}</a>
{% else %}
<span class="chill-no-data-statement">{{ 'thirdparty.No_phonenumber'|trans }}</span>
{% endif %}
</li>
<li><i class="fa fa-li fa-map-marker"></i>
{%- if thirdparty.address is not empty -%}
{{ thirdparty.getAddress|chill_entity_render_box({'with_valid_from': false}) }}
{%- else -%}
<span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
{%- endif -%}
</li>
</ul>
<ul class="record_actions">
<li>
<a href="{{ path('chill_3party_3party_show', { thirdparty_id: thirdparty.id }) }}" class="btn btn-show" target="_blank" title="Voir"></a>
</li>
</ul>
</div>
</div>
</div>
{%- endif -%}

View File

@ -1,52 +0,0 @@
{# template to render a person #}
{%- if options['only_denomination'] == true -%}
<div class="chill_denomination">
{{ contact.name }}
</div>
{%- else -%}
<div class="chill_contact">
<div class="chill_contact_name">
{{ contact.name }}
</div>
<div class="chill_contact_category">
{% for type in contact.type %}
<span class="category">
{{ ('chill_3party.key_label.'~type)|trans }}
</span>
{% endfor %}
</div>
{% if contact.comment is not empty %}
<div class="chill_contact_comment">
{{ contact.comment }}
</div>
{% endif %}
{% if contact.address %}
<div class="chill_address">
<div class="chill_address_address">
{% if contact.address.streetAddress1 %}<p class="street street1">{{ contact.address.streetAddress1 }}</p>{% endif %}
{% if contact.address.streetAddress2 is not empty %}<p class="street street2">{{ contact.address.streetAddress2 }}</p>{% endif %}
{% if contact.address.postCode is not empty %}
<p class="postalCode"><span class="code">{{ contact.address.postCode.code }}</span> <span class="name">{{ contact.address.postCode.name }}</span></p>
<p class="country">{{ contact.address.postCode.country.name|localize_translatable_string }}</p>
{% endif %}
</div>
{%- if options['with_valid_from'] == true -%}
<span class="address_since">{{ 'Since %date%'|trans( { '%date%' : contact.address.validFrom|format_date('long') } ) }}</span>
{%- endif -%}
</div>
{% endif %}
{% if contact.email or contact.telephone is not empty %}
<div class="chill_contact_contact">
<span class="email">
<a href="mailto:{{ contact.email }}">{{ contact.email }}</a>
</span>
<span class="telephone">
<a href="tel:{{ contact.telephone }}">{{ contact.telephone|chill_format_phonenumber }}</a>
</span>
</div>
{% endif %}
</div>
{%- endif -%}

View File

@ -49,19 +49,18 @@ class ThirdPartyRender extends AbstractChillEntityRender
*/
public function renderBox($entity, array $options): string
{
$params = \array_merge(
[ 'with_valid_from' => true ],
$options
);
return
$this->getDefaultOpeningBox('_3party').
$this->templating->render('@ChillThirdParty/ThirdParty/_render.html.twig', [
'contact' => $entity,
'options' => $params
$this->templating->render('@ChillThirdParty/Entity/thirdparty.html.twig', [
'thirdparty' => $entity,
'with_valid_from' => $options['with_valid_from'] ?? true,
'addLink' => $options['addLink'] ?? false,
'addEntity' => $options['addEntity'] ?? false,
'addInfo' => $options['addInfo'] ?? false,
'display' => $options['display'] ?? 'raw',
'options' => $options
]).
$this->getDefaultClosingBox();
}
/**