From 0b2b3270d23bc1bec003f7bda3e6b4babd41ba38 Mon Sep 17 00:00:00 2001 From: st782s Date: Wed, 7 Jun 2017 10:43:46 -0400 Subject: [Portal 15] Also includes Portal 8 This enhancement included changes pertaining to the the charting and search functions of Ecomp SDK Analytics and inclusion of os module in root POM Change-Id: I4a2db5588a311a1098ee67c7d352299afb7679a0 Signed-off-by: st782s --- .../ds2-reports/report-chart-controller.js | 112 +++++-- .../ds2-reports/report-search-controller.js | 1 + .../ds2-reports/report-step-controller.js | 16 +- .../ds2-reports/report-chart-wizard.html | 363 +++++++++++++++------ .../DS2-view-models/ds2-reports/report-run.html | 2 +- 5 files changed, 364 insertions(+), 130 deletions(-) (limited to 'ecomp-sdk/epsdk-app-overlay/src/main/webapp') diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-reports/report-chart-controller.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-reports/report-chart-controller.js index 80e1a269..fc36b73d 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-reports/report-chart-controller.js +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-reports/report-chart-controller.js @@ -1,33 +1,43 @@ appDS2.controller('reportChartController', function ($scope, $rootScope, $timeout, $window, $http, $routeParams,modalService) { - //$scope.test="1223"; - //alert($scope.chartType.value); - console.log("reportChartController called"); + $scope.showLoader = true; $scope.commonOptionOpen = false; $scope.additionalOptionOpen = false; - + $scope.barChartOptionOpen = false; + $scope.timeSeriesChartOptionOpen = false; $scope.selectedChartType = {value:""}; $scope.chartTypeOptions = [ - {value: 'barChart', text: 'Bar Chart'}, - {value: 'timeSeries', text: 'Time Series/Area Chart'}, - {value: 'pieChart', text: 'Pie Chart'}, - {value: 'annotationChart', text: 'Annotation Chart'}, - {value: 'flexibleTimeChart', text: 'Flexible Time Chart'} + {value: 'BarChart3D', text: 'Bar Chart'}, + {value: 'TimeSeriesChart', text: 'Time Series/Area Chart'}, + {value: 'PieChart', text: 'Pie Chart'}, + {value: 'AnnotationChart', text: 'Annotation Chart'}, + {value: 'FlexTimeChart', text: 'Flexible Time Chart'} ]; - - $scope.animateSelected = {value:false}; - + $scope.populateChrtWzdFields = function() { $scope.reportRunJson = {}; $http.get("raptor.htm?action=chart.json&c_master="+$routeParams.reportId).then(function (response) { $scope.reportRunJson = response.data; //Set chart type + $scope.reportRunJson.commonChartOptions.animateAnimatedChart = $scope.reportRunJson.commonChartOptions.animateAnimatedChart+""; + $scope.reportRunJson.commonChartOptions.hideLegend = $scope.reportRunJson.commonChartOptions.hideLegend + ""; + $scope.reportRunJson.showTitle = $scope.reportRunJson.showTitle + ""; + + // if barChartOptions is not null + if ($scope.reportRunJson.barChartOptions) { + $scope.reportRunJson.barChartOptions.displayBarControls = $scope.reportRunJson.barChartOptions.displayBarControls+""; + $scope.reportRunJson.barChartOptions.minimizeXAxisTickers = $scope.reportRunJson.barChartOptions.minimizeXAxisTickers+""; + $scope.reportRunJson.barChartOptions.stackedChart = $scope.reportRunJson.barChartOptions.stackedChart+""; + $scope.reportRunJson.barChartOptions.timeAxis =$scope.reportRunJson.barChartOptions.timeAxis+""; + $scope.reportRunJson.barChartOptions.verticalOrientation = $scope.reportRunJson.barChartOptions.verticalOrientation +""; + $scope.reportRunJson.barChartOptions.xAxisDateType = $scope.reportRunJson.barChartOptions.xAxisDateType +""; + } + if ($scope.reportRunJson.chartTypeJSON) { - var chrtTypeValue = $scope.reportRunJson.chartTypeJSON.value; + var chrtTypeValue = $scope.reportRunJson.chartType; for(var i = 0; i < $scope.chartTypes.length; i++) { - var obj = $scope.chartTypes[i]; - //console.log(obj.id); if ($scope.chartTypes[i].value==chrtTypeValue) { - $scope.reportRunJson.chartTypeJSON.index=$scope.chartTypes[i].index; + $scope.reportRunJson.chartTypeJSON.index=$scope.chartTypes[i].index; + $scope.reportRunJson.chartTypeJSON.value=$scope.chartTypes[i].value; $scope.reportRunJson.chartTypeJSON.title=$scope.chartTypes[i].title; } @@ -108,12 +118,65 @@ appDS2.controller('reportChartController', function ($scope, $rootScope, $timeou } } } + $scope.showLoader = false; }); $scope.legend = "true"; } $scope.saveChartData = function() { + $scope.showLoader = true; + + $scope.reportRunJson.commonChartOptions.animateAnimatedChart = ($scope.reportRunJson.commonChartOptions.animateAnimatedChart=="true") + $scope.reportRunJson.commonChartOptions.hideLegend = ($scope.reportRunJson.commonChartOptions.hideLegend=="true"); + $scope.reportRunJson.showTitle = ($scope.reportRunJson.showTitle=="true"); + + $scope.reportRunJson.chartTypeJSON = { + 'index':0,'title':'','value':''}; + + + if (($scope.reportRunJson.chartType == "BarChart3D")&&($scope.reportRunJson.barChartOptions)) { + $scope.reportRunJson.barChartOptions.displayBarControls = ($scope.reportRunJson.barChartOptions.displayBarControls=="true") ; + $scope.reportRunJson.barChartOptions.minimizeXAxisTickers = ($scope.reportRunJson.barChartOptions.minimizeXAxisTickers=="true") ; + $scope.reportRunJson.barChartOptions.stackedChart = ($scope.reportRunJson.barChartOptions.stackedChart=="true") ; + $scope.reportRunJson.barChartOptions.timeAxis= ($scope.reportRunJson.barChartOptions.timeAxi=="true") ; + $scope.reportRunJson.barChartOptions.verticalOrientation = ($scope.reportRunJson.barChartOptions.verticalOrientation=="true") ; + $scope.reportRunJson.barChartOptions.xAxisDateType = ($scope.reportRunJson.barChartOptions.xAxisDateType=="true") ; + } + + for (var i=0;i<$scope.chartTypes.length;i++) { + if ($scope.reportRunJson.chartType==$scope.chartTypes[i].value) { + $scope.reportRunJson.chartTypeJSON = { + 'index':$scope.chartTypes[i].index, + 'title':$scope.chartTypes[i].title, + 'value':$scope.chartTypes[i].value + } + } + } + + $scope.reportRunJson.domainAxisJSON = { + "index":0,"value":$scope.reportRunJson.domainAxis,"title": $scope.reportRunJson.domainAxis + }; + $scope.reportRunJson.categoryAxisJSON = { + "index":0,"value":$scope.reportRunJson.categoryAxis,"title": $scope.reportRunJson.categoryAxis + }; + + // Specifically for DS2 for color + for (var i=0; i<$scope.reportRunJson.rangeAxisList.length; i ++) { + $scope.reportRunJson.rangeAxisList[i].rangeColorJSON = + {"index":0, "value": $scope.reportRunJson.rangeAxisList[i].rangeColor, "title": ""}; + + $scope.reportRunJson.rangeAxisList[i].rangeLineTypeJSON = + {"index":0, "value": "", "title": ""}; + for (var j=0;j<$scope.lineTypes.length;j++) { + if ($scope.reportRunJson.rangeAxisList[i].rangeLineType ==$scope.lineTypes[j].value) { + $scope.reportRunJson.rangeAxisList[i].rangeLineTypeJSON = + {"index":$scope.lineTypes[j].index, "value": $scope.lineTypes[j].value, "title": $scope.lineTypes[j].title}; + } + } + + } + //Converting string variables to numbers $scope.reportRunJson.commonChartOptions.rightMargin = Number($scope.reportRunJson.commonChartOptions.rightMargin); $scope.reportRunJson.commonChartOptions.topMargin = Number($scope.reportRunJson.commonChartOptions.topMargin); @@ -121,15 +184,24 @@ appDS2.controller('reportChartController', function ($scope, $rootScope, $timeou $scope.reportRunJson.commonChartOptions.leftMargin = Number($scope.reportRunJson.commonChartOptions.leftMargin); if ($scope.reportRunJson.categoryAxisJSON == "") { - console.log('Inside categoryAxisJSON value'); $scope.reportRunJson.categoryAxisJSON = {}; $scope.reportRunJson.categoryAxisJSON.value = -1; - console.log('$scope.reportRunJson.categoryAxisJSON',$scope.reportRunJson.categoryAxisJSON); } - console.log($scope.reportRunJson); $http.post("save_chart", JSON.stringify($scope.reportRunJson)).success(function(data, status) { - $scope.successSubmit=true; + $scope.successSubmit=true; + $scope.showLoader = false; + $scope.reportRunJson.commonChartOptions.animateAnimatedChart = $scope.reportRunJson.commonChartOptions.animateAnimatedChart+""; + $scope.reportRunJson.commonChartOptions.hideLegend = $scope.reportRunJson.commonChartOptions.hideLegend + ""; + $scope.reportRunJson.showTitle = $scope.reportRunJson.showTitle + ""; + if ($scope.reportRunJson.chartType == "BarChart3D") { + $scope.reportRunJson.barChartOptions.displayBarControls = $scope.reportRunJson.barChartOptions.displayBarControls+""; + $scope.reportRunJson.barChartOptions.minimizeXAxisTickers = $scope.reportRunJson.barChartOptions.minimizeXAxisTickers+""; + $scope.reportRunJson.barChartOptions.stackedChart = $scope.reportRunJson.barChartOptions.stackedChart+""; + $scope.reportRunJson.barChartOptions.timeAxis =$scope.reportRunJson.barChartOptions.timeAxis+""; + $scope.reportRunJson.barChartOptions.verticalOrientation = $scope.reportRunJson.barChartOptions.verticalOrientation +""; + $scope.reportRunJson.barChartOptions.xAxisDateType = $scope.reportRunJson.barChartOptions.xAxisDateType +""; + } }) } diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-reports/report-search-controller.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-reports/report-search-controller.js index 3fe5bde3..e1c5e1e8 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-reports/report-search-controller.js +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-reports/report-search-controller.js @@ -1,5 +1,6 @@ appDS2.requires.push('ui.grid'); appDS2.requires.push('ui.grid.pagination'); +appDS2.requires.push('ui.grid.resizeColumns'); appDS2.controller("reportSearchController", ['$scope','$rootScope','$http','$timeout','uiGridConstants','$modal','$q','$log','raptorReportFactory',function ($scope,$rootScope,$http,$timeout,uiGridConstants,$modal,$q,$log,raptorReportFactory) { $scope.getSearchData = function(){ diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-reports/report-step-controller.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-reports/report-step-controller.js index faa2c420..ab073799 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-reports/report-step-controller.js +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-reports/report-step-controller.js @@ -1,6 +1,5 @@ -appDS2.controller('reportStepController', function($scope,$http,$location, $routeParams, $q, $modal,$log,$window, raptorReportFactory, stepFormFactory, DOMHelper) { +appDS2.controller('reportStepController', function($scope,$http,$location, $routeParams, $q, $modal,$log,$window, raptorReportFactory, stepFormFactory) { - $scope.showLoader = true; // tabs for report wizard steps: $scope.activeTabsId = 'Definition'; @@ -743,19 +742,6 @@ appDS2.controller('reportStepController', function($scope,$http,$location, $rout break; } } - - var selectedTabPanelElement = document.getElementById($scope.gTabs[selectedTab].tabPanelId); - - var elem = null; - if (selectedTabPanelElement) { - elem = DOMHelper.firstTabableElement(selectedTabPanelElement); - } - - if (elem) { - $timeout(function () { - elem.focus(); - }, 100); - } } }); diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-chart-wizard.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-chart-wizard.html index 16676d24..3fae62f1 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-chart-wizard.html +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-chart-wizard.html @@ -20,31 +20,31 @@ table{

Report Chart Configuration

- +
+ +
+
- + - +
Chart TypeAnimate
- - -
@@ -108,12 +108,12 @@ table{ - - @@ -127,11 +127,11 @@ table{ - - - + + + - + @@ -144,16 +144,17 @@ table{ + @@ -208,7 +209,7 @@ table{

-
+

@@ -284,7 +285,7 @@ table{ -
+
@@ -337,9 +338,8 @@ table{
- -
- + {{reportRunJson.chartType}} +
@@ -380,13 +380,11 @@ table{
-
- +
-
@@ -414,7 +412,6 @@ table{ - @@ -488,73 +485,250 @@ table{
-
- - - -
-
Range AxisY AxisChart TitleRange AxisY AxisChart Title ColorLine TypeLine Type
- + - -
- - - - - - - - - - - - - -
Primary Axis LabelSecondary Axis Label
- - - -
- - - - - - - - - - - - - - -
Range Axis Minimum RangeMaximum Range
- - - -
-
-
+
+
+ + + + + + + + + + + + + + +
Primary Axis LabelSecondary Axis Label
+ + + +
+ + + + + + + + + + + + + + +
Range Axis Minimum RangeMaximum Range
+ + + +
+
+
+ + + + + + +
+
+
Bar Chart Options
+

+

+
+
+ +
+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + +
OrientationStackedShow ControlsXAxis Date TypeDisplay less XAxis tickers
+ + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + +
Is Time Axis?Log Scale (Y Axis)
+ + + + +
+
+
+ + + + + + + +
+
+
Time Series Chart Options
+

+

+
+
+ +
+
+ + +
+
+ + + + + + + + + + + + + + + + + + + +
Render asX Axis LabelX Axis TickersIs Time Axis?Multi Series
+ + + + + + + + + + +
+
+
+ @@ -606,7 +780,7 @@ table{ down 90° @@ -616,12 +790,12 @@ table{
@@ -717,3 +891,4 @@ table{
+ \ No newline at end of file diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-run.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-run.html index e5a04a1c..aaa1cac0 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-run.html +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-run.html @@ -81,7 +81,7 @@ body { - +
-- cgit 1.2.3-korg