diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
index 05a1934e6..8134f6938 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
@@ -106,6 +106,11 @@ class AccompanyingCourseController extends Controller
])
);
+ //$accompanyingCourse->getRequestorPerson();
+ //$accompanyingCourse->getRequestorThirdParty();
+ //$accompanyingCourse->isRequestorAnonymous();
+ //dump($accompanyingCourse); die;
+
switch ($_format) {
case 'json':
return $this->json($accompanyingCourse);
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AccompanyingCourse.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AccompanyingCourse.vue
index be3014ddb..3f77efadd 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AccompanyingCourse.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AccompanyingCourse.vue
@@ -4,14 +4,22 @@
- {{ $t('course.id') }}
- {{ accompanyingCourse.id }}
+ - {{ $t('course.step') }}
+ - {{ accompanyingCourse.step }}
+ - {{ $t('course.emergency') }}
+ - {{ accompanyingCourse.emergency }}
+ - {{ $t('course.confidential') }}
+ - {{ accompanyingCourse.confidential }}
- {{ $t('course.opening_date') }}
- {{ $d(accompanyingCourse.openingDate.datetime, 'short') }}
- {{ $t('course.closing_date') }}
- - {{ $d(accompanyingCourse.closingDate.datetime, 'short') }}
+ - {{ $d(accompanyingCourse.closingDate.datetime, 'short') }}
- {{ $t('course.remark') }}
- {{ accompanyingCourse.remark }}
- {{ $t('course.closing_motive') }}
- - {{ accompanyingCourse.closing_motive }}
+ - {{ accompanyingCourse.closingMotive.name.fr }}
+ - {{ $t('course.user') }}
+ - {{ accompanyingCourse.user.username }}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
index 631534fcb..c39960620 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
@@ -2,7 +2,7 @@
{{ $t('persons_associated.title')}}
-
+
{{ $t('persons_associated.firstname') }} |
@@ -12,24 +12,19 @@
{{ $t('action.actions') }} |
-
-
+
-
-
+
+
+
@@ -40,7 +35,7 @@ import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue'
export default {
name: 'PersonsAssociated',
- components: {
+ components: {
PersonItem,
AddPersons
},
@@ -55,12 +50,7 @@ export default {
closeParticipation(item) {
console.log('@@ CLICK close participation: item', item);
this.$store.dispatch('closeParticipation', item)
- },
- /*
- savePersons() {
- console.log('[wip] saving persons');
}
- */
}
}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
index 9931535fc..138204074 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
@@ -1,27 +1,58 @@
+
{{ $t('requestor.title') }}
- {{ accompanyingCourse.id }}
- {{ accompanyingCourse.remark }}
+
+
{{ $t('requestor.person_id') }}
+
{{ accompanyingCourse.requestor.person_id }}
+
{{ $t('requestor.type') }}
+
{{ accompanyingCourse.requestor.type }}
+
{{ $t('requestor.text') }}
+
{{ accompanyingCourse.requestor.text }}
+
{{ $t('requestor.firstName') }}
+
{{ accompanyingCourse.requestor.firstName }}
+
{{ $t('requestor.lastName') }}
+
{{ accompanyingCourse.requestor.lastName }}
+
{{ $t('requestor.phonenumber') }}
+
{{ accompanyingCourse.requestor.phonenumber }}
+
{{ $t('requestor.mobilenumber') }}
+
{{ accompanyingCourse.requestor.mobilenumber }}
+
{{ $t('requestor.altNames') }}
+
{{ accompanyingCourse.requestor.altNames }}
+
{{ $t('requestor.anonymous') }}
+
{{ accompanyingCourse.requestorAnonymous }}
+
+
+
{{ $t('requestor.birthdate') }}
+ {{ $d(accompanyingCourse.requestor.birthdate.datetime, 'short') }}
+ {{ $t('requestor.center') }}
+ {{ accompanyingCourse.requestor.center.name }}
+
+
+
+
{{ $t('requestor.address') }}
+ {{ accompanyingCourse.requestor.address.text }}
+ {{ $t('requestor.location') }}
+ {{ accompanyingCourse.requestor.address.postcode.name }}
+
+
+
+