mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-06-07 18:44:08 +00:00
Cohérence graphique des listes d'activités et d'actions dans le contexte d'un parcours
This commit is contained in:
parent
8e6e92ae89
commit
2d1e8b2acd
@ -15,6 +15,10 @@ and this project adheres to
|
|||||||
* [main] address: in edit mode, select the encoded values in multiselect for address reference and city (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/316)
|
* [main] address: in edit mode, select the encoded values in multiselect for address reference and city (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/316)
|
||||||
* [person search] fix bug when using birthdate after and birthdate before
|
* [person search] fix bug when using birthdate after and birthdate before
|
||||||
* [person search] increase pertinence when lastname begins with search pattern
|
* [person search] increase pertinence when lastname begins with search pattern
|
||||||
|
* [activity/actions] Améliore la cohérence du design entre
|
||||||
|
* la page résumé d'un parcours (liste d'actions récentes et liste d'activités récentes)
|
||||||
|
* la page liste des actions
|
||||||
|
* la page liste des activités (contexte personne / contexte parcours)
|
||||||
* [household] field to edit wheter person is titulaire of household or not removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/322)
|
* [household] field to edit wheter person is titulaire of household or not removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/322)
|
||||||
* [activity] create work if a work with same social action is not associated to the activity
|
* [activity] create work if a work with same social action is not associated to the activity
|
||||||
* [visgraph] improve and fix bugs on vis-network relationship graph
|
* [visgraph] improve and fix bugs on vis-network relationship graph
|
||||||
@ -174,7 +178,7 @@ and this project adheres to
|
|||||||
* fast creation buttons
|
* fast creation buttons
|
||||||
* add ordering for types
|
* add ordering for types
|
||||||
|
|
||||||
* [AccompanyingCourse Resume page] badge-title for AccompanyingCourseWork and for Activities;
|
* [AccompanyingCourse Resume page] dashboard for AccompanyingCourseWork and for Activities;
|
||||||
* Improve badges behaviour with small screens;
|
* Improve badges behaviour with small screens;
|
||||||
|
|
||||||
* [ThirdParty]:
|
* [ThirdParty]:
|
||||||
|
|||||||
@ -24,14 +24,16 @@ div.new-activity-select-type {
|
|||||||
}
|
}
|
||||||
|
|
||||||
//// ACTIVITY LIST PAGE
|
//// ACTIVITY LIST PAGE
|
||||||
// precise badge-title specific details
|
// precise dashboard specific details
|
||||||
|
|
||||||
|
p.date-label {
|
||||||
|
display: inline-block;
|
||||||
|
margin: 0 0.5em 0 0;
|
||||||
|
font-weight: 700;
|
||||||
|
font-size: 18pt;
|
||||||
|
}
|
||||||
|
div.dashboard,
|
||||||
h2.badge-title {
|
h2.badge-title {
|
||||||
div.duration {
|
|
||||||
font-size: smaller;
|
|
||||||
padding-left: 1em;
|
|
||||||
margin-top: 1em;
|
|
||||||
}
|
|
||||||
ul.list-content {
|
ul.list-content {
|
||||||
font-size: 70%;
|
font-size: 70%;
|
||||||
list-style-type: none;
|
list-style-type: none;
|
||||||
@ -39,16 +41,13 @@ h2.badge-title {
|
|||||||
margin: 0;
|
margin: 0;
|
||||||
li {
|
li {
|
||||||
margin-bottom: 0.2em;
|
margin-bottom: 0.2em;
|
||||||
// exception: change bg color for action badges above badge-title
|
// exception: change bg color for action badges above dashboard
|
||||||
.bg-light {
|
.bg-light {
|
||||||
background-color: $chill-light-gray !important;
|
background-color: $chill-light-gray !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
div.main {
|
|
||||||
padding: 1em;
|
|
||||||
}
|
|
||||||
|
|
||||||
//// ACTIVITY SHOW AND FORM PAGES
|
//// ACTIVITY SHOW AND FORM PAGES
|
||||||
// Exceptions for flex-bloc in concerned-groups
|
// Exceptions for flex-bloc in concerned-groups
|
||||||
|
|||||||
@ -1,110 +0,0 @@
|
|||||||
<h2 class="badge-title">
|
|
||||||
<span class="title_label">
|
|
||||||
|
|
||||||
{% if activity.date %}
|
|
||||||
<h3>{{ activity.date|format_date('short') }}</h3>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
<div class="duration">
|
|
||||||
{% if activity.durationTime and t.durationTimeVisible %}
|
|
||||||
<p>
|
|
||||||
<abbr class="fa fa-fw fa-hourglass-end" title="{{ 'Duration Time'|trans }}"></abbr>
|
|
||||||
{{ activity.durationTime|date('H:i') }}
|
|
||||||
</p>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% if activity.travelTime and t.travelTimeVisible %}
|
|
||||||
<p>
|
|
||||||
<abbr class="fa fa-fw fa-car" title="{{ 'Travel time'|trans }}"></abbr>
|
|
||||||
{{ activity.travelTime|date('H:i') }}
|
|
||||||
</p>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</span>
|
|
||||||
<span class="title_action">
|
|
||||||
|
|
||||||
{{ activity.type.name | localize_translatable_string }}
|
|
||||||
|
|
||||||
{% if activity.emergency %}
|
|
||||||
<span class="badge bg-danger rounded-pill fs-6">{{ 'Emergency'|trans|upper }}</span>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
<ul class="small_in_title mt-3">
|
|
||||||
|
|
||||||
{% if activity.sentReceived is not empty and t.sentReceivedVisible %}
|
|
||||||
<li>
|
|
||||||
<span class="item-key">{{ 'Sent received'|trans ~ ' : ' }}</span>
|
|
||||||
<b>{{ activity.sentReceived|capitalize|trans }}</b>
|
|
||||||
</li>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% if activity.location and t.locationVisible %}
|
|
||||||
<li>
|
|
||||||
<span class="item-key">{{ 'location'|trans ~ ': ' }}</span>
|
|
||||||
<b>
|
|
||||||
<span>{{ activity.location.locationType.title|localize_translatable_string }}</span>
|
|
||||||
{{ activity.location.name }}
|
|
||||||
</b>
|
|
||||||
</li>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% if activity.user and t.userVisible %}
|
|
||||||
<li>
|
|
||||||
<span class="item-key">{{ 'Referrer'|trans ~ ': ' }}</span>
|
|
||||||
<b>{{ activity.user.usernameCanonical }}</b>
|
|
||||||
</li>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
<li class="associated-persons">
|
|
||||||
<span class="item-key">{{ 'Participants'|trans ~ ' : ' }}</span>
|
|
||||||
{% for p in activity.personsAssociated %}
|
|
||||||
<span class="badge-person">{{ p|chill_entity_render_box }}</span>
|
|
||||||
{% endfor %}
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
<ul class="list-content my-3">
|
|
||||||
{%- if t.reasonsVisible -%}
|
|
||||||
{%- if activity.reasons is not empty -%}
|
|
||||||
<li class="reasons">
|
|
||||||
{% for r in activity.reasons %}
|
|
||||||
{{ r|chill_entity_render_box }}
|
|
||||||
{% endfor %}
|
|
||||||
</li>
|
|
||||||
{%- endif -%}
|
|
||||||
{% endif %}
|
|
||||||
{%- if t.socialIssuesVisible %}
|
|
||||||
{%- if activity.socialIssues is not empty -%}
|
|
||||||
<li class="social-issues">
|
|
||||||
{% for r in activity.socialIssues %}
|
|
||||||
{{ r|chill_entity_render_box }}
|
|
||||||
{% endfor %}
|
|
||||||
</li>
|
|
||||||
{%- endif -%}
|
|
||||||
{% endif %}
|
|
||||||
{%- if t.socialActionsVisible -%}
|
|
||||||
{%- if activity.socialActions is not empty -%}
|
|
||||||
<li class="social-actions">
|
|
||||||
{% for r in activity.socialActions %}
|
|
||||||
{{ r|chill_entity_render_box }}
|
|
||||||
{% endfor %}
|
|
||||||
</li>
|
|
||||||
{%- endif -%}
|
|
||||||
{% endif %}
|
|
||||||
</ul>
|
|
||||||
</span>
|
|
||||||
</h2>
|
|
||||||
|
|
||||||
{% if context == 'person' and activity.accompanyingPeriod is not empty %}
|
|
||||||
<div class="mt-3">
|
|
||||||
<a class="btn btn-sm btn-outline-primary"
|
|
||||||
title="{{ 'Period number %number%'|trans({'%number%': activity.accompanyingPeriod.id}) }}"
|
|
||||||
href="{{ chill_path_add_return_path(
|
|
||||||
"chill_person_accompanying_course_index",
|
|
||||||
{ 'accompanying_period_id': activity.accompanyingPeriod.id }
|
|
||||||
) }}"><i class="fa fa-random"></i>
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
@ -126,7 +126,7 @@
|
|||||||
<div class="wl-row">
|
<div class="wl-row">
|
||||||
{% if bloc.items|length > 0 %}
|
{% if bloc.items|length > 0 %}
|
||||||
<div class="wl-col title">
|
<div class="wl-col title">
|
||||||
<h4>{{ bloc.title }}</h4>
|
<h3>{{ bloc.title }}</h3>
|
||||||
</div>
|
</div>
|
||||||
<div class="wl-col list">
|
<div class="wl-col list">
|
||||||
{% for item in bloc.items %}
|
{% for item in bloc.items %}
|
||||||
|
|||||||
@ -10,50 +10,175 @@
|
|||||||
{% for activity in activities %}
|
{% for activity in activities %}
|
||||||
{% set t = activity.type %}
|
{% set t = activity.type %}
|
||||||
<div class="item-bloc">
|
<div class="item-bloc">
|
||||||
|
|
||||||
<div class="item-row">
|
<div class="item-row">
|
||||||
{% include '@ChillActivity/Activity/activity-badge-title.html.twig' %}
|
<div class="wrap-list">
|
||||||
|
<div class="wl-row">
|
||||||
|
<div class="wl-col title">
|
||||||
|
|
||||||
|
{% if activity.date %}
|
||||||
|
<p class="date-label">
|
||||||
|
{{ activity.date|format_date('short') }}
|
||||||
|
</p>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<div class="wl-col list">
|
||||||
|
|
||||||
|
<h2 class="badge-title">
|
||||||
|
<span class="title_label"></span>
|
||||||
|
<span class="title_action">
|
||||||
|
{{ activity.type.name | localize_translatable_string }}
|
||||||
|
|
||||||
|
{% if activity.emergency %}
|
||||||
|
<span class="badge bg-danger rounded-pill fs-6 float-end">{{ 'Emergency'|trans|upper }}</span>
|
||||||
|
{% endif %}
|
||||||
|
</span>
|
||||||
|
</h2>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{% if activity.comment.comment is not empty
|
<div class="item-row column separator">
|
||||||
or activity.persons|length > 0
|
<div class="wrap-list">
|
||||||
or activity.thirdParties|length > 0
|
{% if activity.location and t.locationVisible %}
|
||||||
or activity.users|length > 0
|
<div class="wl-row">
|
||||||
%}
|
<div class="wl-col title"><h3>{{ 'location'|trans }}</h3></div>
|
||||||
<div class="main">
|
<div class="wl-col list">
|
||||||
{% if activity.comment.comment is not empty %}
|
<p class="wl-item">
|
||||||
{{ activity.comment|chill_entity_render_box({
|
<span>{{ activity.location.locationType.title|localize_translatable_string }}</span>
|
||||||
'disable_markdown': false,
|
{{ activity.location.name }}
|
||||||
'limit_lines': 3,
|
</p>
|
||||||
'metadata': false,
|
</div>
|
||||||
}) }}
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
{% if activity.sentReceived is not empty and t.sentReceivedVisible %}
|
||||||
|
<div class="wl-row">
|
||||||
|
<div class="wl-col title"><h3>{{ 'Sent received'|trans }}</h3></div>
|
||||||
|
<div class="wl-col list">
|
||||||
|
<p class="wl-item">
|
||||||
|
{{ activity.sentReceived|capitalize|trans }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if activity.user and t.userVisible %}
|
||||||
|
<div class="wl-row">
|
||||||
|
<div class="wl-col title"><h3>{{ 'Referrer'|trans }}</h3></div>
|
||||||
|
<div class="wl-col list">
|
||||||
|
<p class="wl-item">
|
||||||
|
{{ activity.user.usernameCanonical|chill_entity_render_string|capitalize }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
|
||||||
{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {
|
{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {
|
||||||
'context': context,
|
'context': context,
|
||||||
'with_display': 'row',
|
'with_display': 'wrap-list',
|
||||||
'entity': activity,
|
'entity': activity,
|
||||||
'badge_person': true
|
'badge_person': true
|
||||||
} %}
|
} %}
|
||||||
|
|
||||||
|
<div class="wrap-list">
|
||||||
|
{%- if activity.reasons is not empty and t.reasonsVisible -%}
|
||||||
|
<div class="wl-row">
|
||||||
|
<div class="wl-col title">
|
||||||
|
<h3>{{ 'Reasons'|trans }}</h3>
|
||||||
|
</div>
|
||||||
|
<div class="wl-col list">
|
||||||
|
{% for r in activity.reasons %}
|
||||||
|
<p class="wl-item reasons">
|
||||||
|
{{ r|chill_entity_render_box }}
|
||||||
|
</p>
|
||||||
|
{% endfor %}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
{%- if activity.socialIssues is not empty and t.socialIssuesVisible -%}
|
||||||
|
<div class="wl-row">
|
||||||
|
<div class="wl-col title">
|
||||||
|
<h3>{{ 'Social issues'|trans }}</h3>
|
||||||
|
</div>
|
||||||
|
<div class="wl-col list">
|
||||||
|
{% for r in activity.socialIssues %}
|
||||||
|
<p class="wl-item social-issues">
|
||||||
|
{{ r|chill_entity_render_box }}
|
||||||
|
</p>
|
||||||
|
{% endfor %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{%- if activity.socialActions is not empty and t.socialActionsVisible -%}
|
||||||
|
<div class="wl-row">
|
||||||
|
<div class="wl-col title">
|
||||||
|
<h3>{{ 'Social actions'|trans }}</h3>
|
||||||
|
</div>
|
||||||
|
<div class="wl-col list">
|
||||||
|
{% for r in activity.socialActions %}
|
||||||
|
<p class="wl-item social-actions">
|
||||||
|
{{ r|chill_entity_render_box }}
|
||||||
|
</p>
|
||||||
|
{% endfor %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{# SEULEMENT SI DÉTAILLÉ
|
||||||
|
{% if activity.comment.comment is not empty %}
|
||||||
|
<div class="wl-row">
|
||||||
|
<div class="wl-col title">
|
||||||
|
<h3>{{ 'Comment'|trans }}</h3>
|
||||||
|
</div>
|
||||||
|
<div class="wl-col list">
|
||||||
|
{{ activity.comment|chill_entity_render_box({
|
||||||
|
'disable_markdown': false,
|
||||||
|
'limit_lines': 3,
|
||||||
|
'metadata': false
|
||||||
|
}) }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
#}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="item-row separator">
|
<div class="item-row separator">
|
||||||
<div class="updatedBy"></div>
|
|
||||||
<ul class="record_actions">
|
<ul class="record_actions">
|
||||||
|
{% if context == 'person' and activity.accompanyingPeriod is not empty %}
|
||||||
|
<li>
|
||||||
|
<a class="btn btn-primary"
|
||||||
|
title="{{ 'See activity in accompanying course context'|trans }}"
|
||||||
|
href="{{ chill_path_add_return_path(
|
||||||
|
"chill_activity_activity_list",
|
||||||
|
{ 'accompanying_period_id': activity.accompanyingPeriod.id }
|
||||||
|
) }}"><i class="fa fa-random fa-fw"></i>
|
||||||
|
{{ 'Period number %number%'|trans({'%number%': activity.accompanyingPeriod.id}) }}
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
{% else %}
|
||||||
<li>
|
<li>
|
||||||
<a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"
|
<a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"
|
||||||
class="btn btn-sm btn-show "></a>
|
class="btn btn-show" title="{{ 'Show'|trans }}"></a>
|
||||||
</li>
|
</li>
|
||||||
{% if no_action is not defined or no_action == false %}
|
{% if no_action is not defined or no_action == false %}
|
||||||
<li>
|
<li>
|
||||||
<a href="{{ path('chill_activity_activity_edit', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"
|
<a href="{{ path('chill_activity_activity_edit', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"
|
||||||
class="btn btn-sm btn-update "></a>
|
class="btn btn-update" title="{{ 'Edit'|trans }}"></a>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<a href="{{ path('chill_activity_activity_delete', { 'id': activity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}"
|
<a href="{{ path('chill_activity_activity_delete', { 'id': activity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}"
|
||||||
class="btn btn-sm btn-delete "></a>
|
class="btn btn-delete" title="{{ 'Delete'|trans }}"></a>
|
||||||
</li>
|
</li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
{% endif %}
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@ -23,8 +23,8 @@
|
|||||||
{% if is_granted('CHILL_ACTIVITY_CREATE', accompanyingCourse) %}
|
{% if is_granted('CHILL_ACTIVITY_CREATE', accompanyingCourse) %}
|
||||||
<ul class="record_actions sticky-form-buttons">
|
<ul class="record_actions sticky-form-buttons">
|
||||||
<li>
|
<li>
|
||||||
<a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}" class="btn btn-create">
|
<a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}"
|
||||||
{{ 'Create'|trans }}
|
class="btn btn-create">{{ 'Create'|trans }}
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|||||||
@ -3,10 +3,88 @@
|
|||||||
{% set t = activity.type %}
|
{% set t = activity.type %}
|
||||||
|
|
||||||
<a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"
|
<a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"
|
||||||
class="badge-link" title="{{ 'Show the activity'|trans }}">
|
class="dashboard-link" title="{{ 'Show the activity'|trans }}">
|
||||||
|
|
||||||
{% include '@ChillActivity/Activity/activity-badge-title.html.twig' %}
|
<div class="dashboard">
|
||||||
|
<span class="title_label"></span>
|
||||||
|
<span class="title_action">
|
||||||
|
|
||||||
|
{%- if activity.date -%}
|
||||||
|
<p class="date-label">{{ activity.date|format_date('short') }}</p>
|
||||||
|
{%- endif -%}
|
||||||
|
|
||||||
|
<span class="like-h3">{{ activity.type.name | localize_translatable_string }}</span>
|
||||||
|
|
||||||
|
{% if activity.emergency %}
|
||||||
|
<span class="badge bg-danger rounded-pill fs-6">{{ 'Emergency'|trans|upper }}</span>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<ul class="small_in_title mt-3">
|
||||||
|
|
||||||
|
{% if activity.sentReceived is not empty and t.sentReceivedVisible %}
|
||||||
|
<li>
|
||||||
|
<span class="item-key">{{ 'Sent received'|trans ~ ' : ' }}</span>
|
||||||
|
<b>{{ activity.sentReceived|capitalize|trans }}</b>
|
||||||
|
</li>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if activity.location and t.locationVisible %}
|
||||||
|
<li>
|
||||||
|
<span class="item-key">{{ 'location'|trans ~ ': ' }}</span>
|
||||||
|
<b>
|
||||||
|
<span>{{ activity.location.locationType.title|localize_translatable_string }}</span>
|
||||||
|
{{ activity.location.name }}
|
||||||
|
</b>
|
||||||
|
</li>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if activity.user and t.userVisible %}
|
||||||
|
<li>
|
||||||
|
<span class="item-key">{{ 'Referrer'|trans ~ ': ' }}</span>
|
||||||
|
<b>{{ activity.user.usernameCanonical }}</b>
|
||||||
|
</li>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<li class="associated-persons">
|
||||||
|
<span class="item-key">{{ 'Participants'|trans ~ ' : ' }}</span>
|
||||||
|
{% for p in activity.personsAssociated %}
|
||||||
|
<span class="badge-person">{{ p|chill_entity_render_box }}</span>
|
||||||
|
{% endfor %}
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<ul class="list-content my-3">
|
||||||
|
{%- if t.reasonsVisible -%}
|
||||||
|
{%- if activity.reasons is not empty -%}
|
||||||
|
<li class="reasons">
|
||||||
|
{% for r in activity.reasons %}
|
||||||
|
{{ r|chill_entity_render_box }}
|
||||||
|
{% endfor %}
|
||||||
|
</li>
|
||||||
|
{%- endif -%}
|
||||||
|
{% endif %}
|
||||||
|
{%- if t.socialIssuesVisible %}
|
||||||
|
{%- if activity.socialIssues is not empty -%}
|
||||||
|
<li class="social-issues">
|
||||||
|
{% for r in activity.socialIssues %}
|
||||||
|
{{ r|chill_entity_render_box }}
|
||||||
|
{% endfor %}
|
||||||
|
</li>
|
||||||
|
{%- endif -%}
|
||||||
|
{% endif %}
|
||||||
|
{%- if t.socialActionsVisible -%}
|
||||||
|
{%- if activity.socialActions is not empty -%}
|
||||||
|
<li class="social-actions">
|
||||||
|
{% for r in activity.socialActions %}
|
||||||
|
{{ r|chill_entity_render_box }}
|
||||||
|
{% endfor %}
|
||||||
|
</li>
|
||||||
|
{%- endif -%}
|
||||||
|
{% endif %}
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -222,3 +222,5 @@ Aggregate by activity type: Aggréger par type d'activité
|
|||||||
Aggregate by activity reason: Aggréger par sujet de l'activité
|
Aggregate by activity reason: Aggréger par sujet de l'activité
|
||||||
|
|
||||||
Last activities: Les dernières activités
|
Last activities: Les dernières activités
|
||||||
|
|
||||||
|
See activity in accompanying course context: Voir l'activité dans le contexte du parcours d'accompagnement
|
||||||
|
|||||||
@ -101,6 +101,10 @@ div.flex-table {
|
|||||||
div.item-row {
|
div.item-row {
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
|
|
||||||
|
&.column { // exception
|
||||||
|
flex-direction: column
|
||||||
|
}
|
||||||
|
|
||||||
div.item-col {
|
div.item-col {
|
||||||
&:first-child {
|
&:first-child {
|
||||||
flex-grow: 0; flex-shrink: 0; flex-basis: auto;
|
flex-grow: 0; flex-shrink: 0; flex-basis: auto;
|
||||||
@ -160,6 +164,12 @@ div.wrap-list {
|
|||||||
& > * {
|
& > * {
|
||||||
padding-right: 1em;
|
padding-right: 1em;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
h3, h4 {
|
||||||
|
font-weight: 700;
|
||||||
|
font-size: 100%;
|
||||||
|
font-family: 'Open Sans';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
div.wl-col.list {
|
div.wl-col.list {
|
||||||
@ -171,6 +181,10 @@ div.wrap-list {
|
|||||||
padding: 0em;
|
padding: 0em;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
blockquote.chill-user-quote {
|
||||||
|
margin: 0.7em 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,51 +1,6 @@
|
|||||||
/// AccompanyingCourse Work list Page
|
/// AccompanyingCourse Work list Page
|
||||||
div.accompanying_course_work-list {
|
div.accompanying_course_work-list {
|
||||||
|
|
||||||
div.timeline {
|
|
||||||
width: 100%;
|
|
||||||
ul {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
|
|
||||||
padding: 0;
|
|
||||||
list-style-type: none;
|
|
||||||
|
|
||||||
> li {
|
|
||||||
flex-grow: 1; flex-shrink: 1; flex-basis: auto;
|
|
||||||
|
|
||||||
div {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
align-items: center;
|
|
||||||
|
|
||||||
&.date {
|
|
||||||
margin-bottom: 1em;
|
|
||||||
}
|
|
||||||
&.label {
|
|
||||||
border-top: 3px solid $chill-green;
|
|
||||||
|
|
||||||
&:before {
|
|
||||||
content: '';
|
|
||||||
display: inline-block;
|
|
||||||
position: relative;
|
|
||||||
width: 15px;
|
|
||||||
height: 15px;
|
|
||||||
top: -9px;
|
|
||||||
|
|
||||||
background-color: $white;
|
|
||||||
border-radius: 12px;
|
|
||||||
border: 2px solid $chill-green;
|
|
||||||
}
|
|
||||||
&.no-label:before {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
div.objective_results {
|
div.objective_results {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
display: grid;
|
display: grid;
|
||||||
@ -69,8 +24,10 @@ div.accompanying_course_work-list {
|
|||||||
//&:nth-child(even) { background-color: $chill-llight-gray; }
|
//&:nth-child(even) { background-color: $chill-llight-gray; }
|
||||||
&.without-objectives {}
|
&.without-objectives {}
|
||||||
&.with-objectives {}
|
&.with-objectives {}
|
||||||
|
}
|
||||||
|
|
||||||
|
div.objective_results,
|
||||||
|
div.evaluations {
|
||||||
h4.title_label {
|
h4.title_label {
|
||||||
display: block;
|
display: block;
|
||||||
margin: 0.4em 0;
|
margin: 0.4em 0;
|
||||||
|
|||||||
@ -39,69 +39,15 @@ span.fa-holder {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* BADGE_TITLE
|
* DASHBOARDS
|
||||||
* Display Title like a badge (with background-colored label)
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
h2.badge-title {
|
/// Theses links apply on dashboards as parent tag.
|
||||||
display: flex;
|
|
||||||
flex-direction: row;
|
|
||||||
width: 100%;
|
|
||||||
color: $dark;
|
|
||||||
|
|
||||||
span.title_label {
|
|
||||||
border-radius: 0.35rem 0 0 0.35rem;
|
|
||||||
color: $white;
|
|
||||||
font-size: 80%;
|
|
||||||
padding: 0.5em;
|
|
||||||
padding-right: 0;
|
|
||||||
h3 {
|
|
||||||
margin-bottom: 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
//position: relative;
|
|
||||||
span {
|
|
||||||
display: none;
|
|
||||||
//position: absolute;
|
|
||||||
//top: 0;
|
|
||||||
//left: 0;
|
|
||||||
//transform: rotate(270deg);
|
|
||||||
//transform-origin: 0 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
span.title_action {
|
|
||||||
flex-grow: 1;
|
|
||||||
margin: 0 0 0 auto;
|
|
||||||
border-radius: 0 0.35rem 0.35rem 0;
|
|
||||||
background-color: $chill-llight-gray;
|
|
||||||
padding: 0.2em 1em;
|
|
||||||
|
|
||||||
ul.small_in_title {
|
|
||||||
margin: 0;
|
|
||||||
//margin-top: 0.5em;
|
|
||||||
font-size: 70%;
|
|
||||||
padding-left: 1rem;
|
|
||||||
&.evaluations {
|
|
||||||
@include list_marker_triangle($orange);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
ul.columns { // XS:1 SM:2 MD:1 LG:2 XL:2 XXL:2
|
|
||||||
@include media-breakpoint-only(sm) {
|
|
||||||
columns: 2; -webkit-columns: 2; -moz-columns: 2;
|
|
||||||
}
|
|
||||||
@include media-breakpoint-up(lg) {
|
|
||||||
columns: 2; -webkit-columns: 2; -moz-columns: 2;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Theses links apply on badge as parent tag.
|
|
||||||
/// They don't look like button, picto or simple text links
|
/// They don't look like button, picto or simple text links
|
||||||
a.badge-link {
|
a.dashboard-link {
|
||||||
color: unset;
|
color: unset;
|
||||||
text-decoration: unset;
|
text-decoration: unset;
|
||||||
& > h2.badge-title {
|
& > div.dashboard {
|
||||||
&:hover {
|
&:hover {
|
||||||
//box-shadow: 0 0 7px 0 $chill-gray;
|
//box-shadow: 0 0 7px 0 $chill-gray;
|
||||||
//opacity: 0.8;
|
//opacity: 0.8;
|
||||||
@ -114,21 +60,80 @@ a.badge-link {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// badge_title in AccompanyingCourse Work list Page
|
div.dashboard {
|
||||||
|
font-weight: 700;
|
||||||
|
font-size: 1.5rem;
|
||||||
|
margin-bottom: 0.5rem;
|
||||||
|
line-height: 1.2;
|
||||||
|
span.like-h3 {
|
||||||
|
color: #334d5c;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
div.dashboard,
|
||||||
|
h2.badge-title {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
width: 100%;
|
||||||
|
color: $dark;
|
||||||
|
span.title_label {
|
||||||
|
color: $white;
|
||||||
|
font-size: 80%;
|
||||||
|
padding: 0.5em;
|
||||||
|
padding-right: 0;
|
||||||
|
border-radius: 0.35rem 0 0 0.35rem;
|
||||||
|
h3 {
|
||||||
|
margin-bottom: 0.5rem;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
span.title_action {
|
||||||
|
flex-grow: 1;
|
||||||
|
margin: 0 0 0 auto;
|
||||||
|
background-color: $chill-llight-gray;
|
||||||
|
padding: 0.2em 1em;
|
||||||
|
border-radius: 0 0.35rem 0.35rem 0;
|
||||||
|
|
||||||
|
ul.small_in_title {
|
||||||
|
font-size: 70%;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ul.small_in_title {
|
||||||
|
margin: 0;
|
||||||
|
//margin-top: 0.5em;
|
||||||
|
padding-left: 1rem;
|
||||||
|
&.evaluations {
|
||||||
|
@include list_marker_triangle($orange);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ul.columns { // XS:1 SM:2 MD:1 LG:2 XL:2 XXL:2
|
||||||
|
@include media-breakpoint-only(sm) {
|
||||||
|
columns: 2; -webkit-columns: 2; -moz-columns: 2;
|
||||||
|
}
|
||||||
|
@include media-breakpoint-up(lg) {
|
||||||
|
columns: 2; -webkit-columns: 2; -moz-columns: 2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/// dashboard_like_badge in AccompanyingCourse Work list Page
|
||||||
div.accompanying_course_work-list {
|
div.accompanying_course_work-list {
|
||||||
|
div.dashboard,
|
||||||
h2.badge-title {
|
h2.badge-title {
|
||||||
span.title_label {
|
span.title_label {
|
||||||
// Calculate same color then border:groove
|
// Calculate same color then border:groove
|
||||||
background-color: shade-color($social-action-color, 34%);
|
background-color: shade-color($social-action-color, 34%);
|
||||||
}
|
}
|
||||||
span.title_action {
|
span.title_action {
|
||||||
@include badge_title($social-action-color);
|
@include dashboard_like_badge($social-action-color);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// badge_title in Activities on resume page
|
/// dashboard_like_badge in Activities on resume page
|
||||||
div.activity-list {
|
div.activity-list {
|
||||||
|
div.dashboard,
|
||||||
h2.badge-title {
|
h2.badge-title {
|
||||||
span.title_label {
|
span.title_label {
|
||||||
// Calculate same color then border:groove
|
// Calculate same color then border:groove
|
||||||
@ -138,7 +143,7 @@ div.activity-list {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
span.title_action {
|
span.title_action {
|
||||||
@include badge_title($activity-color);
|
@include dashboard_like_badge($activity-color);
|
||||||
}
|
}
|
||||||
span.title_label {
|
span.title_label {
|
||||||
div.duration {
|
div.duration {
|
||||||
|
|||||||
@ -18,12 +18,6 @@ div.accompanyingcourse-list {
|
|||||||
//&:nth-child(2) { flex-direction: row; }
|
//&:nth-child(2) { flex-direction: row; }
|
||||||
//&:last-child { flex-direction: column; }
|
//&:last-child { flex-direction: column; }
|
||||||
}
|
}
|
||||||
div.title h3 {
|
|
||||||
font-weight: 700;
|
|
||||||
font-size: 100%;
|
|
||||||
font-family: 'Open Sans';
|
|
||||||
}
|
|
||||||
div.list {}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Search Page (list_with_period.html.twig)
|
/// Search Page (list_with_period.html.twig)
|
||||||
|
|||||||
@ -27,11 +27,10 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
///
|
///
|
||||||
/// Generic mixin for titles like badge
|
/// Mixin for dashboards (with design like badge_social)
|
||||||
// define visual badge used in title area
|
|
||||||
///
|
///
|
||||||
|
|
||||||
@mixin badge_title($color) {
|
@mixin dashboard_like_badge($color) {
|
||||||
@include chill_badge($color);
|
@include chill_badge($color);
|
||||||
&:before {
|
&:before {
|
||||||
margin: 0 0.3em 0 -1.05em;
|
margin: 0 0.3em 0 -1.05em;
|
||||||
|
|||||||
@ -103,7 +103,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="social-actions my-4">
|
<div class="social-actions my-4">
|
||||||
<h2 class="mb-3 d-none">{{ 'Last social actions'|trans }}</h2>
|
<h2 class="mb-3 visually-hidden">{{ 'Last social actions'|trans }}</h2>
|
||||||
{% include 'ChillPersonBundle:AccompanyingCourseWork:list_recent_by_accompanying_period.html.twig' with {'buttonText': false } %}
|
{% include 'ChillPersonBundle:AccompanyingCourseWork:list_recent_by_accompanying_period.html.twig' with {'buttonText': false } %}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -121,7 +121,7 @@
|
|||||||
{% set accompanying_course_id = accompanyingCourse.id %}
|
{% set accompanying_course_id = accompanyingCourse.id %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<h2 class="mb-3 d-none">{{ 'Last activities' |trans }}</h2>
|
<h2 class="mb-3 visually-hidden">{{ 'Last activities' |trans }}</h2>
|
||||||
{% include 'ChillActivityBundle:Activity:list_recent.html.twig' with { 'context': 'accompanyingCourse', 'no_action': true } %}
|
{% include 'ChillActivityBundle:Activity:list_recent.html.twig' with { 'context': 'accompanyingCourse', 'no_action': true } %}
|
||||||
</div>
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|||||||
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
<div class="accompanying_course_work-list">
|
<div class="accompanying_course_work-list">
|
||||||
<h2 class="badge-title">
|
<h2 class="badge-title">
|
||||||
<span class="title_label">{{ 'accompanying_course_work.action'|trans }}</span>
|
<span class="title_label"></span>
|
||||||
<span class="title_action">{{ work.socialAction|chill_entity_render_string }}</span>
|
<span class="title_action">{{ work.socialAction|chill_entity_render_string }}</span>
|
||||||
</h2>
|
</h2>
|
||||||
|
|
||||||
|
|||||||
@ -7,7 +7,217 @@
|
|||||||
|
|
||||||
<h1>{{ block('title') }}</h1>
|
<h1>{{ block('title') }}</h1>
|
||||||
|
|
||||||
{% include 'ChillPersonBundle:AccompanyingCourseWork:list_by_accompanying_period.html.twig' %}
|
{% if works|length == 0 %}
|
||||||
|
<p class="chill-no-data-statement">{{ 'accompanying_course_work.Any work'|trans }}
|
||||||
|
<a class="btn btn-sm btn-create"
|
||||||
|
title="{{ 'accompanying_course_work.create'|trans }}"
|
||||||
|
href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_new', { 'id': accompanyingCourse.id }) }}"
|
||||||
|
></a>
|
||||||
|
</p>
|
||||||
|
|
||||||
|
{% else %}
|
||||||
|
<div class="flex-table accompanying_course_work-list">
|
||||||
|
{% for w in works %}
|
||||||
|
<div class="item-bloc">
|
||||||
|
|
||||||
|
<div class="item-row">
|
||||||
|
<h2 class="badge-title">
|
||||||
|
<span class="title_label"></span>
|
||||||
|
<span class="title_action">{{ w.socialAction|chill_entity_render_string }}
|
||||||
|
|
||||||
|
<ul class="small_in_title columns mt-1">
|
||||||
|
<li>
|
||||||
|
<span class="item-key">{{ 'accompanying_course_work.start_date'|trans ~ ' : ' }}</span>
|
||||||
|
<b>{{ w.startDate|format_date('short') }}</b>
|
||||||
|
</li>
|
||||||
|
{% if w.endDate %}
|
||||||
|
<li>
|
||||||
|
<span class="item-key">{{ 'accompanying_course_work.end_date'|trans ~ ' : ' }}</span>
|
||||||
|
<b>{{ w.endDate|format_date('short') }}</b>
|
||||||
|
</li>
|
||||||
|
{% endif %}
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
</span>
|
||||||
|
</h2>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="item-row separator">
|
||||||
|
<div class="wrap-list">
|
||||||
|
|
||||||
|
{% if w.createdBy %}
|
||||||
|
<div class="wl-row">
|
||||||
|
<div class="wl-col title">
|
||||||
|
<h3>{{ 'Referrer'|trans }}</h3>
|
||||||
|
</div>
|
||||||
|
<div class="wl-col list">
|
||||||
|
<p class="wl-item">
|
||||||
|
{{ w.createdBy.usernameCanonical|chill_entity_render_string|capitalize }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{%- if w.persons -%}
|
||||||
|
<div class="wl-row">
|
||||||
|
<div class="wl-col title">
|
||||||
|
<h3>{{ 'Persons in accompanying course'|trans }}</h3>
|
||||||
|
</div>
|
||||||
|
<div class="wl-col list">
|
||||||
|
{% for p in w.persons %}
|
||||||
|
<span class="wl-item badge-person">
|
||||||
|
{{ p|chill_entity_render_box({
|
||||||
|
'render': 'raw',
|
||||||
|
'addAltNames': false
|
||||||
|
}) }}
|
||||||
|
</span>
|
||||||
|
{% endfor %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{%- if w.handlingThierParty -%}
|
||||||
|
<div class="wl-row">
|
||||||
|
<div class="wl-col title">
|
||||||
|
<h3>{{ 'Thirdparty handling'|trans }}</h3>
|
||||||
|
</div>
|
||||||
|
<div class="wl-col list">
|
||||||
|
<span class="wl-item badge-thirdparty">
|
||||||
|
{{ w.handlingThierParty|chill_entity_render_box({
|
||||||
|
'render': 'raw',
|
||||||
|
'addAltNames': false
|
||||||
|
}) }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{%- if w.socialAction.issue -%}
|
||||||
|
<div class="wl-row">
|
||||||
|
<div class="wl-col title">
|
||||||
|
<h3>{{ 'Social issue'|trans }}</h3>
|
||||||
|
</div>
|
||||||
|
<div class="wl-col list">
|
||||||
|
<p class="wl-item social-issues">
|
||||||
|
{{ w.socialAction.issue|chill_entity_render_box }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if w.accompanyingPeriodWorkEvaluations|length > 0 %}
|
||||||
|
<div class="wl-row">
|
||||||
|
<div class="wl-col title">
|
||||||
|
<h3>{{ 'accompanying_course_work.evaluations'|trans }}</h3>
|
||||||
|
</div>
|
||||||
|
<div class="wl-col list">
|
||||||
|
<ul class="small_in_title evaluations mt-1">
|
||||||
|
{% for e in w.accompanyingPeriodWorkEvaluations %}
|
||||||
|
<li>
|
||||||
|
{{ e.evaluation.title|localize_translatable_string }}
|
||||||
|
|
||||||
|
<ul class="columns">
|
||||||
|
<li>
|
||||||
|
<span class="item-key">{{ 'accompanying_course_work.start_date'|trans ~ ' : ' }}</span>
|
||||||
|
<b>{{ e.startDate|format_date('short') }}</b>
|
||||||
|
</li>
|
||||||
|
{% if e.endDate %}
|
||||||
|
<li>
|
||||||
|
<span class="item-key">{{ 'accompanying_course_work.end_date'|trans ~ ' : ' }}</span>
|
||||||
|
<b>{{ e.endDate|format_date('short') }}</b>
|
||||||
|
</li>
|
||||||
|
{% endif %}
|
||||||
|
{% if e.maxDate %}
|
||||||
|
<li>
|
||||||
|
<span class="item-key">{{ 'accompanying_course_work.max_date'|trans ~ ' : ' }}</span>
|
||||||
|
<b>{{ e.maxDate|format_date('short') }}</b>
|
||||||
|
</li>
|
||||||
|
{% endif %}
|
||||||
|
{% if e.warningInterval and e.warningInterval.d > 0 %}
|
||||||
|
<li>
|
||||||
|
{% set days = (e.warningInterval.d + e.warningInterval.m * 30) %}
|
||||||
|
<span class="item-key">{{ 'accompanying_course_work.warning_interval'|trans ~ ' : ' }}</span>
|
||||||
|
{{ 'accompanying_course_work.%days% days before max_date'|trans({'%days%': days }) }}
|
||||||
|
</li>
|
||||||
|
{% endif %}
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
</li>
|
||||||
|
{% endfor %}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="item-row column">
|
||||||
|
{# SEULEMENT SI DÉTAILLÉ
|
||||||
|
{% if w.results|length > 0 %}
|
||||||
|
<div class="objective_results without-objectives">
|
||||||
|
<div class="objective">
|
||||||
|
<h4 class="title_label">{{ 'accompanying_course_work.goal'|trans }}</h4>
|
||||||
|
<p class="chill-no-data-statement">{{ 'accompanying_course_work.results without objective'|trans }}</p>
|
||||||
|
</div>
|
||||||
|
<div class="results">
|
||||||
|
<h4 class="title_label">{{ 'accompanying_course_work.results'|trans }}</h4>
|
||||||
|
<ul class="result_list">
|
||||||
|
{% for r in w.results %}
|
||||||
|
<li>{{ r.title|localize_translatable_string }}</li>
|
||||||
|
{% endfor %}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
{% if w.goals|length > 0 %}
|
||||||
|
{% for g in w.goals %}
|
||||||
|
<div class="objective_results with-objectives">
|
||||||
|
<div class="objective">
|
||||||
|
<h4 class="title_label">{{ 'accompanying_course_work.goal'|trans }}</h4>
|
||||||
|
<ul class="goal_title"><li>{{ g.goal.title|localize_translatable_string }}</li></ul>
|
||||||
|
</div>
|
||||||
|
<div class="results">
|
||||||
|
<h4 class="title_label">{{ 'accompanying_course_work.results'|trans }}</h4>
|
||||||
|
{% if g.results|length == 0 %}
|
||||||
|
<p class="chill-no-data-statement">{{ 'accompanying_course_work.no_results'|trans }}</p>
|
||||||
|
{% else %}
|
||||||
|
<ul class="result_list">
|
||||||
|
{% for r in g.results %}
|
||||||
|
<li>{{ r.title|localize_translatable_string }}</li>
|
||||||
|
{% endfor %}
|
||||||
|
</ul>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endfor %}
|
||||||
|
{% endif %}
|
||||||
|
#}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="item-row separator">
|
||||||
|
<div class="updatedBy">
|
||||||
|
{{ 'Last updated by'|trans}} <b>{{ w.updatedBy|chill_entity_render_box }}</b>,<br>
|
||||||
|
{{ 'le ' ~ w.updatedAt|format_datetime('long', 'short') }}
|
||||||
|
</div>
|
||||||
|
<ul class="record_actions">
|
||||||
|
<li>
|
||||||
|
<a class="btn btn-edit" title="{{ 'Edit'|trans }}"
|
||||||
|
href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': w.id }) }}"
|
||||||
|
></a>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a class="btn btn-delete" title="{{ 'Delete'|trans }}"
|
||||||
|
href="{{ path('chill_person_accompanying_period_work_delete', { 'id': w.id } ) }}"
|
||||||
|
></a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
{% endfor %}
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
<ul class="record_actions sticky-form-buttons">
|
<ul class="record_actions sticky-form-buttons">
|
||||||
<li>
|
<li>
|
||||||
|
|||||||
@ -1,118 +0,0 @@
|
|||||||
{% if works|length == 0 %}
|
|
||||||
<p class="chill-no-data-statement">{{ 'accompanying_course_work.Any work'|trans }}
|
|
||||||
<a class="btn btn-sm btn-create"
|
|
||||||
href="" title="TODO"></a>{# TODO link #}
|
|
||||||
</p>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
<div class="flex-table accompanying_course_work-list">
|
|
||||||
{% for w in works %}
|
|
||||||
<div class="item-bloc">
|
|
||||||
<div class="item-row">
|
|
||||||
|
|
||||||
<h2 class="badge-title">
|
|
||||||
<span class="title_label">{{ 'accompanying_course_work.action'|trans }}</span>
|
|
||||||
<span class="title_action">{{ w.socialAction|chill_entity_render_string }}</span>
|
|
||||||
</h2>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
<div class="item-row separator">
|
|
||||||
|
|
||||||
<div class="timeline">
|
|
||||||
<ul>
|
|
||||||
<li class="completed">
|
|
||||||
<div class="date">
|
|
||||||
<span>{{ w.startDate|format_date('long') }}</span>
|
|
||||||
</div>
|
|
||||||
<div class="label">
|
|
||||||
<span>{{ 'accompanying_course_work.start_date'|trans }}</span>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
{% if w.endDate == null %}
|
|
||||||
<li>
|
|
||||||
<div class="label no-label"></div>
|
|
||||||
</li>
|
|
||||||
{% else %}
|
|
||||||
<li class="{%if date(w.endDate) < date('now') %}completed{% endif %}">
|
|
||||||
<div class="date">
|
|
||||||
<span>{{ w.endDate|format_date('long') }}</span>
|
|
||||||
</div>
|
|
||||||
<div class="label">
|
|
||||||
<span>{{ 'accompanying_course_work.end_date'|trans }}</span>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
{% endif %}
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
<div class="">
|
|
||||||
|
|
||||||
{% if w.results|length > 0 and w.goals|length > 0 %}
|
|
||||||
|
|
||||||
{% endif %}
|
|
||||||
{% if w.results|length > 0 %}
|
|
||||||
<div class="objective_results without-objectives">
|
|
||||||
<div class="objective">
|
|
||||||
<h4 class="title_label">{{ 'accompanying_course_work.goal'|trans }}</h4>
|
|
||||||
<p class="chill-no-data-statement">{{ 'accompanying_course_work.results without objective'|trans }}</p>
|
|
||||||
</div>
|
|
||||||
<div class="results">
|
|
||||||
<h4 class="title_label">{{ 'accompanying_course_work.results'|trans }}</h4>
|
|
||||||
<ul class="result_list">
|
|
||||||
{% for r in w.results %}
|
|
||||||
<li>{{ r.title|localize_translatable_string }}</li>
|
|
||||||
{% endfor %}
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
{% if w.goals|length > 0 %}
|
|
||||||
{% for g in w.goals %}
|
|
||||||
<div class="objective_results with-objectives">
|
|
||||||
<div class="objective">
|
|
||||||
<h4 class="title_label">{{ 'accompanying_course_work.goal'|trans }}</h4>
|
|
||||||
<ul class="goal_title"><li>{{ g.goal.title|localize_translatable_string }}</li></ul>
|
|
||||||
</div>
|
|
||||||
<div class="results">
|
|
||||||
<h4 class="title_label">{{ 'accompanying_course_work.results'|trans }}</h4>
|
|
||||||
{% if g.results|length == 0 %}
|
|
||||||
<p class="chill-no-data-statement">{{ 'accompanying_course_work.no_results'|trans }}</p>
|
|
||||||
{% else %}
|
|
||||||
<ul class="result_list">
|
|
||||||
{% for r in g.results %}
|
|
||||||
<li>{{ r.title|localize_translatable_string }}</li>
|
|
||||||
{% endfor %}
|
|
||||||
</ul>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endfor %}
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
</div>
|
|
||||||
<div class="item-row separator">
|
|
||||||
|
|
||||||
<div class="updatedBy">
|
|
||||||
{{ 'Last updated by'|trans}} <b>{{ w.updatedBy|chill_entity_render_box }}</b>,<br>
|
|
||||||
{{ 'le ' ~ w.updatedAt|format_datetime('long', 'short') }}
|
|
||||||
</div>
|
|
||||||
<ul class="record_actions">
|
|
||||||
<li>
|
|
||||||
<a class="btn btn-edit" title="{{ 'Edit'|trans }}"
|
|
||||||
href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': w.id }) }}"
|
|
||||||
>{% if buttonText is not defined or buttonText == true %}{{ 'Edit'|trans }}{% endif %}</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a class="btn btn-delete" title="{{ 'Delete'|trans }}"
|
|
||||||
href="{{ path('chill_person_accompanying_period_work_delete', { 'id': w.id } ) }}"
|
|
||||||
>{% if buttonText is not defined or buttonText == true %}{{ 'Delete'|trans }}{% endif %}</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endfor %}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
@ -2,14 +2,11 @@
|
|||||||
{% for w in works | slice(0,5) %}
|
{% for w in works | slice(0,5) %}
|
||||||
|
|
||||||
<a href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': w.id }) }}"
|
<a href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': w.id }) }}"
|
||||||
class="badge-link" title="{{ 'crud.social_action.title_link'|trans }}">
|
class="dashboard-link" title="{{ 'crud.social_action.title_link'|trans }}">
|
||||||
|
|
||||||
<h2 class="badge-title">
|
<div class="dashboard">
|
||||||
<span class="title_label">
|
<span class="title_label"></span>
|
||||||
<span>{{ 'accompanying_course_work.action'|trans }}</span>
|
<span class="title_action"><span class="like-h3">{{ w.socialAction|chill_entity_render_string }}</span>
|
||||||
</span>
|
|
||||||
<span class="title_action">
|
|
||||||
{{ w.socialAction|chill_entity_render_string }}
|
|
||||||
|
|
||||||
<ul class="small_in_title columns mt-3">
|
<ul class="small_in_title columns mt-3">
|
||||||
<li>
|
<li>
|
||||||
@ -75,7 +72,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
</span>
|
</span>
|
||||||
</h2>
|
</div>
|
||||||
|
|
||||||
</a>{# {{ dump(w) }} #}
|
</a>{# {{ dump(w) }} #}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|||||||
@ -198,6 +198,7 @@ Resources: Interlocuteurs privilégiés
|
|||||||
Any requestor to this accompanying course: Aucun demandeur pour ce parcours
|
Any requestor to this accompanying course: Aucun demandeur pour ce parcours
|
||||||
Social actions: Actions d'accompagnement
|
Social actions: Actions d'accompagnement
|
||||||
Last social actions: Les dernières actions d'accompagnement
|
Last social actions: Les dernières actions d'accompagnement
|
||||||
|
Social issue: Problématique sociale
|
||||||
Social issues: Problématiques sociales
|
Social issues: Problématiques sociales
|
||||||
Last events on accompanying course: Dernières actions de suivi
|
Last events on accompanying course: Dernières actions de suivi
|
||||||
Edit & activate accompanying course: Modifier et valider
|
Edit & activate accompanying course: Modifier et valider
|
||||||
@ -429,10 +430,14 @@ accompanying_course_work:
|
|||||||
create_date: Date de création
|
create_date: Date de création
|
||||||
start_date: Date de début
|
start_date: Date de début
|
||||||
end_date: Date de fin
|
end_date: Date de fin
|
||||||
|
max_date: Date d'échéance
|
||||||
|
warning_interval: Rappel
|
||||||
|
'%days% days before max_date': "%days% jour(s) avant l'échéance"
|
||||||
results without objective: Aucun objectif - motif - dispositif
|
results without objective: Aucun objectif - motif - dispositif
|
||||||
no_results: Aucun résultat - orientation
|
no_results: Aucun résultat - orientation
|
||||||
results: Résultats - orientations
|
results: Résultats - orientations
|
||||||
goal: Objectif - motif - dispositif
|
goal: Objectif - motif - dispositif
|
||||||
|
evaluations: Évaluations
|
||||||
Any work: Aucune action d'accompagnement
|
Any work: Aucune action d'accompagnement
|
||||||
remove: Supprimer une action d'accompagnement
|
remove: Supprimer une action d'accompagnement
|
||||||
social_evaluation: Évaluation
|
social_evaluation: Évaluation
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user