diff --git a/public/ts/components/dashboard.ts b/public/ts/components/dashboard.ts index da7aa9f..555586f 100644 --- a/public/ts/components/dashboard.ts +++ b/public/ts/components/dashboard.ts @@ -20,6 +20,7 @@ app.component('dashboard', .compact() .flatten() .value(); + ctrl.retrieve_graph_values(ctrl.graphed_accounts); }; @@ -44,25 +45,23 @@ app.component('dashboard', }); }) .each((cat) => { - cat = _(cat).sortBy((month) => { - return month.date; - }); + cat = _(cat).sortBy((month) => { return month.date; }); }); ctrl.graphique = { options: { chart: { type: 'multiBarChart', - height: 300, + height: 450, stacked: true, showControls: true, showLegend: true, showLabels: true, showValues: true, - showYAxis: false, + showYAxis: true, x: (d) => { return d.x; }, - y: (d) => { return d.y; }, + y: (d) => { return d.y ? d.y : 0; }, valueFormat: (d) => { return `${d} €`; }, xAxis: { @@ -75,13 +74,6 @@ app.component('dashboard', rotateLabels: -67, labelSunbeamLayout: true, useInteractiveGuideline: true, - multibar: { - dispatch: { - elementClick: function(event) { - ctrl.period = event.data.x; // FIXME: doesn't trigger data-binding - } - } - } } }, data: _.chain(response.data) @@ -90,17 +82,18 @@ app.component('dashboard', .map((key) => { return { key: key, - values: _.chain(response.data[key]).map((value) => { - let date = new Date(value.date); - let period = date.getFullYear() + '-' + (date.getMonth() < 9 ? '0' : '') + (date.getMonth() + 1); - ctrl.periods.push(period); + values: _.chain(response.data[key]) + .map((value) => { + let date = new Date(value.date); + let period = date.getFullYear() + '-' + (date.getMonth() < 9 ? '0' : '') + (date.getMonth() + 1); + ctrl.periods.push(period); - return { - key: key, - x: period, - y: parseInt(value.amount) - }; - }) + return { + key: key, + x: period, + y: parseInt(value.amount) + }; + }) .sortBy((item) => { return item.x; }) .value() }; @@ -108,6 +101,8 @@ app.component('dashboard', .value() }; + console.log(ctrl.graphique) + ctrl.periods = _.chain(ctrl.periods).uniq().sort().reverse().value(); ctrl.period = _(ctrl.periods).first(); }); @@ -139,24 +134,24 @@ app.component('dashboard', template: `