diff --git a/src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss b/src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss index 92a84cfbb..a18037cbd 100644 --- a/src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss +++ b/src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss @@ -33,3 +33,64 @@ div.flex-bloc.concerned-groups { flex-basis: 33%; //3 blocs } } + +// exceptions for flex-table in list-records +div.flex-table.list-records { + div.item-bloc { + div.item-row.main { + div.item-col { + &:first-child { + flex-basis: 27%; + } + 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: var(--chill-orange); + } + li.social-actions .badge-primary { + background-color: var(--chill-green); + } + } + } + } + div.item-row.details { + flex-direction: row; + & > div.item-col { + justify-content: flex-start; + align-self: center; + &:nth-child(1) { + flex-grow: 1; flex-shrink: 0; flex-basis: 30%; + } + &:nth-child(2) { + flex-grow: 0; flex-shrink: 1; flex-basis: 70%; + } + } + div.concerned-groups { + font-size: 85%; + h4 { + text-transform: uppercase; + } + } + } + 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; + } +} diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig index f39eafd08..a7acc7491 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig @@ -46,14 +46,27 @@ ] %} {% endif %} -
{% if activity.date %}{{ activity.date|format_date('long') }}{% endif %} | -{{ activity.durationTime|date('H:i') }} | -
+
+
+
+
+ {%
+ if activity.comment.comment is not empty
+ or activity.persons|length > 0
+ or activity.thirdParties|length > 0
+ or activity.users|length > 0
+ %}
+
+
+ {% if activity.date %}
+
+ {{ activity.date|format_date('long') }}+ {% endif %} + +
+
+
+ + + {{ activity.durationTime|date('H:i') }} + + + {% if activity.travelTime %} ++ + {{ activity.travelTime|date('H:i') }} + + {% endif %} +
+
+
+
+ {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'with_display': 'row', 'entity': activity } %}
+
+
{% if activity.comment.comment is not empty %}
- {{ activity.comment|chill_entity_render_box( { 'limit_lines': 3, 'metadata': false } ) }}
+
+ {{ activity.comment|chill_entity_render_box( { 'limit_lines': 3, 'metadata': false } ) }}
+
{% endif %}
- {%- if activity.reasons is empty -%}
- {{ 'No reason associated'|trans }}
- {%- else -%}
- {% for r in activity.reasons %}{{ r|chill_entity_render_box }} {% endfor %}
- {%- endif -%}
- |
- {{ activity.type.name | localize_translatable_string }} | -- | -