From bacc1810f8618db55e6fd26ee50e65514819c556 Mon Sep 17 00:00:00 2001 From: dartcafe Date: Sun, 1 Mar 2020 10:11:39 +0100 Subject: [PATCH 001/123] create date option sequence - initial commit --- src/js/components/Base/PollItemDate.vue | 8 +- src/js/components/Base/PollItemText.vue | 4 +- .../SideBar/SideBarTabOptionsDate.vue | 113 +++++++++++++++--- src/js/store/modules/options.js | 6 +- 4 files changed, 106 insertions(+), 25 deletions(-) diff --git a/src/js/components/Base/PollItemDate.vue b/src/js/components/Base/PollItemDate.vue index 5a6a575183..a504ccec78 100644 --- a/src/js/components/Base/PollItemDate.vue +++ b/src/js/components/Base/PollItemDate.vue @@ -23,7 +23,7 @@ + + + diff --git a/src/js/store/modules/polls.js b/src/js/store/modules/polls.js index b03b9451fc..8c5ca948f9 100644 --- a/src/js/store/modules/polls.js +++ b/src/js/store/modules/polls.js @@ -37,23 +37,54 @@ const getters = { countPolls: (state) => { return state.list.length }, - allPolls: (state) => { - return state.list.filter(poll => (!poll.deleted)) - }, - myPolls: (state) => { - return state.list.filter(poll => (poll.owner === OC.getCurrentUser().uid && !poll.deleted)) - }, - publicPolls: (state) => { - return state.list.filter(poll => (poll.access === 'public' && !poll.deleted)) - }, - hiddenPolls: (state) => { - return state.list.filter(poll => (poll.access === 'hidden' && !poll.deleted)) - }, - deletedPolls: (state) => { - return state.list.filter(poll => (poll.deleted)) - }, - participatedPolls: (state) => { - return state.list.filter(poll => (poll.userHasVoted)) + // allPolls: (state) => { + // return state.list.filter(poll => (!poll.deleted)) + // }, + // myPolls: (state) => { + // return state.list.filter(poll => (poll.owner === OC.getCurrentUser().uid && !poll.deleted)) + // }, + // relevantPolls: (state) => { + // return state.list.filter(poll => (( + // poll.userHasVoted + // || poll.isOwner + // || (poll.allowView && poll.access !== 'public') + // ) && !poll.deleted + // )) + // }, + // publicPolls: (state) => { + // return state.list.filter(poll => (poll.access === 'public' && !poll.deleted)) + // }, + // hiddenPolls: (state) => { + // return state.list.filter(poll => (poll.access === 'hidden' && !poll.deleted)) + // }, + // deletedPolls: (state) => { + // return state.list.filter(poll => (poll.deleted)) + // }, + // participatedPolls: (state) => { + // return state.list.filter(poll => (poll.userHasVoted)) + // }, + + filteredPolls: (state) => (filterId) => { + if (filterId === 'all') { + return state.list.filter(poll => (!poll.deleted)) + } else if (filterId === 'my') { + return state.list.filter(poll => (poll.owner === OC.getCurrentUser().uid && !poll.deleted)) + } else if (filterId === 'relevant') { + return state.list.filter(poll => (( + poll.userHasVoted + || poll.isOwner + || (poll.allowView && poll.access !== 'public') + ) && !poll.deleted + )) + } else if (filterId === 'public') { + return state.list.filter(poll => (poll.access === 'public' && !poll.deleted)) + } else if (filterId === 'hidden') { + return state.list.filter(poll => (poll.access === 'hidden' && !poll.deleted)) + } else if (filterId === 'deleted') { + return state.list.filter(poll => (poll.deleted)) + } else if (filterId === 'participated') { + return state.list.filter(poll => (poll.userHasVoted)) + } } } diff --git a/src/js/views/PollList.vue b/src/js/views/PollList.vue index 880b90896b..07f5e808c6 100644 --- a/src/js/views/PollList.vue +++ b/src/js/views/PollList.vue @@ -23,10 +23,16 @@