diff --git a/src/Bundle/ChillPersonBundle/Resources/public/modules/accompanying_course_work_list/index.js b/src/Bundle/ChillPersonBundle/Resources/public/modules/accompanying_course_work_list/index.js new file mode 100644 index 000000000..cbc8531c0 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Resources/public/modules/accompanying_course_work_list/index.js @@ -0,0 +1 @@ +require('./index.scss'); 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 new file mode 100644 index 000000000..9fe4b99f5 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Resources/public/modules/accompanying_course_work_list/index.scss @@ -0,0 +1,35 @@ + +#accompanying_course_work_list { + + .item { + + .title_label { + display: block; + margin: 0; + + font-size: 0.8rem; + } + + h2.action_title { + margin-top: 0; + } + + .objective_results { + display: grid; + grid-template-areas: + "obj res" + ; + grid-columns: 50%; + column-gap: 1rem; + + .obj { + grid-area: obj; + } + + .res { + grid-area: res; + } + } + } + +} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/edit.html.twig index e9fdbd3ce..53314cf17 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/edit.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/edit.html.twig @@ -11,6 +11,7 @@ {% endblock %} {% block js %} + {{ parent() }} 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 86a7c5401..ec5279759 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 @@ -6,15 +6,78 @@ {% block content %}

{{ block('title') }}

- +
+ {% for w in works %} +
+
+

{{ 'accompanying_course_work.action'|trans }}

+

+ {{ w.socialAction|chill_entity_render_box({ 'no-badge': true }) }} +

+
+ +
+
    +
  • + {{ 'accompanying_course_work.create_date'|trans }} +
  • +
+
+ + {% if w.results|length > 0 %} +
+
+ {{ 'accompanying_course_work.results without objective'|trans }} +
+
+

{{ 'accompanying_course_work.goal'|trans }}

+
    + {% for r in w.results %} +
  • {{ r.title|localize_translatable_string }}
  • + {% endfor %} +
+
+
+ {% endif %} + + {% if w.goals|length > 0 %} +
+ {% for g in w.goals %} +
+

{{ 'accompanying_course_work.goal'|trans }}

+

{{ g.goal.title|localize_translatable_string }}

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

{{ 'accompanying_course_work.no_results'|trans }}

+ {% else %} +

{{ 'accompanying_course_work.result'|trans }}

+
    + {% for r in g.results %} +
  • {{ r.title|localize_translatable_string }}
  • + {% endfor %} +
+ {% endif %} +
+ {% endfor %} +
+ {% endif %} + + + +
+ {% else %} +

{{ 'accompanying_course_work.No work'|trans }}

+ {% endfor %} +
{% endblock %} + + +{% block css %} + {{ parent() }} + {{ encore_entry_link_tags('accompanying_course_work_list') }} +{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Entity/social_action.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Entity/social_action.html.twig index 246ddd1ea..858643e95 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Entity/social_action.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Entity/social_action.html.twig @@ -1,6 +1,6 @@ {% set reversed_parents = parents|reverse %} - + {%- for p in reversed_parents %}