From 8c8d5ceda293a90450370f02d1cf89fbb3a95c73 Mon Sep 17 00:00:00 2001 From: madhuka Date: Sat, 4 Jul 2015 23:58:57 +0530 Subject: [PATCH] Adding Area Chart --- app/scripts/chart-factory/google-chart-factory.js | 4 +++- app/scripts/chart-factory/high-chart-factory.js | 3 ++- app/scripts/chart-factory/nvd3-chart-factory.js | 3 ++- app/scripts/config/chart-config.js | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/scripts/chart-factory/google-chart-factory.js b/app/scripts/chart-factory/google-chart-factory.js index 5a0dd36..26beca7 100644 --- a/app/scripts/chart-factory/google-chart-factory.js +++ b/app/scripts/chart-factory/google-chart-factory.js @@ -10,7 +10,8 @@ angular.module('apacheZeppelinGsocApp').factory('GoogleChartFactory', function( ChartFactory) { var ChartList = { 'Bar': 'BarChart', - 'Line': 'LineChart' + 'Line': 'LineChart', + 'Area': 'AreaChart' }; //googleChart model (sample chart data model) //TO-DO Sample Data will remove after model set. @@ -82,5 +83,6 @@ angular.module('apacheZeppelinGsocApp').factory('GoogleChartFactory', function( }; // define a new internal private method for this chart object function setChartAxis() {} + return GoogleChartFactory; }); \ No newline at end of file diff --git a/app/scripts/chart-factory/high-chart-factory.js b/app/scripts/chart-factory/high-chart-factory.js index 756c8cd..72fdd78 100644 --- a/app/scripts/chart-factory/high-chart-factory.js +++ b/app/scripts/chart-factory/high-chart-factory.js @@ -11,7 +11,8 @@ angular.module('apacheZeppelinGsocApp').factory('HighChartFactory', function( ChartFactory) { var ChartList = { 'Bar': 'bar', - 'Line': 'line' + 'Line': 'line', + 'Area': 'area' }; //highChart model var HighChartChartModel = { diff --git a/app/scripts/chart-factory/nvd3-chart-factory.js b/app/scripts/chart-factory/nvd3-chart-factory.js index 9450243..81ff0ed 100644 --- a/app/scripts/chart-factory/nvd3-chart-factory.js +++ b/app/scripts/chart-factory/nvd3-chart-factory.js @@ -10,7 +10,8 @@ angular.module('apacheZeppelinGsocApp').factory('NVD3ChartFactory', function( ChartFactory) { var ChartList = { 'Bar': 'multiBarHorizontalChart', - 'Line': 'lineChart' + 'Line': 'lineChart', + 'Area': 'stackedAreaChart' }; //NVD3 Chart model var NVD3ChartChartModel = { diff --git a/app/scripts/config/chart-config.js b/app/scripts/config/chart-config.js index aa28a6e..123c710 100644 --- a/app/scripts/config/chart-config.js +++ b/app/scripts/config/chart-config.js @@ -23,5 +23,5 @@ angular.module('apacheZeppelinGsocApp') 'template': 'views/charts/googlechart.html' }], 'dataFiles': ['car', 'bike'], - 'chartTypes': ['Line', 'Bar'] + 'chartTypes': ['Line', 'Bar','Area'] }); \ No newline at end of file