diff --git a/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss index 10d94f667..a7e6c9681 100644 --- a/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss +++ b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss @@ -21,89 +21,28 @@ div.new-activity-select-type { } } -// exceptions for flex-table -div.activity-list { - &.flex-table { - div.item-bloc { - div.item-row.main { - div.item-col { - &:first-child { - flex-basis: 15%; - } - ul.list-content { - li.social-issues, li.social-actions { - .badge-primary { - font-variant: small-caps; - font-weight: bold; - font-size: 88%; - margin-bottom: 0.2em; - } - } - li.social-issues .badge-primary { - background-color: $orange; - } - li.social-actions .badge-primary { - background-color: $green; - } - } - } - } - div.item-row.comment { - margin-left: 15%; - blockquote.chill-user-quote { - margin-top: 0.5em; - margin-bottom: 0.5em; - } - } - div.item-row.details { - margin-left: 15%; +/// liste des échanges, sous le titre-badge, le bloc de contenu +div.main { + padding: 1em; + + /// + ul.list-content { + list-style-type: none; + padding-left: 0.6em; + margin: 0; + li { + margin-bottom: 0.2em; + } + } + div.duration { + font-size: smaller; + padding-left: 1em; + margin-top: 1em; + } - // override flex-bloc to adapt in list - // TODO refund this - div.accompanyingCourse.flex-bloc.concerned-groups { - margin: 0; - width: 100%; - justify-content: space-around; - div.item-bloc { - box-shadow: unset; - padding: 0; - flex-basis: 25%; - div.item-row { - flex-direction: column; - div.item-col { - &:first-child { - width: unset; - } - &:last-child { - border-top: 0; - margin-top: 0; - padding-top: 0; - ul.list-content { - padding: 0; - } - } - } - } - } - } - } - ul.list-content { - list-style-type: none; - padding-left: 1em; - margin: 0 0; - li { - margin-bottom: 0.2em; - } - } - } - div.duration { - font-size: smaller; - padding-left: 1em; - margin-top: 1em; - } - } } + // exceptions for flex-bloc in concerned-groups div.flex-bloc.concerned-groups { margin-top: 1em; diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig index 7d776b5de..89a790588 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig @@ -5,17 +5,17 @@ {% if context == 'person' %} {% set blocs = [ - { 'title': 'Others persons'|trans, + { 'title': 'Others persons'|trans, 'items': entity.persons, 'path' : 'chill_person_view', 'key' : 'person_id' }, - { 'title': 'Third parties'|trans, + { 'title': 'Third parties'|trans, 'items': entity.thirdParties, 'path' : 'chill_3party_3party_show', 'key' : 'thirdparty_id' }, - { 'title': 'Users concerned'|trans, + { 'title': 'Users concerned'|trans, 'items': entity.users, 'path' : 'admin_user_show', 'key' : 'id' @@ -23,22 +23,22 @@ ] %} {% else %} {% set blocs = [ - { 'title': 'Persons in accompanying course'|trans, + { 'title': 'Persons in accompanying course'|trans, 'items': entity.personsAssociated, 'path' : 'chill_person_view', 'key' : 'person_id' }, - { 'title': 'Third persons'|trans, + { 'title': 'Third persons'|trans, 'items': entity.personsNotAssociated, 'path' : 'chill_person_view', 'key' : 'person_id' }, - { 'title': 'Third parties'|trans, + { 'title': 'Third parties'|trans, 'items': entity.thirdParties, 'path' : 'chill_3party_3party_show', 'key' : 'thirdparty_id' }, - { 'title': 'Users concerned'|trans, + { 'title': 'Users concerned'|trans, 'items': entity.users, 'path' : 'admin_user_show', 'key' : 'id' @@ -101,3 +101,31 @@ {% endfor %} {% endif %} + +{% if (with_display == 'wrap-list') %} +
+ {% for bloc in blocs %} +
+ {% if bloc.items|length > 0 %} +
+

{{ bloc.title }}

+
+
+ {% for item in bloc.items %} + + + + {{ item|chill_entity_render_box({ + 'render': 'raw', + 'addAltNames': false + }) }} + + + + {% endfor %} +
+ {% endif %} +
+ {% endfor %} +
+{% endif %} diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig index 0e661c224..9c95d6be0 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig @@ -11,28 +11,49 @@ {% for activity in activities %} {% set t = activity.type %}
-
-
+
- {% if activity.date %} -

{{ activity.date|format_date('long') }}

- {% endif %} - -
- {% if activity.durationTime and t.durationTimeVisible %} -

- - {{ activity.durationTime|date('H:i') }} -

+

+ + {% if activity.date %} +

{{ activity.date|format_date('short') }}

{% endif %} - {% if activity.travelTime and t.travelTimeVisible %} -

- - {{ activity.travelTime|date('H:i') }} -

- {% endif %} -

+
+ {% if activity.durationTime and t.durationTimeVisible %} +

+ + {{ activity.durationTime|date('H:i') }} +

+ {% endif %} + {% if activity.travelTime and t.travelTimeVisible %} +

+ + {{ activity.travelTime|date('H:i') }} +

+ {% endif %} +
+ + + {{ activity.type.name | localize_translatable_string }} +
    + +
  • + {{ 'location'|trans ~ ': ' }} + {# TODO {% if activity.location %}{{ activity.location }}{% endif %} #} + Domicile de l'usager +
    • + + {% if activity.user and t.userVisible %} +
  • + {{ 'Referrer'|trans ~ ': ' }} + {{ activity.user.usernameCanonical }} +
    • + {% endif %} +
+ + + {# {% if context == 'person' and activity.accompanyingPeriod is not empty %}
{% endif %} - -
-
- -
-
- -
-
    -
  • - -
    • - {% if no_action is not defined or no_action == false %} - {# TODO - {% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %} - #} -
  • - -
    • - {# TODO - {% endif %} - {% if is_granted('CHILL_ACTIVITY_DELETE', activity) %} - #} -
  • - -
    • - {# TODO - {% endif %} - #} - {% endif %} -
-
- -
    - - {% if activity.user and t.userVisible %} -
  • - ref: - {{ activity.user.usernameCanonical }} -
    • - {% endif %} - -
  • - {{ activity.type.name | localize_translatable_string }} - - {% if activity.attendee is not null and t.attendeeVisible %} - {% if activity.attendee %} - {{ '→ ' ~ 'present'|trans|capitalize }} - {% else %} - {{ '→ ' ~ 'not present'|trans|capitalize }} - {% endif %} - {% endif %} -
    • - -
  • - {{ 'location'|trans ~ ': ' }} Domicile de l'usager - {# TODO {% if activity.location %}{{ activity.location }}{% endif %} #} -
    • - - {%- if t.reasonsVisible -%} -
  • - {%- if activity.reasons is not empty -%} - {% for r in activity.reasons %} - {{ r|chill_entity_render_box }} - {% endfor %} - {%- endif -%} -
    • - {% endif %} - - {%- if t.socialIssuesVisible %} - - {% endif %} - - {%- if t.socialActionsVisible -%} - - {% endif %} - - -
- - - - -
-
- -
+ #}
+
+
    + {%- if t.reasonsVisible -%} +
  • + {%- if activity.reasons is not empty -%} + {% for r in activity.reasons %} + {{ r|chill_entity_render_box }} + {% endfor %} + {%- endif -%} +
    • + {% endif %} + {%- if t.socialIssuesVisible %} + + {% endif %} + {%- if t.socialActionsVisible -%} + + {% endif %} +
+ + {% if activity.comment.comment is not empty + or activity.persons|length > 0 + or activity.thirdParties|length > 0 + or activity.users|length > 0 + %} - {% if activity.comment.comment is not empty - or activity.persons|length > 0 - or activity.thirdParties|length > 0 - or activity.users|length > 0 - %} -
{% if activity.comment.comment is not empty %} {{ activity.comment|chill_entity_render_box({ 'disable_markdown': false, @@ -162,17 +112,42 @@ 'metadata': false, }) }} {% endif %} -
-
+ {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with { 'context': context, - 'with_display': 'bloc', + 'with_display': 'row', 'entity': activity, 'badge_person': true } %} -
- {% endif %} + {% endif %} +
+ +
+
+ {# + {{ 'Last updated by'|trans}} + {{ activity.updatedBy|chill_entity_render_box }},
+ {{ 'le ' ~ activity.updatedAt|format_datetime('long', 'short') }} + #} +
+
    +
  • + +
    • + {% if no_action is not defined or no_action == false %} +
  • + +
    • +
  • + +
    • + {% endif %} +
+
{% endfor %} diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss index 8f0ae64b2..2e5821659 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss +++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss @@ -120,12 +120,6 @@ div.banner { } } -abbr.referrer { // still used ? - font-size: 70%; - padding-right: 0.4em; - align-self: center; // in flex context -} - /* * HOUSEHOLD CONTEXT * Header custom for Household @@ -185,6 +179,7 @@ div.banner { } } +/// div.household-resume { display: flex; flex-direction: row; @@ -234,3 +229,16 @@ div.accompanyingcourse-resume { } } } + +/// +abbr.referrer { // still used ? + font-size: 70%; + padding-right: 0.4em; + align-self: center; // in flex context +} + +.updatedBy { + margin-top: 0.3rem; + font-size: 0.9rem; + font-style: italic; +} diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss index 29267ad75..e6bdb174b 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss +++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss @@ -108,10 +108,4 @@ div.accompanying_course_work-list { } } - .updatedBy { - margin-top: 0.3rem; - font-size: 0.9rem; - font-style: italic; - } - } diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss index 2c379b5a2..495dce75a 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss +++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss @@ -62,6 +62,9 @@ h2.badge-title { font-size: 80%; padding: 0.5em; padding-right: 0; + h3 { + margin-bottom: 0.5rem; + } } span.title_action { flex-grow: 1; @@ -97,6 +100,9 @@ h2.badge-title { span.title_label { // Calculate same color then border:groove background-color: shade-color($activity-color, 34%); + h3 { + color: $white; + } } span.title_action { @include badge_title($activity-color); @@ -108,6 +114,9 @@ h2.badge-title { p { margin-bottom: 0; text-align: right; + abbr { + text-decoration: none; + } } } } diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/mixins.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/mixins.scss index 878ff82e1..e995f97eb 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/mixins.scss +++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/mixins.scss @@ -4,7 +4,7 @@ /// @mixin chill_badge($color) { - //text-transform: capitalize !important; + text-transform: capitalize !important; font-weight: 500 !important; border-left: 20px groove $color; &:before { diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig index bcb630cde..a53a7c0d0 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig @@ -58,11 +58,10 @@
-
{% if accompanying_period.requestorPerson is not null or accompanying_period.requestorThirdParty is not null %}
-

{{ 'Requestor'|trans }}

+

{{ 'Requestor'|trans({'gender': null }) }}

{% if accompanying_period.requestorPerson is not null %} {{ accompanying_period.requestorPerson|chill_entity_render_string }}