From 3125e00a2aea94ce403a3af3d89db3376256e4d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Sat, 22 Feb 2020 08:33:21 +0100 Subject: [PATCH] fixed ##181 --- src/components/baruser/CreditLists.vue | 50 +++++++++++++++++++++----- src/store/modules/barUsers.js | 10 +++--- 2 files changed, 48 insertions(+), 12 deletions(-) diff --git a/src/components/baruser/CreditLists.vue b/src/components/baruser/CreditLists.vue index 4e78e2a..dc98410 100644 --- a/src/components/baruser/CreditLists.vue +++ b/src/components/baruser/CreditLists.vue @@ -23,18 +23,27 @@ - + + + + Verlauf + + +
- + + {{ now(message.date) }} {{ message.message }} - STORNIERT!!! - STORNIERT!!! + Klicken um zu Stornieren @@ -204,12 +213,15 @@ export default { return { color: 'green accent-4', menu: true, - dialog: false + dialog: false, + componentRenderer: 0, + timer: '' } }, created() { this.menu = this.menu_from_store this.getUsers() + this.timer = setInterval(this.forceRender, 1000) }, methods: { ...mapActions({ @@ -218,6 +230,9 @@ export default { deactivate: 'barUsers/deactivateMenu', commitStorno: 'barUsers/storno' }), + forceRender() { + this.componentRenderer += 1 + }, getColor(type) { return type === 'credit' ? 'title green--text' : 'title red--text' }, @@ -232,10 +247,15 @@ export default { } }, storno(message) { + console.log('storno') if (!message.error) { if (!this.under5minutes(message.date)) this.dialog = true else { - this.commitStorno({username: message.user.username, amount: message.amount, date: message.date}) + this.commitStorno({ + username: message.user.username, + amount: message.amount, + date: message.date + }) } } } @@ -279,10 +299,22 @@ export default { } else if (date.getMinutes() < 10) { return 'vor ' + date.getMinutes() + ' Minuten' } else { - return now.getHours() + ':' + now.getMinutes() + return ( + (now.getHours() < 10 ? '0' : '') + + now.getHours() + + ':' + + (now.getMinutes() < 10 ? '0' : '') + + now.getMinutes() + ) } } else { - return now.getHours() + ':' + now.getMinutes() + return ( + (now.getHours() < 10 ? '0' : '') + + now.getHours() + + ':' + + (now.getMinutes() < 10 ? '0' : '') + + now.getMinutes() + ) } } } @@ -294,8 +326,10 @@ export default { '.' + now.getFullYear() + ' ' + + (now.getHours() < 10 ? '0' : '') + now.getHours() + ':' + + (now.getMinutes() < 10 ? '0' : '') + now.getMinutes() ) } diff --git a/src/store/modules/barUsers.js b/src/store/modules/barUsers.js index 8fe6cfc..fda23e7 100644 --- a/src/store/modules/barUsers.js +++ b/src/store/modules/barUsers.js @@ -99,6 +99,7 @@ const mutations = { user: data.user, error: data.error, storno: false, + loading: false, visible: true, amount: data.amount, date: new Date() @@ -110,7 +111,8 @@ const mutations = { return msg.date - data.date === 0 ? true : false }) if (message) { - message.storno = true + if (data.storno !== undefined) message.storno = data.storno + if (data.loading !== undefined) message.loading = data.loading } }, setMenu: (state, value) => { @@ -189,7 +191,7 @@ const actions = { commit('setAllUsersLoading', false) }, async storno({ commit, rootState, dispatch }, data) { - commit('setUsersLoading', true) + commit('updateMessage', { date: data.date, loading: true }) try { const response = await axios.post( url.barU.storno, @@ -200,12 +202,12 @@ const actions = { { headers: { Token: rootState.login.user.accessToken } } ) commit('setUsers', { [response.data.username]: response.data }) - commit('updateMessage', { date: data.date }) + commit('updateMessage', { date: data.date, storno: true }) } catch (e) { if (e.response) if (e.response.status === 401) dispatch('logout', null, { root: true }) } - commit('setUsersLoading', false) + commit('updateMessage', { date: data.date, loading: false }) }, setFilter({ commit }, data) { commit('setFilter', data)