From bd3a040f8206329d42d206e1ff7086087e42dd21 Mon Sep 17 00:00:00 2001 From: "kuldeep.arora" Date: Mon, 30 Apr 2018 15:19:43 +0530 Subject: [PATCH] Regional Pap pricing UI --- app/partials/analytics/analytics.controller.js | 50 +++++++++++++++++++++----- app/partials/analytics/analytics.html | 32 ++++++++++++++++- app/partials/analytics/analytics.service.js | 16 +++++++++ 3 files changed, 89 insertions(+), 9 deletions(-) diff --git a/app/partials/analytics/analytics.controller.js b/app/partials/analytics/analytics.controller.js index 47b9ed1..499ba6c 100644 --- a/app/partials/analytics/analytics.controller.js +++ b/app/partials/analytics/analytics.controller.js @@ -1,10 +1,10 @@ 'use strict'; angular.module('acufuel') - .controller('analyticsController', ['$scope','analyticsService',function($scope, analyticsService) { + .controller('analyticsController', ['$scope','analyticsService',function($scope,analyticsService) { $(document).ready(function(){ $(function(){ - new jvm.MultiMap({ + /*map = new jvm.MultiMap({ container: $('#map'), maxLevel: 1, main: { @@ -12,20 +12,57 @@ backgroundColor: '#ffce99', }, mapUrlByCode: function(code, multiMap){ - console.log('-----s-----s-s--',code.toLowerCase()) + console.log('dddd---',code); + console.log('----------',map.getRegionName(code)); + getRegionPap(label); return '/js/us-counties/jquery-jvectormap-data-'+ code.toLowerCase()+'-'+ multiMap.defaultProjection+'-en.js'; }, - onRegionClick:function(event, code) { + onRegionClick:function(event, code) { + //console.log('----------',map.getRegionName(code)); var name = (code); alert(name); } + });*/ + + jQuery('#map').vectorMap({ + map: 'us_lcc', + backgroundColor: '#ffce99', + color: '#dfdfdd', + hoverOpacity: 0, + selectedColor: '#5f8b98', + hoverColor: '#5f8b98', + enableZoom: true, + showTooltip: true, + scaleColors: ['#dfdfdd'], + //values: sample_data + onRegionClick: function (event, code) { + var map = $('#map').vectorMap('get', 'mapObject'); + var name = map.getRegionName(code); + getRegionPap(name); + }, + normalizeFunction: 'polynomial' }); }); }) + function getRegionPap(code){ + $scope.showLoader = true; + analyticsService.getRPP(code).then(function(result) { + $scope.rppData = result; + $scope.showLoader = false; + $('#popup1').css('display', 'block'); + + }) + + } + $scope.cancelStatus = function() { + $('#popup1').css('display', 'none'); + + } + $scope.drf = {}; $scope.hfp = {}; @@ -297,7 +334,7 @@ $scope.getCS = function(){ //var makeId = makeId; analyticsService.getCS().then(function(result) { - console.log("==cs values==",result) + //console.log("==cs values==",result) $scope.csValues = result; //console.log("cs data kd --- ",$scope.csValues) $scope.optionscs = { @@ -502,9 +539,6 @@ /*Date Range Filter for Customer Sources*/ $scope.submitDateCs = function(){ - console.log("==fromdate===",$scope.cs.fromDate) - console.log("====todate=====",$scope.cs.toDate) - if ($scope.cs.fromDate === undefined) { $scope.fillForm = true; diff --git a/app/partials/analytics/analytics.html b/app/partials/analytics/analytics.html index 778df28..1d0f199 100644 --- a/app/partials/analytics/analytics.html +++ b/app/partials/analytics/analytics.html @@ -150,6 +150,36 @@ - + +
+
+
+ + + + + + + + + + +
Average PAPRegion
+ + {{data.averagePAP | number :4 }} + + {{data.region}} +
+
+
+ + +
+
+
+
+ +
+ diff --git a/app/partials/analytics/analytics.service.js b/app/partials/analytics/analytics.service.js index 9c0721c..e779ff2 100644 --- a/app/partials/analytics/analytics.service.js +++ b/app/partials/analytics/analytics.service.js @@ -40,6 +40,22 @@ return deferred.promise; } + this.getRPP = function(code){ + var deferred = $q.defer(); + $http({ + method : 'GET', + url : BASE_URL.url +'/fuelerlinx/getAircrafts/'+code + }) + .then(function (result){ + deferred.resolve(result.data); + },function (result){ + console.log(result) + deferred.resolve(result.data); + }) + return deferred.promise; + } + + /*---date filter for Monthly fuel sales chart - dates are sending to the api */ this.getDRFChart = function(fd,td){ var deferred = $q.defer(); -- 2.0.0