From 1119e20a4958c38f49f7c05bc5dbfb6f7dcdfbef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 29 Jun 2021 16:03:59 +0200 Subject: [PATCH] Add minor fixes to summary page: * add messages when no resources * add address to person * replace household link label with household number --- .../views/AccompanyingCourse/index.html.twig | 191 +++++++++--------- .../translations/messages.fr.yml | 1 + 2 files changed, 99 insertions(+), 93 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig index 364f8c7fd..cdb71c99b 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig @@ -91,7 +91,7 @@
  • {%- if p.person.lastAddress is not empty -%} - {{ p.person.getLastAddress|chill_entity_render_box({'with_valid_from': false}) }} + {{ p.person.currentHouseholdAddress|chill_entity_render_box({'with_valid_from': false}) }} {%- else -%} {{ 'No address given'|trans }} {%- endif -%} @@ -110,7 +110,7 @@ ) }}" class="sc-button"> - {{ 'household.Household file'|trans }} + n° {{ p.person.getCurrentHousehold.id }}
    • {% endif %} @@ -124,101 +124,106 @@

    {{ 'Resources'|trans }}

    -
    - {% for r in accompanyingCourse.resources %} -
    - {% if r.person %} -
    -
    -

    - {{ r.person.firstname ~ ' ' ~ r.person.lastname }} - {{ 'Usager' }} -

    -

    - {% 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' %} - {{ born ~ ' le ' ~ r.person.birthdate|format_date('short') }} -

    -
    -
    -
      -
    • - {% if r.person.mobilenumber %} - {{ r.person.mobilenumber }} - {% else %} - - {% if r.person.phonenumber %} - {{ r.person.phonenumber }} - {% else %} - {{ 'No data given'|trans }} - {% endif %} - {% endif %} -
      • -
    • - - {%- if r.person.lastAddress is not empty -%} - {{ r.person.getLastAddress|chill_entity_render_box({'with_valid_from': false}) }} - {%- else -%} - {{ 'No address given'|trans }} - {%- endif -%} -
      • -
    -
      -
    • - -
      • -
    -
    -
    + {% if accompanyingCourse.resources|length == 0 %} +

    {{ 'Any resource for this accompanying course'|trans }}

    + {% else %} +
    + {% for r in accompanyingCourse.resources %} +
    + {% if r.person %} - {% endif %} - {% if r.thirdParty %} +
    +
    +

    + {{ r.person.firstname ~ ' ' ~ r.person.lastname }} + {{ 'Usager' }} +

    +

    + {% 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' %} + {{ born ~ ' le ' ~ r.person.birthdate|format_date('short') }} +

    +
    +
    +
      +
    • + {% if r.person.mobilenumber %} + {{ r.person.mobilenumber }} + {% else %} + + {% if r.person.phonenumber %} + {{ r.person.phonenumber }} + {% else %} + {{ 'No data given'|trans }} + {% endif %} + {% endif %} +
      • +
    • + + {%- if r.person.lastAddress is not empty -%} + {{ r.person.getLastAddress|chill_entity_render_box({'with_valid_from': false}) }} + {%- else -%} + {{ 'No address given'|trans }} + {%- endif -%} +
      • +
    +
      +
    • + +
      • +
    +
    +
    -
    -
    -

    - {{ r.thirdParty.name }} - {{ 'Tiers' }} -

    -
    -
    - -
      -
    • - -
      • -
    -
    -
    + {% endif %} + {% if r.thirdParty %} - {% endif %} -
    - {% endfor %} -
    +
    +
    +

    + {{ r.thirdParty.name }} + {{ 'Tiers' }} +

    +
    +
    + +
      +
    • + +
      • +
    +
    +
    + + {% endif %} +
    + {% endfor %} +
    + {% endif %}

    {{ 'Social actions'|trans }}

    diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml index f7deaf9eb..0ad70a15b 100644 --- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml @@ -189,6 +189,7 @@ See accompanying period: Voir cette période d'accompagnement Referrer: Référent Some peoples does not belong to any household currently. Add them to an household soon: Certaines personnes n'appartiennent à aucun ménage actuellement. Renseignez leur appartenance à un ménage dès que possible. Add to household now: Ajouter à un ménage +Any resource for this accompanying course: Aucun interlocuteur privilégié pour ce parcours # pickAPersonType Pick a person: Choisir une personne