diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss index 4a569084f..ec2bfae95 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss @@ -87,6 +87,7 @@ div.flex-table { div.item-row { display: flex; flex-direction: row; + &:not(:first-child) { margin-top: 0.5em; border-top: 1px dotted $gray-900; @@ -100,13 +101,13 @@ div.flex-table { } &:last-child { flex-grow: 1; flex-shrink: 1; flex-basis: auto; + display: flex; justify-content: flex-end; - ul.record_actions { - margin: 0; - align-self: flex-start; flex-grow: 1; flex-shrink: 0; flex-basis: auto; + align-self: flex-start; + margin: 0; li { margin-right: 5px; } diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/person_with_period.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/person_with_period.scss index 6be613ea3..ada9bce9d 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/person_with_period.scss +++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/person_with_period.scss @@ -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-household-members { - div.comment { - // for the comment for household-members - } div.periods { div.header, div.list-content { @@ -13,7 +15,7 @@ div.list-household-members { } div.header { position: relative; - a.sc-button { + a.btn { position: absolute; width: 30px; height: 30px; diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue index eb611c9c1..9399f9245 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue @@ -22,8 +22,8 @@ class="item-bloc" v-bind:key="conc.person.id" > -
- - {{ p.person.firstname ~ ' ' ~ p.person.lastname }} - -
- {% endfor %} - {% else %} - {{ 'No data given'|trans }} - {% endif %} ++ + {{ p.person.firstname ~ ' ' ~ p.person.lastname }} + +
+ {% endfor %} + {% else %} + {{ 'No data given'|trans }} + {% endif %} +{{ accompanying_period.requestorPerson.firstname ~ ' ' ~ accompanying_period.requestorPerson.lastname }}
++ {{ accompanying_period.requestorPerson.firstname ~ ' ' ~ accompanying_period.requestorPerson.lastname }} +
+ {% endif %} + {% if accompanying_period.requestorThirdParty is not null %} ++ {{ accompanying_period.requestorThirdParty.name }} +
+ {% endif %} + {% else %} + {{ 'No data given'|trans }} {% endif %} - {% if accompanying_period.requestorThirdParty is not null %} -{{ accompanying_period.requestorThirdParty.name }}
- {% endif %} - {% else %} - {{ 'No data given'|trans }} - {% endif %} +- {{ '%total% persons matching the search pattern:'|transchoice( total, { '%total%' : total}) }} - - {{ pattern }} - -
++ {{ '%total% persons matching the search pattern:'|transchoice( total, { '%total%' : total}) }} + + {{ pattern }} + +
-{{ 'Results %start%-%end% of %total%'|trans({ '%start%' : start, '%end%': start + persons|length, '%total%' : total } ) }}
+{{ 'Results %start%-%end% of %total%'|trans({ '%start%' : start, '%end%': start + persons|length, '%total%' : total } ) }}
-{% if persons|length > 0 %} + {% if persons|length > 0 %} -{% trans %}Name{% endtrans %} | -{% trans %}Date of birth{% endtrans %} | -{% trans %}Nationality{% endtrans %} | -- |
---|
- {% set is_open = person.isOpen() %} - - {{ person|chill_entity_render_box }} - {% apply spaceless %} - {% if chill_person.fields.accompanying_period == 'visible' %} - {% if is_open == false %} - - {% else %} - - {% endif %} - {% endif %} - {% endapply %} - - | -- {% if person.birthdate is not null %} - {{ person.birthdate|format_date('long') }} - {% else %}{{ 'Unknown date of birth'|trans }}{% endif %} - | -- {% if person.nationality is not null %} - {{person.nationality.name | localize_translatable_string }} - {% else %} - {{ 'Without nationality'|trans }} - {% endif %} - | -- |
+ {% set is_open = person.isOpen() %} + + {{ person|chill_entity_render_box }} + {% apply spaceless %} + {% if chill_person.fields.accompanying_period == 'visible' %} + {% if is_open == false %} + + {% else %} + + {% endif %} + {% endif %} + {% endapply %} + + | ++ {% if person.birthdate is not null %} + {{ person.birthdate|format_date('long') }} + {% else %}{{ 'Unknown date of birth'|trans }}{% endif %} + | ++ {% if person.nationality is not null %} + {{person.nationality.name | localize_translatable_string }} + {% else %} + {{ 'Without nationality'|trans }} {% endif %} - - | -
- {{ '%total% persons matching the search pattern:'|transchoice( total, { '%total%' : total}) }} - - {{ pattern }} - -
++ {{ '%total% persons matching the search pattern:'|transchoice( total, { '%total%' : total}) }} + + {{ pattern }} + +
-{{ 'Results %start%-%end% of %total%'|trans({ '%start%' : start, '%end%': start + persons|length, '%total%' : total } ) }}
+{{ 'Results %start%-%end% of %total%'|trans({ '%start%' : start, '%end%': start + persons|length, '%total%' : total } ) }}
-{% if persons|length > 0 %} + {% if persons|length > 0 %} -{% trans %}Name{% endtrans %} | -{% trans %}Date of birth{% endtrans %} | -{% trans %}Phonenumber{% endtrans %} | -- |
---|
- {% set is_open = person.isOpen() %} - - {{person.firstName}} {{person.lastName}} - {% apply spaceless %} - {% if chill_person.fields.accompanying_period == 'visible' %} - {% if is_open == false %} - - {% else %} - - {% endif %} + | {% trans %}Name{% endtrans %} | +{% trans %}Date of birth{% endtrans %} | +{% trans %}Phonenumber{% endtrans %} | ++ | |
---|---|---|---|---|---|
+ {% set is_open = person.isOpen() %} + + {{person.firstName}} {{person.lastName}} + {% apply spaceless %} + {% if chill_person.fields.accompanying_period == 'visible' %} + {% if is_open == false %} + + {% else %} + + {% endif %} + {% endif %} + {% endapply %} + + | ++ {% if person.birthdate is not null %}{{person.birthdate|format_date('long') }}{% else %}{{ 'Unknown date of birth'|trans }}{% endif %} + | +
+
|
- - {% if person.birthdate is not null %}{{person.birthdate|format_date('long') }}{% else %}{{ 'Unknown date of birth'|trans }}{% endif %} - | -
-
|
- - - | -
{{ person.mobilenumber|chill_format_phonenumber }}+
- {{ '%total% persons matching the search pattern:'|transchoice( total, { '%total%' : total}) }} - - {{ pattern }} - -
+{{ 'Results %start%-%end% of %total%'|trans({ '%start%' : start, '%end%': start + persons|length, '%total%' : total } ) }}
++ {{ '%total% persons matching the search pattern:'|transchoice( total, { '%total%' : total}) }} + + {{ pattern }} + +
- -{% if persons|length > 0 %} - -{{ 'Results %start%-%end% of %total%'|trans({ '%start%' : start, '%end%': start + persons|length, '%total%' : total } ) }}