diff --git a/.changes/unreleased/UX-20251103-131554.yaml b/.changes/unreleased/UX-20251103-131554.yaml new file mode 100644 index 000000000..660665b23 --- /dev/null +++ b/.changes/unreleased/UX-20251103-131554.yaml @@ -0,0 +1,6 @@ +kind: UX +body: Change the order of display for results and objectives in the social work/action form +time: 2025-11-03T13:15:54.837971477+01:00 +custom: + Issue: "455" + SchemaChange: No schema change diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue index bf403291e..bd888dd3c 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue @@ -52,20 +52,7 @@ - -
-
- {{ $t("results_without_objective") }} -
-
- -
-
- - +
{{ @@ -76,6 +63,32 @@
+ + +
+
+ {{ $t("results_without_objective") }} +
+
+ +
+
+ +
+ +
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 index f1efbd31e..9adba79ff 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig @@ -2,30 +2,6 @@ # OPTIONS # - displayContent: [short|long] default: short #} -{% if w.results|length > 0 %} - - - - - - - - - - - - -

{{ 'accompanying_course_work.goal'|trans }}

{{ 'accompanying_course_work.results'|trans }}

-

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

-
-
    - {% for r in w.results %} -
  • {{ r.title|localize_translatable_string }}
  • - {% endfor %} -
-
-{% endif %} - {% if w.goals|length > 0 %} @@ -57,6 +33,31 @@
{% endif %} +{% if w.results|length > 0 %} + + + + + + + + + + + + +

{{ 'accompanying_course_work.goal'|trans }}

{{ 'accompanying_course_work.results'|trans }}

+

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

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