From 7f6e3b1df9414393ab94488199965e8bf37dedd0 Mon Sep 17 00:00:00 2001 From: "kuldeep.arora" Date: Thu, 1 Nov 2018 18:58:58 +0530 Subject: [PATCH] final code --- app/partials/FuelVendors/FuelVendors.controller.js | 14 +--- .../accountSetting/accountSetting.Controller.js | 2 +- .../accountSetting/accountSetting.Service.js | 8 -- app/partials/accountSetting/accountSetting.html | 23 +++--- app/partials/analytics/analytics.controller.js | 19 +---- app/partials/analytics/analytics.html | 15 +--- app/partials/analytics/analytics.service.js | 15 ---- app/partials/customers/customers.controller.js | 41 +--------- app/partials/customers/customers.html | 88 +--------------------- app/partials/dashboard/dashboard.controller.js | 23 +----- app/partials/dashboard/dashboard.html | 19 +---- app/partials/enterFuelOrder/enterFuelOrder.html | 6 -- app/partials/fuelManager/fuelManager.controller.js | 6 +- app/partials/fuelOrders/fuelOrders.controller.js | 10 --- app/partials/fuelOrders/fuelOrders.html | 72 ------------------ app/partials/main/main.controller.js | 34 +-------- app/partials/scheduler/scheduler.controller.js | 1 + app/partials/scheduler/scheduler.html | 8 +- .../updateFuelManager.controller.js | 12 --- app/partials/viewCompany/viewCompany.controller.js | 29 ------- .../viewFuelVendor/viewFuelVendor.service.js | 16 ---- 21 files changed, 30 insertions(+), 431 deletions(-) diff --git a/app/partials/FuelVendors/FuelVendors.controller.js b/app/partials/FuelVendors/FuelVendors.controller.js index 7169a7e..05b94f4 100644 --- a/app/partials/FuelVendors/FuelVendors.controller.js +++ b/app/partials/FuelVendors/FuelVendors.controller.js @@ -7,11 +7,7 @@ function FuelVendorsController($scope, $rootScope, $uibModal, $filter, $http, FuelVendorsService, CustomersService, ViewFuelVendorService, NgTableParams) { - /*$(document).ready(function() { - $scope.showLoader = true; - $('#example').DataTable(); - $scope.showLoader = false; - });*/ + $scope.userProfileId = JSON.parse(localStorage.getItem('userProfileId')) $scope.reset = function(){ $("input").val(""); @@ -82,9 +78,7 @@ }) } - // CustomersService.getMargin().then(function(result) { - // $scope.marginList = result; - // }) + CustomersService.getJetMargin($scope.userProfileId).then(function(result) { $scope.jetMarginList = result; @@ -120,9 +114,7 @@ }) } }) - /*$scope.data.addressOne - $scope.data.addressTwo - $scope.data.city*/ + $scope.addFirstData = function(sel, step){ // console.log($scope.data) diff --git a/app/partials/accountSetting/accountSetting.Controller.js b/app/partials/accountSetting/accountSetting.Controller.js index 906dfc8..9e809ae 100644 --- a/app/partials/accountSetting/accountSetting.Controller.js +++ b/app/partials/accountSetting/accountSetting.Controller.js @@ -83,7 +83,7 @@ var updateData = "companyName=" + $scope.userData.companyName + "&username=" + $scope.userData.username + "&firstName=" + $scope.userData.firstName + "&lastName=" + $scope.userData.lastName + "&phone=" + $scope.userData.phone + "&mobile=" + $scope.userData.mobile - + "&status=" + $scope.userData.status + "&userType=" + $scope.userData.userType + "&userTypeId=" + $scope.userData.userType.id + "&userProfileId=" + $scope.userid + "&userTimeZone=" + $scope.userData.userTimeZone; + + "&status=" + $scope.userData.status + "&userType=" + $scope.userData.userType + "&userTypeId=" + $scope.userData.userType.id + "&userProfileId=" + $scope.userid + "&userTimeZone=" + $scope.userData.userTimeZone + "&icao=" + $scope.userData.icao; // console.log("======updateData===",updateData) AccountSettingService.updateUserProfile(updateData).then(function(result) { diff --git a/app/partials/accountSetting/accountSetting.Service.js b/app/partials/accountSetting/accountSetting.Service.js index 679cc53..0a1b5ac 100644 --- a/app/partials/accountSetting/accountSetting.Service.js +++ b/app/partials/accountSetting/accountSetting.Service.js @@ -19,7 +19,6 @@ }).then(function(result) { deferred.resolve(result.data); }, function(result) { - //console.log(result.data) deferred.resolve(result.data); }) return deferred.promise; @@ -56,7 +55,6 @@ }).then(function(result) { deferred.resolve(result.data); }, function(result) { - //console.log(result.data) deferred.resolve(result.data); }) return deferred.promise; @@ -74,7 +72,6 @@ }).then(function(result) { deferred.resolve(result.data); }, function(result) { - //console.log(result.data) deferred.resolve(result.data); }) return deferred.promise; @@ -93,14 +90,12 @@ }).then(function(result) { deferred.resolve(result.data); }, function(result) { - //console.log(result.data) deferred.resolve(result.data); }) return deferred.promise; } this.addAdditionalAccount = function(data) { - console.log('----$scope.accountdata--', data); var deferred = $q.defer(); $http({ method : 'POST', @@ -128,7 +123,6 @@ .then(function (result){ deferred.resolve(result.data); },function (result){ - //console.log(result.data) deferred.resolve(result.data); }) return deferred.promise; @@ -147,7 +141,6 @@ }).then(function(result) { deferred.resolve(result.data); }, function(result) { - //console.log(result.data) deferred.resolve(result.data); }) return deferred.promise; @@ -165,7 +158,6 @@ }).then(function(result) { deferred.resolve(result.data); }, function(result) { - //console.log(result.data) deferred.resolve(result.data); }) return deferred.promise; diff --git a/app/partials/accountSetting/accountSetting.html b/app/partials/accountSetting/accountSetting.html index 5a5d793..8d31533 100644 --- a/app/partials/accountSetting/accountSetting.html +++ b/app/partials/accountSetting/accountSetting.html @@ -23,26 +23,27 @@
-
-
-
-
-
+
- - -
+
+ +
+ +
+
+
+
+ +
- diff --git a/app/partials/analytics/analytics.controller.js b/app/partials/analytics/analytics.controller.js index fe060a6..47a0282 100644 --- a/app/partials/analytics/analytics.controller.js +++ b/app/partials/analytics/analytics.controller.js @@ -14,8 +14,6 @@ angular.module('acufuel') $scope.flag = true; //for spinner var data = Highcharts.geojson(Highcharts.maps['countries/us/us-all']); var separators = Highcharts.geojson(Highcharts.maps['countries/us/us-all'], 'mapline'); - // Some responsiveness - //var small = $('#container').width() < 400; analyticsService.getAllRPP().then(function(result) { for (var i = 0; i < data.length; i++) { @@ -123,18 +121,6 @@ angular.module('acufuel') } }, - /* legend: small ? {} : { - layout: 'vertical', - align: 'right', - verticalAlign: 'middle' - }, - - colorAxis: { - min: 0, - minColor: '#E6E7E8', - maxColor: '#005645' - },*/ - mapNavigation: { enabled: true, buttonOptions: { @@ -235,7 +221,7 @@ angular.module('acufuel') axisLabel: 'Orders', axisLabelDistance: -20, tickFormat: function(d) { - return d3.format(',.1f')(d); + return d3.format(',')(d); } } } @@ -251,11 +237,11 @@ angular.module('acufuel') //var makeId = makeId; analyticsService.getCS().then(function(result) { $scope.csValues = result; + console.log("cs",result) $scope.optionscs = { chart: { type: 'pieChart', height: 500, - // color: ["#FEDFC3","#D89700","#FFE8B3","FFD980","#FF7F0E","#fff2e6","#ffcc99","#ffa64d","#ff8c1a","#B37D00","#f5f5f0","#e0e0d1","#ccccb3","#adad85","#999966","#7a7a52"], x: function(d) { return d.key; }, @@ -627,7 +613,6 @@ angular.module('acufuel') chart: { type: 'pieChart', height: 500, - // color: ["#FEDFC3","#D89700","#FFE8B3","FFD980","#FF7F0E","#fff2e6","#ffcc99","#ffa64d","#ff8c1a","#B37D00","#f5f5f0","#e0e0d1","#ccccb3","#adad85","#999966","#7a7a52"], x: function(d) { return d.key; }, diff --git a/app/partials/analytics/analytics.html b/app/partials/analytics/analytics.html index 98ed372..13845dc 100644 --- a/app/partials/analytics/analytics.html +++ b/app/partials/analytics/analytics.html @@ -137,17 +137,7 @@
-
- -
-
+
@@ -159,9 +149,6 @@
- - -
diff --git a/app/partials/analytics/analytics.service.js b/app/partials/analytics/analytics.service.js index ae902ef..d59894a 100644 --- a/app/partials/analytics/analytics.service.js +++ b/app/partials/analytics/analytics.service.js @@ -71,21 +71,6 @@ return deferred.promise; } - // this.getRPP = function(code){ - // var deferred = $q.defer(); - // $http({ - // method : 'GET', - // url : BASE_URL.url +'/fuelerlinx/getCompleteRegionalPap/'+code - // }) - // .then(function (result){ - // deferred.resolve(result.data); - // },function (result){ - // console.log(result) - // deferred.resolve(result.data); - // }) - // return deferred.promise; - // } - /* without region code */ this.getAllRPP = function(){ diff --git a/app/partials/customers/customers.controller.js b/app/partials/customers/customers.controller.js index 8037405..c119a00 100644 --- a/app/partials/customers/customers.controller.js +++ b/app/partials/customers/customers.controller.js @@ -51,15 +51,6 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta ); - /*function getAllCompanies(){ - CustomersService.getAllCompanies().then(function(result) { - $scope.companyList = result; - for(var i=0; i<$scope.companyList.length; i++){ - $scope.companyList[i].masterMargin = $scope.companyList[i].margin.id; - } - }) - - }*/ $scope.statusFilter = [ { @@ -156,9 +147,7 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta $scope.showLoader = false; }) } - // CustomersService.getMargin().then(function(result) { - // $scope.marginList = result; - // }) + $scope.marginFilterOptions = []; CustomersService.getJetMargin($scope.userProfileId).then(function(result) { $scope.showLoader = true; @@ -271,13 +260,7 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta } - /*$scope.getModal = function(makeId, index) { - $scope.showLoader = true; - CustomersService.getModal($scope.aircraft.make).then(function(result) { - $scope.showLoader = false; - $scope.aircraftDetails[index].aircraftModalList = result; - }) - }*/ + $scope.getModal = function(makeId, index) { $scope.showLoader = true; $scope.aircraft.make = makeId; @@ -300,13 +283,6 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta }) } - /*$scope.getSize = function(model, index) { - $scope.showLoader = true; - CustomersService.getAircraftSize($scope.aircraft.make, model).then(function(result) { - $scope.showLoader = false; - $scope.aircraftDetails[index].aircraftSizeList = result; - }) - }*/ $scope.getFuelType = function(size, index) { $scope.showLoader = true; @@ -614,19 +590,6 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta }) } - // old api not use - /*$scope.checkJetWithTail = function(tail, index) { - ViewCompanyService.checkJetType(tail).then(function(result) { - if (result.jetA == "true") { - $scope.jetShow[index] = false; - $scope.marginShow[index] = true; - } else { - $scope.jetShow[index] = true; - $scope.marginShow[index] = false; - } - }) - }*/ - $scope.etaTimeList = [{time:"12:00 AM"},{time:"12:30 AM"},{time:"01:00 AM"},{time:"01:30 AM"},{time:"02:00 AM"},{time:"02:30 AM"},{time:"03:00 AM"},{time:"03:30 AM"}, {time:"04:00 AM"},{time:"04:30 AM"},{time:"05:00 AM"},{time:"05:30 AM"},{time:"06:00 AM"},{time:"06:30 AM"},{time:"07:00 AM"},{time:"07:30 AM"}, diff --git a/app/partials/customers/customers.html b/app/partials/customers/customers.html index 1f9e94c..ec5f9bc 100644 --- a/app/partials/customers/customers.html +++ b/app/partials/customers/customers.html @@ -368,73 +368,10 @@
- - - @@ -445,12 +382,7 @@ - - + @@ -472,8 +404,6 @@ - - @@ -786,12 +707,7 @@
Tenant/Base Customer
CAA Member
Tenant/CAA
- +
diff --git a/app/partials/dashboard/dashboard.controller.js b/app/partials/dashboard/dashboard.controller.js index 342e23e..0c21099 100644 --- a/app/partials/dashboard/dashboard.controller.js +++ b/app/partials/dashboard/dashboard.controller.js @@ -171,26 +171,6 @@ } - -// $scope.submitLogin = function() { -// LoginService.setAuth(true); -// toastr.info("Login successfully"); -// $state.go('app.dashboard'); -// /*LoginService.login($scope.username, $scope.password).then(function(result){ -// if(typeof result == 'object') { -// LoginService.setAuth(true); -// $rootScope.path = true; -// var reqPwdChng = localStorage.getItem("requiredChangePwd"); -// if (reqPwdChng && reqPwdChng == "Y") { -// $state.go('resetPassword'); -// } else { -// $state.go('app.upload'); -// } -// } else { -// toastr.info("Error in login. Please check login name and password"); -// } -// })*/ -// } $scope.completeOrderCount = ''; $scope.pendingOrderCount= ''; @@ -269,7 +249,6 @@ //staggerLabels: true, duration: 500, stacked: false, - //color: ["#FEDFC3", "#990000", "#000099", "#009900"], color: ["#A9A9A9", "#000099", "#990000", "#009900"], xAxis: { axisLabel: 'Months', @@ -279,7 +258,7 @@ axisLabel: 'Orders', axisLabelDistance: -20, tickFormat: function(d) { - return d3.format(',.1f')(d); + return d3.format(',')(d); } } } diff --git a/app/partials/dashboard/dashboard.html b/app/partials/dashboard/dashboard.html index 3ef64bd..4d0f9bc 100644 --- a/app/partials/dashboard/dashboard.html +++ b/app/partials/dashboard/dashboard.html @@ -4,19 +4,7 @@ } - +
@@ -34,9 +22,6 @@ table tr:nth-child(even) {
 Monthly - - -
@@ -59,7 +44,6 @@ table tr:nth-child(even) {
 Monthly -
@@ -82,7 +66,6 @@ table tr:nth-child(even) {
  Monthly -
diff --git a/app/partials/enterFuelOrder/enterFuelOrder.html b/app/partials/enterFuelOrder/enterFuelOrder.html index 85a859d..6b63954 100644 --- a/app/partials/enterFuelOrder/enterFuelOrder.html +++ b/app/partials/enterFuelOrder/enterFuelOrder.html @@ -227,12 +227,6 @@
Tenant/Base Customer
CAA Member
Tenant/CAA
-
diff --git a/app/partials/fuelManager/fuelManager.controller.js b/app/partials/fuelManager/fuelManager.controller.js index fc8da18..3817321 100644 --- a/app/partials/fuelManager/fuelManager.controller.js +++ b/app/partials/fuelManager/fuelManager.controller.js @@ -13,13 +13,11 @@ var mmn = todayDate.getMonth()+1; //January is 0! var yyyyn = todayDate.getFullYear(); - if(ddn -<10) { + if(ddn < 10 ) { ddn ='0'+ddn } - if(mmn - <10) { + if(mmn < 10) { mmn ='0'+mmn } diff --git a/app/partials/fuelOrders/fuelOrders.controller.js b/app/partials/fuelOrders/fuelOrders.controller.js index a1de818..74acd68 100644 --- a/app/partials/fuelOrders/fuelOrders.controller.js +++ b/app/partials/fuelOrders/fuelOrders.controller.js @@ -87,11 +87,6 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT myselect.style.background = colour; myselect.blur(); } - - - /*setInterval(function(){ - colourFunction(); - }, 1)*/ $scope.attachmentFilterOptions = []; @@ -104,11 +99,6 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT } ); - // $(document).ready(function() { - // $scope.showLoader = true; - // $('#example').DataTable(); - // $scope.showLoader = false; - // }); $scope.getOrders = function() { fuelOrdersService.getOrders().then(function(result) { diff --git a/app/partials/fuelOrders/fuelOrders.html b/app/partials/fuelOrders/fuelOrders.html index f3f4a07..cd9f300 100644 --- a/app/partials/fuelOrders/fuelOrders.html +++ b/app/partials/fuelOrders/fuelOrders.html @@ -384,50 +384,9 @@
-
Tail Make Model
@@ -482,21 +412,12 @@ - - - -
- @@ -438,9 +397,6 @@ - @@ -457,30 +413,18 @@
Tail Make Model
- - - -