From 125494100b5934bb1537b3b97e9faeff19471561 Mon Sep 17 00:00:00 2001 From: Vladimir Lugovsky Date: Wed, 25 Nov 2015 17:05:51 +0300 Subject: [PATCH] fix(dashboard): add another chart for revenue --- .../dashboard/widgets/amChart/amChart.js | 67 +++++++++++-------- 1 file changed, 39 insertions(+), 28 deletions(-) diff --git a/src/app/pages/dashboard/widgets/amChart/amChart.js b/src/app/pages/dashboard/widgets/amChart/amChart.js index 05e4504..e42517a 100644 --- a/src/app/pages/dashboard/widgets/amChart/amChart.js +++ b/src/app/pages/dashboard/widgets/amChart/amChart.js @@ -5,36 +5,36 @@ blurAdminApp.directive('amChart', function () { restrict: 'E', controller: ['$scope', function ($scope) { var chartData = [ - { date: new Date(2012, 11), value: 0}, - { date: new Date(2013, 0), value: 15000}, - { date: new Date(2013, 1), value: 30000}, + { date: new Date(2012, 11), value: 0, value0: 0 }, + { date: new Date(2013, 0), value: 15000, value0: 19000}, + { date: new Date(2013, 1), value: 30000, value0: 20000}, - { date: new Date(2013, 2), value: 25000}, - { date: new Date(2013, 3), value: 21000}, - { date: new Date(2013, 4), value: 24000}, - { date: new Date(2013, 5), value: 31000}, - { date: new Date(2013, 6), value: 40000}, - { date: new Date(2013, 7), value: 37000}, - { date: new Date(2013, 8), value: 18000}, - { date: new Date(2013, 9), value: 5000}, - { date: new Date(2013, 10), value: 40000}, - { date: new Date(2013, 11), value: 20000}, - { date: new Date(2014, 0), value: 5000}, + { date: new Date(2013, 2), value: 25000, value0: 22000}, + { date: new Date(2013, 3), value: 21000, value0: 25000}, + { date: new Date(2013, 4), value: 24000, value0: 29000}, + { date: new Date(2013, 5), value: 31000, value0: 26000}, + { date: new Date(2013, 6), value: 40000, value0: 25000}, + { date: new Date(2013, 7), value: 37000, value0: 20000}, + { date: new Date(2013, 8), value: 18000, value0: 22000}, + { date: new Date(2013, 9), value: 5000, value0: 26000}, + { date: new Date(2013, 10), value: 40000, value0: 30000}, + { date: new Date(2013, 11), value: 20000, value0: 25000}, + { date: new Date(2014, 0), value: 5000, value0: 13000}, - { date: new Date(2014, 1), value: 3000}, - { date: new Date(2014, 2), value: 1800}, - { date: new Date(2014, 3), value: 10400}, - { date: new Date(2014, 4), value: 25500}, - { date: new Date(2014, 5), value: 2100}, - { date: new Date(2014, 6), value: 6500}, - { date: new Date(2014, 7), value: 1100}, - { date: new Date(2014, 8), value: 17200}, - { date: new Date(2014, 9), value: 26900}, - { date: new Date(2014, 10), value: 14100}, - { date: new Date(2014, 11), value: 35300}, - { date: new Date(2015, 0), value: 54800}, - { date: new Date(2015, 1), value: 49800} + { date: new Date(2014, 1), value: 3000, value0: 13000}, + { date: new Date(2014, 2), value: 1800, value0: 13000}, + { date: new Date(2014, 3), value: 10400, value0: 13000}, + { date: new Date(2014, 4), value: 25500, value0: 13000}, + { date: new Date(2014, 5), value: 2100, value0: 13000}, + { date: new Date(2014, 6), value: 6500, value0: 13000}, + { date: new Date(2014, 7), value: 1100, value0: 13000}, + { date: new Date(2014, 8), value: 17200, value0: 13000}, + { date: new Date(2014, 9), value: 26900, value0: 13000}, + { date: new Date(2014, 10), value: 14100, value0: 13000}, + { date: new Date(2014, 11), value: 35300, value0: 13000}, + { date: new Date(2015, 0), value: 54800, value0: 13000}, + { date: new Date(2015, 1), value: 49800, value0: 13000} ]; var chart = AmCharts.makeChart('amchart', { @@ -50,10 +50,21 @@ blurAdminApp.directive('amChart', function () { } ], graphs: [ + { + id: 'g0', + bullet: 'none', + useLineColorForBulletBorder: true, + lineColor: colorDefault, + lineThickness: 1, + negativeLineColor: colorDanger, + type: 'smoothedLine', + valueField: 'value0', + fillAlphas: 1, + fillColorsField: 'lineColor' + }, { id: 'g1', bullet: 'none', - //bulletSize: 8, useLineColorForBulletBorder: true, lineColor: colorPrimary, lineThickness: 1,