diff --git a/CHANGELOG.md b/CHANGELOG.md index e8201ceb6..e074d731f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ and this project adheres to * [Accompanying period work] list evaluations associated to a work by startDate, and then by id, from the most recent to older * [Documents] Change wording 'créer' to 'enregistrer' (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/634) * [Parcours]: The number of 'mes parcours' displayed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/572) +* [Hompage_widget]: Renaming of tabs and removal of social actions tab (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/570) ## Test releases diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue index 343b638da..fbf453b47 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue @@ -25,14 +25,14 @@ {{ $t('my_accompanying_courses.tab') }} -
  • +
  • {{ $t('my_works.description') }}
    diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js index b5ae78e34..edc781087 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js @@ -15,11 +15,11 @@ const appMessages = { description_warning: "Liste des tâches auxquelles je suis assigné et dont la date d'échéance est dépassée.", }, my_accompanying_courses: { - tab: "Mes parcours", - description: "Liste des parcours d'accompagnement que l'on vient de m'attribuer.", + tab: "Mes nouveaux parcours", + description: "Liste des parcours d'accompagnement que l'on vient de m'attribuer depuis moins de 15 jours.", }, my_notifications: { - tab: "Mes notifications", + tab: "Mes nouvelles notifications", description: "Liste des notifications reçues et non lues.", }, my_workflows: { diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/store.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/store.js index c33ec2123..44127da1c 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/store.js +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/store.js @@ -13,7 +13,7 @@ const isEmpty = (obj) => { const store = createStore({ strict: debug, state: { - works: {}, + // works: {}, evaluations: {}, tasks: { warning: {}, @@ -26,9 +26,9 @@ const store = createStore({ loading: false }, getters: { - isWorksLoaded(state) { - return !isEmpty(state.works); - }, + // isWorksLoaded(state) { + // return !isEmpty(state.works); + // }, isEvaluationsLoaded(state) { return !isEmpty(state.evaluations); }, @@ -49,7 +49,7 @@ const store = createStore({ }, counter(state) { return { - works: state.works.count, + // works: state.works.count, evaluations: state.evaluations.count, tasksWarning: state.tasks.warning.count, tasksAlert: state.tasks.alert.count, @@ -60,10 +60,10 @@ const store = createStore({ } }, mutations: { - addWorks(state, works) { - //console.log('addWorks', works); - state.works = works; - }, + // addWorks(state, works) { + // //console.log('addWorks', works); + // state.works = works; + // }, addEvaluations(state, evaluations) { //console.log('addEvaluations', evaluations); state.evaluations = evaluations; @@ -99,22 +99,22 @@ const store = createStore({ switch (tab) { case 'MyCustoms': break; - case 'MyWorks': - if (!getters.isWorksLoaded) { - commit('setLoading', true); - const url = `/api/1.0/person/accompanying-period/work/my-near-end${'?'+ param}`; - makeFetch('GET', url) - .then((response) => { - commit('addWorks', response); - commit('setLoading', false); - }) - .catch((error) => { - commit('catchError', error); - throw error; - }) - ; - } - break; + // case 'MyWorks': + // if (!getters.isWorksLoaded) { + // commit('setLoading', true); + // const url = `/api/1.0/person/accompanying-period/work/my-near-end${'?'+ param}`; + // makeFetch('GET', url) + // .then((response) => { + // commit('addWorks', response); + // commit('setLoading', false); + // }) + // .catch((error) => { + // commit('catchError', error); + // throw error; + // }) + // ; + // } + // break; case 'MyEvaluations': if (!getters.isEvaluationsLoaded) { commit('setLoading', true);