Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

Renaming of tabs and removal of social actions tab

Browse Source
This commit is contained in:
Julie Lenaerts 2022-04-20 16:33:05 +02:00
parent a70c561596
commit 9a0eb1c74c
5 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -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 * [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) * [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) * [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 ## Test releases

6
src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue
View File

@ -25,14 +25,14 @@
{{ $t('my_accompanying_courses.tab') }} {{ $t('my_accompanying_courses.tab') }}
</a> </a>
</li> </li>
<li class="nav-item"> <!-- <li class="nav-item">
<a class="nav-link" <a class="nav-link"
:class="{'active': activeTab === 'MyWorks'}" :class="{'active': activeTab === 'MyWorks'}"
@click="selectTab('MyWorks')"> @click="selectTab('MyWorks')">
{{ $t('my_works.tab') }} {{ $t('my_works.tab') }}
<tab-counter :count="state.works.count"></tab-counter> <tab-counter :count="state.works.count"></tab-counter>
</a> </a>
</li> </li> -->
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" <a class="nav-link"
:class="{'active': activeTab === 'MyEvaluations'}" :class="{'active': activeTab === 'MyEvaluations'}"
@ -135,7 +135,7 @@ export default {
for (const m of [ for (const m of [
'MyNotifications', 'MyNotifications',
'MyAccompanyingCourses', 'MyAccompanyingCourses',
'MyWorks', // 'MyWorks',
'MyEvaluations', 'MyEvaluations',
'MyTasks', 'MyTasks',
'MyWorkflows', 'MyWorkflows',

1
src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorks.vue
View File

@ -1,3 +1,4 @@
// CURRENTLY NOT IN USE
<template> <template>
<div class="accompanying_course_work"> <div class="accompanying_course_work">
<div class="alert alert-light">{{ $t('my_works.description') }}</div> <div class="alert alert-light">{{ $t('my_works.description') }}</div>

6
src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js
View File

@ -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.", description_warning: "Liste des tâches auxquelles je suis assigné et dont la date d'échéance est dépassée.",
}, },
my_accompanying_courses: { my_accompanying_courses: {
tab: "Mes parcours", tab: "Mes nouveaux parcours",
description: "Liste des parcours d'accompagnement que l'on vient de m'attribuer.", description: "Liste des parcours d'accompagnement que l'on vient de m'attribuer depuis moins de 15 jours.",
}, },
my_notifications: { my_notifications: {
tab: "Mes notifications", tab: "Mes nouvelles notifications",
description: "Liste des notifications reçues et non lues.", description: "Liste des notifications reçues et non lues.",
}, },
my_workflows: { my_workflows: {

50
src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/store.js
View File

@ -13,7 +13,7 @@ const isEmpty = (obj) => {
const store = createStore({ const store = createStore({
strict: debug, strict: debug,
state: { state: {
works: {}, // works: {},
evaluations: {}, evaluations: {},
tasks: { tasks: {
warning: {}, warning: {},
@ -26,9 +26,9 @@ const store = createStore({
loading: false loading: false
}, },
getters: { getters: {
isWorksLoaded(state) { // isWorksLoaded(state) {
return !isEmpty(state.works); // return !isEmpty(state.works);
}, // },
isEvaluationsLoaded(state) { isEvaluationsLoaded(state) {
return !isEmpty(state.evaluations); return !isEmpty(state.evaluations);
}, },
@ -49,7 +49,7 @@ const store = createStore({
}, },
counter(state) { counter(state) {
return { return {
works: state.works.count, // works: state.works.count,
evaluations: state.evaluations.count, evaluations: state.evaluations.count,
tasksWarning: state.tasks.warning.count, tasksWarning: state.tasks.warning.count,
tasksAlert: state.tasks.alert.count, tasksAlert: state.tasks.alert.count,
@ -60,10 +60,10 @@ const store = createStore({
} }
}, },
mutations: { mutations: {
addWorks(state, works) { // addWorks(state, works) {
//console.log('addWorks', works); // //console.log('addWorks', works);
state.works = works; // state.works = works;
}, // },
addEvaluations(state, evaluations) { addEvaluations(state, evaluations) {
//console.log('addEvaluations', evaluations); //console.log('addEvaluations', evaluations);
state.evaluations = evaluations; state.evaluations = evaluations;
@ -99,22 +99,22 @@ const store = createStore({
switch (tab) { switch (tab) {
case 'MyCustoms': case 'MyCustoms':
break; break;
case 'MyWorks': // case 'MyWorks':
if (!getters.isWorksLoaded) { // if (!getters.isWorksLoaded) {
commit('setLoading', true); // commit('setLoading', true);
const url = `/api/1.0/person/accompanying-period/work/my-near-end${'?'+ param}`; // const url = `/api/1.0/person/accompanying-period/work/my-near-end${'?'+ param}`;
makeFetch('GET', url) // makeFetch('GET', url)
.then((response) => { // .then((response) => {
commit('addWorks', response); // commit('addWorks', response);
commit('setLoading', false); // commit('setLoading', false);
}) // })
.catch((error) => { // .catch((error) => {
commit('catchError', error); // commit('catchError', error);
throw error; // throw error;
}) // })
; // ;
} // }
break; // break;
case 'MyEvaluations': case 'MyEvaluations':
if (!getters.isEvaluationsLoaded) { if (!getters.isEvaluationsLoaded) {
commit('setLoading', true); commit('setLoading', true);