diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/App.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/App.vue
index aa2d32a16..2404920b7 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/App.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/App.vue
@@ -1,29 +1,57 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/DisplayPersonsBloc.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/DisplayPersonsBloc.vue
new file mode 100644
index 000000000..b2bb20315
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/DisplayPersonsBloc.vue
@@ -0,0 +1,51 @@
+
+
+
+
+
{{ $t(bloc.title) }}
+
+
+
+
+
+
+
+
+
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/PersonBadge.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/PersonBadge.vue
new file mode 100644
index 000000000..f1760cf7f
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/PersonBadge.vue
@@ -0,0 +1,19 @@
+
+
+ {{ person.name }}
+
+
+
+
+
+
+
+
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js
index e74311d98..1a34728c7 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js
@@ -2,8 +2,12 @@ import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n'
const appMessages = {
fr: {
- activities: {
- add_persons: "Ajouter des personnes concernées"
+ activity: {
+ add_persons: "Ajouter des personnes concernées",
+ bloc_persons: "Usagers du parcours",
+ bloc_persons_not_associated: "Tiers non-pro.",
+ bloc_thirdparty: "Tiers professionnels",
+ bloc_users: "T(M)S",
}
}
}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
index 068ae2db7..d56af676e 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
@@ -28,13 +28,13 @@
Parties concernées
{%- if edit_form.persons is defined -%}
- {{ form_row(edit_form.persons) }}
+ {{ form_widget(edit_form.persons) }}
{% endif %}
{%- if edit_form.thirdParties is defined -%}
- {{ form_row(edit_form.thirdParties) }}
+ {{ form_widget(edit_form.thirdParties) }}
{% endif %}
{%- if edit_form.users is defined -%}
- {{ form_row(edit_form.users) }}
+ {{ form_widget(edit_form.users) }}
{% endif %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
index f1af6e749..ce93dbd94 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
@@ -7,7 +7,6 @@
{% block content %}
{# <=== vue component #}
{% include 'ChillActivityBundle:Activity:edit.html.twig' %}
- {{ dump() }}
{% endblock %}
{% block js %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
index 44897a331..c1f8b55b9 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
@@ -29,13 +29,13 @@
Parties concernées
{%- if form.persons is defined -%}
- {{ form_row(form.persons) }}
+ {{ form_widget(form.persons) }}
{% endif %}
{%- if form.thirdParties is defined -%}
- {{ form_row(form.thirdParties) }}
+ {{ form_widget(form.thirdParties) }}
{% endif %}
{%- if form.users is defined -%}
- {{ form_row(form.users) }}
+ {{ form_widget(form.users) }}
{% endif %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig
index 050dcd1e6..a22d2240e 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig
@@ -7,7 +7,6 @@
{% block content %}
{# <=== vue component #}
{% include 'ChillActivityBundle:Activity:new.html.twig' %}
- {{ dump() }}
{% endblock %}
{% block js %}