From 5fda7ea8264b7e9a04944b6155cd06e067245802 Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Mon, 3 Dec 2018 11:09:49 +0100 Subject: [PATCH] Feat(config): Autre -> virements --- config/config.yml | 4 ++-- src/store/modules/datas.js | 23 +++++++++++++++++------ src/views/home.vue | 2 +- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/config/config.yml b/config/config.yml index 1ec66db..66ca3e1 100644 --- a/config/config.yml +++ b/config/config.yml @@ -14,8 +14,8 @@ postes: words: - PAIEMENT - other: - name: Autre + virements: + name: Virements variant: info icon: directions invert: true diff --git a/src/store/modules/datas.js b/src/store/modules/datas.js index 080a90d..8a9bb90 100644 --- a/src/store/modules/datas.js +++ b/src/store/modules/datas.js @@ -43,16 +43,27 @@ export default { return (new Date(x.Date) >= start) & (new Date(x.Date) < end) }) }, - tag_filter_rows: (state, getters) => (tags) => { + tag_filter_rows: (state, getters) => (tags, invert) => { if (tags) { return getters.date_filter_rows.filter(row => { - return tags.every(t => { - return row.tags.map(t => t.name.toLowerCase()) - .indexOf(t.toLowerCase()) > -1 - }) + if (invert) { + return tags.some(t => { + return row.tags.map(t => t.name.toLowerCase()) + .indexOf(t.toLowerCase()) < 0 + }) + } else { + return tags.every(t => { + return row.tags.map(t => t.name.toLowerCase()) + .indexOf(t.toLowerCase()) > -1 + }) + } }) } else { - return getters.date_filter_rows + if (invert) { + return [] + } else { + return getters.date_filter_rows + } } }, libelle_filter_rows: (state, getters) => (words, invert) => { diff --git a/src/views/home.vue b/src/views/home.vue index a535a4c..0d74b89 100644 --- a/src/views/home.vue +++ b/src/views/home.vue @@ -18,7 +18,7 @@ - + <<<<<<< HEAD