From 330580f2733b5f38ba3ccd33491f22f796cc62c4 Mon Sep 17 00:00:00 2001 From: madhuka Date: Wed, 24 Jun 2015 16:13:43 +0530 Subject: [PATCH] cleaning code --- app/scripts/app.js | 4 +- .../chart-factory/google-chart-factory.js | 17 ++++--- .../chart-factory/high-chart-factory.js | 1 - .../chart-factory/nvd3-chart-factory.js | 3 +- app/scripts/config/chart-config.js | 2 - app/scripts/controllers/chart-controllers.js | 5 +- app/scripts/services/chart-meta-service.js | 46 ++++++------------- test/spec/controllers/chart-controllers.js | 4 ++ 8 files changed, 32 insertions(+), 50 deletions(-) diff --git a/app/scripts/app.js b/app/scripts/app.js index a0d343c..2c1d9ea 100644 --- a/app/scripts/app.js +++ b/app/scripts/app.js @@ -13,7 +13,7 @@ angular .module('apacheZeppelinGsocApp', [ 'ngResource', 'ngRoute', - 'googlechart', + 'googlechart', 'highcharts-ng', 'nvd3' ]) @@ -26,7 +26,7 @@ angular templateUrl: 'views/milestone01.html', controller:'ChartCtrl' }) - .when('/contact', { + .when('/contact', { templateUrl: 'views/contact.html' }) .when('/', { diff --git a/app/scripts/chart-factory/google-chart-factory.js b/app/scripts/chart-factory/google-chart-factory.js index 4b5f03b..d3347a6 100644 --- a/app/scripts/chart-factory/google-chart-factory.js +++ b/app/scripts/chart-factory/google-chart-factory.js @@ -19,15 +19,14 @@ angular.module('apacheZeppelinGsocApp').factory('GoogleChartFactory', function( cssStyle: 'height:400px; width:500px;', data: { 'cols': [{ - id: 'pizza', - label: 'Pizza', - type: 'string' - }, { - id: 'populartiy', - label: 'Populartiy', - type: 'number' - } - ], + id: 'pizza', + label: 'Pizza', + type: 'string' + }, { + id: 'populartiy', + label: 'Populartiy', + type: 'number' + }], 'rows': [{ c: [{ v: 'Pepperoni' diff --git a/app/scripts/chart-factory/high-chart-factory.js b/app/scripts/chart-factory/high-chart-factory.js index ca35a8b..8d59daf 100644 --- a/app/scripts/chart-factory/high-chart-factory.js +++ b/app/scripts/chart-factory/high-chart-factory.js @@ -76,7 +76,6 @@ angular.module('apacheZeppelinGsocApp').factory('HighChartFactory', function( } function loadYAxisLabel(fileName) { - console.log(fileName) highAxisLabels = d3.csv(fileName).row(highYaxisModel).get(getHighYaxis); } return HighChartFactory; diff --git a/app/scripts/chart-factory/nvd3-chart-factory.js b/app/scripts/chart-factory/nvd3-chart-factory.js index a0c5a2f..0454e92 100644 --- a/app/scripts/chart-factory/nvd3-chart-factory.js +++ b/app/scripts/chart-factory/nvd3-chart-factory.js @@ -25,7 +25,7 @@ angular.module('apacheZeppelinGsocApp').factory('NVD3ChartFactory', function( right: 20, bottom: 20, left: 20 - }, + }, x: function(d) { return d.valuex; }, @@ -65,7 +65,6 @@ angular.module('apacheZeppelinGsocApp').factory('NVD3ChartFactory', function( function setChartTypeView(chartType) { NVD3ChartFactory.viewModel.options.chart.type = ChartList[chartType]; } - var NVD3Chart = { model: nvd3Model, get: getNVD3 diff --git a/app/scripts/config/chart-config.js b/app/scripts/config/chart-config.js index 99d92ca..22c5b5a 100644 --- a/app/scripts/config/chart-config.js +++ b/app/scripts/config/chart-config.js @@ -1,5 +1,4 @@ 'use strict'; - /** * @ngdoc function * @name apacheZeppelinGsocApp.configure @@ -8,7 +7,6 @@ * * @author madhuka udantha */ - angular.module('apacheZeppelinGsocApp') .constant('chartConfig', { 'libraryName': [{ diff --git a/app/scripts/controllers/chart-controllers.js b/app/scripts/controllers/chart-controllers.js index ecbfc60..1a7d0a8 100644 --- a/app/scripts/controllers/chart-controllers.js +++ b/app/scripts/controllers/chart-controllers.js @@ -11,8 +11,7 @@ angular.module('apacheZeppelinGsocApp').controller('ChartCtrl', function($scope, ChartFactory, GoogleChartFactory, HighChartFactory, NVD3ChartFactory, ChartService, ChartMetaService, chartConfig) { - var vm = this, - varmyChart = {}; + var vm = this; //loading from chart config file. var libraryName = chartConfig.libraryName; var files = chartConfig.dataFiles; @@ -41,7 +40,7 @@ angular.module('apacheZeppelinGsocApp').controller('ChartCtrl', function($scope, drawChart(data); } - function getChartTemplateURL(libraryIndex) { + function getChartTemplateURL() { return ChartMetaService.getChartTemplateURL(); } diff --git a/app/scripts/services/chart-meta-service.js b/app/scripts/services/chart-meta-service.js index ab9514f..e839e09 100644 --- a/app/scripts/services/chart-meta-service.js +++ b/app/scripts/services/chart-meta-service.js @@ -1,5 +1,4 @@ 'use strict'; - /** * @ngdoc function * @name apacheZeppelinGsocApp.ChartMetaService @@ -7,67 +6,52 @@ * # ChartMetaService will be using Handle Basic Chart Meta Details. * */ - - angular.module('apacheZeppelinGsocApp').service('ChartMetaService', function() { - /*Chart Meta Data Service*/ var MetaModel = { - ChartLib:null, - ChartTemplateURL:null, - ChartType:null, - ChartDataSetName:null, - ChartDataSetPath:null, + ChartLib: null, + ChartTemplateURL: null, + ChartType: null, + ChartDataSetName: null, + ChartDataSetPath: null, ChartData: null }; - //getters this.getChartLib = function() { - return MetaModel.ChartLib ; + return MetaModel.ChartLib; }; - this.getChartType = function() { - return MetaModel.ChartType ; + return MetaModel.ChartType; }; - this.getChartTemplateURL = function() { - return MetaModel.ChartTemplateURL ; + return MetaModel.ChartTemplateURL; }; - this.getChartDataSetName = function() { - return MetaModel.ChartDataSetName ; + return MetaModel.ChartDataSetName; }; - this.getChartDataSetPath = function() { - return MetaModel.ChartDataSetPath ; + return MetaModel.ChartDataSetPath; }; - this.getChartData = function() { - return MetaModel.ChartData ; + return MetaModel.ChartData; }; - //setters this.setChartLib = function(ChartLib) { - MetaModel.ChartLib = ChartLib ; + MetaModel.ChartLib = ChartLib; }; - this.setChartType = function(ChartType) { - MetaModel.ChartType = ChartType ; + MetaModel.ChartType = ChartType; }; - this.setChartTemplateURL = function(ChartTemplateURL) { MetaModel.ChartTemplateURL = ChartTemplateURL; }; - this.setChartDataSetName = function(ChartDataSetName) { - MetaModel.ChartDataSetName = ChartDataSetName ; + MetaModel.ChartDataSetName = ChartDataSetName; MetaModel.ChartDataSetPath = 'data/' + ChartDataSetName + '.csv'; MetaModel.ChartData = d3.csv(MetaModel.ChartDataSetPath); }; - //looking for UI model logic this.isMetaCompleted = function() { - return MetaModel.ChartType !== null ; + return MetaModel.ChartType !== null; }; - }); \ No newline at end of file diff --git a/test/spec/controllers/chart-controllers.js b/test/spec/controllers/chart-controllers.js index 1e9b2b1..188a7a7 100644 --- a/test/spec/controllers/chart-controllers.js +++ b/test/spec/controllers/chart-controllers.js @@ -46,5 +46,9 @@ describe('Controller: ChartCtrl', function() { expect(ChartCtrl.isButtonActive('dataButton','car')).toBe(false); }); + it('Get ChartTemplate URL testing', function() { + expect(ChartCtrl.getChartTemplateURL).toBeDefined(); + expect(ChartCtrl.getChartTemplateURL instanceof Function).toBe(true); + }); });