diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js index 1a0485f26..59beeae48 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js @@ -153,7 +153,7 @@ $scope.getProviders(orgs[0].rowid); }); if (!$rootScope.stateParams.view) { - $state.go('dashboard.analytics.capacityReport'); + $state.go('dashboard.analytics.cost'); } analytic.tabShow=function(chat,report){ analytic.tabShowChat=chat; @@ -288,7 +288,7 @@ $rootScope.filterNewEnt.resources=$scope.selectedResources; }; if (!$rootScope.stateParams.view && $rootScope.organObject) { - $state.go('dashboard.analytics.capacityReport'); + $state.go('dashboard.analytics.cost'); } }]); })(angular); diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js index 57dbfb6f7..166d3404e 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js @@ -37,19 +37,6 @@ capRept.serviceCapacity=result.capacity.AWS; //capRept.serviceType=Object.keys(capRept.serviceCapacity.services)[0]; capRept.serviceType='EC2'; - if(result.splitUpCapacities && Object.keys(result.splitUpCapacities).length >0) { - angular.forEach(result.splitUpCapacities, function (val, key) { - var a=key.replace(/([A-Z])/g, ' $1').replace(/^./, function(str) { - return str.toUpperCase(); - }); - $rootScope.splitUpCapacities.push({id:key,val:a}); - }); - if( $rootScope.splitUpCapacities && $rootScope.splitUpCapacities.length >0) { - $scope.$emit('CHANGE_splitUp', $rootScope.splitUpCapacities[0].id); - capRept.splitUp = $rootScope.splitUpCapacities[0].val; - capRept.createLable(result, $rootScope.splitUpCapacities[0].id); - } - } capRept.createList(); }); @@ -172,7 +159,6 @@ gridApi.grid.registerRowsProcessor($scope.singleFilter, 200); $scope.gridApi = gridApi; }; - if(capRept.serviceType === 'EC2' && fltrObj && fltrObj.provider && fltrObj.provider.id) { if($rootScope.organNewEnt.instanceType === 'Managed') { $scope.colArray.push('bgName','projectName','environmentName');