Skip to content

Right Filter changes for Usage. #767

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 1 commit into from
Sep 27, 2016
Merged

Right Filter changes for Usage. #767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions client/cat3/src/factory/workzoneServices.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,18 @@
};
var url ='/aws/providers/describe/vpcs';
return $http.post(fullUrl(url),reqBody, Auth.getHeaderObject());
},
getManagedInstances:function (providerId) {
var url ='/providers/'+providerId+'/managedInstances';
return $http.get(fullUrl(url),Auth.getHeaderObject());
},
getAssignedInstances:function (providerId) {
var url ='/providers/'+providerId+'/unmanagedInstances';
return $http.get(fullUrl(url),Auth.getHeaderObject());
},
getUnassignedInstances:function (providerId) {
var url ='/providers/'+providerId+'/unassigned-instances';
return $http.get(fullUrl(url),Auth.getHeaderObject());
}
};
return serviceInterface;
Expand Down
166 changes: 85 additions & 81 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 @@ -17,80 +17,85 @@
<input type="radio" ng-model="analytic.viewByFilter" name="viewBy" value="ProviderView">Provider
</label>
</div>
<div class="col-lg-12 col-md-12 form-group" ng-show="stateItems.filterView.org">
<label for="">Organization</label>
<select ng-model="organNewEnt.org" class="chooseProjectExisting width-100 form-control">
<option value="">Select</option>
<option ng-repeat="org in organObject" value="{{organObject.indexOf(org)}}" >{{org.name}}</option>
</select>
</div>
<div class="col-lg-12 col-md-12 form-group" ng-show="stateItems.filterView.bus">
<label for="">Business Group</label>
<select id="bgListInputExisting" class="chooseBGExisting width-100 form-control" ng-model="organNewEnt.buss">
<option value="">Select</option>
<option ng-repeat="buss in organObject[organNewEnt.org].businessGroups" value="{{organObject[organNewEnt.org].businessGroups.indexOf(buss)}}" >{{buss.name}}</option>
</select>
</div>
<div class="col-lg-12 col-md-12 form-group" ng-show="stateItems.filterView.proj">
<label >Project</label>
<select class="chooseProjectExisting width-100 form-control" ng-model="organNewEnt.proj">
<option value="">Select</option>
<option ng-repeat="proj in organObject[organNewEnt.org].businessGroups[organNewEnt.buss].projects" value="{{organObject[organNewEnt.org].businessGroups[organNewEnt.buss].projects.indexOf(proj)}}" >{{proj.name}}</option>
</select>
</div>
<div class="col-lg-12 col-md-12 form-group" ng-show="stateItems.filterView.env">
<label >Environment</label>
<select class="chooseProjectExisting width-100 form-control" ng-model="organNewEnt.env">
<option value="">Select</option>
<option ng-repeat="env in organObject[organNewEnt.org].environments" value="{{organObject[organNewEnt.org].environments.indexOf(env)}}" >{{env.name}}</option>
</select>
</div>
<div class="col-lg-12 col-md-12 form-group" ng-show="stateItems.filterView.provi">
<label for="">Provider</label>
<select class="form-control select2 select2-hidden-accessible" id="selectProvider" ng-model="organNewEnt.provider" >
<option value=''>Select</option>
<option ng-repeat="provider in providers" value="{{providers.indexOf(provider)}}">{{provider.providerName}}</option>
</select>
</div>
<div class="col-lg-12 col-md-12 form-group" ng-show="stateItems.filterView.zone">
<label for="">Zone</label>
<select class="form-control select2 select2-hidden-accessible" id="Zone" ng-model="filter.regionId" ng-options="region.region as region.region_name +' | '+region.region for region in regions" ng-change="fnRegionChange()">
<option value=''>Select</option>
</select>
</div>
<div class="col-lg-12 col-md-12 form-group" ng-show="stateItems.filterView.region">
<label for="">Region</label>
<select class="form-control select2 select2-hidden-accessible" id="selectRegion" ng-model="filter.regionId" ng-options="region.region as region.region_name +' | '+region.region for region in regions" ng-change="fnRegionChange()">
<option value=''>Select</option>
</select>
</div>
<div class="col-lg-12 col-md-12 form-group" ng-show="stateItems.filterView.resources">
<label for="">Resources</label>
<div class="panel-group">
<div class="panel panel-default">
<div class="panel-heading">
<div class="search">
<label for="search-input"><i class="fa fa-search" aria-hidden="true"></i><span class="sr-only">Search</span></label>
<input ng-model="searchText.name" class="search-input" class="form-control input-lg" placeholder="Search" autocomplete="off" spellcheck="false" autocorrect="off" tabindex="1">
<a id="search-clear" href="#" class="fa fa-times-circle hide" aria-hidden="true"><span class="sr-only">Clear search</span></a>
</div>
</div>
<div class="panel-body bp-panel-body list-resources">
<ul class="list-group ">
<li class="list-group-item" title="First item">First itemitemitemitem</li>
<li class="list-group-item" title="First item">Second item</li>
<li class="list-group-item" title="First item">Third item</li>
</ul>
</div>
</div>
<div class="col-lg-12 col-md-12 form-group" ng-show="stateItems.filterView.org">
<label for="">Organization</label>
<select ng-model="organNewEnt.org" class="chooseProjectExisting width-100 form-control">
<option value="">Select</option>
<option ng-repeat="org in organObject" value="{{organObject.indexOf(org)}}" >{{org.name}}</option>
</select>
</div>
<div class="col-lg-12 col-md-12 form-group" ng-show="stateItems.filterView.bus">
<label for="">Business Group</label>
<select id="bgListInputExisting" class="chooseBGExisting width-100 form-control" ng-model="organNewEnt.buss">
<option value="">Select</option>
<option ng-repeat="buss in organObject[organNewEnt.org].businessGroups" value="{{organObject[organNewEnt.org].businessGroups.indexOf(buss)}}" >{{buss.name}}</option>
</select>
</div>
<div class="col-lg-12 col-md-12 form-group" ng-show="stateItems.filterView.proj">
<label >Project</label>
<select class="chooseProjectExisting width-100 form-control" ng-model="organNewEnt.proj">
<option value="">Select</option>
<option ng-repeat="proj in organObject[organNewEnt.org].businessGroups[organNewEnt.buss].projects" value="{{organObject[organNewEnt.org].businessGroups[organNewEnt.buss].projects.indexOf(proj)}}" >{{proj.name}}</option>
</select>
</div>
<div class="col-lg-12 col-md-12 form-group" ng-show="stateItems.filterView.env">
<label >Environment</label>
<select class="chooseProjectExisting width-100 form-control" ng-model="organNewEnt.env">
<option value="">Select</option>
<option ng-repeat="env in organObject[organNewEnt.org].environments" value="{{organObject[organNewEnt.org].environments.indexOf(env)}}" >{{env.name}}</option>
</select>
</div>
<div class="col-lg-12 col-md-12 form-group" ng-show="stateItems.filterView.provi">
<label for="">Provider</label>
<select class="form-control select2 select2-hidden-accessible" id="selectProvider" ng-model="organNewEnt.provider" >
<option value=''>Select</option>
<option ng-repeat="provider in providers" value="{{providers.indexOf(provider)}}">{{provider.providerName}}</option>
</select>
</div>
<div class="col-lg-12 col-md-12 form-group" ng-show="stateItems.filterView.zone">
<label for="">Zone</label>
<select class="form-control select2 select2-hidden-accessible" id="Zone" ng-model="filter.regionId" ng-options="region.region as region.region_name +' | '+region.region for region in regions" ng-change="fnRegionChange()">
<option value=''>Select</option>
</select>
</div>
<div class="col-lg-12 col-md-12 form-group" ng-show="stateItems.filterView.region">
<label for="">Region</label>
<select class="form-control select2 select2-hidden-accessible" id="selectRegion" ng-model="filter.regionId" ng-options="region.region as region.region_name +' | '+region.region for region in regions" ng-change="fnRegionChange()">
<option value=''>Select</option>
</select>
</div>
<div class="col-lg-12 col-md-12 form-group" ng-show="stateItems.filterView.instanceType">
<label for="">Type of Instance</label>
<select class="form-control select2 select2-hidden-accessible" ng-model="filter.instanceType" ng-change="getResourse(filter.instanceType)">
<option value=''>Select</option>
<option value='Managed'>Managed</option>
<option value='Assigned'>Assigned</option>
<option value='Unassigned'>Unassigned</option>
</select>
</div>
<div class="col-lg-12 col-md-12 form-group" ng-show="stateItems.filterView.resources">
<label for="">Resources</label>
<div class="panel-group">
<div class="panel panel-default">
<div class="panel-heading">
<div class="search">
<label for="search-input"><i class="fa fa-search" aria-hidden="true"></i><span class="sr-only">Search</span></label>
<input ng-model="searchText.name" ng-model-options="{ debounce: 200 }" class="search-input" class="form-control input-lg" placeholder="Search" autocomplete="off" spellcheck="false" autocorrect="off" tabindex="1" ng-change="doResourceSearch()">
<a id="search-clear" href="#" class="fa fa-times-circle hide" aria-hidden="true"><span class="sr-only">Clear search</span></a>
</div>
</div>
<div class="panel-body bp-panel-body list-resources">
<ul class="list-group">
<li class="list-group-item cursor" ng-repeat="resource in resourceList | filter:searchText.name | filter:{platformId: filters.platformId}" ng-class="{'selected':selectedResources.indexOf(resource.platformId)>-1}" ng-click="toggleResourceSelection(resource.platformId);">{{resource.platformId}}</li>
</ul>
</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>
</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>
</div>
</fieldset>
</form>
<br/>
Expand All @@ -108,22 +113,21 @@
</li>
</ul>
<div class="well" id="well">
<div class="btn-group" role="group" aria-label="...">
<button type="button" class="btn btn-sm btn-primary cat-btn-update" ng-class="{'active':filterNewEnt.period === 'day'}" ng-click="analytic.applyFilter(true,'day')">DAY</button>
<button type="button" class="btn btn-sm btn-primary cat-btn-update" ng-class=" {'active':filterNewEnt.period === 'week'}" ng-click="analytic.applyFilter(true,'week')">WEEK</button>
<button type="button" class="btn btn-sm btn-primary cat-btn-update" ng-class=" {'active':filterNewEnt.period === 'month'}" ng-click="analytic.applyFilter(true,'month')">MONTH</button>
<button type="button" class="btn btn-sm btn-primary cat-btn-update" ng-class=" {'active':filterNewEnt.period === 'year'}" ng-click="analytic.applyFilter(true,'year')">YEAR</button>
<select ng-show="stateItems.filterView.splitUpType && splitUpCosts.length > 0" class="form-control select2 select2-hidden-accessible" style="width: auto;height: 31px;" ng-model="analytic.splitUp"
ng-options="sp.id as sp.val for sp in splitUpCosts" >
</select>
</div>
<div class="btn-group" role="group" aria-label="...">
<button type="button" class="btn btn-sm btn-primary cat-btn-update" ng-class="{'active':filterNewEnt.period === 'day'}" ng-click="analytic.applyFilter(true,'day')">DAY</button>
<button type="button" class="btn btn-sm btn-primary cat-btn-update" ng-class=" {'active':filterNewEnt.period === 'week'}" ng-click="analytic.applyFilter(true,'week')">WEEK</button>
<button type="button" class="btn btn-sm btn-primary cat-btn-update" ng-class=" {'active':filterNewEnt.period === 'month'}" ng-click="analytic.applyFilter(true,'month')">MONTH</button>
<button type="button" class="btn btn-sm btn-primary cat-btn-update" ng-class=" {'active':filterNewEnt.period === 'year'}" ng-click="analytic.applyFilter(true,'year')">YEAR</button>
<select ng-show="stateItems.filterView.splitUpType && splitUpCosts.length > 0" class="form-control select2 select2-hidden-accessible" style="width: auto;height: 31px;" ng-model="analytic.splitUp"
ng-options="sp.id as sp.val for sp in splitUpCosts" >
</select>
</div>
<div class="col-lg-7 col-md-7 col-sm-12 pull-right" >
<span ng-repeat="filt in filterNewEnt" ng-if="filt !== '' && filt.title">
<!--data-toggle="tooltip" onmouseenter="$(this).tooltip('show')"-->
<span class="label label-success " title="{{filt.title}}">{{filt.title}} :{{filt.name}} </span>
</span>
</div>

</div>
<div ui-view></div>
</div>
Expand Down
63 changes: 49 additions & 14 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 @@ -19,7 +19,6 @@
deferred.reject({redirectTo: 'dashboard'});
}
return deferred.promise;

}]
}
}).state('dashboard.analytics.capacity', {
Expand All @@ -38,14 +37,13 @@
deferred.reject({redirectTo: 'dashboard'});
}
return deferred.promise;

}]
}
}).state('dashboard.analytics.usage', {
url: "usage/",
templateUrl: "src/partials/sections/dashboard/analytics/view/usage.html",
controller: "usageCtrl as usage",
params:{filterView:{org:true,provi:true,region:true,resources:true}},
params:{filterView:{org:true,provi:true,region:false,instanceType:true,resources:true}},
resolve: {
auth: ["$q", function ($q) {
var deferred = $q.defer();
Expand All @@ -57,7 +55,6 @@
deferred.reject({redirectTo: 'dashboard'});
}
return deferred.promise;

}]
}
})
Expand All @@ -79,16 +76,17 @@
$rootScope.organNewEnt.org = '0';
$rootScope.filterNewEnt.period='month';
$rootScope.splitUpCosts=[];
$scope.selectedResources = [];
analytic.viewByFilter='orgView';
$scope.$watch(function() { return analytic.viewByFilter}, function(newVal, oldVal) {
if(newVal === 'ProviderView'){
$rootScope.viewType='ProviderView';
$state.params.filterView.provi=true;
} else {
$rootScope.organNewEnt.provider=''
$rootScope.viewType='orgView';
$state.params.filterView.provi=false;
}
if(newVal === 'ProviderView'){
$rootScope.viewType='ProviderView';
$state.params.filterView.provi=true;
} else {
$rootScope.organNewEnt.provider=''
$rootScope.viewType='orgView';
$state.params.filterView.provi=false;
}
$rootScope.stateItems = $state.params;
}, true);
$scope.$on('CHANGE_splitUp', function (event, data) {
Expand Down Expand Up @@ -131,7 +129,7 @@
analytic.splitUp=$rootScope.splitUpCosts[0];
}
};
// // get organigetion
//get organisation
genericServices.getTreeNew().then(function (orgs) {
$rootScope.organObject = orgs;
analytic.applyFilter(true);
Expand Down Expand Up @@ -165,6 +163,8 @@
$scope.getProviders = function() {
workzoneServices.getProviders().then(function(response) {
$scope.providers = response.data;
$scope.filter = [];
$scope.filter.providerId = response.data[0]._id;
}, function(error) {
toastr.error(error);
});
Expand Down Expand Up @@ -209,5 +209,40 @@
$scope.getProviderRegions();
}
};
$scope.getResourse = function(instType) {
if(instType === 'Managed') {
workzoneServices.getManagedInstances($scope.filter.providerId).then(function(response) {
$scope.resourceList = response.data;
}, function(error) {
toastr.error(error);
});
}
if(instType === 'Assigned') {
workzoneServices.getAssignedInstances($scope.filter.providerId).then(function(response) {
$scope.resourceList = response.data.unmanagedInstances;
}, function(error) {
toastr.error(error);
});
}
if(instType === 'Unassigned') {
workzoneServices.getUnassignedInstances($scope.filter.providerId).then(function(response) {
$scope.resourceList = response.data.data;
}, function(error) {
toastr.error(error);
});
}
};
$scope.toggleResourceSelection = function(resourceId) {
var idx = $scope.selectedResources.indexOf(resourceId);
if(idx > -1) {
$scope.selectedResources.splice(idx, 1);
} else {
if($scope.selectedResources.length === 5){
toastr.error('Maximum 5 resources allowed.');
}else{
$scope.selectedResources.push(resourceId);
}
}
};
}]);
})(angular);
})(angular);
8 changes: 6 additions & 2 deletions 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 @@ -227,8 +227,8 @@
}

.bp-panel-body {
max-height:150px;
min-height: 100px;
max-height: 105px;
min-height: 80px;
overflow-y: auto;
}

Expand Down Expand Up @@ -264,4 +264,8 @@
.filter-name {
margin-top: -21px;
}

.selected {
background: #ddd;
}
}