jinql
/
blur-admin
mirror of https://github.com/akveo/blur-admin
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(dashboard): use variables for line color chart

pull/46/head
KostyaDanovsky 2016-05-12 11:08:20 +03:00 committed by kostya.danovsky
parent f0b6c1baa8
commit 1d58c6ff92
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/pages/dashboard/dashboardLineChart/DashboardLineChartCtrl.js
View File

@ -9,13 +9,13 @@
.controller('DashboardLineChartCtrl', DashboardLineChartCtrl); .controller('DashboardLineChartCtrl', DashboardLineChartCtrl);
/** @ngInject */ /** @ngInject */
function DashboardLineChartCtrl(layoutColors, layoutPaths) { function DashboardLineChartCtrl(layoutColors, layoutPaths, baUtil) {
var graphColor = layoutColors.primary;
var chartData = [ var chartData = [
{ date: new Date(2012, 11), value: 0, value0: 0 }, { date: new Date(2012, 11), value: 0, value0: 0 },
{ date: new Date(2013, 0), value: 15000, value0: 19000}, { date: new Date(2013, 0), value: 15000, value0: 19000},
{ date: new Date(2013, 1), value: 30000, value0: 20000}, { date: new Date(2013, 1), value: 30000, value0: 20000},
{ date: new Date(2013, 2), value: 25000, value0: 22000}, { date: new Date(2013, 2), value: 25000, value0: 22000},
{ date: new Date(2013, 3), value: 21000, value0: 25000}, { date: new Date(2013, 3), value: 21000, value0: 25000},
{ date: new Date(2013, 4), value: 24000, value0: 29000}, { date: new Date(2013, 4), value: 24000, value0: 29000},
@ -69,7 +69,7 @@
id: 'g0', id: 'g0',
bullet: 'none', bullet: 'none',
useLineColorForBulletBorder: true, useLineColorForBulletBorder: true,
lineColor: 'rgba(0, 0, 0, 0.3)', lineColor: baUtil.hexToRGB(graphColor, 0.3),
lineThickness: 1, lineThickness: 1,
negativeLineColor: layoutColors.danger, negativeLineColor: layoutColors.danger,
type: 'smoothedLine', type: 'smoothedLine',
@ -81,7 +81,7 @@
id: 'g1', id: 'g1',
bullet: 'none', bullet: 'none',
useLineColorForBulletBorder: true, useLineColorForBulletBorder: true,
lineColor: 'rgba(0, 0, 0, 0.4)', lineColor: baUtil.hexToRGB(graphColor, 0.5),
lineThickness: 1, lineThickness: 1,
negativeLineColor: layoutColors.danger, negativeLineColor: layoutColors.danger,
type: 'smoothedLine', type: 'smoothedLine',

15
src/app/pages/dashboard/popularApp/popularApp1.js
View File

@ -1,15 +0,0 @@
/**
* @author v.lugovksy
* created on 16.12.2015
*/
(function () {
'use strict';
angular.module('BlurAdmin.pages.dashboard')
.service('popularApp1', popularApp1);
/** @ngInject */
function popularApp1() {
}
})();