diff --git a/bower.json b/bower.json index 763e54d..86a8bd1 100644 --- a/bower.json +++ b/bower.json @@ -57,7 +57,8 @@ "./dist/amcharts/plugins/responsive/responsive.min.js", "./dist/amcharts/serial.js", "./dist/amcharts/funnel.js", - "./dist/amcharts/pie.js" + "./dist/amcharts/pie.js", + "./dist/amcharts/gantt.js" ] }, "amcharts-stock": { diff --git a/src/app/pages/charts/amCharts/charts.html b/src/app/pages/charts/amCharts/charts.html index 93c27a6..61cea6d 100644 --- a/src/app/pages/charts/amCharts/charts.html +++ b/src/app/pages/charts/amCharts/charts.html @@ -1,18 +1,30 @@
-
+
+
+
-
+
+
+
+ +
+
+ +
+
+
+
@@ -21,10 +33,15 @@
- -
+ +
+ + + + +
\ No newline at end of file diff --git a/src/app/pages/charts/amCharts/combinedChart/combinedChart.html b/src/app/pages/charts/amCharts/combinedChart/combinedChart.html new file mode 100644 index 0000000..8683149 --- /dev/null +++ b/src/app/pages/charts/amCharts/combinedChart/combinedChart.html @@ -0,0 +1 @@ +
diff --git a/src/app/pages/charts/amCharts/combinedChart/combinedChartCtrl.js b/src/app/pages/charts/amCharts/combinedChart/combinedChartCtrl.js new file mode 100644 index 0000000..ef151ba --- /dev/null +++ b/src/app/pages/charts/amCharts/combinedChart/combinedChartCtrl.js @@ -0,0 +1,226 @@ +/** + * @author a.demeshko + * created on 22.12.2015 + */ +(function () { + 'use strict'; + + angular.module('BlurAdmin.pages.charts.amCharts') + .controller('combinedChartCtrl', combinedChartCtrl); + + /** @ngInject */ + function combinedChartCtrl($element, layoutColors) { + var id = $element[0].getAttribute('id'); + var chart = AmCharts.makeChart(id, { + "type": "serial", + "theme": "none", + "dataDateFormat": "YYYY-MM-DD", + "precision": 2, + "valueAxes": [{ + "id": "v1", + "title": "Sales", + "position": "left", + "autoGridCount": false, + "labelFunction": function(value) { + return "$" + Math.round(value) + "M"; + } + }, { + "id": "v2", + "title": "Market Days", + "gridAlpha": 0, + "position": "right", + "autoGridCount": false + }], + "graphs": [{ + "id": "g3", + "valueAxis": "v1", + "lineColor": layoutColors.primaryBg, + "fillColors": layoutColors.primaryBg, + "fillAlphas": 1, + "type": "column", + "title": "Actual Sales", + "valueField": "sales2", + "clustered": false, + "columnWidth": 0.5, + "legendValueText": "$[[value]]M", + "balloonText": "[[title]]
$[[value]]M" + }, { + "id": "g4", + "valueAxis": "v1", + "lineColor": layoutColors.primaryLight, + "fillColors": layoutColors.primaryLight, + "fillAlphas": 1, + "type": "column", + "title": "Target Sales", + "valueField": "sales1", + "clustered": false, + "columnWidth": 0.3, + "legendValueText": "$[[value]]M", + "balloonText": "[[title]]
$[[value]]M" + }, { + "id": "g1", + "valueAxis": "v2", + "bullet": "round", + "bulletBorderAlpha": 1, + "bulletColor": "#FFFFFF", + "bulletSize": 5, + "hideBulletsCount": 50, + "lineThickness": 2, + "lineColor": layoutColors.success, + "type": "smoothedLine", + "title": "Market Days", + "useLineColorForBulletBorder": true, + "valueField": "market1", + "balloonText": "[[title]]
[[value]]" + }, { + "id": "g2", + "valueAxis": "v2", + "bullet": "round", + "bulletBorderAlpha": 1, + "bulletColor": "#FFFFFF", + "bulletSize": 5, + "hideBulletsCount": 50, + "lineThickness": 2, + "lineColor": layoutColors.primary, + "type": "smoothedLine", + "dashLength": 5, + "title": "Market Days ALL", + "useLineColorForBulletBorder": true, + "valueField": "market2", + "balloonText": "[[title]]
[[value]]" + }], + "chartScrollbar": { + "graph": "g1", + "oppositeAxis": false, + "offset": 30, + "scrollbarHeight": 50, + "backgroundAlpha": 0, + "selectedBackgroundAlpha": 0.1, + "selectedBackgroundColor": "#888888", + "graphFillAlpha": 0, + "graphLineAlpha": 0.5, + "selectedGraphFillAlpha": 0, + "selectedGraphLineAlpha": 1, + "autoGridCount": true, + "color": "#AAAAAA" + }, + "chartCursor": { + "pan": true, + "cursorColor" : layoutColors.danger, + "valueLineEnabled": true, + "valueLineBalloonEnabled": true, + "cursorAlpha": 0, + "valueLineAlpha": 0.2 + }, + "categoryField": "date", + "categoryAxis": { + "parseDates": true, + "dashLength": 1, + "minorGridEnabled": true + }, + "legend": { + "useGraphSettings": true, + "position": "top" + }, + "balloon": { + "borderThickness": 1, + "shadowAlpha": 0 + }, + "export": { + "enabled": true + }, + "dataProvider": [{ + "date": "2013-01-16", + "market1": 71, + "market2": 75, + "sales1": 5, + "sales2": 8 + }, { + "date": "2013-01-17", + "market1": 74, + "market2": 78, + "sales1": 4, + "sales2": 6 + }, { + "date": "2013-01-18", + "market1": 78, + "market2": 88, + "sales1": 5, + "sales2": 2 + }, { + "date": "2013-01-19", + "market1": 85, + "market2": 89, + "sales1": 8, + "sales2": 9 + }, { + "date": "2013-01-20", + "market1": 82, + "market2": 89, + "sales1": 9, + "sales2": 6 + }, { + "date": "2013-01-21", + "market1": 83, + "market2": 85, + "sales1": 3, + "sales2": 5 + }, { + "date": "2013-01-22", + "market1": 88, + "market2": 92, + "sales1": 5, + "sales2": 7 + }, { + "date": "2013-01-23", + "market1": 85, + "market2": 90, + "sales1": 7, + "sales2": 6 + }, { + "date": "2013-01-24", + "market1": 85, + "market2": 91, + "sales1": 9, + "sales2": 5 + }, { + "date": "2013-01-25", + "market1": 80, + "market2": 84, + "sales1": 5, + "sales2": 8 + }, { + "date": "2013-01-26", + "market1": 87, + "market2": 92, + "sales1": 4, + "sales2": 8 + }, { + "date": "2013-01-27", + "market1": 84, + "market2": 87, + "sales1": 3, + "sales2": 4 + }, { + "date": "2013-01-28", + "market1": 83, + "market2": 88, + "sales1": 5, + "sales2": 7 + }, { + "date": "2013-01-29", + "market1": 84, + "market2": 87, + "sales1": 5, + "sales2": 8 + }, { + "date": "2013-01-30", + "market1": 81, + "market2": 85, + "sales1": 4, + "sales2": 7 + }] + }); + } + +})(); diff --git a/src/app/pages/charts/amCharts/ganttChart/ganttChart.html b/src/app/pages/charts/amCharts/ganttChart/ganttChart.html new file mode 100644 index 0000000..83068a1 --- /dev/null +++ b/src/app/pages/charts/amCharts/ganttChart/ganttChart.html @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/src/app/pages/charts/amCharts/ganttChart/ganttChartCtrl.js b/src/app/pages/charts/amCharts/ganttChart/ganttChartCtrl.js new file mode 100644 index 0000000..1508b05 --- /dev/null +++ b/src/app/pages/charts/amCharts/ganttChart/ganttChartCtrl.js @@ -0,0 +1,297 @@ +/** + * @author a.demeshko + * created on 22.12.2015 + */ +(function () { + 'use strict'; + + angular.module('BlurAdmin.pages.charts.amCharts') + .controller('ganttChartCtrl', ganttChartCtrl); + + /** @ngInject */ + function ganttChartCtrl(layoutColors, $element) { + var id = $element[0].getAttribute('id'); + var chart = AmCharts.makeChart( id, { + "type": "gantt", + "theme": "light", + "marginRight": 70, + "period": "hh", + "dataDateFormat":"YYYY-MM-DD", + "balloonDateFormat": "JJ:NN", + "columnWidth": 0.5, + "valueAxis": { + "type": "date", + "minimum": 7, + "maximum": 31 + }, + "brightnessStep": 10, + "graph": { + "fillAlphas": 1, + "balloonText": "[[task]]: [[open]] [[value]]" + }, + "rotate": true, + "categoryField": "category", + "segmentsField": "segments", + "colorField": "color", + "startDate": "2015-01-01", + "startField": "start", + "endField": "end", + "durationField": "duration", + "dataProvider": [ + { + "category": "John", + "segments": [ { + "start": 7, + "duration": 2, + "color": "#46615e", + "task": "Task #1" + }, { + "duration": 2, + "color": "#727d6f", + "task": "Task #2" + }, { + "duration": 2, + "color": "#8dc49f", + "task": "Task #3" + } ] + }, { + "category": "Smith", + "segments": [ { + "start": 10, + "duration": 2, + "color": "#727d6f", + "task": "Task #2" + }, { + "duration": 1, + "color": "#8dc49f", + "task": "Task #3" + }, { + "duration": 4, + "color": "#46615e", + "task": "Task #1" + } ] + }, { + "category": "Ben", + "segments": [ { + "start": 12, + "duration": 2, + "color": "#727d6f", + "task": "Task #2" + }, { + "start": 16, + "duration": 2, + "color": "#FFE4C4", + "task": "Task #4" + } ] + }, { + "category": "Mike", + "segments": [ { + "start": 9, + "duration": 6, + "color": "#46615e", + "task": "Task #1" + }, { + "duration": 4, + "color": "#727d6f", + "task": "Task #2" + } ] + }, { + "category": "Lenny", + "segments": [ { + "start": 8, + "duration": 1, + "color": "#8dc49f", + "task": "Task #3" + }, { + "duration": 4, + "color": "#46615e", + "task": "Task #1" + } ] + }, { + "category": "Scott", + "segments": [ { + "start": 15, + "duration": 3, + "color": "#727d6f", + "task": "Task #2" + } ] + }, { + "category": "Julia", + "segments": [ { + "start": 9, + "duration": 2, + "color": "#46615e", + "task": "Task #1" + }, { + "duration": 1, + "color": "#727d6f", + "task": "Task #2" + }, { + "duration": 8, + "color": "#8dc49f", + "task": "Task #3" + } ] + }, { + "category": "Bob", + "segments": [ { + "start": 9, + "duration": 8, + "color": "#727d6f", + "task": "Task #2" + }, { + "duration": 7, + "color": "#8dc49f", + "task": "Task #3" + } ] + }, { + "category": "Kendra", + "segments": [ { + "start": 11, + "duration": 8, + "color": "#727d6f", + "task": "Task #2" + }, { + "start": 16, + "duration": 2, + "color": "#FFE4C4", + "task": "Task #4" + } ] + }, { + "category": "Tom", + "segments": [ { + "start": 9, + "duration": 4, + "color": "#46615e", + "task": "Task #1" + }, { + "duration": 3, + "color": "#727d6f", + "task": "Task #2" + }, { + "duration": 5, + "color": "#8dc49f", + "task": "Task #3" + } ] + }, { + "category": "Kyle", + "segments": [ { + "start": 6, + "duration": 3, + "color": "#727d6f", + "task": "Task #2" + } ] + }, { + "category": "Anita", + "segments": [ { + "start": 12, + "duration": 2, + "color": "#727d6f", + "task": "Task #2" + }, { + "start": 16, + "duration": 2, + "color": "#FFE4C4", + "task": "Task #4" + } ] + }, { + "category": "Jack", + "segments": [ { + "start": 8, + "duration": 10, + "color": "#46615e", + "task": "Task #1" + }, { + "duration": 2, + "color": "#727d6f", + "task": "Task #2" + } ] + }, { + "category": "Kim", + "segments": [ { + "start": 12, + "duration": 2, + "color": "#727d6f", + "task": "Task #2" + }, { + "duration": 3, + "color": "#8dc49f", + "task": "Task #3" + } ] + }, { + "category": "Aaron", + "segments": [ { + "start": 18, + "duration": 2, + "color": "#727d6f", + "task": "Task #2" + }, { + "duration": 2, + "color": "#FFE4C4", + "task": "Task #4" + } ] + }, { + "category": "Alan", + "segments": [ { + "start": 17, + "duration": 2, + "color": "#46615e", + "task": "Task #1" + }, { + "duration": 2, + "color": "#727d6f", + "task": "Task #2" + }, { + "duration": 2, + "color": "#8dc49f", + "task": "Task #3" + } ] + }, { + "category": "Ruth", + "segments": [ { + "start": 13, + "duration": 2, + "color": "#727d6f", + "task": "Task #2" + }, { + "duration": 1, + "color": "#8dc49f", + "task": "Task #3" + }, { + "duration": 4, + "color": "#46615e", + "task": "Task #1" + } ] + }, { + "category": "Simon", + "segments": [ { + "start": 10, + "duration": 3, + "color": "#727d6f", + "task": "Task #2" + }, { + "start": 17, + "duration": 4, + "color": "#FFE4C4", + "task": "Task #4" + } ] + } ], + "valueScrollbar": { + "autoGridCount":true + }, + "chartCursor": { + "cursorColor":"#55bb76", + "valueBalloonsEnabled": false, + "cursorAlpha": 0, + "valueLineAlpha":0.5, + "valueLineBalloonEnabled": true, + "valueLineEnabled": true, + "zoomable":false, + "valueZoomable":true + }, + "export": { + "enabled": true + } + }); + } + +})(); diff --git a/src/app/pages/charts/chartJs/chartJs.html b/src/app/pages/charts/chartJs/chartJs.html index 85fdd29..47c7a99 100644 --- a/src/app/pages/charts/chartJs/chartJs.html +++ b/src/app/pages/charts/chartJs/chartJs.html @@ -1,53 +1,25 @@ -
-
- - - -
- -
- - - - -
-
- -
-
+
+
-
+
-
- -
-
+
-
- - - - -
@@ -64,3 +36,31 @@
+ + +
+
+ + + + +
+
+ + + +
+
+ + + + +
+
+ + + diff --git a/src/app/pages/charts/morris/morris.html b/src/app/pages/charts/morris/morris.html index 7f22a5a..febc831 100644 --- a/src/app/pages/charts/morris/morris.html +++ b/src/app/pages/charts/morris/morris.html @@ -1,28 +1,30 @@
-
- -
Simple Line Chart
-
-
-
Area Chart
-
+ +
-
+
+
+
+ +
+
+
+
+
-
-
- +
+
+
+ area-chart + area-data='areaData' + area-xkey='y' + area-ykeys='["a", "b"]' % + area-labels='["Serie A", "Serie B"]' + line-colors='colors'>
diff --git a/src/sass/app/_chartsPage.scss b/src/sass/app/_chartsPage.scss index da02130..7c01b6c 100644 --- a/src/sass/app/_chartsPage.scss +++ b/src/sass/app/_chartsPage.scss @@ -10,12 +10,10 @@ } #funnelChart, #lineChart { - height: 360px; } #pieChart { max-width: 1120px; - height: 400px; } .amcharts-pie-slice { @@ -124,4 +122,24 @@ .chart-panel{ height: 495px; +} + +#filterChart { + width : 96%; + font-size : 11px; + margin-left: auto; + margin-right: auto; + margin-top:15px; +} + +.amcharts-graph-g1 .amcharts-graph-fill { + filter: url(#blur); +} + +.amcharts-graph-g2 .amcharts-graph-fill { + filter: url(#blur); +} + +.amcharts-cursor-fill { + filter: url(#shadow); } \ No newline at end of file