Skip to content

Hk dev #984

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 2 commits into from
Nov 28, 2016
Merged

Hk dev #984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f24b40
discovery tag mapping
Nov 28, 2016
7b554d8
Css remove
Nov 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
3 changes: 3 additions & 0 deletions client/cat3/main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,10 @@
<script src="src/partials/sections/dashboard/analytics/analyticsServices.js"></script>
<script src="src/partials/sections/dashboard/analytics/controller/costCtrl.js"></script>
<script src="src/partials/sections/dashboard/analytics/controller/capacityCtrl.js"></script>
<script src="src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js"></script>
<script src="src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js"></script>
<script src="src/partials/sections/dashboard/analytics/controller/usageCtrl.js"></script>

<script src="src/partials/sections/dashboard/bots/botsCtrl.js"></script>
<script src="src/partials/sections/dashboard/bots/controller/audittrailCtrl.js"></script>
<script src="src/partials/sections/dashboard/bots/controller/botLogsCtrl.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion client/cat3/src/clientRoutes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ function routeConfig($stateProvider, $urlRouterProvider, $httpProvider, modulePe
}]
}
}).state('dashboard.analytics', {
url: "/analytics/",
url: "/CM/",
templateUrl: "src/partials/sections/dashboard/analytics/analytics.html",
controller: "analyticsCtrl as analytic",
resolve: {
Expand Down
2 changes: 1 addition & 1 deletion client/cat3/src/partials/globals/header/headerDashboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</li>
<li>
<div id="analytics" class="headNavigItem" ng-if="analyticsBool" ui-sref='dashboard.analytics' ui-sref-active='activeSection'>
<i class="fa fa-area-chart white"></i> ANALYTICS
<i class="fa fa-cloud white"></i> Cloud
</div>
</li>
<li>
Expand Down
19 changes: 11 additions & 8 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 @@ -97,7 +97,7 @@
</div>
<div class="col-lg-12 col-md-12 marginbottom5">
<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>
<!--<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>
</div>
</form>
Expand All @@ -107,20 +107,23 @@
<div class="panelRight">
<div id='rightPanel' class='container-fluid'>
<ul class="nav nav-tabs" >
<li ng-class="{'active':analytic.tabShowChat === true}"><a ng-click="analytic.tabShow(true,false)" ><i class="fa fa-area-chart fa-2" aria-hidden="true"></i> Dashboard</a></li>
<li ng-class="{'active':analytic.tabShowReport === true}"><a ng-click="analytic.tabShow(false,true)" ><i class="fa fa-file-text fa-2" aria-hidden="true"></i> Reports</a></li>
<li ng-show="stateItems.otherTabView" class="active"><a > {{stateItems.otherTab}}</a></li>
<li ng-hide="stateItems.dashboardHide" ng-class="{'active':analytic.tabShowChat === true}"><a ng-click="analytic.tabShow(true,false)" ><i class="fa fa-area-chart fa-2" aria-hidden="true"></i> Dashboard</a></li>
<li ng-hide="stateItems.reportHide" ng-class="{'active':analytic.tabShowReport === true}"><a ng-click="analytic.tabShow(false,true)" ><i class="fa fa-file-text fa-2" aria-hidden="true"></i> Reports</a></li>
<li class="form-group pull-right filter-btn" >
<button type="button" class="btn btn-xs cat-btn-update ng-scope pull-right margin-left6" ng-click="isOpenSidebar = !isOpenSidebar">
<i class="fa fa-filter fa-2 white" aria-hidden="true"></i>&nbsp;Filter
</button>
</li>
</ul>
<div class="well" id="well" ng-hide="stateItems.filterView.period">
<div class="well" id="well" >
<div class="col-lg-5 col-md-5 col-sm-12 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="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="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="applyFilter(true,'month')">MONTH</button>
<button type="button" class="btn btn-sm btn-primary cat-btn-update" disabled="disabled" ng-class=" {'active':filterNewEnt.period === 'year'}" ng-click="applyFilter(true,'year')">YEAR</button>
<span ng-hide="stateItems.filterView.period">
<button type="button" class="btn btn-sm btn-primary cat-btn-update" ng-class="{'active':filterNewEnt.period === 'day'}" ng-click="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="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="applyFilter(true,'month')">MONTH</button>
<button type="button" class="btn btn-sm btn-primary cat-btn-update" disabled="disabled" ng-class=" {'active':filterNewEnt.period === 'year'}" ng-click="applyFilter(true,'year')">YEAR</button>
</span>
</div>
<div class="col-lg-7 col-md-7 col-sm-12 filter-wrapper">
<span ng-repeat="filt in filterNewEnt" ng-if="filt !== '' && filt.title">
Expand Down
43 changes: 40 additions & 3 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 @@ -4,7 +4,7 @@
.config(['$stateProvider', '$urlRouterProvider', '$httpProvider', 'modulePermissionProvider', function($stateProvider, $urlRouterProvider, $httpProvider, modulePermissionProvider) {
var modulePerms = modulePermissionProvider.$get();
$stateProvider.state('dashboard.analytics.cost', {
url: "cost/",
url: "analytics/cost/",
templateUrl: "src/partials/sections/dashboard/analytics/view/cost.html",
controller: "costCtrl as cost",
params:{filterView:{cost:true,viewBy:true,splitUpType:true,org:true}},
Expand All @@ -22,7 +22,7 @@
}]
}
}).state('dashboard.analytics.capacity', {
url: "capacity/",
url: "analytics/capacity/",
templateUrl: "src/partials/sections/dashboard/analytics/view/capacity.html",
controller: "capacityCtrl as capaCtr",
params:{filterView:{period:true,cost:true,viewBy:true,splitUpType:true,org:true}},
Expand All @@ -40,7 +40,7 @@
}]
}
}).state('dashboard.analytics.usage', {
url: "usage/",
url: "analytics/usage/",
templateUrl: "src/partials/sections/dashboard/analytics/view/usage.html",
controller: "usageCtrl as usage",
params:{filterView:{usage:true,org:true,provi:true,instanceType:true,resources:true}},
Expand All @@ -57,10 +57,47 @@
return deferred.promise;
}]
}
}).state('dashboard.analytics.tagMapping', {
url: "discovery/tagMapping/",
templateUrl: "src/partials/sections/dashboard/analytics/view/discoveryTagMapping.html",
controller: "discoveryTagMappingCtrl as disTgMap",
params:{filterView:{period:true,org:true,provi:true},dashboardHide:true,reportHide:true,otherTab:'Tag mapping',otherTabView:true},
resolve: {
auth: ["$q", function ($q) {
var deferred = $q.defer();
// instead, go to a different page
if (modulePerms.analyticsBool()) {
// everything is fine, proceed
deferred.resolve();
} else {
deferred.reject({redirectTo: 'dashboard'});
}
return deferred.promise;
}]
}
}).state('dashboard.analytics.resources', {
url: "discovery/resources/",
templateUrl: "src/partials/sections/dashboard/analytics/view/discoveryResources.html",
controller: "discoveryResourcesCtrl as disResrc",
params:{filterView:{period:true,org:true,provi:true},dashboardHide:true,otherTab:'Resources',otherTabView:true,reportHide:true},
resolve: {
auth: ["$q", function ($q) {
var deferred = $q.defer();
// instead, go to a different page
if (modulePerms.analyticsBool()) {
// everything is fine, proceed
deferred.resolve();
} else {
deferred.reject({redirectTo: 'dashboard'});
}
return deferred.promise;
}]
}
});
}])
.controller('analyticsCtrl',['$scope', '$rootScope','$state','genericServices','analyticsServices', 'workzoneServices', 'toastr', function ($scope, $rootScope, $state, genericServices,analyticsServices, workzoneServices, toastr) {
var analytic = this;
$scope.isTreeOpen = false;
//var splitUp=null;
analytic.tabShowChat=true;
analytic.tabShowReport=false;
Expand Down
15 changes: 14 additions & 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 @@ -308,4 +308,17 @@
}
.marginbottom10{
margin-bottom: 10px !important;
}
}
#tagMappting{
.saveBtn{
position: fixed;
bottom: 10px;
left: 40%;
}
.form-control{
height: 29px;
padding: 2px 10px;
font-size: 12px;
line-height: 1;
}
}
2 changes: 1 addition & 1 deletion client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@
$timeout(function () {
$rootScope.applyFilter(true,'month');
capaCtr.trendsChart($rootScope.filterNewEnt);
var treeNames = ['Analytics','capacity'];
var treeNames = ['Cloud Management','Analytics','capacity'];
$rootScope.$emit('treeNameUpdate', treeNames);
},500);
};
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -290,7 +290,7 @@
$timeout(function () {
$rootScope.applyFilter(true,'month');
costObj.trendsChart($rootScope.filterNewEnt);
var treeNames = ['Analytics','Cost'];
var treeNames = ['Cloud Management','Analytics','Cost'];
$rootScope.$emit('treeNameUpdate', treeNames);
},500);
};
Expand Down
12 changes: 12 additions & 0 deletions client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
(function (angular) {
"use strict";
angular.module('dashboard.analytics')
.controller('discoveryResourcesCtrl', ['$scope', '$rootScope', '$state','analyticsServices', 'genericServices','$timeout', function ($scope,$rootScope,$state,analyticsServices,genSevs,$timeout){
$rootScope.stateItems = $state.params;
$rootScope.organNewEnt.provider='0';
analyticsServices.applyFilter(true,null);
var treeNames = ['Cloud Management','Discovery','Resources'];
$rootScope.$emit('treeNameUpdate', treeNames);

}]);
})(angular);
39 changes: 39 additions & 0 deletions client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
(function (angular) {
"use strict";
angular.module('dashboard.analytics')
.controller('discoveryTagMappingCtrl', ['$scope', '$rootScope', '$state','analyticsServices', 'genericServices','$timeout', function ($scope,$rootScope,$state,analyticsServices,genSevs,$timeout){
var disTgMap=this;
$rootScope.stateItems = $state.params;
$rootScope.organNewEnt.provider='0';
analyticsServices.applyFilter(true,null);
var treeNames = ['Cloud Management','Discovery','Tag Mapping'];
$rootScope.$emit('treeNameUpdate', treeNames);
$scope.newEnt={};
var fltrObj=$rootScope.filterNewEnt;
disTgMap.tagOption=[];
disTgMap.getAllTags =function () {
$scope.newEnt={};
if(fltrObj && fltrObj.provider && fltrObj.provider.id) {
$scope.newEnt.providerId = fltrObj.provider.id;
$scope.isLoadingTag = true;
var param = {
inlineLoader: true,
url: '/providers/' + fltrObj.provider.id + '/tags'
};
genSevs.promiseGet(param).then(function (tagResult) {
$scope.isLoadingTag = false;
disTgMap.tagOption = tagResult;
});
}
};
disTgMap.save =function(){
console.log($scope.newEnt);
};
$rootScope.applyFilter =function(filterApp,period){
analyticsServices.applyFilter(true,null);
disTgMap.getAllTags();
};
disTgMap.getAllTags();

}]);
})(angular);
2 changes: 1 addition & 1 deletion client/cat3/src/partials/sections/dashboard/analytics/controller/usageCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
$rootScope.organNewEnt.provider='0';
$rootScope.$emit('INI_usage', 'Unassigned');
$timeout(function(){$rootScope.applyFilter(true,'month')},500);
var treeNames = ['Analytics','Usage'];
var treeNames = ['Cloud Management','Analytics','Usage'];
$rootScope.$emit('treeNameUpdate', treeNames);

};
Expand Down
Loading