diff --git a/src/js/components/VoteTable/VoteTable.vue b/src/js/components/VoteTable/VoteTable.vue index 7fe1d3dcbe..f606397693 100644 --- a/src/js/components/VoteTable/VoteTable.vue +++ b/src/js/components/VoteTable/VoteTable.vue @@ -52,8 +52,7 @@ :key="option.id" :user-id="participant.userId" :option="option" - :is-active="acl.userId === participant.userId && acl.allowVote" - @voteClick="setVote(option, participant.userId)" /> + :is-active="acl.userId === participant.userId && acl.allowVote" /> @@ -155,18 +154,6 @@ export default { this.userToRemove = userId this.modal = true }, - - setVote(option, userId) { - this.$store - .dispatch('poll/votes/set', { - option: option, - userId: userId, - setTo: this.$store.getters['poll/votes/getNextAnswer']({ - option: option, - userId: userId, - }), - }) - }, }, } diff --git a/src/js/components/VoteTable/VoteTableVoteItem.vue b/src/js/components/VoteTable/VoteTableVoteItem.vue index 25ac0e3e18..7a87a5b70b 100644 --- a/src/js/components/VoteTable/VoteTableVoteItem.vue +++ b/src/js/components/VoteTable/VoteTableVoteItem.vue @@ -22,7 +22,7 @@ @@ -51,6 +51,7 @@ export default { computed: { ...mapGetters({ expired: 'poll/expired', + answerSequence: 'poll/answerSequence', }), answer() { @@ -64,6 +65,14 @@ export default { } }, + nextAnswer() { + if (this.answerSequence.indexOf(this.answer) < 0) { + return this.answerSequence[1] + } else { + return this.answerSequence[(this.answerSequence.indexOf(this.answer) + 1) % this.answerSequence.length] + } + }, + isValidUser() { return (this.userId !== '' && this.userId !== null) }, @@ -73,6 +82,17 @@ export default { }, }, + + methods: { + setVote() { + this.$store + .dispatch('poll/votes/set', { + option: this.option, + userId: this.userId, + setTo: this.nextAnswer, + }) + }, + }, } diff --git a/src/js/store/modules/poll.js b/src/js/store/modules/poll.js index 653a55c4ab..8ed66ccda6 100644 --- a/src/js/store/modules/poll.js +++ b/src/js/store/modules/poll.js @@ -75,6 +75,13 @@ const mutations = { } const getters = { + answerSequence: (state) => { + if (state.allowMaybe) { + return ['no', 'yes', 'maybe'] + } else { + return ['no', 'yes'] + } + }, expired: (state) => { return (state.expire > 0 && moment.unix(state.expire).diff() < 0) diff --git a/src/js/store/modules/subModules/votes.js b/src/js/store/modules/subModules/votes.js index 06da10cd05..ad8883ac5d 100644 --- a/src/js/store/modules/subModules/votes.js +++ b/src/js/store/modules/subModules/votes.js @@ -62,14 +62,6 @@ const mutations = { const getters = { - answerSequence: (state, getters, rootState) => { - if (rootState.poll.allowMaybe) { - return ['no', 'maybe', 'yes', 'no'] - } else { - return ['no', 'yes', 'no'] - } - }, - ranked: (state, getters, rootState) => { let votesRank = [] rootState.poll.options.list.forEach(function(option) { @@ -101,16 +93,6 @@ const getters = { && vote.voteOptionText === payload.option.pollOptionText) }) }, - - getNextAnswer: (state, getters) => (payload) => { - try { - return getters.answerSequence[getters.answerSequence.indexOf(getters.getVote(payload).voteAnswer) + 1] - } catch (e) { - return getters.answerSequence[1] - } - - }, - } const actions = { @@ -118,7 +100,6 @@ const actions = { const endPoint = 'apps/polls/votes/delete' return axios.post(generateUrl(endPoint), { pollId: context.rootState.poll.id, - voteId: 0, userId: payload.userId, }) .then(() => {