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/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/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 @@ + + diff --git a/src/components/postes_comparison.vue b/src/components/postes_comparison.vue new file mode 100644 index 0000000..1f67766 --- /dev/null +++ b/src/components/postes_comparison.vue @@ -0,0 +1,74 @@ + + + + + + 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) +} diff --git a/src/views/home.vue b/src/views/home.vue index 4890604..a12f92e 100644 --- a/src/views/home.vue +++ b/src/views/home.vue @@ -21,6 +21,8 @@ + + + +>>>>>>> chartjs