diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss index 4bfb059a2..bdd2d7ba4 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss +++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss @@ -1,7 +1,4 @@ - - - - +/// AccompanyingCourse Work list Page div.accompanying_course_work-list { // ?? howto calculate border:groove generated from $orange ?? @@ -33,95 +30,90 @@ 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; + min-width: 210px; - .objective_results { - display: grid; - grid-template-areas: + 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: 3px solid var(--bs-chill-green); + + &:before { + content: ''; + display: inline-block; + position: relative; + width: 12px; + height: 12px; + + background-color: white; + border-radius: 12px; + border: 2px solid var(--bs-chill-green); + + top: -9px; + } + } + } + } + } + + div.objective_results { + display: grid; + width: 100%; + grid-template-areas: "obj res" - ; - grid-template-columns: 50%; - column-gap: 1rem; - - padding: 0.3rem; - - .obj { - grid-area: obj; - } - - .res { - grid-area: res; - - ul.result_list { - list-style-type: none; - padding: 0; + ; + grid-template-columns: 50%; + column-gap: 1rem; + padding: 0.3rem; + .obj { + grid-area: obj; } - } - } - - .objective_results:nth-child(2n+2) { - background-color: var(--bs-chill-llight-gray); - } - } - - &.short { - .item { - padding-bottom: 0; - ul.record_actions { - margin-bottom: 0; - } - } - } - - */ - - .updatedBy { - margin-top: 1rem; - text-align: right; - font-size: 0.9rem; - 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: 3px solid var(--bs-chill-green); - - &:before { - content: ''; - display: inline-block; - position: relative; - width: 12px; - height: 12px; - - background-color: white; - border-radius: 12px; - border: 2px solid var(--bs-chill-green); - - top: -9px; + .res { + grid-area: res; + ul.result_list { + list-style-type: none; + padding: 0; + } + } + &:nth-child(2n+2) { + background-color: var(--bs-chill-llight-gray); } - } } - } + + &.short { + .item { + padding-bottom: 0; + ul.record_actions { + margin-bottom: 0; + } + } + } + + .updatedBy { + margin-top: 1rem; + text-align: right; + font-size: 0.9rem; + font-style: italic; + } + } 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 a005c514a..b1d6f841d 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 @@ -14,17 +14,18 @@
{% for w in works %}
-
+

{{ 'accompanying_course_work.action'|trans }} {{ w.socialAction|chill_entity_render_string }}

-
+
+
-
    +
    • {{ w.createdAt|format_date('long') }} @@ -51,7 +52,10 @@
- {# + +
+
+ {% if w.results|length > 0 %}
@@ -91,10 +95,10 @@
{% endfor %} {% endif %} - #} -
+
+
{{ 'Last updated by'|trans}} {{ w.updatedBy|chill_entity_render_box }}, {{ 'le ' ~ w.updatedAt|format_datetime('long', 'short') }}
@@ -106,8 +110,8 @@ -
+
{% endfor %}