From b61d465a24676b3c59fd040e59813386c9344a44 Mon Sep 17 00:00:00 2001
From: Bertrand Benjamin <benjamin.bertrand@opytex.org>
Date: Sat, 1 Dec 2018 16:11:09 +0100
Subject: [PATCH 01/10] Feat(JS): Add vue chartjs

---
 package.json |  2 ++
 yarn.lock    | 43 ++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 8cc57af..933240f 100644
--- a/package.json
+++ b/package.json
@@ -15,10 +15,12 @@
     "@fortawesome/free-solid-svg-icons": "^5.5.0",
     "@fortawesome/vue-fontawesome": "^0.1.2",
     "bootstrap-vue": "^2.0.0-rc.11",
+    "chart.js": "^2.7.3",
     "jquery": "^3.3.1",
     "js-yaml": "^3.12.0",
     "papaparse": "^4.6.2",
     "vue": "^2.5.17",
+    "vue-chartjs": "^3.4.0",
     "vue-router": "^3.0.1",
     "vuex": "^3.0.1"
   },
diff --git a/yarn.lock b/yarn.lock
index 060c02b..34394fb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2185,6 +2185,29 @@ chardet@^0.7.0:
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
+chart.js@^2.7.3:
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.7.3.tgz#cdb61618830bf216dc887e2f7b1b3c228b73c57e"
+  integrity sha512-3+7k/DbR92m6BsMUYP6M0dMsMVZpMnwkUyNSAbqolHKsbIzH2Q4LWVEHHYq7v0fmEV8whXE0DrjANulw9j2K5g==
+  dependencies:
+    chartjs-color "^2.1.0"
+    moment "^2.10.2"
+
+chartjs-color-string@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.5.0.tgz#8d3752d8581d86687c35bfe2cb80ac5213ceb8c1"
+  integrity sha512-amWNvCOXlOUYxZVDSa0YOab5K/lmEhbFNKI55PWc4mlv28BDzA7zaoQTGxSBgJMHIW+hGX8YUrvw/FH4LyhwSQ==
+  dependencies:
+    color-name "^1.0.0"
+
+chartjs-color@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.2.0.tgz#84a2fb755787ed85c39dd6dd8c7b1d88429baeae"
+  integrity sha1-hKL7dVeH7YXDndbdjHsdiEKbrq4=
+  dependencies:
+    chartjs-color-string "^0.5.0"
+    color-convert "^0.5.3"
+
 check-types@^7.3.0:
   version "7.4.0"
   resolved "https://registry.yarnpkg.com/check-types/-/check-types-7.4.0.tgz#0378ec1b9616ec71f774931a3c6516fad8c152f4"
@@ -2394,6 +2417,11 @@ collection-visit@^1.0.0:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
 
+color-convert@^0.5.3, color-convert@~0.5.0:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-0.5.3.tgz#bdb6c69ce660fadffe0b0007cc447e1b9f7282bd"
+  integrity sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=
+
 color-convert@^1.9.0, color-convert@^1.9.1:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
@@ -2401,11 +2429,6 @@ color-convert@^1.9.0, color-convert@^1.9.1:
   dependencies:
     color-name "1.1.3"
 
-color-convert@~0.5.0:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-0.5.3.tgz#bdb6c69ce660fadffe0b0007cc447e1b9f7282bd"
-  integrity sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=
-
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
@@ -6503,6 +6526,11 @@ mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdi
   dependencies:
     minimist "0.0.8"
 
+moment@^2.10.2:
+  version "2.22.2"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
+  integrity sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=
+
 move-concurrently@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
@@ -10242,6 +10270,11 @@ vm-browserify@0.0.4:
   dependencies:
     indexof "0.0.1"
 
+vue-chartjs@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/vue-chartjs/-/vue-chartjs-3.4.0.tgz#669e4453be0676605fc9290b3b581867ccd15c88"
+  integrity sha512-uikAXl66g49rawH7Uto3gKh/7vxflcd5xyYbnQVGKSYEh9VI9JGMZ1KNPAEr+8ViRd2FX1hPDVevKBONK6v1fw==
+
 vue-cli-plugin-electron-builder@^1.0.0-rc.9:
   version "1.0.0-rc.9"
   resolved "https://registry.yarnpkg.com/vue-cli-plugin-electron-builder/-/vue-cli-plugin-electron-builder-1.0.0-rc.9.tgz#84143b36e05f8b550c44e5827f6d33bf2d9773fe"

From 0c2b8159d1b32921033559536d4ab63981cacf45 Mon Sep 17 00:00:00 2001
From: Bertrand Benjamin <benjamin.bertrand@opytex.org>
Date: Sun, 2 Dec 2018 16:43:23 +0100
Subject: [PATCH 02/10] Feat: first doughnut chart with chartjs

---
 src/components/charjs_donut.vue      | 19 +++++++++++
 src/components/postes_comparison.vue | 51 ++++++++++++++++++++++++++++
 src/views/home.vue                   |  6 +++-
 3 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 src/components/charjs_donut.vue
 create mode 100644 src/components/postes_comparison.vue

diff --git a/src/components/charjs_donut.vue b/src/components/charjs_donut.vue
new file mode 100644
index 0000000..45cebef
--- /dev/null
+++ b/src/components/charjs_donut.vue
@@ -0,0 +1,19 @@
+<script>
+import { Doughnut } from 'vue-chartjs'
+
+export default {
+  name: 'pie',
+  extends: Doughnut,
+  props: ['chartdata', 'options'],
+  mounted () {
+    this.renderChart(this.chartdata, this.options)
+  }
+}
+</script>
+
+<style scope>
+#doughnut-chart {
+  width: 100px;
+  height: 100px;
+}
+</style>
diff --git a/src/components/postes_comparison.vue b/src/components/postes_comparison.vue
new file mode 100644
index 0000000..ce80634
--- /dev/null
+++ b/src/components/postes_comparison.vue
@@ -0,0 +1,51 @@
+<template>
+  <div class="container">
+    <pie :chartdata="data" :options="options"></pie>
+  </div>
+</template>
+
+<script>
+import pie from './charjs_donut'
+
+export default {
+  name: 'postesComparison',
+  components: {
+    'pie': pie
+  },
+  data () {
+    return {
+      data: {
+        labels: ["Africa", "Asia", "Europe", "Latin America", "North America"],
+        datasets: [
+          {
+            label: "Population (millions)",
+            backgroundColor: ["#3e95cd", "#8e5ea2","#3cba9f","#e8c3b9","#c45850"],
+            data: [2478,5267,734,784,433]
+          }
+        ]
+      },
+      options: {
+        responsive: true,
+        maintainAspectRatio: false,
+        title: {
+          display: true,
+          text: 'Predicted world population (millions) in 2050'
+        }
+      }
+    }
+  },
+  computed: {
+  },
+  methods: {
+  }
+}
+
+</script>
+
+<style scope>
+.container {
+  position: relative;
+  height: 40vh;
+  width: 80vw;
+}
+</style>
diff --git a/src/views/home.vue b/src/views/home.vue
index bedbec0..96842cf 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -21,6 +21,8 @@
        <box @click.native="set_poste('other')" postename="other"></box>
      </b-card-group>
 
+     <postes-comparison></postes-comparison>
+
     <b-table striped hover :items="filtered_rows(poste.words, poste.invert)" :fields='fields'></b-table>
   </div>
 </template>
@@ -28,11 +30,13 @@
 <script>
 import { mapGetters, mapActions } from 'vuex'
 import box from '../components/box'
+import postesComparison from '../components/postes_comparison'
 
 export default {
   name: 'home',
   components: {
-    box: box
+    box: box,
+    postesComparison: postesComparison
   },
   data () {
     return {

From a3a1055c90ed8dddc08c2d3e2d30ecb40abc05cb Mon Sep 17 00:00:00 2001
From: Bertrand Benjamin <benjamin.bertrand@opytex.org>
Date: Sun, 2 Dec 2018 17:58:33 +0100
Subject: [PATCH 03/10] Feat: Remove async in load actions

---
 src/store/modules/config.js | 2 +-
 src/store/modules/datas.js  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/store/modules/config.js b/src/store/modules/config.js
index 2021b34..be1ed6f 100644
--- a/src/store/modules/config.js
+++ b/src/store/modules/config.js
@@ -30,7 +30,7 @@ export default {
     }
   },
   actions: {
-    async load_postes (context) {
+    load_postes (context) {
       readFile(path.join(context.getters.config_dir, context.getters.postes_filename), 'utf8', (err, content) => {
         if (err) {
           console.log(err)
diff --git a/src/store/modules/datas.js b/src/store/modules/datas.js
index c2d8358..9d18ad9 100644
--- a/src/store/modules/datas.js
+++ b/src/store/modules/datas.js
@@ -80,7 +80,7 @@ export default {
     }
   },
   actions: {
-    async find_csv (context) {
+    find_csv (context) {
       try {
         readdir(context.rootGetters['config/data_dir'], (err, list) => {
           if (err) {
@@ -99,7 +99,7 @@ export default {
         console.log(e)
       }
     },
-    async load_csv (context, csv) {
+    load_csv (context, csv) {
       readFile(path.join(context.rootGetters['config/data_dir'], csv), 'utf8', (err, content) => {
         if (err) {
           console.log(err)

From 4c7523dbb8dc7f477d939dfe9e5d6e9f565da533 Mon Sep 17 00:00:00 2001
From: Bertrand Benjamin <benjamin.bertrand@opytex.org>
Date: Sun, 2 Dec 2018 18:02:44 +0100
Subject: [PATCH 04/10] Feat: Rename postes.yml to config.yml and consequences
 in vuex

---
 config/{postes.yml => config.yml} |  0
 src/store/modules/config.js       | 10 +++++-----
 src/views/home.vue                |  2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename config/{postes.yml => config.yml} (100%)

diff --git a/config/postes.yml b/config/config.yml
similarity index 100%
rename from config/postes.yml
rename to config/config.yml
diff --git a/src/store/modules/config.js b/src/store/modules/config.js
index be1ed6f..063244e 100644
--- a/src/store/modules/config.js
+++ b/src/store/modules/config.js
@@ -7,7 +7,7 @@ export default {
   state: {
     data_dir: '/home/lafrite/scripts/comptes/data/',
     config_dir: '/home/lafrite/scripts/comptes/config/',
-    postes_filename: 'postes.yml',
+    config_filename: 'config.yml',
     postes: {}
   },
   getters: {
@@ -17,8 +17,8 @@ export default {
     config_dir: (state) => {
       return state.config_dir
     },
-    postes_filename: (state) => {
-      return state.postes_filename
+    config_filename: (state) => {
+      return state.config_filename
     },
     postes: (state) => {
       return state.postes
@@ -30,8 +30,8 @@ export default {
     }
   },
   actions: {
-    load_postes (context) {
-      readFile(path.join(context.getters.config_dir, context.getters.postes_filename), 'utf8', (err, content) => {
+    load(context) {
+      readFile(path.join(context.getters.config_dir, context.getters.config_filename), 'utf8', (err, content) => {
         if (err) {
           console.log(err)
         } else {
diff --git a/src/views/home.vue b/src/views/home.vue
index 96842cf..3f751eb 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -59,7 +59,7 @@ export default {
     }
   },
   mounted: function () {
-    this.$store.dispatch('config/load_postes')
+    this.$store.dispatch('config/load')
     this.$store.dispatch('datas/find_csv')
   },
   computed: {

From 697435de303c68cf2fa10fc6e69c9cdfa11ccd66 Mon Sep 17 00:00:00 2001
From: Bertrand Benjamin <benjamin.bertrand@opytex.org>
Date: Mon, 3 Dec 2018 09:49:36 +0100
Subject: [PATCH 05/10] Feat: Tag rows before storing them in vuex

---
 src/libs/data_processing.js | 27 +++++++++++++++++++++++++++
 src/store/modules/datas.js  | 13 +++++++++++--
 src/views/home.vue          | 15 ++++++++++++++-
 3 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 src/libs/data_processing.js

diff --git a/src/libs/data_processing.js b/src/libs/data_processing.js
new file mode 100644
index 0000000..2946b70
--- /dev/null
+++ b/src/libs/data_processing.js
@@ -0,0 +1,27 @@
+export function appendTag (row, keywords, field='Libellé') {
+  // Append row.tag
+  // if row.libellé contains one of words and not invert it gets tagged
+  // if row.libellé contains no words and invert it gets tagged
+  // according to keywords [{name: string, words: [], invert: bool}]
+  // row['tags'] =
+  row.tags = keywords.filter(k => {
+    return strContains(row[field], k.words, k.invert)
+  })
+}
+
+function strContains (string, words, invert) {
+  // Does a string contain one of words or the opposite
+  if (!words) {
+    return true
+  }
+  if (invert) {
+    return words.every(v => {
+      return string.indexOf(v) < 0
+    })
+  } else {
+    return words.some(v => {
+      return string.indexOf(v) >= 0
+    })
+  }
+}
+
diff --git a/src/store/modules/datas.js b/src/store/modules/datas.js
index 9d18ad9..c5ddf2a 100644
--- a/src/store/modules/datas.js
+++ b/src/store/modules/datas.js
@@ -1,6 +1,7 @@
 import { readdir, readFile } from 'fs'
 import path from 'path'
 import Papa from 'papaparse'
+import { appendTag } from '../../libs/data_processing'
 
 var today = new Date()
 var monthAgo = new Date()
@@ -66,7 +67,6 @@ export default {
       state.csv_files = csvs
     },
     SET_DATA: (state, { data }) => {
-      data.data = data.data.filter(x => x.Libellé !== undefined)
       state.rows = data
     },
     APPEND_DATA: (state, { content }) => {
@@ -108,10 +108,19 @@ export default {
             header: true
           }
           var parsed = Papa.parse(content, parseConfig)
-          context.commit('SET_DATA', { data: parsed })
+          context.dispatch('clean_store_data', parsed)
         }
       })
     },
+    clean_store_data (context, parsed) {
+      var postes = Object.values(context.rootGetters['config/postes'])
+      parsed.data = parsed.data.filter(x => x.Libellé !== undefined)
+      parsed.data.forEach(row => {
+        appendTag(row, postes, 'Libellé')
+      })
+
+      context.commit('SET_DATA', { data: parsed })
+    },
     set_start (context, start) {
       context.commit('SET_START', { start })
     },
diff --git a/src/views/home.vue b/src/views/home.vue
index 3f751eb..2e70986 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -23,7 +23,16 @@
 
      <postes-comparison></postes-comparison>
 
-    <b-table striped hover :items="filtered_rows(poste.words, poste.invert)" :fields='fields'></b-table>
+    <b-table striped hover :items="filtered_rows(poste.words, poste.invert)" :fields='fields'>
+      <template slot="tags" slot-scope="data">
+        <div v-for="tag in data.item.tags">
+          <div v-if="tag.name !== 'Tout'">
+            <font-awesome-icon :icon="tag.icon" class="fa"/>
+          </div>
+        </div>
+      </template>
+    </b-table>
+
   </div>
 </template>
 
@@ -53,6 +62,10 @@ export default {
         {
           key: 'Libellé',
           sortable: true
+        },
+        {
+          key: 'tags',
+          sortable: true
         }
       ],
       poste: {}

From 84768e5239a9b46f6a1e3a641add1786924e6e0d Mon Sep 17 00:00:00 2001
From: Bertrand Benjamin <benjamin.bertrand@opytex.org>
Date: Mon, 3 Dec 2018 10:41:57 +0100
Subject: [PATCH 06/10] Feat: Tag filtering not on words

---
 config/config.yml          |  5 -----
 src/components/box.vue     | 19 ++++++++++++++++---
 src/store/modules/datas.js | 12 ++++++++++++
 src/views/home.vue         | 32 ++++++++++++++++++++++----------
 4 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/config/config.yml b/config/config.yml
index 28de419..1ec66db 100644
--- a/config/config.yml
+++ b/config/config.yml
@@ -1,10 +1,5 @@
 ---
 postes:
-  total:
-    name: Tout
-    variant: info
-    icon: file-invoice-dollar
-
   cash:
     name: Cash
     variant: info
diff --git a/src/components/box.vue b/src/components/box.vue
index 2002a6f..6cd59b4 100644
--- a/src/components/box.vue
+++ b/src/components/box.vue
@@ -25,6 +25,11 @@ export default {
   ],
   data () {
     return {
+      default_poste: {
+        name: 'Tout',
+        variant: 'info',
+        icon: 'file-invoice-dollar'
+      }
     }
   },
   computed: {
@@ -32,15 +37,23 @@ export default {
       'postes'
     ]),
     ...mapGetters('datas', [
-      'libelle_filter_rows'
+      'tag_filter_rows'
     ]),
     poste () {
-      return this.postes[this.postename]
+      if (this.postename) {
+        return this.postes[this.postename]
+      } else {
+        return this.default_poste
+      }
     }
   },
   methods: {
     filter_rows () {
-      return this.libelle_filter_rows(this.poste.words, this.poste.invert)
+      if (this.poste === this.default_poste) {
+        return this.tag_filter_rows([])
+      } else {
+        return this.tag_filter_rows([this.poste.name])
+      }
     },
     total () {
       return Math.round(
diff --git a/src/store/modules/datas.js b/src/store/modules/datas.js
index c5ddf2a..080a90d 100644
--- a/src/store/modules/datas.js
+++ b/src/store/modules/datas.js
@@ -43,6 +43,18 @@ export default {
         return (new Date(x.Date) >= start) & (new Date(x.Date) < end)
       })
     },
+    tag_filter_rows: (state, getters) => (tags) => {
+      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
+          })
+        })
+      } else {
+        return getters.date_filter_rows
+      }
+    },
     libelle_filter_rows: (state, getters) => (words, invert) => {
       if (!words) {
         return getters.date_filter_rows
diff --git a/src/views/home.vue b/src/views/home.vue
index 2e70986..a535a4c 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -15,15 +15,19 @@
     </b-container>
 
      <b-card-group deck class="mb-3">
-       <box @click.native="set_poste('total')" postename="total"></box>
-       <box @click.native="set_poste('cash')" postename="cash"></box>
-       <box @click.native="set_poste('CB')" postename="CB"></box>
-       <box @click.native="set_poste('other')" postename="other"></box>
+       <box @click.native="set_postes_filter([])"></box>
+       <box @click.native="set_postes_filter(['cash'])" postename="cash"></box>
+       <box @click.native="set_postes_filter(['CB'])" postename="CB"></box>
+       <box @click.native="set_postes_filter(['other'])" postename="other"></box>
      </b-card-group>
 
+<<<<<<< HEAD
      <postes-comparison></postes-comparison>
 
     <b-table striped hover :items="filtered_rows(poste.words, poste.invert)" :fields='fields'>
+=======
+    <b-table striped hover :items="filtered_rows" :fields='fields'>
+>>>>>>> Feat: Tag filtering not on words
       <template slot="tags" slot-scope="data">
         <div v-for="tag in data.item.tags">
           <div v-if="tag.name !== 'Tout'">
@@ -65,10 +69,14 @@ export default {
         },
         {
           key: 'tags',
-          sortable: true
         }
       ],
-      poste: {}
+      default_poste: {
+        name: 'Tout',
+        variant: 'info',
+        icon: 'file-invoice-dollar'
+      },
+      postes_filter: []
     }
   },
   mounted: function () {
@@ -78,11 +86,15 @@ export default {
   computed: {
     ...mapGetters({
       'csvs': 'datas/csvs',
-      'filtered_rows': 'datas/libelle_filter_rows',
+      'tag_filter_rows': 'datas/tag_filter_rows',
       'start': 'datas/start',
       'end': 'datas/end',
       'postes': 'config/postes'
-    })
+    }),
+    filtered_rows () {
+      return this.tag_filter_rows(this.postes_filter)
+    }
+
   },
   methods: {
     ...mapActions('datas', [
@@ -94,8 +106,8 @@ export default {
     table_date_format (date) {
       return date
     },
-    set_poste (postename) {
-      this.poste = this.postes[postename]
+    set_postes_filter (postenames) {
+      this.postes_filter = postenames
     }
   }
 }

From 97cec37bda601eda6ffda5bbee44099b171cc359 Mon Sep 17 00:00:00 2001
From: Bertrand Benjamin <benjamin.bertrand@opytex.org>
Date: Mon, 3 Dec 2018 11:03:23 +0100
Subject: [PATCH 07/10] Feat: import all FontAwesomeIcon

---
 src/main.js | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/main.js b/src/main.js
index f981bac..ed855b1 100644
--- a/src/main.js
+++ b/src/main.js
@@ -9,18 +9,12 @@ import 'bootstrap-vue/dist/bootstrap-vue.css'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
-  faCar, faChargingStation, faRoad,
-  faUtensils, faDirections,
-  faFileInvoiceDollar, faMoneyBillWave, faCreditCard,
-  faShoppingCart, faShoppingBasket
+  fas
 } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
 
 library.add(
-  faCar, faChargingStation, faRoad,
-  faUtensils, faDirections,
-  faFileInvoiceDollar, faMoneyBillWave, faCreditCard,
-  faShoppingCart, faShoppingBasket
+  fas
 )
 
 Vue.component('font-awesome-icon', FontAwesomeIcon)

From 5fda7ea8264b7e9a04944b6155cd06e067245802 Mon Sep 17 00:00:00 2001
From: Bertrand Benjamin <benjamin.bertrand@opytex.org>
Date: Mon, 3 Dec 2018 11:09:49 +0100
Subject: [PATCH 08/10] 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 @@
        <box @click.native="set_postes_filter([])"></box>
        <box @click.native="set_postes_filter(['cash'])" postename="cash"></box>
        <box @click.native="set_postes_filter(['CB'])" postename="CB"></box>
-       <box @click.native="set_postes_filter(['other'])" postename="other"></box>
+       <box @click.native="set_postes_filter(['virements'])" postename="virements"></box>
      </b-card-group>
 
 <<<<<<< HEAD

From f28d22ecb64b7d2160ca8a41f0ea83c5c6401dee Mon Sep 17 00:00:00 2001
From: Bertrand Benjamin <benjamin.bertrand@opytex.org>
Date: Sun, 2 Dec 2018 16:43:23 +0100
Subject: [PATCH 09/10] Feat: first doughnut chart with chartjs

---
 src/views/home.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/views/home.vue b/src/views/home.vue
index 0d74b89..c5d2018 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -21,13 +21,9 @@
        <box @click.native="set_postes_filter(['virements'])" postename="virements"></box>
      </b-card-group>
 
-<<<<<<< HEAD
      <postes-comparison></postes-comparison>
 
-    <b-table striped hover :items="filtered_rows(poste.words, poste.invert)" :fields='fields'>
-=======
     <b-table striped hover :items="filtered_rows" :fields='fields'>
->>>>>>> Feat: Tag filtering not on words
       <template slot="tags" slot-scope="data">
         <div v-for="tag in data.item.tags">
           <div v-if="tag.name !== 'Tout'">

From c469976d508c0f9148da9c9e923a196fb37beab9 Mon Sep 17 00:00:00 2001
From: Bertrand Benjamin <benjamin.bertrand@opytex.org>
Date: Mon, 3 Dec 2018 11:53:01 +0100
Subject: [PATCH 10/10] Feat: Doughnut chart react on datas

---
 config/config.yml                    | 10 -----
 src/components/box.vue               |  7 +---
 src/components/charjs_donut.vue      | 12 +++---
 src/components/postes_comparison.vue | 55 ++++++++++++++++++++--------
 src/libs/data_processing.js          |  5 +++
 5 files changed, 51 insertions(+), 38 deletions(-)

diff --git a/config/config.yml b/config/config.yml
index 66ca3e1..99b54a7 100644
--- a/config/config.yml
+++ b/config/config.yml
@@ -54,13 +54,3 @@ postes:
       - SALAISON CHALAM
       - INTERMARCHE
       - LA FERME DU COIN
-
-  bio: 
-    name: Bio
-    variant: success
-    icon: shopping-basket
-    words:
-      - BIOCOOP
-      - LA VIE CLAIRE
-      - MAISON VITALE
-
diff --git a/src/components/box.vue b/src/components/box.vue
index 6cd59b4..ecec6cb 100644
--- a/src/components/box.vue
+++ b/src/components/box.vue
@@ -17,6 +17,7 @@
 
 <script>
 import { mapGetters } from 'vuex'
+import { total } from '../libs/data_processing'
 export default {
   name: 'box',
   props: [
@@ -56,11 +57,7 @@ export default {
       }
     },
     total () {
-      return Math.round(
-        -this.filter_rows()
-          .map(x => parseFloat(x.Montant))
-          .reduce((sum, x) => sum + x, 0)
-      )
+      return total(this.filter_rows())
     },
     count () {
     }
diff --git a/src/components/charjs_donut.vue b/src/components/charjs_donut.vue
index 45cebef..92f3108 100644
--- a/src/components/charjs_donut.vue
+++ b/src/components/charjs_donut.vue
@@ -1,19 +1,17 @@
 <script>
-import { Doughnut } from 'vue-chartjs'
+import { Doughnut, mixins } from 'vue-chartjs'
+const { reactiveProp } = mixins
 
 export default {
   name: 'pie',
   extends: Doughnut,
-  props: ['chartdata', 'options'],
+  mixins: [reactiveProp],  
+  props: ['chartData', 'options'],
   mounted () {
-    this.renderChart(this.chartdata, this.options)
+    this.renderChart(this.chartData, this.options)
   }
 }
 </script>
 
 <style scope>
-#doughnut-chart {
-  width: 100px;
-  height: 100px;
-}
 </style>
diff --git a/src/components/postes_comparison.vue b/src/components/postes_comparison.vue
index ce80634..1f67766 100644
--- a/src/components/postes_comparison.vue
+++ b/src/components/postes_comparison.vue
@@ -1,11 +1,14 @@
 <template>
   <div class="container">
-    <pie :chartdata="data" :options="options"></pie>
+    <pie :chart-data="chartdata" :options="options" v-if="spendings[0] !== 0"></pie>
   </div>
 </template>
 
+
 <script>
 import pie from './charjs_donut'
+import { mapGetters } from 'vuex'
+import { total } from '../libs/data_processing'
 
 export default {
   name: 'postesComparison',
@@ -14,27 +17,47 @@ export default {
   },
   data () {
     return {
-      data: {
-        labels: ["Africa", "Asia", "Europe", "Latin America", "North America"],
-        datasets: [
-          {
-            label: "Population (millions)",
-            backgroundColor: ["#3e95cd", "#8e5ea2","#3cba9f","#e8c3b9","#c45850"],
-            data: [2478,5267,734,784,433]
-          }
-        ]
-      },
+      selected_tags: [
+        'virements',
+        'cash',
+        'autoroute',
+        'essence',
+        'courses',
+        'sans tags'
+      ],
       options: {
         responsive: true,
-        maintainAspectRatio: false,
-        title: {
-          display: true,
-          text: 'Predicted world population (millions) in 2050'
-        }
+        maintainAspectRatio: false
       }
     }
   },
   computed: {
+    ...mapGetters('datas', [
+      'tag_filter_rows'
+    ]),
+    chartdata () {
+      return {
+        labels: this.selected_tags,
+        datasets: [
+          {
+            label: "Dépenses",
+            data: this.spendings
+          }
+        ]
+      }
+    },
+    spendings () {
+      var tagsSpendings = this.selected_tags.map(tag => {
+        if (tag) {
+          return total(this.tag_filter_rows([tag]))
+        } else {
+          return 0
+        }
+      })
+      tagsSpendings[tagsSpendings.length - 1] = total(this.tag_filter_rows([])) - tagsSpendings.reduce((sum, a) => sum + a, 0)
+      console.log(tagsSpendings)
+      return tagsSpendings
+    }
   },
   methods: {
   }
diff --git a/src/libs/data_processing.js b/src/libs/data_processing.js
index 2946b70..78123e1 100644
--- a/src/libs/data_processing.js
+++ b/src/libs/data_processing.js
@@ -25,3 +25,8 @@ function strContains (string, words, invert) {
   }
 }
 
+export function total (row, field='Montant') {
+  var sum = row.map(x => parseFloat(x[field]))
+    .reduce((sum, x) => sum + x, 0)
+  return Math.round(sum)
+}