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

fix conflict + error on CommentType

Browse Source
This commit is contained in:
nobohan
2021-06-25 13:57:49 +02:00
parent 36eb247995 c23ada3533
commit aa5c7f333e
11 changed files with 520 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
View File

@@ -43,6 +43,7 @@
{{ form_widget(form.altNames, { 'label': 'Alternative names'}) }}
{% endif %}
{{ form_row(form.gender, {'label' : 'Gender'}) }}
{{ form_row(form.genderComment, { 'label' : 'Comment on the gender'} ) }}
</fieldset>
<fieldset>
@@ -54,9 +55,12 @@
{%- if form.countryOfBirth is defined -%}
{{ form_row(form.countryOfBirth, { 'label' : 'Country of birth' } ) }}
{%- endif -%}
{%- if form.deathdate is defined -%}
{{ form_row(form.deathdate, { 'label' : 'Date of death' } ) }}
{%- endif -%}
</fieldset>
{%- if form.nationality is defined or form.spokenLanguages is defined or form.maritalStatus is defined -%}
{%- if form.nationality is defined or form.spokenLanguages is defined -%}
<fieldset>
<legend><h2>{{ 'Administrative information'|trans }}</h2></legend>
{%- if form.nationality is defined -%}
@@ -65,8 +69,21 @@
{%- if form.spokenLanguages is defined -%}
{{ form_row(form.spokenLanguages, {'label' : 'Spoken languages'}) }}
{%- endif -%}
</fieldset>
{%- endif -%}
{%- if form.numberOfChildren is defined or form.maritalStatus is defined -%}
<fieldset>
<legend><h2>{{ 'Marital status'|trans }}</h2></legend>
{{ form_row(form.numberOfChildren, {'label' : 'Number of children'}) }}
{%- if form.maritalStatus is defined -%}
{{ form_row(form.maritalStatus, { 'label' : 'Marital status'} ) }}
<div id="maritalStatus">
{{ form_row(form.maritalStatus, { 'label' : 'Marital status'} ) }}
</div>
<div id="maritalStatusDate">
{{ form_row(form.maritalStatusDate, { 'label' : 'Date of last marital status change'} ) }}
{{ form_row(form.maritalStatusComment, { 'label' : 'Comment on the marital status'} ) }}
</div>
{%- endif -%}
</fieldset>
{%- endif -%}
@@ -75,13 +92,24 @@
<fieldset>
<legend><h2>{{ 'Contact information'|trans }}</h2></legend>
{%- if form.email is defined -%}
{{ form_row(form.email, {'label': 'Email'}) }}
<div id="personEmail">
{{ form_row(form.email, {'label': 'Email'}) }}
</div>
<div id="personAcceptEmail">
{{ form_row(form.acceptEmail, {'label' : 'Accept emails ?'}) }}
</div>
{%- endif -%}
{%- if form.phonenumber is defined -%}
{{ form_row(form.phonenumber, {'label': 'Phonenumber'}) }}
{%- endif -%}
{%- if form.mobilenumber is defined -%}
{{ form_row(form.mobilenumber, {'label': 'Mobilenumber'}) }}
<div id="personPhoneNumber">
{{ form_row(form.mobilenumber, {'label': 'Mobilenumber'}) }}
</div>
<div id="personAcceptSMS">
{{ form_row(form.acceptSMS, {'label' : 'Accept short text message ?'}) }}
</div>
{%- endif -%}
{%- if form.otherPhoneNumbers is defined -%}
{{ form_widget(form.otherPhoneNumbers) }}
@@ -114,3 +142,8 @@
{% endblock personcontent %}
{% block js %}
<script type="text/javascript" src="{{ asset('build/person.js') }}"></script>
{% endblock js %}

85
src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
View File

@@ -73,12 +73,14 @@ This view should receive those arguments:
<dt>{{ 'Gender'|trans }}&nbsp;:</dt>
<dd>{{ ( person.gender|default('Not given'))|trans }}</dd>
{% if not person.genderComment.isEmpty %}
<dt>{{ 'Gender comment'|trans }}&nbsp;:</dt>
<dd>{{ person.genderComment|chill_entity_render_box }}</dd>
{% endif %}
</dl>
{% if is_granted('CHILL_PERSON_UPDATE', person) %}
{{ include(edit_tmp_name, edit_tmp_args) }}
{% endif %}
</figure>
</div>
@@ -114,11 +116,14 @@ This view should receive those arguments:
{% endif %}
{% endapply %}</dd>
{%- endif -%}
{% if person.deathdate is not null %}
<dt>{{ 'Date of death'|trans }}&nbsp;:</dt>
<dd>{{ person.deathdate|format_date('long') }}</dd>
{% endif %}
</dl>
{% if is_granted('CHILL_PERSON_UPDATE', person) %}
{{ include(edit_tmp_name, edit_tmp_args) }}
{% endif %}
</figure>
</div>
</div>
@@ -155,6 +160,21 @@ This view should receive those arguments:
</dd>
</dl>
{%- endif -%}
{%-if chill_person.fields.number_of_children == 'visible' -%}
<dl>
<dt>{{'Number of children'|trans}}&nbsp;:</dt>
<dd>
{% if person.numberOfChildren is not null %}
{{ person.numberOfChildren }}
{% else %}
<span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
{% endif %}
</dd>
</dl>
{%- endif -%}
{%- if chill_person.fields.marital_status == 'visible' -%}
<dl>
<dt>{{'Marital status'|trans}}&nbsp;:</dt>
@@ -166,11 +186,24 @@ This view should receive those arguments:
{% endif %}
</dd>
</dl>
<dl>
<dt>{{'Date of last marital status change'|trans}}&nbsp;:</dt>
{% if person.maritalStatusDate is not null %}
<dd>
{{ person.maritalStatusDate|format_date('long') }}
</dd>
{% endif %}
</dl>
<dl>
{% if not person.maritalStatusComment.isEmpty %}
<dt>{{'Comment on the marital status'|trans}}&nbsp;:</dt>
<dd>
{{ person.maritalStatusComment|chill_entity_render_box }}
</dd>
{% endif %}
</dl>
{%- endif -%}
{% if is_granted('CHILL_PERSON_UPDATE', person) %}
{{ include(edit_tmp_name, edit_tmp_args) }}
{% endif %}
</figure>
</div>
{%- endif -%}
@@ -213,6 +246,13 @@ This view should receive those arguments:
<dl>
<dt>{{ 'Email'|trans }}&nbsp;:</dt>
<dd>{% if person.email is not empty %}<a href="mailto:{{ person.email|escape('html_attr') }}">{{ person.email }}</a>{% else %}<span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>{% endif %}</dd>
{%- if person.email is not empty and person.acceptEmail -%}
<dd>
<span class="badge badge-secondary">
{{- 'Accept emails'|trans -}}
</span>
</dd>
{%- endif -%}
</dl>
{%- endif -%}
{%- if chill_person.fields.phonenumber == 'visible' -%}
@@ -225,6 +265,13 @@ This view should receive those arguments:
<dl>
<dt>{{ 'Mobilenumber'|trans }}&nbsp;:</dt>
<dd>{% if person.mobilenumber is not empty %}<a href="tel:{{ person.mobilenumber }}"><pre>{{ person.mobilenumber|chill_format_phonenumber }}</pre></a>{% else %}<span class="chill-no-data-statement">{{ 'No data given'|trans }}{% endif %}</dd>
{%- if person.mobilenumber is not empty and person.acceptSMS -%}
<dd>
<span class="badge badge-secondary">
{{- 'Accept short text message'|trans -}}
</span>
</dd>
{%- endif -%}
</dl>
{% endif %}
{% for pp in person.otherPhoneNumbers %}
@@ -253,9 +300,6 @@ This view should receive those arguments:
</dl>
{%- endif -%}
{% if is_granted('CHILL_PERSON_UPDATE', person) %}
{{ include(edit_tmp_name, edit_tmp_args) }}
{% endif %}
</figure>
</div>
{%- endif -%}
@@ -272,14 +316,21 @@ This view should receive those arguments:
<div class="grid-10 push-1 grid-mobile-12 grid-tablet-12 push-mobile-0 push-tablet-0 parent">
<figure class="person-details">
{% if is_granted('CHILL_PERSON_UPDATE', person) %}
{{ include(edit_tmp_name, edit_tmp_args) }}
{% endif %}
</figure>
</div>
{% endif %}
{% if is_granted('CHILL_PERSON_UPDATE', person) %}
<ul class="grid-12 sticky-form-buttons record_actions ">
<li>
<a class="sc-button bt-update" href="{{ path('chill_person_general_edit', { 'person_id': person.id }) }}">
{{ 'Edit'|trans }}
</a>
</li>
</ul>
{% endif %}
</div> <!-- end of div.person-view -->
{% endblock %}