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/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue index 7f9b66326..d0db1206a 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue @@ -32,63 +32,71 @@ export default { PersonsAssociated, Requestor, SocialIssue, - Referrer, + //Referrer, //fait foirer socialissues Resources, Comment, Confirm, }, computed: mapState([ - 'accompanyingCourse' + 'accompanyingCourse', 'socialIssueOptions' ]) }; diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js index 8b7a4ad6b..70b2ba56e 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js @@ -146,6 +146,25 @@ const postResource = (id, payload, method) => { }); }; +/* +* Endpoint to Add/remove SocialIssue +*/ +const postSocialIssue = (id, body, method) => { + //console.log('api body and method', body, method); + const url = `/api/1.0/person/accompanying-course/${id}/socialissue.json`; + return fetch(url, { + method: method, + headers: { + 'Content-Type': 'application/json;charset=utf-8' + }, + body: JSON.stringify(body) + }) + .then(response => { + if (response.ok) { return response.json(); } + throw Error('Error with request resource response'); + }); +}; + export { getAccompanyingCourse, patchAccompanyingCourse, @@ -154,4 +173,5 @@ export { postParticipation, postRequestor, postResource, + postSocialIssue }; diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue index 1a85e4bb7..3a26cad93 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue @@ -20,9 +20,11 @@
- - {{ $t('course.step.draft') }} - + + + {{ $t('course.step.draft') }} + +
@@ -43,20 +45,26 @@ -
{{ $t('social_issue.title') }}
-
_
-
_
+
+ + +
+ + 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') + ]) }} +
+ +
  • @@ -38,6 +39,7 @@
+
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/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js index 93de282db..3b9040c3d 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", + assign_me: "M'assigner comme référent", + placeholder: "Choisir un TMS", }, 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..4d6e15915 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);