Skip to content

Analytic filter #771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 29, 2016
Merged

Analytic filter #771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ca23d9e
Merge remote-tracking branch 'upstream/topic-cloud-analytics' into an…
Sep 27, 2016
710a9b6
Merge remote-tracking branch 'upstream/topic-cloud-analytics' into an…
Sep 28, 2016
6cd5895
Merge remote-tracking branch 'upstream/topic-cloud-analytics' into an…
Sep 28, 2016
6ae40ff
Chinged filter and filter event
Sep 28, 2016
d29a140
Changed done for split up
Sep 28, 2016
6ce34da
Changed done for split up
Sep 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions client/cat3/src/partials/sections/dashboard/analytics/analytics.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@
</div>
</div>
<div class="col-lg-12 col-md-12 marginbottom5">
<button type="button" class="btn btn-primary" ng-click="analytic.applyFilter(true,filterNewEnt.period);isOpenSidebar=false;"><i class="fa fa-filter fa-2 white" aria-hidden="true"></i>&nbsp;Apply</button>
<button type="button" class="btn btn-default" ng-click="analytic.applyFilter(false,filterNewEnt.period);isOpenSidebar=false;"><i class="fa fa-times fa-2" aria-hidden="true"></i>&nbsp;Clear</button>
<button type="button" class="btn btn-primary" ng-click="applyFilter(true,filterNewEnt.period);isOpenSidebar=false;"><i class="fa fa-filter fa-2 white" aria-hidden="true"></i>&nbsp;Apply</button>
<button type="button" class="btn btn-default" ng-click="applyFilter(false,filterNewEnt.period);isOpenSidebar=false;"><i class="fa fa-times fa-2" aria-hidden="true"></i>&nbsp;Clear</button>
</div>
</fieldset>
</form>
Expand Down
56 changes: 8 additions & 48 deletions client/cat3/src/partials/sections/dashboard/analytics/analytics.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
}
})
}])
.controller('analyticsCtrl',['$scope', '$rootScope','$state','genericServices', 'workzoneServices', 'toastr', function ($scope, $rootScope, $state, genericServices, workzoneServices, toastr) {
.controller('analyticsCtrl',['$scope', '$rootScope','$state','genericServices','analyticsServices', 'workzoneServices', 'toastr', function ($scope, $rootScope, $state, genericServices,analyticsServices, workzoneServices, toastr) {
var analytic = this;
var splitUp=null;
analytic.tabShowChat=true;
Expand All @@ -68,14 +68,10 @@
$rootScope.isOpenSidebar = false;
$rootScope.dashboardChild = 'analytics';
$rootScope.stateItems = $state.params;
analyticsServices.initFilter();
var treeNames = ['Analytics'];
//$rootScope.$emit('treeNameUpdate', treeNames);
$rootScope.$emit('HEADER_NAV_CHANGE', 'ANALYTICS');
$rootScope.organNewEnt=[];
$rootScope.filterNewEnt={};
$rootScope.organNewEnt.org = '0';
$rootScope.filterNewEnt.period='month';
$rootScope.splitUpCosts=[];
$scope.selectedResources = [];
analytic.viewByFilter='orgView';
$scope.$watch(function() { return analytic.viewByFilter}, function(newVal, oldVal) {
Expand All @@ -96,48 +92,11 @@
$scope.$broadcast('CHANGE_VIEW',newVal);
}, true);
analytic.applyCount=0
analytic.applyFilter = function(filterApp,period){
$rootScope.filterApply= new Date();
var obj=$rootScope.organObject,
or=$rootScope.organNewEnt.org,
bu=$rootScope.organNewEnt.buss,
pr=$rootScope.organNewEnt.proj;
if(period)
$rootScope.filterNewEnt.period=period;

if(or){
$rootScope.filterNewEnt.org={name:obj[or].name,id:obj[or].rowid,title:'Org'};
$rootScope.filterNewEnt.provider='';
}
if(filterApp){
if(bu){
$rootScope.filterNewEnt.buss = {name:obj[or].businessGroups[bu].name,id:obj[or].businessGroups[bu].rowid,title:'BU'};
}
if(pr){
$rootScope.filterNewEnt.proj = {name:obj[or].businessGroups[bu].projects[pr].name,id:obj[or].businessGroups[bu].projects[pr].rowid,title:'Project'};
}

if($rootScope.organNewEnt.provider){
$rootScope.filterNewEnt.provider={name:$scope.providers[$rootScope.organNewEnt.provider].providerName,id:$scope.providers[$rootScope.organNewEnt.provider]._id,title:'Provider'};
} else{
$rootScope.filterNewEnt.provider='';
}
} else{
$rootScope.organNewEnt={}
$rootScope.organNewEnt.org=or;
analytic.viewByFilter='orgView';
analytic.splitUp=$rootScope.splitUpCosts[0];
}
};
//get organisation
genericServices.getTreeNew().then(function (orgs) {
$rootScope.organObject = orgs;
analytic.applyFilter(true);
});
$rootScope.organNewEnt=[];
$rootScope.organNewEnt.org = '0';
//$rootScope.organNewEnt.buss='0';
//$rootScope.organNewEnt.proj='0';
if (!$rootScope.stateParams.view) {
$state.go('dashboard.analytics.cost');
}
Expand All @@ -151,7 +110,6 @@
analytic.tabShowChat=chat;
analytic.tabShowReport=report;
};

analytic.hideTreeOverlay();
$scope.getAllRegionsList = function() {
workzoneServices.getAllRegionsList().then(function(response) {
Expand All @@ -162,6 +120,7 @@
};
$scope.getProviders = function() {
workzoneServices.getProviders().then(function(response) {
$rootScope.providers=response.data;
$scope.providers = response.data;
$scope.filter = [];
$scope.filter.providerId = response.data[0]._id;
Expand Down Expand Up @@ -196,9 +155,7 @@
$scope.providerLoading = false;
});
};
if (!$rootScope.stateItems.view) {
$state.go('dashboard.analytics.cost');
}

$scope.getAllRegionsList();
$scope.getProviders();
$scope.fnProviderChange = function() {
Expand Down Expand Up @@ -244,5 +201,8 @@
}
}
};
if (!$rootScope.stateParams.view) {
$state.go('dashboard.analytics.cost');
}
}]);
})(angular);
})(angular);
2 changes: 1 addition & 1 deletion client/cat3/src/partials/sections/dashboard/analytics/analytics.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,6 @@
}

.selected {
background: #ddd;
background: #E49C25;
}
}
53 changes: 52 additions & 1 deletion client/cat3/src/partials/sections/dashboard/analytics/analyticsServices.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,60 @@
(function (angular) {
"use strict";
angular.module('apis.analytics',[])
.factory('analyticsServices',[ function () {
.factory('analyticsServices',['$rootScope', function ($rootScope) {
return {
initFilter:function(){
$rootScope.organNewEnt=[];
$rootScope.filterNewEnt={};
$rootScope.organNewEnt.org = '0';
$rootScope.filterNewEnt.period='month';
$rootScope.splitUpCosts=[];
},
applyFilter : function(filterApp,period){
if($rootScope.organObject) {
var obj = $rootScope.organObject,
or = $rootScope.organNewEnt.org,
bu = $rootScope.organNewEnt.buss,
pr = $rootScope.organNewEnt.proj;
if (period)
$rootScope.filterNewEnt.period = period;

if (or) {
$rootScope.filterNewEnt.org = {name: obj[or].name, id: obj[or].rowid, title: 'Org'};
$rootScope.filterNewEnt.provider = '';
}
if (filterApp) {
if (bu) {
$rootScope.filterNewEnt.buss = {
name: obj[or].businessGroups[bu].name,
id: obj[or].businessGroups[bu].rowid,
title: 'BU'
};
}
if (pr) {
$rootScope.filterNewEnt.proj = {
name: obj[or].businessGroups[bu].projects[pr].name,
id: obj[or].businessGroups[bu].projects[pr].rowid,
title: 'Project'
};
}

if ($rootScope.organNewEnt.provider) {
$rootScope.filterNewEnt.provider = {
name: $rootScope.providers[$rootScope.organNewEnt.provider].providerName,
id: $rootScope.providers[$rootScope.organNewEnt.provider]._id,
title: 'Provider'
};
} else {
$rootScope.filterNewEnt.provider = '';
}
} else {
$rootScope.organNewEnt = {}
$rootScope.organNewEnt.org = or;
}
}

}
};
}]);
})(angular);
98 changes: 49 additions & 49 deletions client/cat3/src/partials/sections/dashboard/analytics/controller/costCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,13 @@
angular.module('dashboard.analytics')
.controller('costCtrl', ['$scope', '$rootScope', '$state','analyticsServices', 'genericServices', function ($scope,$rootScope,$state,analyticsServices,genSevs){
$rootScope.stateItems = $state.params;
//analyticsServices.initFilter();
// var treeNames = ['Analytics','Cost'];
// $rootScope.$emit('treeNameUpdate', treeNames);
analyticsServices.initFilter();
var costObj =this;
costObj.chartData=[];
costObj.splitUp=null;
costObj.pieChat={
option:{},
totalCoust:'',
Expand Down Expand Up @@ -71,8 +74,9 @@
showControls: true,
showValues: true,
xAxis: {
axisLabel: 'label',
showMaxMin: false
axisLabel: '',
showMaxMin: false,
staggerLabels:false
},
yAxis: {
tickFormat: function (d) {
Expand Down Expand Up @@ -123,6 +127,7 @@
$rootScope.splitUpCosts.push({id:key,val:a});
});
$scope.$emit('CHANGE_splitUp', $rootScope.splitUpCosts[0].id);
costObj.splitUp= $rootScope.splitUpCosts[0].val;
costObj.createLable(result, $rootScope.splitUpCosts[0].id);
} else {
costObj.createLable(result,'provider');
Expand All @@ -137,7 +142,6 @@
{name: 'totalCost', field: 'cost.totalCost'}
];
costObj.pieChat.totalCoust = result.cost.totalCost;
costObj.serviceCosts = result.cost.AWS.serviceCosts;
costObj.pieChat.data = [];
costObj.barChat.data = [];
// create bar
Expand All @@ -149,50 +153,34 @@
value: value.cost.totalCost
});
});

angular.forEach(result.cost.AWS.serviceCosts, function (valueChild, keyChild) {
var va = [];
costObj.costGridOptions.columnDefs.push({
name: keyChild,
field: 'cost.AWS.serviceCosts.' + keyChild
})
angular.forEach(result.splitUpCosts[viewType], function (valBar) {
va.push(
{
"label": valBar.name,
"value": valBar.cost.AWS.serviceCosts[keyChild]
if(result.cost && result.cost.AWS && result.cost.AWS.serviceCosts) {
costObj.serviceCosts = result.cost.AWS.serviceCosts;
angular.forEach(result.cost.AWS.serviceCosts, function (valueChild, keyChild) {
var va = [];
costObj.costGridOptions.columnDefs.push({
name: keyChild,
field: 'cost.AWS.serviceCosts.' + keyChild
})
angular.forEach(result.splitUpCosts[viewType], function (valBar) {
var chVal = '';
if (valBar.cost.AWS.serviceCosts[keyChild]) {
chVal = valBar.cost.AWS.serviceCosts[keyChild];
} else {
chVal = 0;
}
);
});
costObj.barChat.data.push({
"key": keyChild,
"values": va
va.push(
{
"label": valBar.name,
"value": chVal
}
);
});
costObj.barChat.data.push({
"key": keyChild,
"values": va
});
});
});
// } else {
// costObj.costGridOptions.data = result.splitUpCosts.businessUnits;
// angular.forEach(result.splitUpCosts.businessUnits, function (value) {
// costObj.pieChat.data.push({
// key: value.name,
// value: value.cost.totalCost
// });
// });
// angular.forEach(result.cost.AWS.serviceCosts,function(valueChild,keyChild){
// var va=[];
// costObj.costGridOptions.columnDefs.push({name: keyChild, field: 'cost.AWS.serviceCosts.'+keyChild})
// angular.forEach(result.splitUpCosts.businessUnits, function (valBar) {
// va.push(
// { "label": valBar.name,
// "value": valBar.cost.AWS.serviceCosts[keyChild]
// }
// );
// });
// costObj.barChat.data.push({
// "key": keyChild,
// "values": va
// });
// });
// }
}
}
};
costObj.trendsChart=function(fltObj){
Expand Down Expand Up @@ -252,6 +240,7 @@
} else {
entityId=fltObj.org.id;
}
//http://192.168.152.139:3001
param.url='/analytics/cost/trend?parentEntityId='+fltObj.org.id+'&entityId='+fltObj.org.id+'&toTimeStamp='+new Date()+'&period='+fltObj.period+'&interval=86400'
}

Expand All @@ -262,7 +251,13 @@
angular.forEach(result.cost.AWS.serviceCosts, function (valueChild, keyChild) {
var va = [];
angular.forEach(result.costTrends, function (value) {
va.push([value.fromTime,value.cost.AWS.serviceCosts[keyChild]]);
var chVal='';
if(value.cost.AWS.serviceCosts[keyChild]){
chVal=value.cost.AWS.serviceCosts[keyChild];
} else {
chVal=0;
}
va.push([value.fromTime,chVal]);
});
costObj.trendLineChart.data.push({
"key": keyChild,
Expand All @@ -274,14 +269,19 @@
};
costObj.createChart();
$scope.$on('CHANGE_VIEW', function (event, data) {
costObj.splitUp=data.replace(/([A-Z])/g, ' $1').replace(/^./, function(str) {
return str.toUpperCase();
});
costObj.createLable(costObj.chartData,data);
});
$rootScope.$watch('filterApply', function () {
$rootScope.applyFilter =function(filterApp,period){
analyticsServices.applyFilter(filterApp,period);
if($state.current.name === "dashboard.analytics.cost") {
costObj.getCostData($rootScope.filterNewEnt);
costObj.trendsChart($rootScope.filterNewEnt);
}
});
};
$rootScope.applyFilter(true,'month');
costObj.trendsChart($rootScope.filterNewEnt);

}]);
})(angular);
Loading