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 3353749db..f0ed84771 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss @@ -203,3 +203,36 @@ div.wraplist { } } } + + +/* +* __WRAP_HEADER_BLOC________ +* HEADER ROW FOR FLEX-TABLE ELEMENTS +*/ + +div.wrapheader { + width: 100%; + + div.wh-row { + display: flex; + flex-direction: row; + + &:first-child { + align-items: baseline; + } + &:last-child {} + + div.wh-col { + &:first-child { + flex-grow: 0; flex-shrink: 1; flex-basis: auto; + } + &:last-child { + flex-grow: 1; flex-shrink: 1; flex-basis: auto; + + display: flex; + justify-content: flex-end; + } + } + + } +} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig index 21713e37d..31440d706 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig @@ -2,102 +2,95 @@
{% for accompanying_period in accompanying_periods %}
-
-
- - - {{ accompanying_period.id }} - - {% if accompanying_period.emergency %} - {{- 'Emergency'|trans|upper -}} - {% endif %} - {% if accompanying_period.confidential %} - {{- 'Confidential'|trans|upper -}} - {% endif %} -
-
- {% if accompanying_period.step == 'DRAFT' %} - {{- 'Draft'|trans|upper -}} - {% else %} - {{- 'Confirmed'|trans|upper -}} - {% endif %} -
-
-
-
- {% if accompanying_period.closingDate == null %} - {{ 'accompanying_period.dates_from_%opening_date%'|trans({ '%opening_date%': accompanying_period.openingDate|format_date('long') } ) }} - {% else %} - {{ 'accompanying_period.dates_from_%opening_date%_to_%closing_date%'|trans({ - '%opening_date%': accompanying_period.openingDate|format_date('long'), - '%closing_date%': accompanying_period.closingDate|format_date('long')} - ) }} - {% if accompanying_period.isOpen == false %} -
-
{{ 'Closing motive'|trans }} :
-
{{ accompanying_period.closingMotive|chill_entity_render_box }}
-
- {% endif %} - {% endif %} -
-
- {% if chill_accompanying_periods.fields.user == 'visible' %} - {% if accompanying_period.user %} - {{ accompanying_period.user.username }} - {% else %} - {{ 'No accompanying user'|trans }} - {% endif %} - {% endif %} -
-
-
-
-
-

{{ 'Participants'|trans }}

-
- {% if accompanying_period.participations.count > 0 %} - {% for p in accompanying_period.participations %} -

- - {{ p.person.firstname ~ ' ' ~ p.person.lastname }} - -

- {% endfor %} +
+
+
+ + + {{ accompanying_period.id }} + + {% if accompanying_period.emergency %} + {{- 'Emergency'|trans|upper -}} + {% endif %} + {% if accompanying_period.confidential %} + {{- 'Confidential'|trans|upper -}} + {% endif %} +
+
+ {% if accompanying_period.step == 'DRAFT' %} + {{- 'Draft'|trans|upper -}} {% else %} - {{ 'No data given'|trans }} + {{- 'Confirmed'|trans|upper -}} + {% endif %} +
+
+
+
+ {% if accompanying_period.closingDate == null %} + {{ 'accompanying_period.dates_from_%opening_date%'|trans({ '%opening_date%': accompanying_period.openingDate|format_date('long') } ) }} + {% else %} + {{ 'accompanying_period.dates_from_%opening_date%_to_%closing_date%'|trans({ + '%opening_date%': accompanying_period.openingDate|format_date('long'), + '%closing_date%': accompanying_period.closingDate|format_date('long')} + ) }} + {% if accompanying_period.isOpen == false %} +
+
{{ 'Closing motive'|trans }} :
+
{{ accompanying_period.closingMotive|chill_entity_render_box }}
+
+ {% endif %} + {% endif %} +
+
+ {% if chill_accompanying_periods.fields.user == 'visible' %} + {% if accompanying_period.user %} + {{ accompanying_period.user.username }} + {% else %} + {{ 'No accompanying user'|trans }} + {% endif %} {% endif %}
-
- {% if accompanying_period.requestorPerson is not null or accompanying_period.requestorThirdParty is not null %} -
+
+
+
-
-

{{ 'Requestor'|trans }}

-
- {% if accompanying_period.requestorPerson is not null %} -

- {{ accompanying_period.requestorPerson.firstname ~ ' ' ~ accompanying_period.requestorPerson.lastname }} -

- {% endif %} - {% if accompanying_period.requestorThirdParty is not null %} -

- {{ accompanying_period.requestorThirdParty.name }} -

- {% endif %} + {% if accompanying_period.participations.count > 0 %} +
+

{{ 'Participants'|trans }}

+
+ {% for p in accompanying_period.participations %} +

+ + {{ p.person.firstname ~ ' ' ~ p.person.lastname }} + +

+ {% endfor %} +
-
-
-
- {% endif %} - - {% if accompanying_period.socialIssues.count > 0 %} -
-
+ {% endif %} + {% if accompanying_period.requestorPerson is not null or accompanying_period.requestorThirdParty is not null %} +
+

{{ 'Requestor'|trans }}

+
+ {% if accompanying_period.requestorPerson is not null %} +

+ {{ accompanying_period.requestorPerson.firstname ~ ' ' ~ accompanying_period.requestorPerson.lastname }} +

+ {% endif %} + {% if accompanying_period.requestorThirdParty is not null %} +

+ {{ accompanying_period.requestorThirdParty.name }} +

+ {% endif %} +
+
+ {% endif %} + {% if accompanying_period.socialIssues.count > 0 %}

{{ 'Social issues'|trans }}

@@ -108,13 +101,13 @@ {% endfor %}
-
+ {% endif %}
- {% endif %} +
-
    +
      {# TODO if enable_accompanying_course_with_multiple_persons is true ... #}
    • -
+
{% endfor %}