diff --git a/src/components/finanzer/Overview.vue b/src/components/finanzer/Overview.vue index a853c77..dc6f135 100644 --- a/src/components/finanzer/Overview.vue +++ b/src/components/finanzer/Overview.vue @@ -161,7 +161,7 @@ // eslint-disable-next-line no-console console.log(this.selectedYear.value, this.type.value, this.selectedMonth.value) if (this.type.value === 'amount') { - this.$emit("add:amount", {user: user, amount: this.amount, year: this.selectedYear, month: this.selectedMonth}) + this.$emit("add:amount", {user: user, amount: this.amount, year: this.selectedYear.value, month: this.selectedMonth.value}) } if (this.type.value === 'credit') { this.$emit("add:credit", {user: user, credit: this.amount, year: this.selectedYear.value, month: this.selectedMonth.value}) diff --git a/src/components/finanzer/Table.vue b/src/components/finanzer/Table.vue index 2890c27..0f8ddfb 100644 --- a/src/components/finanzer/Table.vue +++ b/src/components/finanzer/Table.vue @@ -81,7 +81,7 @@ return { headers: [ { - text: 'Schulden / Guthpaben', + text: 'Schulden / Guthaben', align: 'left', sortable: false, value: 'type' diff --git a/src/views/BarView.vue b/src/views/BarView.vue index 3b70549..2f1723e 100644 --- a/src/views/BarView.vue +++ b/src/views/BarView.vue @@ -47,9 +47,11 @@ } }) .catch(error => { - // eslint-disable-next-line no-console - console.log(error) - this.$store.dispatch("logout") + if (error.response) { + if (error.response.status == 401) { + this.$store.dispatch('logout') + } + } this.users = [] }) this.users = this.users.sort((a,b) => { @@ -73,6 +75,14 @@ }) user.amount = response.data.amount }) + .catch(error => { + if (error.response) { + if (error.response.status == 401) { + this.$store.dispatch('logout') + } + } + this.users = [] + }) }, addCreditList(user) { // eslint-disable-next-line no-console diff --git a/src/views/FinanzerView.vue b/src/views/FinanzerView.vue index 05f0f9f..88a4794 100644 --- a/src/views/FinanzerView.vue +++ b/src/views/FinanzerView.vue @@ -59,6 +59,65 @@ this.activeUser = {...e} } }, + createAmount(creditList) { + let amount = { + type:'Schulden', + jan_amount: 0 - creditList.jan.depts, + feb_amount: 0 - creditList.feb.depts, + maer_amount: 0 - creditList.maer.depts, + apr_amount:0 - creditList.apr.depts, + mai_amount: 0 - creditList.mai.depts, + jun_amount: 0 - creditList.jun.depts, + jul_amount: 0 - creditList.jul.depts, + aug_amount: 0 - creditList.aug.depts, + sep_amount: 0 - creditList.sep.depts, + okt_amount: 0 - creditList.okt.depts, + nov_amount: 0 - creditList.nov.depts, + dez_amount: 0 - creditList.dez.depts, + last: 0 - creditList['last'] + } + + amount.sum = amount.jan_amount + amount.feb_amount + amount.maer_amount + amount.apr_amount + amount.mai_amount + amount.jun_amount + amount.jul_amount + amount.aug_amount + amount.sep_amount + amount.okt_amount + amount.nov_amount + amount.dez_amount + return amount + }, + createCredit(creditList) { + let credit = { + type:'Guthaben', + jan_amount: creditList.jan.credit, + feb_amount: creditList.feb.credit, + maer_amount: creditList.maer.credit, + apr_amount: creditList.apr.credit, + mai_amount: creditList.mai.credit, + jun_amount: creditList.jun.credit, + jul_amount: creditList.jul.credit, + aug_amount: creditList.aug.credit, + sep_amount: creditList.sep.credit, + okt_amount: creditList.okt.credit, + nov_amount: creditList.nov.credit, + dez_amount: creditList.dez.credit + } + credit.sum = credit.jan_amount + credit.feb_amount + credit.maer_amount + credit.apr_amount + credit.mai_amount + credit.jun_amount + credit.jul_amount + credit.aug_amount + credit.sep_amount + credit.okt_amount + credit.nov_amount + credit.dez_amount + return credit + }, + createSum(credit, amount) { + let sum = { + type:'Summe', + jan_amount: credit.jan_amount + amount.jan_amount, + feb_amount: credit.feb_amount + amount.feb_amount, + maer_amount: credit.maer_amount + amount.maer_amount, + apr_amount: credit.apr_amount + amount.apr_amount, + mai_amount: credit.mai_amount + amount.mai_amount, + jun_amount: credit.jun_amount + amount.jun_amount, + jul_amount: credit.jul_amount + amount.jul_amount, + aug_amount: credit.aug_amount + amount.aug_amount, + sep_amount: credit.sep_amount + amount.sep_amount, + okt_amount: credit.okt_amount + amount.okt_amount, + nov_amount: credit.nov_amount + amount.nov_amount, + dez_amount: credit.dez_amount + amount.dez_amount, + } + sum.sum = sum.jan_amount + sum.feb_amount + sum.maer_amount + sum.apr_amount + sum.mai_amount + sum.jun_amount + sum.jul_amount + sum.aug_amount + sum.sep_amount + sum.okt_amount + sum.nov_amount + sum.dez_amount + return sum + }, getUser() { httpClient.getFinanzerMain(this.$store.getters.getToken) .then(response => { @@ -74,58 +133,10 @@ // eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-console console.log('creditList: ', creditList, response.data[user]['creditList']) - let amount = { - type:'Schulden', - jan_amount: 0 - response.data[user]['creditList'][creditList].jan.depts, - feb_amount: 0 - response.data[user]['creditList'][creditList].feb.depts, - maer_amount: 0 - response.data[user]['creditList'][creditList].maer.depts, - apr_amount:0 - response.data[user]['creditList'][creditList].apr.depts, - mai_amount: 0 - response.data[user]['creditList'][creditList].mai.depts, - jun_amount: 0 - response.data[user]['creditList'][creditList].jun.depts, - jul_amount: 0 - response.data[user]['creditList'][creditList].jul.depts, - aug_amount: 0 - response.data[user]['creditList'][creditList].aug.depts, - sep_amount: 0 - response.data[user]['creditList'][creditList].sep.depts, - okt_amount: 0 - response.data[user]['creditList'][creditList].okt.depts, - nov_amount: 0 - response.data[user]['creditList'][creditList].nov.depts, - dez_amount: 0 - response.data[user]['creditList'][creditList].dez.depts, - last: 0 - response.data[user]['creditList'][creditList]['last'] - } - - amount.sum = amount.jan_amount + amount.feb_amount + amount.maer_amount + amount.apr_amount + amount.mai_amount + amount.jun_amount + amount.jul_amount + amount.aug_amount + amount.sep_amount + amount.okt_amount + amount.nov_amount + amount.dez_amount - - let credit = { - type:'Guthaben', - jan_amount: response.data[user]['creditList'][creditList].jan.credit, - feb_amount: response.data[user]['creditList'][creditList].feb.credit, - maer_amount: response.data[user]['creditList'][creditList].maer.credit, - apr_amount:response.data[user]['creditList'][creditList].apr.credit, - mai_amount:response.data[user]['creditList'][creditList].mai.credit, - jun_amount:response.data[user]['creditList'][creditList].jun.credit, - jul_amount:response.data[user]['creditList'][creditList].jul.credit, - aug_amount:response.data[user]['creditList'][creditList].aug.credit, - sep_amount:response.data[user]['creditList'][creditList].sep.credit, - okt_amount:response.data[user]['creditList'][creditList].okt.credit, - nov_amount:response.data[user]['creditList'][creditList].nov.credit, - dez_amount:response.data[user]['creditList'][creditList].dez.credit - } - credit.sum = credit.jan_amount + credit.feb_amount + credit.maer_amount + credit.apr_amount + credit.mai_amount + credit.jun_amount + credit.jul_amount + credit.aug_amount + credit.sep_amount + credit.okt_amount + credit.nov_amount + credit.dez_amount - let sum = { - type:'Summe', - jan_amount: credit.jan_amount + amount.jan_amount, - feb_amount: credit.feb_amount + amount.feb_amount, - maer_amount: credit.maer_amount + amount.maer_amount, - apr_amount: credit.apr_amount + amount.apr_amount, - mai_amount: credit.mai_amount + amount.mai_amount, - jun_amount: credit.jun_amount + amount.jun_amount, - jul_amount: credit.jul_amount + amount.jul_amount, - aug_amount: credit.aug_amount + amount.aug_amount, - sep_amount: credit.sep_amount + amount.sep_amount, - okt_amount: credit.okt_amount + amount.okt_amount, - nov_amount: credit.nov_amount + amount.nov_amount, - dez_amount: credit.dez_amount + amount.dez_amount, - } - sum.sum = sum.jan_amount + sum.feb_amount + sum.maer_amount + sum.apr_amount + sum.mai_amount + sum.jun_amount + sum.jul_amount + sum.aug_amount + sum.sep_amount + sum.okt_amount + sum.nov_amount + sum.dez_amount + let amount = this.createAmount(response.data[user]['creditList'][creditList]) + let credit = this.createCredit(response.data[user]['creditList'][creditList]) + let sum = this.createSum(credit, amount) list[creditList] = [{...credit}, {...amount}, {...sum}] // eslint-disable-next-line no-console console.log("creditList list:", creditList, list) @@ -140,10 +151,14 @@ active: false }) }}) - .catch(error => { - // eslint-disable-next-line no-console - console.log("error: ", error.response.data.error) - }) + .catch(error => { + if (error.response) { + if (error.response.status == 401) { + this.$store.dispatch('logout') + } + } + this.users = [] + }) this.users = this.users.sort((a, b) => { if (a.lastname > b.lastname) return 1 @@ -158,10 +173,68 @@ }, addAmount(data) { httpClient.addAmountFinanzer(this.$store.getters.getToken, {userId: data.user.username, amount: data.amount * 100, year: data.year, month: data.month}) + .then(response => { + // eslint-disable-next-line no-console + console.log(response.data) + + let user = this.users.find(user => {return user.username === data.user.username}) + let index = this.users.indexOf(user) + let list = {} + for (let creditList in response.data) { + // eslint-disable-next-line no-unused-vars + // eslint-disable-next-line no-console + console.log('creditList: ', creditList, response.data[creditList]) + + let amount = this.createAmount(response.data[creditList]) + let credit = this.createCredit(response.data[creditList]) + let sum = this.createSum(credit, amount) + list[creditList] = [{...credit}, {...amount}, {...sum}] + // eslint-disable-next-line no-console + console.log("creditList list:", creditList, list) + } + this.users[index].creditList = list + }) + .catch(error => { + if (error.response) { + if (error.response.status == 401) { + this.$store.dispatch('logout') + } + } + this.users = [] + }) }, addCredit(data) { httpClient.addCreditFinanzer(this.$store.getters.getToken, {userId: data.user.username, credit: data.credit * 100, year: data.year, month: data.month}) + .then(response => { + // eslint-disable-next-line no-console + console.log(response.data) + + let user = this.users.find(user => {return user.username === data.user.username}) + let index = this.users.indexOf(user) + let list = {} + for (let creditList in response.data) { + // eslint-disable-next-line no-unused-vars + // eslint-disable-next-line no-console + console.log('creditList: ', creditList, response.data[creditList]) + + let amount = this.createAmount(response.data[creditList]) + let credit = this.createCredit(response.data[creditList]) + let sum = this.createSum(credit, amount) + list[creditList] = [{...credit}, {...amount}, {...sum}] + // eslint-disable-next-line no-console + console.log("creditList list:", creditList, list) + } + this.users[index].creditList = list + }) + .catch(error => { + if (error.response) { + if (error.response.status == 401) { + this.$store.dispatch('logout') + } + } + this.users = [] + }) }, deactivateAllUser() { for (let user in this.users) {