diff options
author | st782s <statta@research.att.com> | 2017-05-24 10:20:53 -0400 |
---|---|---|
committer | st782s <statta@research.att.com> | 2017-05-24 10:22:16 -0400 |
commit | 34f706fedc5536caf2a218dbcd809991a1b484dd (patch) | |
tree | ceabff4d5e7ec89ed866ce1451366479cb0bd426 /ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts | |
parent | c081bd0a7db3f434e76c03a9ca0334539ee84470 (diff) |
[PORTAL-10] Enhancing Drill Down
Changes have been made to improve the stability of Drill down
capabilities.
Change-Id: I6d4831b69f19f9b33cf43b65acc6dd7c5deebb67
Signed-off-by: st782s <statta@research.att.com>
Diffstat (limited to 'ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts')
10 files changed, 124 insertions, 118 deletions
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 806b1bc2..80e1a269 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 @@ -345,7 +345,7 @@ appDS2.controller('reportChartController', function ($scope, $rootScope, $timeou }); -app.directive('onlyDigits', function () { +appDS2.directive('onlyDigits', function () { return { restrict: 'A', @@ -362,7 +362,7 @@ app.directive('onlyDigits', function () { }; }); -app.directive('onlyCharacters', function () { +appDS2.directive('onlyCharacters', function () { return { restrict: 'A', require: '?ngModel', diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-reports/report-run-controller.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-reports/report-run-controller.js index 760ff6d3..6eb0afe6 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-reports/report-run-controller.js +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-reports/report-run-controller.js @@ -52,12 +52,15 @@ appDS2.controller("reportRunController", ['$scope','$rootScope','$routeParams',' + $scope.backToParentReport = function (){ + $window.location.href = "report#/report_run/"+$scope.parentReportUrlParams + } $scope.urlParams = parseQueryString($scope.currentReportUrlParams); - $scope.reportChartURL = 'report#/report_chart_wizard/'+$scope.urlParams.c_master; + $scope.reportChartURL = 'report#/report_chart/'+$scope.urlParams.c_master; - $scope.reportEditURL = 'report_wizard.htm?action=report.edit&c_master='+$scope.urlParams.c_master; + $scope.reportEditURL = 'report#/report_wizard/'+$scope.urlParams.c_master; $http.get('raptor.htm?action=report.run.container&'+$scope.currentReportUrlParams).then( 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 f1e82fa5..faa2c420 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 @@ -408,8 +408,8 @@ appDS2.controller('reportStepController', function($scope,$http,$location, $rout "displayHeaderAlignment" : ($scope.selectedDisplayHeaderAlignment.value=="null")?null:$scope.selectedDisplayHeaderAlignment.value, "sortable" : ($scope.sortable.value=="true"), "visible" : ($scope.visible.value=="true"), - "drilldownURL" : drilldownURL, - "drilldownParams" : "", + "drilldownURL" : raptorReportFactory.drillDownURL, + "drilldownParams" : raptorReportFactory.drillDownParams, "drilldownType" : "" } raptorReportFactory.saveColumnEditInfo(colInfo).then(function(data){ @@ -600,26 +600,46 @@ appDS2.controller('reportStepController', function($scope,$http,$location, $rout }); }; - $scope.openDrillDownReportPopup = function (reportId) { + $scope.openDrillDownReportPopup = function (reportId,parentReportId) { var modalInstance = $modal.open({ scope: $scope, animation: $scope.animationsEnabled, templateUrl: 'app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-drilldown-edit.html', sizeClass: 'modal-large', controller: ['$scope', '$modalInstance', '$http', '$log','raptorReportFactory','reportId', function ($scope, $modalInstance, $http, $log, raptorReportFactory, reportId) { + + $scope.drillDownOptionList =[]; $scope.selectedvalueradioGroup = {"name":""}; $scope.selectedChildReportFormField = {"value":""}; $scope.selectedChildReportColumn = {"value":""}; $scope.fixedValue = {"value":""}; $scope.suppressValues = {"value":""}; - raptorReportFactory.getChildReportFormField(reportId).then(function(data){ - $scope.childReportFF =data; + raptorReportFactory.getChildReportFormField(reportId).then(function(data){ + for (var i=0;i<data.length;i++) { + $scope.drillDownOptionList.push( + { + "name": data[i].name, + "id": data[i].id, + "selectedvalueradioGroup":{"name":""}, + "selectedChildReportFormField":{"value":""}, + "selectedChildReportColumn":{"value":""}, + "fixedValue":{"value":""}, + "suppressValues":{"value":""} + } + ) + } },function(error){ $log.error("raptorReportFactory: getChildReportFormField failed."); }); - raptorReportFactory.getChildReportColumn(reportId).then(function(data){ + raptorReportFactory.getChildReportFormField(parentReportId).then(function(data){ + $scope.childReportFF =data; + },function(error){ + $log.error("raptorReportFactory: getChildReportFormField failed."); + }); + + raptorReportFactory.getChildReportColumn(parentReportId).then(function(data){ $scope.childReportCol =data; },function(error){ $log.error("raptorReportFactory: getChildReportFormField failed."); @@ -628,19 +648,10 @@ appDS2.controller('reportStepController', function($scope,$http,$location, $rout raptorReportFactory.setDrillDownPopupOptions(null); $scope.complete = function() { -// if ($scope.selectedvalueradioGroup.name=="radiovalue1") { -// console.log("radio 1 selected"); -// } else if ($scope.selectedvalueradioGroup.name=="radiovalue2") { -// console.log("radio 2 selected"); -// } else if ($scope.selectedvalueradioGroup.name=="radiovalue3") { -// console.log("radio 3 selected"); -// } else if ($scope.selectedvalueradioGroup.name=="radiovalue4") { -// console.log("radio 4 selected"); -// } else if ($scope.selectedvalueradioGroup.name=="radiovalue5") { -// console.log("radio 5 selected"); -// } else { -// console.log("None selected"); -// } + + console.log("$scope.drillDownOptionList: "); + console.log($scope.drillDownOptionList); + var drillDownPopupOptions= { radioGroup : $scope.selectedvalueradioGroup.name, @@ -649,8 +660,23 @@ appDS2.controller('reportStepController', function($scope,$http,$location, $rout fixedValue: $scope.fixedValue.value, suppressValues: $scope.suppressValues.value } - raptorReportFactory.setDrillDownPopupOptions(drillDownPopupOptions); - console.log(raptorReportFactory.drillDownPopupOptions); + var drillDownParams = ""; + var ampStr =""; + for (var i=0;i<$scope.drillDownOptionList.length; i++) { + if (drillDownParams!="") { + ampStr = "&"; + } + if ($scope.drillDownOptionList[i].selectedvalueradioGroup.name=="fixedValue"){ + drillDownParams = drillDownParams + ampStr + $scope.drillDownOptionList[i].id + "="+$scope.drillDownOptionList[i].fixedValue.value; + } else if ($scope.drillDownOptionList[i].selectedvalueradioGroup.name=="reportFF"){ + drillDownParams = drillDownParams + ampStr + $scope.drillDownOptionList[i].id + "=[!"+$scope.drillDownOptionList[i].selectedChildReportFormField.value + "]"; + } else if ($scope.drillDownOptionList[i].selectedvalueradioGroup.name=="reportCol"){ + drillDownParams = drillDownParams + ampStr + $scope.drillDownOptionList[i].id + "=["+$scope.drillDownOptionList[i].selectedChildReportColumn.value + "]"; + } + } + raptorReportFactory.setDrillDownPopupOptions(reportId,drillDownParams); + console.log(raptorReportFactory.drillDownURL); + console.log(raptorReportFactory.drillDownParams); $modalInstance.close(); }; @@ -970,8 +996,10 @@ appDS2.controller('reportStepController', function($scope,$http,$location, $rout }); $scope.$on('openDrillDownpage', function(event, reportId) { + console.log("$scope.reportId"); + console.log($scope.reportId); if (reportId!="") { - $scope.openDrillDownReportPopup(reportId); + $scope.openDrillDownReportPopup(reportId,$scope.reportId); } }); diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-directives/ds2Header.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-directives/ds2Header.js index 7dcbdbe8..088fa487 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-directives/ds2Header.js +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-directives/ds2Header.js @@ -88,7 +88,7 @@ appDS2.directive('ds2Header', function () { $scope.adjustHeader=function() { $scope.showHeader = ($cookies.get("show_app_header") == undefined ? true : $cookies.get("show_app_header")); - console.log($scope.showHeader); + // console.log($scope.showHeader); if ($scope.showHeader==true) { document.getElementById('page-content').style.marginTop = "45px"; }else{ diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-services/ds2-raptor-report/raptorReportFactory.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-services/ds2-raptor-report/raptorReportFactory.js index 65e05fbd..b0aafdbf 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-services/ds2-raptor-report/raptorReportFactory.js +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-services/ds2-raptor-report/raptorReportFactory.js @@ -376,8 +376,9 @@ appDS2.factory('raptorReportFactory', function($http, $q) { return $q.reject("raptorReportFactory: getSearchDataAtPage callback failed"); }); }, - setDrillDownPopupOptions: function(drillDownPopupOptions) { - this.drillDownPopupOptions = drillDownPopupOptions; + setDrillDownPopupOptions: function(drillDownURL,drillDownParams) { + this.drillDownURL = drillDownURL; + this.drillDownParams = drillDownParams; }, getReportDeleteStatus : function(deleteUrl) { return $http.get(deleteUrl).then(function(response) { diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/b2b-leftnav-ext.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/b2b-leftnav-ext.html index fad0e041..5337fd24 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/b2b-leftnav-ext.html +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/b2b-leftnav-ext.html @@ -1,43 +1,50 @@ -<div class="b2b-nav-menu" id="left-menu-main-div" ng-class="leftMenuClass"> +<div class="b2b-nav-menu" id="left-menu-main-div" + ng-class="leftMenuClass"> <div class="b2b-subnav-container" id="left-menu-subnav-container"> <ul class="b2b-subnav-content" id="left-menu-subnav-content"> <li id="b2b-subnav-content-li"> <div ng-class="leftMenuArrowClass" id="left-menu-arrow-toggle-div"> - <a ng-click="toggleDrawer(showmenu);" class="text-right" id="left-menu-arrow-toggle-anchor"> - <i ng-class="{true: 'icon-controls-left', false: 'icon-controls-right'}[showmenu]" id="left-menuf-arrow-toggle-icon"> </i> + <a ng-click="toggleDrawer(showmenu);" class="text-right" + id="left-menu-arrow-toggle-anchor"> <i + ng-class="{true: 'icon-controls-left', false: 'icon-controls-right'}[showmenu]" + id="left-menuf-arrow-toggle-icon"> </i> </a> </div> </li> - <li ng-repeat="menu in menuData" ng-click="toggleNav($index,menu.href,showmenu)" id="left-menu-li-{{menu.name.split(' ').join('-')}}"> - <span ng-class="{true: 'menu-icon', false: 'menu-icon-collapse'}[showmenu]" id="left-menu-span-{{menu.name.split(' ').join('-')}}"> - <span class="{{menu.imageSrc}}" id="icon-image-{{menu.name.split(' ').join('-')}}"></span> - </span> - <a ng-class="{expand: isOpen($index)}" - id="parent-item-{{menu.name.split(' ').join('-')}}" - ng-if="showmenu" - aria-label="{{menu.name}}" title="{{menu.name}}" - aria-expanded="{{(idx==$index)?true:false;}}" - href="javascript:void(0);"> - {{menu.name}} - <i aria-hidden="true" - ng-if="(menu.menuItems.length > 0)" - class="b2b-icon-primary-plus-minus" - ng-class="idx==$index ? 'icon-primary-expanded' : 'icon-primary-collapsed'"></i> - </a> - <div role="region" aria-hidden="{{(isOpen($index))?false:true;}}" id="left-menu-child-div-{{menu.name.split(' ').join('-')}}"> - <ul ng-class="{expand: idx==$index}" id="left-menu-child-ul-{{menu.name.split(' ').join('-')}}"> - <li ng-repeat="menuItem in menu.menuItems" - ng-click="liveLink($event, $index, $parent.$index)" - id="left-menu-child-li-{{menuItem.name.split(' ').join('-')}}-{{menu.name.split(' ').join('-')}}"> - <a aria-hidden="{{!(idx==$parent.$index)}}" - aria-label="{{menuItem.name}}" title="{{menuItem.name}}" - id="child-item-{{menuItem.name.split(' ').join('-')}}" - href="{{menuItem.href}}" tabindex="{{(idx==$parent.$index)?0:-1;}}" - ng-class="{active: itemIdx==$index && navIdx==$parent.$index}">{{menuItem.name}}</a> - </li> - </ul> - </div> - </li> + <li ng-repeat="menu in menuData" + ng-click="toggleNav($index,menu.href,showmenu)" + id="left-menu-li-{{menu.name.split(' ').join('-')}}"><span + ng-class="{true: 'menu-icon', false: 'menu-icon-collapse'}[showmenu]" + id="left-menu-span-{{menu.name.split(' ').join('-')}}"> <span + class="{{menu.imageSrc}}" + id="icon-image-{{menu.name.split(' ').join('-')}}"></span> + </span> <a ng-class="{expand: isOpen($index)}" + id="parent-item-{{menu.name.split(' ').join('-')}}" ng-if="showmenu" + aria-label="{{menu.name}}" title="{{menu.name}}" + aria-expanded="{{(idx==$index)?true:false;}}" + href="javascript:void(0);"> {{menu.name}} <i aria-hidden="true" + ng-if="(menu.menuItems.length > 0)" + class="b2b-icon-primary-plus-minus" + ng-class="idx==$index ? 'icon-primary-expanded' : 'icon-primary-collapsed'"></i> + </a> + <div role="region" aria-hidden="{{(isOpen($index))?false:true;}}" + id="left-menu-child-div-{{menu.name.split(' ').join('-')}}"> + <div class="left-menu-child"> + <ul ng-class="{expand: idx==$index}" + id="left-menu-child-ul-{{menu.name.split(' ').join('-')}}"> + <li ng-repeat="menuItem in menu.menuItems" + ng-click="liveLink($event, $index, $parent.$index)" + id="left-menu-child-li-{{menuItem.name.split(' ').join('-')}}-{{menu.name.split(' ').join('-')}}"> + <a aria-hidden="{{!(idx==$parent.$index)}}" + aria-label="{{menuItem.name}}" title="{{menuItem.name}}" + id="child-item-{{menuItem.name.split(' ').join('-')}}" + href="{{menuItem.href}}" + tabindex="{{(idx==$parent.$index)?0:-1;}}" + ng-class="{active: itemIdx==$index && navIdx==$parent.$index}">{{menuItem.name}}</a> + </li> + </ul> + </div> + </div></li> </ul> </div> </div>
\ No newline at end of file diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/admin-menu-edit.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/admin-menu-edit.html index 69fd324b..913b10ed 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/admin-menu-edit.html +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/admin-menu-edit.html @@ -3,7 +3,7 @@ <h1 class="heading-page" id="AdminMenuItems">Admin Menu Items</h1> </div> <div> - <button type="submit" ng-click="addNewFnMenuItemModalPopup();" class="btn btn-alt btn-small">Add Menu Item</button> + <button type="submit" ng-click="addNewFnMenuItemModalPopup();" class="btn btn-alt btn-small" style="position: initial;">Add Menu Item</button> </div> <h3 class="heading-small"> diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-col-edit.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-col-edit.html index 097d1795..e74f89a8 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-col-edit.html +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-col-edit.html @@ -20,6 +20,11 @@ #columnEditTable .selectWrap{ width:220px; } + + +#drilldownOption .selectWrap{ + width:450px; +} </style> <div style="height: 700px;"> @@ -101,7 +106,7 @@ <tr> <td class="colTableLeftColumn" style="width:350px;">Drill-down Link:</td> - <td> + <td id="drilldownOption"> <select name="drillDown" b2b-dropdown ng-model="selectedDrillDownReport.value" placeholder-text="Select"> <option b2b-dropdown-list option-repeat="d in drilldownReports" value="{{d.id}}">{{d.name}}</option> </select> diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-drilldown-edit.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-drilldown-edit.html index ec2134bf..6b98ac78 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-drilldown-edit.html +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-drilldown-edit.html @@ -33,57 +33,42 @@ <div class="b2b-modal-body ng-scope ng-isolate-scope in" style="margin-bottom: -50px;"> <form name="workflowForm" class="css-form" novalidate> - <div id="columnEditTable"> + <div id="columnEditTable" ng-repeat="drillDownOption in drillDownOptionList"> <table class="striped"> <tbody> - <fieldset role="radiogroup" radio-group-accessibility> - <tr ng-show="childReportFF.length>0"> + <tr ng-show="childReportFF.length>0||childReportCol.length>0"> <td colspan="2"> - <h2>User</h2> + <h2>{{drillDownOption.name}}</h2> </td> </tr> - <tr ng-show="childReportFF.length>0"> - <td> - <div class="form-row" role="radio" style="margin-top:0px;"> - <label for="optionsRadios1111" class="radio"> - <input type="radio" ng-model="selectedvalueradioGroup.name" id="optionsRadios1111" name="optionsRadio11" value="noValue" required> - <i class="skin"></i> - <span>No Value</span> - </label> - </div> - </td> - <td style="margin-top:10px;"> - <p>Accept Default</p> - </td> - </tr> - <tr ng-show="childReportFF.length>0"> + <tr ng-show="childReportFF.length>0||childReportCol.length>0"> <td> <div class="form-row" role="radio" style="margin-top:0px;"> - <label for="optionsRadios2222" class="radio"> - <input type="radio" ng-model="selectedvalueradioGroup.name" id="optionsRadios2222" name="optionsRadio11" value="fixedValue"> + <label for="optionsRadios2{{$index}}" class="radio"> + <input type="radio" ng-model="drillDownOption.selectedvalueradioGroup.name" id="optionsRadios2{{$index}}" name="optionsRadio2{{$index}}" value="fixedValue"> <i class="skin"></i> <span>Fixed Value</span> </label> </div> </td> - <td><input type="text" name="defaultValue" ng-model="fixedValue.value" class="colTableInput"></td> + <td><input type="text" name="defaultValue" ng-model="drillDownOption.fixedValue.value" class="colTableInput"></td> </tr> - <tr ng-show="childReportFF.length>0"> + <tr ng-show="childReportCol.length>0"> <td> <div class="form-row" role="radio" style="margin-top:0px;"> - <label for="optionsRadios333333" class="radio"> - <input type="radio" ng-model="selectedvalueradioGroup.name" id="optionsRadios333333" name="optionsRadio11" value="reportCol"> + <label for="optionsRadios3{{$index}}" class="radio"> + <input type="radio" ng-model="drillDownOption.selectedvalueradioGroup.name" id="optionsRadios3{{$index}}" name="optionsRadio3{{$index}}" value="reportCol"> <i class="skin"></i> <span>Value of Column</span> </div> </td> <td> - <select name="childReportColumn" b2b-dropdown ng-model="selectedChildReportColumn.value" placeholder-text="Select"> + <select name="childReportColumn" b2b-dropdown ng-model="drillDownOption.selectedChildReportColumn.value" placeholder-text="Select"> <option b2b-dropdown-list option-repeat="d in childReportCol" value="{{d.id}}">{{d.name}}</option> </select> </td> @@ -93,46 +78,23 @@ <tr ng-show="childReportFF.length>0"> <td> <div class="form-row" role="radio" style="margin-top:0px;"> - <label for="optionsRadios444444" class="radio"> - <input type="radio" ng-model="selectedvalueradioGroup.name" id="optionsRadios444444" name="optionsRadio11" value="reportFF"> + <label for="optionsRadios4{{$index}}" class="radio"> + <input type="radio" ng-model="drillDownOption.selectedvalueradioGroup.name" id="optionsRadios4{{$index}}" name="optionsRadio4{{$index}}" value="reportFF"> <i class="skin"></i> <span>Value of Form Field</span> </div> </td> <td> - <select name="childReportFormField" b2b-dropdown ng-model="selectedChildReportFormField.value" placeholder-text="Select"> + <select name="childReportFormField" b2b-dropdown ng-model="drillDownOption.selectedChildReportFormField.value" placeholder-text="Select"> <option b2b-dropdown-list option-repeat="d in childReportFF" value="{{d.id}}">{{d.name}}</option> </select> </td> </tr> - <tr ng-show="childReportFF.length>0"> - <td> - <div class="form-row" role="radio" style="margin-top:0px;"> - <label for="optionsRadios5555" class="radio"> - <input type="radio" ng-model="selectedvalueradioGroup.name" id="optionsRadios5555" name="optionsRadio11" value="valueSet" required> - <i class="skin"></i> - <span>Value Set</span> - </label> - </div> - </td> - <td style="margin-top:10px;"> - <p>Pass the value of the selected column if not empty, otherwise pass the value of the selected form field</p> - </td> - </tr> + </fieldset> - <tr> - <td colspan="2"> - <h2>Parameter values not to be passed to the drill-down report</h2> - </td> - </tr> - - <tr> - <td class="colTableLeftColumn">Suppress Values</td> - <td><input type="text" name="suppressValue" ng-model="suppressValues.value" class="colTableInput"></td> - </tr> </tbody> </table> 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 70b24925..e5a04a1c 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 @@ -80,7 +80,7 @@ body { <br><br> <button type="submit" style="width: 90px; height:35px;margin-top:20px; margin-left:5px;" class="btn btn-alt btn-small" ng-click="runReport()">Run</button> </form> - <a type="submit" ng-show="showBackButton" style="margin: 10px" ng-href="report.htm#/report_run/{{parentReportUrlParams}}" att-button btn-type="primary" size="small" title='Back'>Back</a> + <button type="submit" ng-show="showBackButton" style="width: 90px; height:35px;margin-top:20px; margin-left:5px;" class="btn btn-alt btn-small" ng-click="backToParentReport()">Back</button> <iframe id="chartiframe" ng-show="showChart" width="100%" height="450px" style="border: none" scrolling="no"></iframe> <div id="errorDiv"></div> <div ng-if="showGrid"> |