From f51b476873968f32e1feba70c56cd69b1a4def00 Mon Sep 17 00:00:00 2001 From: KostyaDanovsky Date: Thu, 19 Nov 2015 16:58:54 +0300 Subject: [PATCH] change data for main dashboard chart --- .../dashboard/widgets/amChart/amChart.js | 70 ++++++------------- 1 file changed, 22 insertions(+), 48 deletions(-) diff --git a/src/app/pages/dashboard/widgets/amChart/amChart.js b/src/app/pages/dashboard/widgets/amChart/amChart.js index 5cefe27..5bc5172 100644 --- a/src/app/pages/dashboard/widgets/amChart/amChart.js +++ b/src/app/pages/dashboard/widgets/amChart/amChart.js @@ -5,44 +5,24 @@ blurAdminApp.directive('amChart', function () { restrict: 'E', controller: ['$scope', function ($scope) { var chartData = [ - { date: new Date(2011, 0), value: -30700}, - { date: new Date(2011, 1), value: -16800}, - { date: new Date(2011, 2), value: -7300}, - { date: new Date(2011, 3), value: -2700}, - { date: new Date(2011, 4), value: -25100}, - { date: new Date(2011, 5), value: -28100}, - { date: new Date(2011, 6), value: -34800}, - { date: new Date(2011, 7), value: -7400}, - { date: new Date(2011, 8), value: -1100}, - { date: new Date(2011, 9), value: -7400}, - { date: new Date(2011, 10), value: -12400}, - { date: new Date(2011, 11), value: -2400}, - { date: new Date(2012, 0), value: -2200}, - { date: new Date(2012, 1), value: 0}, - { date: new Date(2012, 2), value: -29600}, - { date: new Date(2012, 3), value: -21700}, - { date: new Date(2012, 4), value: -14700}, - { date: new Date(2012, 5), value: -1500}, - { date: new Date(2012, 6), value: -1600}, - { date: new Date(2012, 7), value: -1100}, - { date: new Date(2012, 8), value: -6800}, - { date: new Date(2012, 9), value: -1900}, - { date: new Date(2012, 10), value: -5600}, - { date: new Date(2012, 11), value: -7700}, - { date: new Date(2013, 0), value: -21300}, - { date: new Date(2013, 1), value: -13700}, - { date: new Date(2013, 2), value: -300}, - { date: new Date(2013, 3), value: 10900}, - { date: new Date(2013, 4), value: 20300}, - { date: new Date(2013, 5), value: 25500}, - { date: new Date(2013, 6), value: 10700}, - { date: new Date(2013, 7), value: -4200}, - { date: new Date(2013, 8), value: -5000}, - { date: new Date(2013, 9), value: 17700}, - { date: new Date(2013, 10), value: 25100}, - { date: new Date(2013, 11), value: 37000}, - { date: new Date(2014, 0), value: 300}, - { date: new Date(2014, 1), value: 17900}, + { date: new Date(2012, 11), value: 0}, + { date: new Date(2013, 0), value: 15000}, + { date: new Date(2013, 1), value: 30000}, + + + { 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: 20000}, + { 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(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}, @@ -54,13 +34,7 @@ blurAdminApp.directive('amChart', function () { { 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: 29800}, - { date: new Date(2015, 2), value: 26700}, - { date: new Date(2015, 3), value: 41100}, - { date: new Date(2015, 4), value: 46200}, - { date: new Date(2015, 5), value: 4700}, - { date: new Date(2015, 6), value: 44500}, - { date: new Date(2015, 7), value: 4700} + { date: new Date(2015, 1), value: 49800} ]; var chart = AmCharts.makeChart('amchart', { @@ -80,12 +54,12 @@ blurAdminApp.directive('amChart', function () { bullet: 'round', bulletSize: 8, useLineColorForBulletBorder: true, - lineColor: colorSuccess, + lineColor: colorPrimary, lineThickness: 1, negativeLineColor: colorDanger, type: 'smoothedLine', valueField: 'value', - fillAlphas: 0.3, + fillAlphas: 1, fillColorsField: 'lineColor' } ], @@ -133,7 +107,7 @@ blurAdminApp.directive('amChart', function () { }); function zoomChart() { - chart.zoomToDates(new Date(2013, 3), new Date(2013, 10)); + chart.zoomToDates(new Date(2013, 3), new Date(2014, 0)); } chart.addListener('rendered', zoomChart);