diff --git a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss index 6cf4d23f2..6aa0e1c8d 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss @@ -13,9 +13,9 @@ div#header-accompanying_course-name { background: none repeat scroll 0 0 #718596; color: #FFF; - padding-top: 1em; - padding-bottom: 1em; - + h1 { + margin: 0.4em 0; + } span { a { color: white; @@ -54,3 +54,10 @@ div.subheader { color: grey; margin-right: 1em; } + +table { + ul.record_actions { + margin: 0; + padding: 0.5em; + } +} diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js index dee070804..319378d7e 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js @@ -37,12 +37,16 @@ const messages = { ok: "OK", cancel: "Annuler", close: "Fermer", - next: "Suivant", - previous: "Précédent", back: "Retour", check_all: "cocher tout", reset: "réinitialiser" }, + nav: { + next: "Suivant", + previous: "Précédent", + top: "Haut", + bottom: "Bas", + } } }; diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue index 7f9b66326..8dd66d0f2 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue @@ -1,5 +1,6 @@ + + diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ToggleFlags.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/ToggleFlags.vue similarity index 100% rename from src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ToggleFlags.vue rename to src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/ToggleFlags.vue diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue index c3e83a548..858d6d04e 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue @@ -8,17 +8,17 @@
-
- créé par {{ initialComment.creator.text }} - le {{ $d(initialComment.createdAt.datetime, 'long') }} -
- modifié par {{ initialComment.updatedBy.text }} - le {{ $d(initialComment.updatedAt.datetime, 'long') }} -
-
-
+ + +
+ {{ $t('comment.created_by', [ + initialComment.creator.text, + $d(initialComment.createdAt.datetime, 'long') + ]) }} +
+ + +
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 9c31c7ef5..7c61b066c 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue @@ -43,7 +43,7 @@ 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 6a2c6d5cc..c6783677a 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue @@ -53,7 +53,10 @@ - + +
+ +
import { mapState } from 'vuex'; import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue'; -import ResourceItem from './ResourceItem.vue'; +import ResourceItem from './Resources/ResourceItem.vue'; export default { name: 'Resources', diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ResourceItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue similarity index 100% rename from src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ResourceItem.vue rename to src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue index a756727d8..26bd160c1 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue @@ -3,19 +3,21 @@

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

- + + name="field" + :close-on-select="false" + :allow-empty="true" + :show-labels="false" + track-by="id" + label="text" + :multiple="true" + :searchable="false" + :placeholder="$t('social_issue.label')" + @update:model-value="updateSocialIssues" + :model-value="value" + :options="options">
@@ -23,38 +25,56 @@ - diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav.vue new file mode 100644 index 000000000..117c4f09b --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav.vue @@ -0,0 +1,191 @@ + + + + + diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav/Item.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav/Item.vue new file mode 100644 index 000000000..413f216cc --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav/Item.vue @@ -0,0 +1,30 @@ + + + diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js index 93de282db..242d48b8f 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js @@ -39,6 +39,7 @@ const appMessages = { title: "Demandeur", add_requestor: "Ajouter un demandeur", is_anonymous: "Le demandeur est anonyme", + counter: "Il n'y a pas encore de demandeur", type: "Type", person_id: "id", text: "Dénomination", @@ -57,7 +58,10 @@ const appMessages = { label: "Choisir les problématiques sociales", }, referrer: { - title: "Référent", + title: "Référent du parcours", + label: "Vous pouvez choisir un TMS ou vous assigner directement comme référent", + placeholder: "Choisir un TMS", + assign_me: "M'assigner comme référent", }, resources: { title: "Interlocuteurs privilégiés", @@ -69,7 +73,8 @@ const appMessages = { comment: { title: "Observations", label: "Ajout d'une note", - content: "Rédigez une première note..." + content: "Rédigez une première note...", + created_by: "créé par {0}, le {1}" }, confirm: { title: "Confirmation", diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js index 0f7a4f188..c9121c5fd 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js @@ -5,7 +5,8 @@ import { getAccompanyingCourse, confirmAccompanyingCourse, postParticipation, postRequestor, - postResource } from '../api'; + postResource, + postSocialIssue } from '../api'; const debug = process.env.NODE_ENV !== 'production'; const id = window.accompanyingCourseId; @@ -74,8 +75,11 @@ let initPromise = getAccompanyingCourse(id) state.accompanyingCourse.confidential = value; }, postFirstComment(state, comment) { - console.log('### mutation: postFirstComment', comment); + //console.log('### mutation: postFirstComment', comment); state.accompanyingCourse.initialComment = comment; + }, + updateSocialIssues(state, value) { + state.accompanyingCourse.socialIssues = value; }, confirmAccompanyingCourse(state, response) { //console.log('### mutation: confirmAccompanyingCourse: response', response); @@ -145,7 +149,7 @@ let initPromise = getAccompanyingCourse(id) })).catch((error) => { commit('catchError', error) }); }, toggleIntensity({ commit }, payload) { - console.log(payload); + //console.log(payload); patchAccompanyingCourse(id, { type: "accompanying_period", intensity: payload }) .then(course => new Promise((resolve, reject) => { commit('toggleIntensity', course.intensity); @@ -167,16 +171,24 @@ let initPromise = getAccompanyingCourse(id) })).catch((error) => { commit('catchError', error) }); }, postFirstComment({ commit }, payload) { - console.log('## action: postFirstComment: payload', payload); + //console.log('## action: postFirstComment: payload', payload); patchAccompanyingCourse(id, { type: "accompanying_period", initialComment: payload }) .then(course => new Promise((resolve, reject) => { commit('postFirstComment', course.initialComment); resolve(); })).catch((error) => { commit('catchError', error) }); }, - + updateSocialIssues({ commit }, { payload, body, method }) { + //console.log('## action: payload', { payload, body, method }); + postSocialIssue(id, body, method) + .then(response => new Promise((resolve, reject) => { + //console.log('response', response); + commit('updateSocialIssues', payload); + resolve(); + })).catch((error) => { commit('catchError', error) }); + }, confirmAccompanyingCourse({ commit }) { - console.log('## action: confirmAccompanyingCourse'); + //console.log('## action: confirmAccompanyingCourse'); confirmAccompanyingCourse(id) .then(response => new Promise((resolve, reject) => { commit('confirmAccompanyingCourse', response);