diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.html b/client/cat3/src/partials/sections/dashboard/analytics/analytics.html index d36774c2c..26ade8722 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.html @@ -125,7 +125,7 @@ - +
diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js index 410b3c6ee..1a0485f26 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js @@ -128,7 +128,8 @@ $rootScope.$emit('HEADER_NAV_CHANGE', 'ANALYTICS'); $scope.selectedResources = []; analytic.viewByFilter='orgView'; - $scope.$watch(function() { return analytic.viewByFilter}, function(newVal) { + $scope.$watch(function() { + return analytic.viewByFilter}, function(newVal) { if(newVal === 'ProviderView'){ $rootScope.viewType='ProviderView'; if($state.params && $state.params.filterView){ @@ -152,7 +153,7 @@ $scope.getProviders(orgs[0].rowid); }); if (!$rootScope.stateParams.view) { - $state.go('dashboard.analytics.cost'); + $state.go('dashboard.analytics.capacityReport'); } analytic.tabShow=function(chat,report){ analytic.tabShowChat=chat; @@ -287,7 +288,7 @@ $rootScope.filterNewEnt.resources=$scope.selectedResources; }; if (!$rootScope.stateParams.view && $rootScope.organObject) { - $state.go('dashboard.analytics.cost'); + $state.go('dashboard.analytics.capacityReport'); } }]); })(angular); diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analyticsServices.js b/client/cat3/src/partials/sections/dashboard/analytics/analyticsServices.js index 75b9d1102..3e6b0e89b 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analyticsServices.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/analyticsServices.js @@ -18,10 +18,10 @@ month:months[new Date().getMonth()], day:moment(new Date()).format('YYYY-MM-DD') }; - $rootScope.filterNewEnt.date= $rootScope.filterNewEnt.endDate.month+' '+ $rootScope.filterNewEnt.endDate.year; + $rootScope.filterNewEnt.date= moment($rootScope.filterNewEnt.endDate.month+' 01 '+ $rootScope.filterNewEnt.endDate.year).format('YYYY-MM-DD'); }, applyFilter : function(filterApp,period){ - $rootScope.filterNewEnt.date= $rootScope.filterNewEnt.endDate.month+' '+ $rootScope.filterNewEnt.endDate.year; + $rootScope.filterNewEnt.date= moment($rootScope.filterNewEnt.endDate.month+' 01 '+ $rootScope.filterNewEnt.endDate.year).format('YYYY-MM-DD'); if($rootScope.organObject) { var obj = $rootScope.organObject, or = $rootScope.organNewEnt.org, @@ -36,7 +36,7 @@ console.log(moment(dt).add(wk, 'days').format('YYYY-MM-DD')); $rootScope.filterNewEnt.date=moment(dt).add(wk, 'days').format('YYYY-MM-DD'); } else { - $rootScope.filterNewEnt.date= $rootScope.filterNewEnt.endDate.month+' '+ $rootScope.filterNewEnt.endDate.year; + $rootScope.filterNewEnt.date=moment( $rootScope.filterNewEnt.endDate.month+' 01 '+ $rootScope.filterNewEnt.endDate.year).format('YYYY-MM-DD'); } $rootScope.filterNewEnt.period = period; } 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 46182647a..57dbfb6f7 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js @@ -93,7 +93,7 @@ }); }; $scope.chefConfig=function (id) { - var promise = genSevs.editRunlist(id); + genSevs.editRunlist(id); }; capRept.createList = function () { capRept.filterValue=''; @@ -106,8 +106,8 @@ capRept.listGrid[value].data=[]; capRept.listGrid[value].paginationPageSizes= [25, 50, 100]; capRept.listGrid[value].paginationPageSize=25; - $scope.colArray=['platformId','state','orgName','privateIpAddress','os']; - if(capRept.serviceType === 'EC2') { + $scope.colArray=['platformId','state','privateIpAddress','os']; + if(capRept.serviceType === 'EC2') { capRept.listGrid[value].columnDefs = [ {name: 'Instance Id', field: 'platformId', cellTooltip: true}, {name: 'os', enableFiltering: true, displayName: 'OS', field: 'os', cellTooltip: true}, @@ -118,7 +118,6 @@ field: 'region', cellTooltip: true }, - {name: 'orgName', displayName: 'Org Name', field: 'orgName', cellTooltip: true}, { name: 'cost', displayName: 'Cost', @@ -134,7 +133,7 @@ ]; } if(capRept.serviceType === 'RDS') { - $scope.colArray=['platformId','state','orgName','dbEngine'] + $scope.colArray=['platformId','state','dbEngine']; capRept.listGrid[value].columnDefs = [ {name: 'Instance', field: 'platformId', cellTooltip: true}, {name: 'dbEngine', enableFiltering: true, displayName: 'Engine', field: 'dbEngine', cellTooltip: true}, @@ -144,7 +143,6 @@ field: 'region', cellTooltip: true }, - {name: 'orgName', displayName: 'Org Name', field: 'orgName', cellTooltip: true}, { name: 'cost', displayName: 'Cost', @@ -165,7 +163,7 @@ {name: 'bucketName', field: 'bucketName', cellTooltip: true}, {name: 'bucketOwnerName', field: 'bucketOwnerName', cellTooltip: true}, {name: 'bucketSize', field: 'bucketSize', displayName:'Bucket Size (MB)', cellTooltip: true}, - {name: 'orgName', field: 'orgName', cellTooltip: true}, + {name: 'cost', displayName: 'Cost',cellTemplate: ''}, {name: 'Action', cellTooltip: true,cellTemplate:" "} ]; @@ -177,12 +175,16 @@ if(capRept.serviceType === 'EC2' && fltrObj && fltrObj.provider && fltrObj.provider.id) { if($rootScope.organNewEnt.instanceType === 'Managed') { - $scope.colArray.push('bgName'); - capRept.listGrid[value].columnDefs.splice(6,0,{name: 'bgName', displayName: 'Bg Name', field: 'bgName', cellTooltip: true}); + $scope.colArray.push('bgName','projectName','environmentName'); + capRept.listGrid[value].columnDefs.splice(5,0,{name: 'bgName', displayName: 'Bg Name', field: 'bgName', cellTooltip: true}); + capRept.listGrid[value].columnDefs.splice(6,0,{name: 'projectName', displayName: 'Project Name', field: 'projectName', cellTooltip: true}); + capRept.listGrid[value].columnDefs.splice(7,0,{name: 'environmentName', displayName: 'Env Name', field: 'environmentName', cellTooltip: true}); $scope.instanceType= 'managedInstances'; $scope.instanceType= 'managedInstances'; } else if($rootScope.organNewEnt.instanceType === 'Assigned'){ - $scope.colArray.push('bgName'); - capRept.listGrid[value].columnDefs.splice(6,0,{name: 'bgName', displayName: 'Bg Name', field: 'bgName', cellTooltip: true}); + $scope.colArray.push('bgName','projectName','environmentName'); + capRept.listGrid[value].columnDefs.splice(5,0,{name: 'bgName', displayName: 'Bg Name', field: 'bgName', cellTooltip: true}); + capRept.listGrid[value].columnDefs.splice(6,0,{name: 'projectName', displayName: 'Project Name', field: 'projectName', cellTooltip: true}); + capRept.listGrid[value].columnDefs.splice(7,0,{name: 'environmentName', displayName: 'Env Name', field: 'environmentName', cellTooltip: true}); $scope.instanceType= 'managedInstances'; $scope.instanceType= 'unmanagedInstances'; } else if($rootScope.organNewEnt.instanceType === 'Unassigned'){ $scope.instanceType= 'unassigned-instances'; @@ -222,12 +224,12 @@ } }); } else if(fltrObj && fltrObj.provider && fltrObj.provider.id){ - var param = { + var paramResources= { inlineLoader:true, url: '/resources?filterBy=providerDetails.id:'+fltrObj.provider.id+',resourceType:'+capRept.serviceType+',category:'+$rootScope.organNewEnt.instanceType.toLowerCase() // url:'src/partials/sections/dashboard/analytics/data/ins.json' }; - genSevs.promiseGet(param).then(function (instResult) { + genSevs.promiseGet(paramResources).then(function (instResult) { ///// capRept.listGrid[value].data = instResult.data; if(capRept.serviceType === 'RDS'){ @@ -265,7 +267,7 @@ //} }; - $scope.$watch('capRept.serviceType',function (newValue, oldValue) { + $scope.$watch('capRept.serviceType',function () { capRept.createList(); }); $scope.aggregateInstanceCost=function (cost) { @@ -363,11 +365,11 @@ var $yesterday = new Date($today); $yesterday.setDate($today.getDate() - 1); if(fltObj && fltObj.resources && fltObj.resources.length >0) { - var $today = new Date(); - var $yesterday = new Date($today); - $yesterday.setDate($today.getDate() - 1); + var $todayA = new Date(); + var $yesterdayA = new Date($todayA); + $yesterday.setDate($todayA.getDate() - 1); var param = { - url: '/analytics/trend/usage?resource=' + items._id + '&fromTimeStamp=' + $yesterday + '&toTimeStamp=' + $today + '&interval=3600' + url: '/analytics/trend/usage?resource=' + items._id + '&fromTimeStamp=' + $yesterdayA + '&toTimeStamp=' + $todayA + '&interval=3600' //url:'src/partials/sections/dashboard/analytics/data/usage.json' }; genSevs.promiseGet(param).then(function (result) { diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/costCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/costCtrl.js index 2b557cf21..67c471a30 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/costCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/costCtrl.js @@ -114,6 +114,7 @@ } // param.url='src/partials/sections/dashboard/analytics/data/cost.json'; + console.log(fltObj.date); param.url='/analytics/cost/aggregate?parentEntityId='+fltObj.org.id+'&entityId='+entityId+'&toTimeStamp='+new Date(fltObj.date)+'&period='+fltObj.period; } diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js index 6efa6442e..08b1295c2 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js @@ -37,10 +37,10 @@ }); }); // Bu - var param = { + var paramProviders = { url: '/providers/' + fltrObj.provider.id + '/tag-mappings/businessGroup' }; - genSevs.promiseGet(param).then(function (instResult) { + genSevs.promiseGet(paramProviders).then(function (instResult) { $scope.TagName.bgTag=instResult.tagName+'-bu'; $scope.TagName.bgFild='tags.'+instResult.tagName; angular.forEach(instResult.tagValues,function(val){ @@ -48,10 +48,10 @@ }); }); // project - var param = { + var paramP = { url: '/providers/' + fltrObj.provider.id + '/tag-mappings/project' }; - genSevs.promiseGet(param).then(function (instResult) { + genSevs.promiseGet(paramP).then(function (instResult) { $scope.TagName.projectTag=instResult.tagName+'-pr'; $scope.TagName.projFild='tags.'+instResult.tagName; angular.forEach(instResult.tagValues,function(val){ @@ -311,7 +311,7 @@ }, 1000); } }; - disResrc.importInstance =function ($event) { + disResrc.importInstance =function () { var modalInstance = $modal.open({ animation: true, templateUrl: 'src/partials/sections/dashboard/analytics/view/instanceManage.html', @@ -344,7 +344,7 @@ var treeNames = ['Cloud Management','Discovery','Resources']; $rootScope.$emit('treeNameUpdate', treeNames); var fltrObj=$rootScope.filterNewEnt; - $rootScope.applyFilter =function(filterApp,period){ + $rootScope.applyFilter =function(){ analyticsServices.applyFilter(true,null); disResrc.init(); }; @@ -457,7 +457,7 @@ }; } } - }).result.then(function(response) { + }).result.then(function() { }, function() { console.log("Dismiss at " + new Date()); }); diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoverySyncResultCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoverySyncResultCtrl.js index c4a32d2b3..f501ed90d 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoverySyncResultCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoverySyncResultCtrl.js @@ -27,8 +27,8 @@ } else { if (data.statusList && data.statusList.length) { $scope.progressValue = data.statusList.length; - for (var i = 0; i < data.statusList.length; i++) { - $scope.statusMessage = data.statusList[i].status.message; + for (var ii = 0; ii < data.statusList.length; ii++) { + $scope.statusMessage = data.statusList[ii].status.message; $scope.isInstanceImporting = false; } } diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js index e30c2d0f2..c4b8bd920 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js @@ -92,7 +92,7 @@ toastr.success('Successfully updated.','Update'); }); }; - $rootScope.applyFilter =function(filterApp,period){ + $rootScope.applyFilter =function(){ analyticsServices.applyFilter(true,null); disTgMap.getTagMapping(); }; diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.html b/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.html index d1c5e54bc..1a9f1bd14 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.html @@ -82,24 +82,25 @@ ANALYTICS
    -
  • +
  • - - Cost - + + Capacity +
    • -
  • +
  • - - Capacity - + + Cost +
    • +