diff --git a/src/app/pages/charts/chartJs/chartJs.html b/src/app/pages/charts/chartJs/chartJs.html index 0bd5efb..08cf605 100644 --- a/src/app/pages/charts/chartJs/chartJs.html +++ b/src/app/pages/charts/chartJs/chartJs.html @@ -1,53 +1,66 @@ -
- -
- +
+
+
-
- +
+ + chart-data="data" chart-labels="labels" chart-series="series" chart-click="changeData">
-
-
-
- +
+
+
-
- - +
+ +
-
-
- +
+
+
- -
- +
+ + chart-legend="true" chart-series="series" chart-data="data" chart-labels="labels" + chart-click="changeData">
-
\ No newline at end of file +
+ +
+
+ + + +
+
+ + + +
+
diff --git a/src/app/pages/charts/chartJs/chartJs1DCtrl.js b/src/app/pages/charts/chartJs/chartJs1DCtrl.js index a70efd4..3caef0e 100644 --- a/src/app/pages/charts/chartJs/chartJs1DCtrl.js +++ b/src/app/pages/charts/chartJs/chartJs1DCtrl.js @@ -13,7 +13,8 @@ $scope.labels =["Sleeping", "Designing", "Coding", "Cycling", "Running"]; $scope.data = [20, 40, 5, 35, 10]; - + $scope.options = { + }; $scope.changeData = function () { $scope.data = shuffle($scope.data); }; diff --git a/src/app/pages/charts/chartJs/chartJsWaveCtrl.js b/src/app/pages/charts/chartJs/chartJsWaveCtrl.js new file mode 100644 index 0000000..171fb92 --- /dev/null +++ b/src/app/pages/charts/chartJs/chartJsWaveCtrl.js @@ -0,0 +1,23 @@ +/** + * @author a.demeshko + * created on 12/16/15 + */ +(function () { + 'use strict'; + + angular.module('BlurAdmin.pages.charts.chartJs') + .controller('chartJsWaveCtrl', chartJsWaveCtrl); + + /** @ngInject */ + function chartJsWaveCtrl($scope, $interval) { + $scope.labels =["April", "May", "June", "Jule", "August", "September", "October", "November", "December"]; + $scope.data = [[1, 9, 3, 4, 5, 6, 7, 8, 2].map(function(e){ + return Math.sin(e) * 25 +25; + })]; + + $interval(function(){ + $scope.data[0].unshift($scope.data[0].pop()); + }, 300) + } + +})(); \ No newline at end of file diff --git a/src/app/theme/chartJsConfig.js b/src/app/theme/chartJsConfig.js index f988615..d864f8f 100644 --- a/src/app/theme/chartJsConfig.js +++ b/src/app/theme/chartJsConfig.js @@ -9,10 +9,10 @@ .config(chartJsConfig); /** @ngInject */ - function chartJsConfig(ChartJsProvider) { + function chartJsConfig(ChartJsProvider, layoutColors) { // Configure all charts ChartJsProvider.setOptions({ - colours: ['#FF5252', '#FF8A80'], + colours: [layoutColors.primary, layoutColors.danger, layoutColors.warning, layoutColors.success, layoutColors.default, layoutColors.primaryDark, layoutColors.successDark, layoutColors.warningLight, layoutColors.successLight, layoutColors.successBg, layoutColors.info], responsive: true }); // Configure all line charts diff --git a/src/sass/theme/dashboard/_trafficChart.scss b/src/sass/theme/dashboard/_trafficChart.scss index 7448de6..cf04962 100644 --- a/src/sass/theme/dashboard/_trafficChart.scss +++ b/src/sass/theme/dashboard/_trafficChart.scss @@ -33,7 +33,7 @@ width: 160px; } -ul.doughnut-legend { +.traffic-legend ul.doughnut-legend { li { list-style: none; font-size: 12px;