From 63013164221f57aaccb3cc33d590dca6c5d692c8 Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 18 Dec 2015 13:55:06 +0300 Subject: [PATCH] moris charts --- bower.json | 3 +- src/app/pages/charts/charts.module.js | 3 +- src/app/pages/charts/flot/float.module.js | 0 src/app/pages/charts/flot/flot.html | 10 +++ src/app/pages/charts/flot/flotCtrl.js | 3 + src/app/pages/charts/morris/morris.html | 80 +++++++++++++++++++ src/app/pages/charts/morris/morris.module.js | 20 +++++ src/app/pages/charts/morris/morrisCtrl.js | 16 ++++ .../contentTop/contentTop.directive.js | 1 + .../theme/components/sidebar/SidebarCtrl.js | 4 + src/app/theme/theme.module.js | 1 + 11 files changed, 139 insertions(+), 2 deletions(-) create mode 100644 src/app/pages/charts/flot/float.module.js create mode 100644 src/app/pages/charts/flot/flot.html create mode 100644 src/app/pages/charts/flot/flotCtrl.js create mode 100644 src/app/pages/charts/morris/morris.html create mode 100644 src/app/pages/charts/morris/morris.module.js create mode 100644 src/app/pages/charts/morris/morrisCtrl.js diff --git a/bower.json b/bower.json index be95cad..d144d59 100644 --- a/bower.json +++ b/bower.json @@ -45,7 +45,8 @@ "angular-progress-button-styles": "~0.1.0", "angular-ui-router": "~0.2.15", "angular-chart.js": "~0.8.8", - "angular-chartist.js": "~3.3.12" + "angular-chartist.js": "~3.3.12", + "angular-morris-chart": "~1.1.0" }, "overrides": { "amcharts": { diff --git a/src/app/pages/charts/charts.module.js b/src/app/pages/charts/charts.module.js index 883e044..800c7ad 100644 --- a/src/app/pages/charts/charts.module.js +++ b/src/app/pages/charts/charts.module.js @@ -8,7 +8,8 @@ angular.module('BlurAdmin.pages.charts', [ 'BlurAdmin.pages.charts.amCharts', 'BlurAdmin.pages.charts.chartJs', - 'BlurAdmin.pages.charts.chartist' + 'BlurAdmin.pages.charts.chartist', + 'BlurAdmin.pages.charts.morris' ]) .config(routeConfig); diff --git a/src/app/pages/charts/flot/float.module.js b/src/app/pages/charts/flot/float.module.js new file mode 100644 index 0000000..e69de29 diff --git a/src/app/pages/charts/flot/flot.html b/src/app/pages/charts/flot/flot.html new file mode 100644 index 0000000..3fb197e --- /dev/null +++ b/src/app/pages/charts/flot/flot.html @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/app/pages/charts/flot/flotCtrl.js b/src/app/pages/charts/flot/flotCtrl.js new file mode 100644 index 0000000..1065c74 --- /dev/null +++ b/src/app/pages/charts/flot/flotCtrl.js @@ -0,0 +1,3 @@ +/** + * Created by alex on 12/18/15. + */ diff --git a/src/app/pages/charts/morris/morris.html b/src/app/pages/charts/morris/morris.html new file mode 100644 index 0000000..cc32733 --- /dev/null +++ b/src/app/pages/charts/morris/morris.html @@ -0,0 +1,80 @@ +
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
\ No newline at end of file diff --git a/src/app/pages/charts/morris/morris.module.js b/src/app/pages/charts/morris/morris.module.js new file mode 100644 index 0000000..7254865 --- /dev/null +++ b/src/app/pages/charts/morris/morris.module.js @@ -0,0 +1,20 @@ +/** + * @author a.demeshko + * created on 12/18/15 + */ +(function () { + 'use strict'; + + angular.module('BlurAdmin.pages.charts.morris', []) + .config(routeConfig); + + /** @ngInject */ + function routeConfig($stateProvider) { + $stateProvider + .state('charts.morris', { + url: '/morris', + templateUrl: 'app/pages/charts/morris/morris.html' + }); + } + +})(); \ No newline at end of file diff --git a/src/app/pages/charts/morris/morrisCtrl.js b/src/app/pages/charts/morris/morrisCtrl.js new file mode 100644 index 0000000..a8e3c95 --- /dev/null +++ b/src/app/pages/charts/morris/morrisCtrl.js @@ -0,0 +1,16 @@ +/** + * @author a.demeshko + * created on 12/16/15 + */ +(function () { + 'use strict'; + + angular.module('BlurAdmin.pages.charts.morris') + .controller('morrisCtrl', morrisCtrl); + + /** @ngInject */ + function morrisCtrl($scope,layoutColors) { + $scope.colors = [layoutColors.primary, layoutColors.danger, layoutColors.warning, layoutColors.success, layoutColors.default, layoutColors.primaryDark]; + } + +})(); \ No newline at end of file diff --git a/src/app/theme/components/contentTop/contentTop.directive.js b/src/app/theme/components/contentTop/contentTop.directive.js index ba1850e..94dc0a5 100644 --- a/src/app/theme/components/contentTop/contentTop.directive.js +++ b/src/app/theme/components/contentTop/contentTop.directive.js @@ -22,6 +22,7 @@ '/charts/amCharts': 'amCharts', '/charts/chartJs': 'Chart.js', '/charts/chartist': 'Chartist.js', + '/charts/morris': 'Morris', '/grid': 'Grid', '/alerts': 'Alerts', '/progressBars': 'Progress Bars', diff --git a/src/app/theme/components/sidebar/SidebarCtrl.js b/src/app/theme/components/sidebar/SidebarCtrl.js index da5063c..f4a3efa 100644 --- a/src/app/theme/components/sidebar/SidebarCtrl.js +++ b/src/app/theme/components/sidebar/SidebarCtrl.js @@ -31,6 +31,10 @@ { title: 'Chartist', root: '#/charts/chartist' + }, + { + title: 'Morris', + root: '#/charts/morris' } ] }, diff --git a/src/app/theme/theme.module.js b/src/app/theme/theme.module.js index ced2925..090bd9d 100644 --- a/src/app/theme/theme.module.js +++ b/src/app/theme/theme.module.js @@ -9,6 +9,7 @@ 'toastr', 'chart.js', 'angular-chartist', + 'angular.morris-chart', 'BlurAdmin.theme.components' ]);