diff --git a/src/components/finanzer/FinanzerNavigation.vue b/src/components/finanzer/FinanzerNavigation.vue index 07ff246..ddd4c06 100644 --- a/src/components/finanzer/FinanzerNavigation.vue +++ b/src/components/finanzer/FinanzerNavigation.vue @@ -1,11 +1,7 @@ - + home @@ -15,23 +11,19 @@ work - - Dienstverwaltung - + Dienstverwaltung - - {{ user.lastname }}, {{ user.firstname }} - + + {{ user.lastname }}, {{ user.firstname }} + + + @@ -42,13 +34,14 @@ export default { name: 'FinanzerNavigation', methods: { ...mapActions({ - addUser: 'finanzerUsers/addUser', + addUser: 'finanzerUsers/addUser' }) }, computed: { ...mapGetters({ users: 'finanzerUsers/users', - allUsers: 'finanzerUsers/allUsers' + allUsers: 'finanzerUsers/allUsers', + loading: 'finanzerUsers/usersLoading' }) } } diff --git a/src/components/finanzer/User.vue b/src/components/finanzer/User.vue index 22c3647..4ba9f54 100644 --- a/src/components/finanzer/User.vue +++ b/src/components/finanzer/User.vue @@ -1,21 +1,19 @@ - {{ activeUser.lastname }}, {{ activeUser.firstname }} + {{ activeUser.lastname }}, {{ activeUser.firstname }} - Email senden + Email senden - {{ + + {{ errorMessage(errorMail) - }} + }} + @@ -30,16 +28,14 @@ {{ activeUser.locked ? 'Gesperrt' : 'nicht Gesperrt' }} + >{{ activeUser.locked ? 'Gesperrt' : 'nicht Gesperrt' }} {{ activeUser.locked ? 'Entperren' : 'Sperren' }} + >{{ activeUser.locked ? 'Entperren' : 'Sperren' }} @@ -75,8 +71,7 @@ autoLock: autoLock.value }) " - >Speichern + >Speichern @@ -87,11 +82,7 @@ - + {{ - (activeUser.creditList[year][1].last / 100).toFixed(2) - }} + {{ + (activeUser.creditList[year][1].last / 100).toFixed(2) + }} + Gesamt: @@ -171,12 +163,12 @@ " > {{ - ( - getAllSum( - activeUser.creditList[year][2].sum, - activeUser.creditList[year][1].last - ) / 100 - ).toFixed(2) + ( + getAllSum( + activeUser.creditList[year][2].sum, + activeUser.creditList[year][1].last + ) / 100 + ).toFixed(2) }} @@ -341,6 +333,7 @@ export default { }, watch: { activeUser(newVal) { + // eslint-disable-next-line no-console console.log(newVal) this.limit = (newVal.limit / 100).toFixed(2) this.autoLock = { @@ -349,6 +342,7 @@ export default { } }, id(newVal) { + // eslint-disable-next-line no-console console.log(newVal) this.setActiveUser(newVal) } diff --git a/src/plugins/routes.js b/src/plugins/routes.js index 820f5ce..5d3723f 100644 --- a/src/plugins/routes.js +++ b/src/plugins/routes.js @@ -1,6 +1,6 @@ //const main = 'https://192.168.5.128:5000/' -//const main = 'https://localhost:5000/' -const main = 'http://192.168.5.118:5000/' +const main = 'http://localhost:5000/' +//const main = 'http://192.168.5.118:5000/' //const main = 'https://groeger-clan.duckdns.org:5000/' const url = { diff --git a/src/router/index.js b/src/router/index.js index 8d6f02b..61875eb 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -97,7 +97,6 @@ const router = new VueRouter({ router.beforeEach((to, from, next) => { store.dispatch('fetchAccessToken') - console.log('fullPath', to.fullPath) if (to.fullPath.includes('/main')) { if (to.fullPath.includes('/main/finanzer')) { if (!store.state.login.user.group.includes('moneymaster')) { diff --git a/src/store/modules/finanzerUsers.js b/src/store/modules/finanzerUsers.js index 2f3984a..d6dad2a 100644 --- a/src/store/modules/finanzerUsers.js +++ b/src/store/modules/finanzerUsers.js @@ -24,7 +24,9 @@ const state = { { value: 10, text: 'Oktober' }, { value: 11, text: 'November' }, { value: 12, text: 'Dezember' } - ] + ], + allUsersLoading: false, + usersLoading: false } const mutations = { @@ -217,12 +219,19 @@ const mutations = { setYear: (state, value) => { if (value) state.year++ else state.year-- + }, + setAllUsersLoading: (state, value) => { + state.allUsersLoading = value + }, + setUsersLoading: (state, value) => { + state.usersLoading = value } } const actions = { // eslint-disable-next-line no-unused-vars async getAllUsers({ commit, rootState, dispatch }) { + commit('setAllUsersLoading', true) try { const response = await axios.post( url.searchUser, @@ -236,8 +245,10 @@ const actions = { if (err.response.status === 401) dispatch('logout', null, { root: true }) } + commit('setAllUsersLoading', false) }, async getUsers({ commit, rootState, dispatch }) { + commit('setUsersLoading', true) try { const response = await axios.get(url.getFinanzerMain, { headers: { Token: rootState.login.user.accessToken } @@ -248,6 +259,7 @@ const actions = { if (err.response.status === 401) dispatch('logout', null, { root: true }) } + commit('setUsersLoading', false) }, setActiveUser({ commit }, username) { commit('setActiveUser', username) @@ -410,6 +422,12 @@ const getters = { }, months: state => { return state.months + }, + allUsersLoading: state => { + return state.allUsersLoading + }, + usersLoading: state => { + return state.usersLoading } } diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 4118304..1f87270 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -11,6 +11,7 @@ const mutations = { state.user = user let list = {} for (let creditList in user['creditList']) { + // eslint-disable-next-line no-console console.log(creditList) let amount = mutations.createAmount(user['creditList'][creditList]) let credit = mutations.createCredit(user['creditList'][creditList]) @@ -19,6 +20,7 @@ const mutations = { } state.user.creditList = list state.creditList = [] + // eslint-disable-next-line no-console console.log(state.user) }, createAmount(creditList) {