diff --git a/CHANGELOG.md b/CHANGELOG.md index e7d12f61d..cbd2cc588 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ and this project adheres to * Household: show date validFrom and validTo when moving * address reference: add index for refid * [accompanyingCourse_work] fix styles conflicts + fix bug with remove goal (remove goals one at a time) +* [accompanyingCourse] improve masonry on resume page, add origin ## Test releases diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss index f39f64eb2..db5df905a 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss +++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss @@ -254,3 +254,24 @@ abbr.referrer { // still used ? border: 1px solid black; padding: 10px; } + +/// Masonry blocs on AccompanyingCourse resume page +div#dashboards { + div.mbloc { + & > div:not(.warnings) { + border: 1px solid $chill-light-gray; + background-color: $chill-llight-gray; + border-radius: 0.35rem; + padding: 1rem; + } + & > div.warnings .alert { + margin-bottom: 0; + } + blockquote.chill-user-quote { + margin: -1.2em; + p { + margin: 0; + } + } + } +} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig index 39e924d18..fe7cd53c4 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig @@ -21,104 +21,134 @@ {% block content %}
-
+
+ {% if 'DRAFT' == accompanyingCourse.step %} -
- {% include '@ChillPerson/AccompanyingCourse/_still_draft.html.twig' %} +
+
+ {% include '@ChillPerson/AccompanyingCourse/_still_draft.html.twig' %} +
{% endif %} {% if 'DRAFT' != accompanyingCourse.step %} {% if withoutHousehold|length > 0 %} -
- {% include '@ChillPerson/AccompanyingCourse/_join_household.html.twig' %} +
+
+ {% include '@ChillPerson/AccompanyingCourse/_join_household.html.twig' %} +
{% endif %} {% endif %} {% if accompanyingCourse.locationStatus == 'address' or accompanyingCourse.locationStatus == 'none' %} -
- {% include '@ChillPerson/AccompanyingCourse/_warning_address.html.twig' %} +
+
+ {% include '@ChillPerson/AccompanyingCourse/_warning_address.html.twig' %} +
{% endif %} -
- {% if accompanyingCourse.locationStatus == 'person' %} -

{{ 'This course is located by'|trans }}

-

{{ accompanyingCourse.personLocation|chill_entity_render_string }}

- {% elseif accompanyingCourse.locationStatus == 'address' %} -

{{ 'This course has a temporarily location'|trans }}

- {% endif %} +
+
+ {% if accompanyingCourse.locationStatus == 'person' %} +

{{ 'This course is located by'|trans }}

+

{{ accompanyingCourse.personLocation|chill_entity_render_string }}

+ {% elseif accompanyingCourse.locationStatus == 'address' %} +

{{ 'This course has a temporarily location'|trans }}

+ {% endif %} - {% if accompanyingCourse.locationStatus != 'none' %} - {{ accompanyingCourse.location|chill_entity_render_box }} - {% endif %} + {% if accompanyingCourse.locationStatus != 'none' %} + {{ accompanyingCourse.location|chill_entity_render_box }} + {% endif %} +
- {% if accompanyingCourse.participations is not empty %} -
-

{{ 'Persons associated'|trans }}

- {% for r in accompanyingCourse.participations %} - {{ _self.insert_onthefly('person', r.person) }} - {% endfor %} -
- {% endif %} - - {% if accompanyingCourse.resources is not empty %} -
-

{{ 'Resources'|trans }}

- {% for r in accompanyingCourse.resources %} - {% if r.person is not null %} - {{ _self.insert_onthefly('person', r.person) }} - {% elseif r.thirdParty is not null %} - {{ _self.insert_onthefly('thirdparty', r.thirdParty) }} - {% endif %} - {% endfor %} -
- {% endif %} - {% if accompanyingCourse.pinnedComment is not empty %} -
-

{{ 'Pinned comment'|trans }}

-
- {{ accompanyingCourse.pinnedComment.content }} -
- {{ 'Last updated by'| trans }} - +
+
+ +
+ + {{ accompanyingCourse.pinnedComment.content|chill_markdown_to_html }} +
+ {{ 'Last updated by'| trans }} + {{ accompanyingCourse.pinnedComment.updatedBy|chill_entity_render_box }} - {{ 'on'|trans ~ ' ' }} - + {{ 'on'|trans ~ ' ' }} + {{ accompanyingCourse.pinnedComment.updatedAt|format_datetime("medium", "short") }} -
-
+
+
+
{% endif %} - {% if accompanyingCourse.scopes is not empty %} -
-

{{ 'Scopes'|trans }}

-
- {% for s in accompanyingCourse.scopes %} - {{ s.name|localize_translatable_string|capitalize }}{% if not loop.last %}, {% endif %} + {% if accompanyingCourse.participations is not empty %} +
+
+

{{ 'Persons associated'|trans }}

+ {% for r in accompanyingCourse.participations %} + {{ _self.insert_onthefly('person', r.person) }} {% endfor %}
{% endif %} - {% if accompanyingCourse.requestorPerson is not null or accompanyingCourse.requestorThirdParty is not null %} -
- {% if accompanyingCourse.requestorPerson is not null %} -

{{ 'Requestor'|trans }}

- {{ _self.insert_onthefly('person', accompanyingCourse.requestorPerson) }} - {% elseif accompanyingCourse.requestorThirdParty is not null %} -

{{ 'Requestor'|trans }}

- {{ _self.insert_onthefly('thirdparty', accompanyingCourse.requestorThirdParty) }} - {% endif %} + {% if accompanyingCourse.resources is not empty %} +
+
+

{{ 'Resources'|trans }}

+ {% for r in accompanyingCourse.resources %} + {% if r.person is not null %} + {{ _self.insert_onthefly('person', r.person) }} + {% elseif r.thirdParty is not null %} + {{ _self.insert_onthefly('thirdparty', r.thirdParty) }} + {% endif %} + {% endfor %} +
{% endif %} + + {% if accompanyingCourse.scopes is not empty %} +
+
+

{{ 'Scopes'|trans }}

+
+ {% for s in accompanyingCourse.scopes %} + {{ s.name|localize_translatable_string|capitalize }}{% if not loop.last %}, {% endif %} + {% endfor %} +
+
+
+ {% endif %} + + {% if accompanyingCourse.requestorPerson is not null or accompanyingCourse.requestorThirdParty is not null %} +
+
+ {% if accompanyingCourse.requestorPerson is not null %} +

{{ 'Requestor'|trans }}

+ {{ _self.insert_onthefly('person', accompanyingCourse.requestorPerson) }} + {% elseif accompanyingCourse.requestorThirdParty is not null %} +

{{ 'Requestor'|trans }}

+ {{ _self.insert_onthefly('thirdparty', accompanyingCourse.requestorThirdParty) }} + {% endif %} +
+
+ {% endif %} + + {% if accompanyingCourse.origin is not empty %} +
+
+

{{ 'Origin'|trans }}

+ {{ accompanyingCourse.origin.label|localize_translatable_string|capitalize }} +
+
+ {% endif %} +