diff --git a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss index 8770d3100..f931db1e7 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss @@ -151,7 +151,7 @@ div.flex-table { padding: 1em; display: flex; flex-direction: row; - & > h5 { + & > h4, & > h5 { margin-top: 0; margin-bottom: 0.3em; flex-grow: 0; 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 c6783677a..32fbb86c2 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue @@ -3,45 +3,47 @@

{{ $t('requestor.title') }}

-
+
+ -
{{ $t('requestor.type') }}
-
{{ accompanyingCourse.requestor.type }}
-
{{ $t('requestor.text') }}
-
{{ accompanyingCourse.requestor.text }}
-
{{ $t('requestor.is_anonymous') }}
-
{{ accompanyingCourse.requestorAnonymous }}
+
+

+ {{ accompanyingCourse.requestor.type }} + {{ accompanyingCourse.requestor.text }} +

-
-
{{ $t('requestor.person_id') }}
-
{{ accompanyingCourse.requestor.person_id }}
-
{{ $t('requestor.birthdate') }}
-
{{ $d(accompanyingCourse.requestor.birthdate.datetime, 'short') }}
-
{{ $t('requestor.center') }}
-
{{ accompanyingCourse.requestor.center.name }}
-
{{ $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.person_id') }}
-
{{ accompanyingCourse.requestor.thirdparty_id }}
-
{{ $t('requestor.address') }}
-
{{ accompanyingCourse.requestor.address.text }}
-
{{ $t('requestor.location') }}
-
{{ accompanyingCourse.requestor.address.postcode.name }}
+
+ +
{{ $t('requestor.birthdate') }}
+
{{ $d(accompanyingCourse.requestor.birthdate.datetime, 'short') }}
+ +
{{ $t('requestor.center') }}
+
{{ accompanyingCourse.requestor.center.name }}
+ +
{{ $t('requestor.phonenumber') }}
+
{{ accompanyingCourse.requestor.phonenumber }}
+
{{ $t('requestor.mobilenumber') }}
+
{{ accompanyingCourse.requestor.mobilenumber }}
+
+ +
+ +
{{ $t('requestor.address') }}
+
{{ accompanyingCourse.requestor.address.text }}
+ +
{{ $t('requestor.location') }}
+
{{ accompanyingCourse.requestor.address.postcode.name }}
+
+ +
    +
  • + +
  • +
    @@ -53,6 +55,7 @@
+
@@ -104,6 +107,13 @@ export default { get() { return this.$store.state.accompanyingCourse.requestorAnonymous; } + }, + url() { + return (this.accompanyingCourse.requestor.type === 'person') ? { + show: `/fr/person/${this.accompanyingCourse.requestor.id}/general`, + } : { + show: `/fr/thirdparty/thirdparty/${this.accompanyingCourse.requestor.id}/show`, + } } }, methods: { @@ -120,3 +130,28 @@ export default { } } + + diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav.vue index 117c4f09b..3bc1ea33a 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav.vue @@ -184,7 +184,7 @@ div#navmap { } } @media only screen and (max-width: 768px) { - div.sticky-section { + div#navmap { display: none; } }