Merge branch 'master' into 295_resume_retouches

This commit is contained in:
2021-11-24 11:47:47 +01:00
1254 changed files with 68603 additions and 65686 deletions

View File

@@ -0,0 +1,28 @@
{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig" %}
{% block content %}
<h1>{{ "Close accompanying course"|trans }}</h1>
{{ form_start(form) }}
{{ form_row(form.closingDate) }}
{{ form_row(form.closingMotive) }}
{% set accompanying_course_id = null %}
{% if accompanyingCourse %}
{% set accompanying_course_id = accompanyingCourse.id %}
{% endif %}
<ul class="record_actions sticky-form-buttons">
<li class="cancel">
<a href="{{ chill_return_path_or('chill_person_accompanying_course_index', {'accompanying_period_id' : accompanyingCourse.id}) }}" class="btn btn-cancel">
{{ 'Return'|trans }}
</a>
</li>
<li>
<button class="btn btn-update" type="submit">{{ 'Save'|trans }}</button>
</li>
</ul>
{{ form_end(form) }}
{% endblock %}

View File

@@ -21,8 +21,10 @@
<div class="wh-col">
{% if accompanying_period.step == 'DRAFT' %}
<span class="badge bg-secondary">{{- 'Draft'|trans|upper -}}</span>
{% else %}
{% elseif accompanying_period.step == 'CONFIRMED' %}
<span class="badge bg-primary">{{- 'Confirmed'|trans|upper -}}</span>
{% else %}
<span class="badge bg-primary">{{- 'Closed'|trans|upper -}}</span>
{% endif %}
</div>
</div>