diff --git a/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss index bd67b58ca..3518d1751 100644 --- a/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss +++ b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss @@ -6,7 +6,7 @@ //} .activity { - color: $chill-green; + //color: $chill-green; } // exceptions for flex-bloc in concerned-groups diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig index ef82a5f4a..f7c0d12b2 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig @@ -18,57 +18,44 @@ {% else %}
- + {% for activity in activities %} {% set t = activity.type %}
- + {% if activity.date %}

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

{% endif %} - +
- {% if t.durationTimeVisible > 0 %} -

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

- {% endif %} - + {% if t.durationTimeVisible > 0 %} +

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

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

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

+

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

{% endif %}
{% if context == 'person' and activity.accompanyingPeriod is not empty %} -
- - - {{ activity.accompanyingPeriod.id }} +
+ + + {{ activity.accompanyingPeriod.id }} -
+
{% endif %} - +
    @@ -77,19 +64,19 @@ {{ 'by'|trans }}{{ 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 %} + {{ '→ ' ~ 'present'|trans|capitalize }} + {% else %} {{ '→ ' ~ 'not present'|trans|capitalize }} {% endif %} {% endif %}
    • - +
  • {{ 'location'|trans ~ ': ' }} Domicile de l'usager @@ -97,7 +84,7 @@ {% if activity.location %}{{ activity.location }}{% endif %} #}
    • - + {%- if t.reasonsVisible -%}
  • {%- if activity.reasons is empty -%} @@ -121,7 +108,7 @@ {%- endif -%}
    • {% endif %} - + {%- if t.socialActionsVisible -%} {% endif %} - +
  • @@ -159,19 +146,19 @@
- - {% + + {% if activity.comment.comment is not empty or activity.persons|length > 0 or activity.thirdParties|length > 0 - or activity.users|length > 0 + or activity.users|length > 0 %}
{% 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 } ) }} @@ -179,7 +166,7 @@ {% endif %}
{% endif %} - +
{% endfor %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_join_household.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_join_household.html.twig new file mode 100644 index 000000000..fd0cf373d --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_join_household.html.twig @@ -0,0 +1,38 @@ +
+
+ {{ 'Some peoples does not belong to any household currently. Add them to an household soon'|trans }} +
+ +
+ +
+
+ +

{{ 'household.Select people to move'|trans }}

+
    + {% for p in withoutHousehold %} +
  • + + {{ p|chill_entity_render_box }} +
    • + {% endfor %} +
+ + + +
    +
  • + +
    • +
+
+
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig index 13a39b6bc..b88f93928 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig @@ -7,10 +7,10 @@ {% endblock %} {% block content %} -
+
{% if 'DRAFT' == accompanyingCourse.step %} -
+
{{ 'This accompanying course is still a draft'|trans }} @@ -20,205 +20,61 @@
{% endif %} - {% if withoutHousehold|length > 0 %} -
-
- {{ 'Some peoples does not belong to any household currently. Add them to an household soon'|trans }} -
-
    -
  • - -
    • -
-
-
-
- -

{{ 'household.Select people to move'|trans }}

-
    - {% for p in withoutHousehold %} -
  • - - {{ p|chill_entity_render_box }} -
    • - {% endfor %} -
- - - +
+

{{ 'Associated peoples'|trans }}

+
+ {% for participation in accompanyingCourse.participations %} + {% if participation.enddate is null %} +
+ {{ participation.person|chill_entity_render_box({ + 'render': 'bloc', 'addLink': false, 'addInfo': true + }) }} +
+ {% endif %} + {% endfor %} + {# AJOUTER ACTIONS - + #}
+ {% if withoutHousehold|length > 0 %} + {% include '@ChillPerson/AccompanyingCourse/_join_household.html.twig' with {} %} + {% endif %} +
- {% endif %} - -

{{ 'Associated peoples'|trans }}

- -
- {% for p in accompanyingCourse.participations %} - {% if p.enddate is null %} -
-
-
-

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

-

- {% set born = (p.person.gender == 'woman') ? 'née': 'né' %} - {% set gender = (p.person.gender == 'woman') ? 'fa-venus' : - (p.person.gender == 'man') ? 'fa-mars' : 'fa-neuter' %} - {% set genderTitle = (p.person.gender == 'woman') ? 'femme' : - (p.person.gender == 'man') ? 'homme' : 'neutre' %} - {{ born ~ ' le ' ~ p.person.birthdate|format_date('short') }} -

-
-
- - -
+
+

{{ 'Requestor'|trans }}

+ {% if accompanyingCourse.requestorPerson is not empty %} + {% set requestor = accompanyingCourse.requestorPerson %} + {% set info = true %} + {% elseif accompanyingCourse.requestor is not empty %} + {% set requestor = accompanyingCourse.requestorThirdParty %} + {% set info = false %} + {% endif %} + {% if accompanyingCourse.requestor == null %} +

{{ 'Any requestor to this accompanying course'|trans }}

+ {% else %} +
+
+ {{ requestor|chill_entity_render_box({ + 'render': 'bloc', 'addLink': false, 'addEntity': true, 'addInfo': info + }) }}
{% endif %} - {% endfor %}
-

{{ 'Requestor'|trans }}

- - {% if accompanyingCourse.requestor == null %} -

{{ 'Any requestor to this accompanying course'|trans }}

- {% elseif accompanyingCourse.requestorPerson is not empty %} - {% set r = accompanyingCourse.requestorPerson %} -
-
-

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

-

- {% set born = (r.gender == 'woman') ? 'née': 'né' %} - {% set gender = (r.gender == 'woman') ? 'fa-venus' : - (r.gender == 'man') ? 'fa-mars' : 'fa-neuter' %} - {% set genderTitle = (r.gender == 'woman') ? 'femme' : - (r.gender == 'homme') ? 'fa-mars' : 'neutre' %} - {{ born ~ ' le ' ~ r.birthdate|format_date('short') }} -

-
-
- -
    -
  • - -
    • -
-
-
- - {% elseif accompanyingCourse.requestorThirdParty is not empty %} - {% set r = accompanyingCourse.requestorThirdParty %} -
-
-

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

-
-
- -
    -
  • - -
    • -
-
-
- {% endif %} - -
+

{{ 'Resources'|trans }}

{% if accompanyingCourse.resources|length == 0 %}

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

@@ -228,12 +84,12 @@
{% if r.person %} {{ r.person|chill_entity_render_box({ - 'render': 'bloc', 'addLink': true, 'addEntity': true, 'addInfo': true + 'render': 'bloc', 'addLink': false, 'addEntity': true, 'addInfo': true }) }} {% endif %} {% if r.thirdParty %} {{ r.thirdParty|chill_entity_render_box({ - 'render': 'bloc', 'addLink': true, 'addEntity': true, 'addInfo': true + 'render': 'bloc', 'addLink': false, 'addEntity': true, 'addInfo': false }) }} {% endif %}
@@ -242,9 +98,8 @@ {% endif %}
-

{{ 'Social actions'|trans }}

- -
+