Skip to content

Changed the split up data, added path for analytics in jquery page cl… #764

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

Changed the split up data, added path for analytics in jquery page cl… #764

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
18 changes: 9 additions & 9 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 @@ -88,8 +88,8 @@


<div class="col-lg-12 col-md-12 marginbottom5">
<button type="button" class="btn btn-primary" ng-click="analytic.applyFilter(true);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);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="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>
Expand All @@ -109,18 +109,18 @@
</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-click="">DAY</button>
<button type="button" class="btn btn-sm btn-primary cat-btn-update" ng-click="">WEEK</button>
<button type="button" class="btn btn-sm btn-primary cat-btn-update active" ng-click="">MONTH</button>
<button type="button" class="btn btn-sm btn-primary cat-btn-update" ng-click="">YEAR</button>
<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="value as value for (key , value) in splitUpCosts">
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="filter in filterNewEnt">
<span ng-repeat="filt in filterNewEnt" ng-if="filt !== '' && filt.title">
<!--data-toggle="tooltip" onmouseenter="$(this).tooltip('show')"-->
<span ng-if="filter !== '' " class="label label-success " title="{{filter.title}}">{{filter.title}} :{{filter.name}} </span>
<span class="label label-success " title="{{filt.title}}">{{filt.title}} :{{filt.name}} </span>
</span>
</div>

Expand Down
10 changes: 7 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 @@ -75,14 +75,17 @@
//$rootScope.$emit('treeNameUpdate', treeNames);
$rootScope.$emit('HEADER_NAV_CHANGE', 'ANALYTICS');
$rootScope.organNewEnt=[];
$rootScope.filterNewEnt={};
$rootScope.organNewEnt.org = '0';
$rootScope.filterNewEnt.period='month';
$rootScope.splitUpCosts=[];
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;
}
Expand All @@ -94,15 +97,16 @@
$scope.$watch(function() { return analytic.splitUp}, function(newVal, oldVal) {
$scope.$broadcast('CHANGE_VIEW',newVal);
}, true);
$rootScope.filterNewEnt={};
analytic.applyCount=0
analytic.applyFilter = function(filterApp){
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;
$rootScope.filterNewEnt={}
if(period)
$rootScope.filterNewEnt.period=period;

if(or){
$rootScope.filterNewEnt.org={name:obj[or].name,id:obj[or].rowid,title:'Org'};
$rootScope.filterNewEnt.provider='';
Expand Down
14 changes: 8 additions & 6 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 @@ -109,19 +109,21 @@
} else {
entityId=fltObj.org.id;
}
param.url='/analytics/cost/aggregate?parentEntityId='+fltObj.org.id+'&entityId='+entityId+'&toTimeStamp='+new Date()+'&period=month';
param.url='/analytics/cost/aggregate?parentEntityId='+fltObj.org.id+'&entityId='+entityId+'&toTimeStamp='+new Date()+'&period='+fltObj.period;
}

genSevs.promiseGet(param).then(function (result) {
costObj.chartData=result;
$rootScope.splitUpCosts=[];
console.log('aaa',result.splitUpCosts);
if(result.splitUpCosts) {
angular.forEach(result.splitUpCosts, function (val, key) {
$rootScope.splitUpCosts.push(key);
var a=key.replace(/([A-Z])/g, ' $1').replace(/^./, function(str) {
return str.toUpperCase();
});
$rootScope.splitUpCosts.push({id:key,val:a});
});
$scope.$emit('CHANGE_splitUp', $rootScope.splitUpCosts[0]);
costObj.createLable(result, $rootScope.splitUpCosts[0]);
$scope.$emit('CHANGE_splitUp', $rootScope.splitUpCosts[0].id);
costObj.createLable(result, $rootScope.splitUpCosts[0].id);
} else {
costObj.createLable(result,'provider');
}
Expand Down Expand Up @@ -250,7 +252,7 @@
} else {
entityId=fltObj.org.id;
}
param.url='/analytics/cost/trend?parentEntityId='+fltObj.org.id+'&entityId='+fltObj.org.id+'&toTimeStamp='+new Date()+'&period=month&interval=86400'
param.url='/analytics/cost/trend?parentEntityId='+fltObj.org.id+'&entityId='+fltObj.org.id+'&toTimeStamp='+new Date()+'&period='+fltObj.period+'&interval=86400'
}

genSevs.promiseGet(param).then(function (result) {
Expand Down
23 changes: 22 additions & 1 deletion client/htmls/private/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@
<li class="left-projects-links hidden" id="trackStyle" data-target="#Track" navigation="Track">
<a class="dropdown-toggle navigationTab" href="#ajax/trackSettings.html" id="trackNew" onclick="setleftnavigation(this,'Track');"><i class="fa fa-anchor"></i>&nbsp;TRACK</a>
</li>
<li class="left-projects-links hidden" data-target="#Workspace" navigation="Workspace,Workspace1">
<a class="navigationTab" id="analytics" href="#" onclick="setleftnavigation(this,'analytics');" >
<i class="fa fa-area-chart white"></i>&nbsp; ANALYTICS
</a>
</li>
<!--track ends here-->
<!--right side navbar-->
<span class="navRight">
Expand Down Expand Up @@ -754,7 +759,23 @@ <h4 class="modal-title">

function setleftnavigation(toplink, breadcrumbHeader) {
var TabID = $(toplink).attr('id');
if (TabID === "workZoneNew") {
if (TabID === "analytics") {

if(isAngularIntegration){
var checkUrl = window.location.href;
if(checkUrl.indexOf('ajax/Dev.html') !==-1){
console.log('here');
}else{
window.location.href = "../../cat3/#/dashboard/analytics/cost/";
return false;
}
}
$('#Settings_nav').hide();
$('#Workspace1').show();
$('#trackShow').hide();

}
else if (TabID === "workZoneNew") {

if(isAngularIntegration){
var checkUrl = window.location.href;
Expand Down