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 daaae9e28..ed474911f 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,57 +1,56 @@ /// AccompanyingCourse Work list Page div.accompanying_course_work-list { - div.objective_results { + table.obj-res-eval { + border-collapse: collapse; + border-radius: 5px; width: 100%; - display: grid; - grid-template-areas: "obj res"; - grid-template-columns: 50%; - column-gap: 0.2rem; - padding: 0.3rem; - - div.objective { - grid-area: obj; + &, tr, th, td { + border: 1px solid lightgray; + padding: 0.3em; + } + th { h4.title_label { - border-radius: 0.35rem 0 0 0.35rem; + font-weight: 700; + font-size: 100%; + font-family: 'Open Sans'; + margin: 0; } } - div.results { - grid-area: res; - h4.title_label { - border-radius: 0 0.35rem 0.35rem 0; - } + td { + font-size: 85%; + } + td.obj, + td.res { + width: 50%; + } + td.eval { + width: 100%; } - //&:nth-child(even) { background-color: $chill-llight-gray; } - &.without-objectives {} - &.with-objectives {} } - div.objective_results, - div.evaluations { - h4.title_label { - display: block; - margin: 0.4em 0; - padding: 0.1em 0.5em; - font-variant-caps: small-caps; - font-size: 95%; - background-color: tint-color($chill-orange, 80%); - + * { - margin-top: 0; - } + ul { + &.goal_title, + &.result_list, + &.eval_title { + padding-left: 1em; + margin-bottom: 0; } - ul { - &.goal_title, - &.result_list { - padding-left: 1em; - margin-bottom: 0; - } - &.goal_title { - @include list_marker_triangle($social-issue-color); - } - &.result_list { - @include list_marker_triangle($pink); - } + &.goal_title { + @include list_marker_triangle($social-issue-color); + } + &.result_list { + @include list_marker_triangle($pink); + } + &.eval_title { + @include list_marker_triangle($orange); } } } + +div.flex-table div.item-bloc:nth-child(2n) table.obj-res-eval { + &, tr, th, td { + background-color: $chill-llight-gray; + } +} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig new file mode 100644 index 000000000..ffa5da9ca --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig @@ -0,0 +1,102 @@ + +{% if w.results|length > 0 %} +
{{ 'accompanying_course_work.goal'|trans }} |
+ {{ 'accompanying_course_work.results'|trans }} |
+
+
+
---|---|
+ {{ 'accompanying_course_work.results without objective'|trans }} + |
+
+
|
+
{{ 'accompanying_course_work.goal'|trans }} |
+ {{ 'accompanying_course_work.results'|trans }} |
+
+
+ {% for g in w.goals %}
+
---|---|
+
|
+
+ {% if g.results|length == 0 %}
+ {{ 'accompanying_course_work.no_results'|trans }} + {% else %} +
|
+
+ {{ 'accompanying_course_work.evaluations'|trans }}+ |
+
+
+ {% for e in w.accompanyingPeriodWorkEvaluations %}
+
---|
+
|
+
{{ 'accompanying_course_work.results without objective'|trans }}
-{{ 'accompanying_course_work.no_results'|trans }}
- {% else %} -{{ 'accompanying_course_work.results without objective'|trans }}
- {% if w.results %} - {{ 'accompanying_course_work.results'|trans }} -