diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/App.vue
index c4c014e19..48f68380b 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/App.vue
@@ -27,9 +27,9 @@ export default {
}
},
mounted() {
- console.log('OnTheFly mounted');
- console.log('OnTheFly: data context', this.context);
- console.log('OnTheFly: data options', this.options);
+ //console.log('OnTheFly mounted');
+ //console.log('OnTheFly: data context', this.context);
+ //console.log('OnTheFly: data options', this.options);
},
methods: {
saveFormOnTheFly(payload) {
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 f43e37f29..e4d84a7a4 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
@@ -6,7 +6,7 @@ div.accompanying_course_work-list {
flex-direction: row;
width: 100%;
color: $dark;
- height: 40px;
+ //height: 40px;
span.title_label {
border-radius: 0.35rem 0 0 0.35rem;
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
index 690ef99e3..13eb99c14 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
@@ -49,6 +49,26 @@
{% endfor %}
+ {% if 'DRAFT' == accompanyingCourse.step %}
+
+ {% include '@ChillPerson/AccompanyingCourse/_still_draft.html.twig' %}
+
+ {% endif %}
+
+ {% if 'DRAFT' != accompanyingCourse.step %}
+ {% if withoutHousehold|length > 0 %}
+
+ {% include '@ChillPerson/AccompanyingCourse/_join_household.html.twig' %}
+
+ {% endif %}
+ {% endif %}
+
+ {% if accompanyingCourse.locationStatus == 'address' or accompanyingCourse.locationStatus == 'none' %}
+
+ {% include '@ChillPerson/AccompanyingCourse/_warning_address.html.twig' %}
+
+ {% endif %}
+
{% if accompanyingCourse.locationStatus == 'person' %}
{{ 'This course is located by'|trans }}
@@ -62,26 +82,6 @@
{% endif %}
- {% if 'DRAFT' == accompanyingCourse.step %}
-
- {% include '@ChillPerson/AccompanyingCourse/_still_draft.html.twig' %}
-
- {% endif %}
-
- {% if accompanyingCourse.locationStatus == 'address' or accompanyingCourse.locationStatus == 'none' %}
-
- {% include '@ChillPerson/AccompanyingCourse/_warning_address.html.twig' %}
-
- {% endif %}
-
- {% if 'DRAFT' != accompanyingCourse.step %}
- {% if withoutHousehold|length > 0 %}
-
- {% include '@ChillPerson/AccompanyingCourse/_join_household.html.twig' %}
-
- {% endif %}
- {% endif %}
-
{# DISABLED
{{ 'Resume Accompanying Course'|trans }}
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index a12145f9c..0b6cb8e8f 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -378,10 +378,10 @@ Show Accompanying Course: Voir le parcours
Edit Accompanying Course: Modifier le parcours
Create Accompanying Course: Créer un nouveau parcours
Drop Accompanying Course: Supprimer le parcours
-This course is located at a temporarily address. You should locate this course to an user: Ce parcours est localisé à une adresse temporaire. Il devrait être localisé auprès d'un usager concerné.
+This course is located at a temporarily address. You should locate this course to an user: Le parcours est localisé à une adresse temporaire. Il devrait être localisé auprès d'une personne concernée.
Accompanying course location: Localisation du parcours
-This course is located by: Ce parcours est localisé auprès de
-This course has a temporarily location: Ce parcours a une localisation temporaire
+This course is located by: Parcours localisé auprès de
+This course has a temporarily location: Localisation temporaire
Choose a person to locate by: Localiser auprès d'un usager concerné
Associate at least one member with an household, and set an address to this household: Associez au moins un membre du parcours à un ménage, et indiquez une adresse à ce ménage.
Locate by: Localiser auprès de