diff --git a/src/Bundle/ChillPersonBundle/Resources/public/modules/accompanying_course_work_list/index.scss b/src/Bundle/ChillPersonBundle/Resources/public/modules/accompanying_course_work_list/index.scss index 9fe4b99f5..433f291b5 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/modules/accompanying_course_work_list/index.scss +++ b/src/Bundle/ChillPersonBundle/Resources/public/modules/accompanying_course_work_list/index.scss @@ -2,16 +2,19 @@ #accompanying_course_work_list { .item { + margin-bottom: 1.5rem; + padding: 1rem; + border: 1px solid gray; .title_label { display: block; margin: 0; - font-size: 0.8rem; - } + font-variant-caps: small-caps; - h2.action_title { - margin-top: 0; + + * { + margin-top: 0; + } } .objective_results { @@ -19,8 +22,10 @@ grid-template-areas: "obj res" ; - grid-columns: 50%; + grid-template-columns: 50%; column-gap: 1rem; + + padding: 0.3rem; .obj { grid-area: obj; @@ -28,8 +33,64 @@ .res { grid-area: res; + + ul.result_list { + list-style-type: none; + padding: 0; + } } } + + .objective_results:nth-child(2n+2) { + background-color: var(--chill-llight-gray); + } } + .updatedBy { + margin-top: 1rem; + text-align: right; + font-size: 0.8rem; + font-style: italic; + } +} + +ul.timeline { + display: flex; + align-items: center; + justify-content: center; + padding: 0; + list-style-type: none; + + > li { + min-width: 210px; + + div.date { + margin-bottom: 20px; + display: flex; + flex-direction: column; + align-items: center; + } + div.label { + display: flex; + flex-direction: column; + align-items: center; + + padding: 0 40px; + border-top: 2px solid var(--chill-green); + + &:before { + content: ''; + display: inline-block; + position: relative; + width: 25px; + height: 25px; + + background-color: white; + border-radius: 25px; + border: 1px solid #ddd; + + top: -15px; + } + } + } } diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig index ec5279759..28626f7c2 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig @@ -17,23 +17,45 @@
-
{% if w.results|length > 0 %} -
+
- {{ 'accompanying_course_work.results without objective'|trans }} +

{{ 'accompanying_course_work.goal'|trans }}

+

{{ 'accompanying_course_work.results without objective'|trans }}

-

{{ 'accompanying_course_work.goal'|trans }}

-
    +

    {{ 'accompanying_course_work.results'|trans }}

    +
      {% for r in w.results %} -
    • {{ r.title|localize_translatable_string }}
    • +
    • {{ r.title|localize_translatable_string }}
    • {% endfor %}
@@ -41,35 +63,40 @@ {% endif %} {% if w.goals|length > 0 %} -
- {% for g in w.goals %} -
+ {% for g in w.goals %} +
+

{{ 'accompanying_course_work.goal'|trans }}

-

{{ g.goal.title|localize_translatable_string }}

+

{{ g.goal.title|localize_translatable_string }}

-
+
{% if g.results|length == 0 %} +

{{ 'accompanying_course_work.results'|trans }}

{{ 'accompanying_course_work.no_results'|trans }}

{% else %} -

{{ 'accompanying_course_work.result'|trans }}

-
    +

    {{ 'accompanying_course_work.results'|trans }}

    +
      {% for r in g.results %} -
    • {{ r.title|localize_translatable_string }}
    • +
    • {{ r.title|localize_translatable_string }}
    • {% endfor %}
    {% endif %}
- {% endfor %} -
+
+ {% endfor %} {% endif %} +
+ {{ 'Last updated by'|trans}}: {{ w.updatedBy|chill_entity_render_box }}, {{ w.updatedAt|format_datetime('long', 'short') }} +
+ diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml index d34bd76b7..8397c3fa7 100644 --- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml @@ -339,7 +339,9 @@ accompanying_course_work: action: Action create_date: Date de création start_date: Date de début - results without objective: Résultats - orientation sans objectifs - motifs - dispositifs - no_result: Aucun résultat - orientation - result: Résultat - orientation - goal: Objectifs - motifs - dispositifs + end_date: Date de fin + results without objective: Aucun objectif - motif - dispositif + no_results: Aucun résultat - orientation + results: Résultats - orientations + goal: Objectif - motif - dispositif +