diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
index 6786cb05f..e5b0cdda7 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
@@ -72,7 +72,7 @@ class AccompanyingCourseController extends Controller
$em->persist($period);
$em->flush();
- return $this->redirectToRoute('chill_person_accompanying_course_show', [
+ return $this->redirectToRoute('chill_person_accompanying_course_edit', [
'accompanying_period_id' => $period->getId()
]);
@@ -92,17 +92,16 @@ class AccompanyingCourseController extends Controller
}
/**
- * Show page of Accompanying Course section
+ * Edit page of Accompanying Course section
*
- * the page show all blocks except one active edit block, managed by vuejs component
- * that's why title of page is 'edit accompanying course'
+ * the page edit all blocks managed by vuejs component
*
- * @Route("/{_locale}/parcours/{accompanying_period_id}/show", name="chill_person_accompanying_course_show")
+ * @Route("/{_locale}/parcours/{accompanying_period_id}/edit", name="chill_person_accompanying_course_edit")
* @ParamConverter("accompanyingCourse", options={"id": "accompanying_period_id"})
*/
- public function showAction(AccompanyingPeriod $accompanyingCourse): Response
+ public function editAction(AccompanyingPeriod $accompanyingCourse): Response
{
- return $this->render('@ChillPerson/AccompanyingCourse/show.html.twig', [
+ return $this->render('@ChillPerson/AccompanyingCourse/edit.html.twig', [
'accompanyingCourse' => $accompanyingCourse
]);
}
diff --git a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
index e9ce20b53..49543c42d 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
@@ -43,7 +43,7 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
->setExtras(['order' => 10]);
$menu->addChild($this->translator->trans('Edit Accompanying Course'), [
- 'route' => 'chill_person_accompanying_course_show',
+ 'route' => 'chill_person_accompanying_course_edit',
'routeParameters' => [
'accompanying_period_id' => $period->getId()
]])
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/index.js
index 66b6d6683..2a7f19d61 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/index.js
@@ -4,20 +4,47 @@ import { appMessages } from './js/i18n'
import { initPromise } from './store'
import App from './App.vue';
+import Banner from './components/Banner.vue';
-initPromise.then(store => {
+const root = window.vueRootComponent;
- //console.log('store in create_store', store);
- //console.log('store accompanyingCourse', store.state.accompanyingCourse);
-
- const i18n = _createI18n(appMessages);
-
- const app = createApp({
- template: `
-{{ accompanyingCourse.id }} -{{ accompanyingCourse.openingDate|format_date('short') }} -{{ accompanyingCourse.closingDate|format_date('short') }} -{{ accompanyingCourse.closingMotive|chill_entity_render_box }} -{{ accompanyingCourse.remark|raw }} -{{ accompanyingCourse.user }} -usagers: -{% for p in accompanyingCourse.participations %} - {{ p.person.id }} | {{ p.person.fullnamecanonical }} | {{ p.startdate|format_date('short') }} | {{ p.enddate|format_date('short') }} -{% endfor %} + {{ accompanyingCourse.id }} + {{ accompanyingCourse.openingDate|format_date('short') }} + {{ accompanyingCourse.closingDate|format_date('short') }} + {{ accompanyingCourse.closingMotive|chill_entity_render_box }} + {{ accompanyingCourse.remark|raw }} + {{ accompanyingCourse.user }} + usagers: + {% for p in accompanyingCourse.participations %} + {{ p.person.id }} | {{ p.person.fullnamecanonical }} | {{ p.startdate|format_date('short') }} | {{ p.enddate|format_date('short') }} + {% endfor %}{{ dump() }} + {# ==> insert accompanyingCourse vue component #} + {% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig index 937fb2e0a..f2595c65b 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig @@ -156,4 +156,7 @@