From 4f1de64cdb37fdb65a7ac175911bd7221cf2f75c Mon Sep 17 00:00:00 2001 From: "kuldeep.arora" Date: Wed, 31 Oct 2018 17:25:52 +0530 Subject: [PATCH] final phase task --- app/partials/customers/customers.controller.js | 19 +++- app/partials/customers/customers.html | 39 +++++++- .../enterFuelOrder/enterFuelOrder.controller.js | 31 ++++-- app/partials/enterFuelOrder/enterFuelOrder.html | 41 +++++++- app/partials/fuelOrders/fuelOrders.controller.js | 109 ++++++++++++++------- app/partials/fuelOrders/fuelOrders.html | 46 ++++++++- 6 files changed, 224 insertions(+), 61 deletions(-) diff --git a/app/partials/customers/customers.controller.js b/app/partials/customers/customers.controller.js index 3713ad6..8037405 100644 --- a/app/partials/customers/customers.controller.js +++ b/app/partials/customers/customers.controller.js @@ -109,6 +109,16 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta getAllCompanies(); + $scope.getAircraftMakeAndModel=function (data) { + for(var i = 0; i < $scope.aircraftList.length; i++){ + if($scope.aircraftList[i].tail === data){ + $scope.order.aircraftMake = $scope.aircraftList[i].make; + $scope.order.aircraftModel = $scope.aircraftList[i].model; + } + + } + } + $scope.editMargin = function(customer) { //console.log('customer', customer); $scope.showLoader = true; @@ -434,10 +444,10 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta $scope.fuelData = {}; $scope.fuelData.companyId = $scope.selectedCompanyId; $scope.fuelData.companyName =$scope.order.defaultCompanyName; - var aircraftObj =JSON.parse($scope.order.aircraftName); - $scope.fuelData.aircraftName = aircraftObj.tail; - $scope.fuelData.make = aircraftObj.make; - $scope.fuelData.model = aircraftObj.model; + // var aircraftObj =JSON.parse($scope.order.aircraftName); + $scope.fuelData.aircraftName = $scope.order.aircraftName; + $scope.fuelData.make = $scope.order.aircraftMake; + $scope.fuelData.model = $scope.order.aircraftModel; //$scope.fuelData.fuelOn = $scope.order.fuelOn; $scope.fuelData.invoiced = $scope.order.invoiced; $scope.fuelData.volume = $scope.order.volume; @@ -495,7 +505,6 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta } $scope.dispatchOrder.fuelOrderList.push($scope.fuelData); - //console.log("=====$scope.fueldata======",$scope.fuelData) fuelOrdersService.dispathFuelOrder($scope.dispatchOrder).then(function(result) { $scope.showLoader = false; $scope.order = {}; diff --git a/app/partials/customers/customers.html b/app/partials/customers/customers.html index 794a9fa..1f9e94c 100644 --- a/app/partials/customers/customers.html +++ b/app/partials/customers/customers.html @@ -617,16 +617,49 @@
-
+
- - + + +
+
+
+
+
+ +
+
+ +
+
+
+ +
+
+
+ +
+ +
+
+ +
+
+
diff --git a/app/partials/enterFuelOrder/enterFuelOrder.controller.js b/app/partials/enterFuelOrder/enterFuelOrder.controller.js index ec94bc6..93ee285 100644 --- a/app/partials/enterFuelOrder/enterFuelOrder.controller.js +++ b/app/partials/enterFuelOrder/enterFuelOrder.controller.js @@ -12,7 +12,7 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http, enterFuelOrderService.getAllCompanies().then(function(result) { $scope.showLoader = false; $scope.companyList = result; - //console.log("===company====",result) + console.log("===company====",result) }) $scope.order = {}; @@ -24,11 +24,14 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http, $scope.selectedCompanyId = ''; $scope.marginId = ''; $scope.selectedTier = ''; + $scope.order.aircraftMake = ''; + $scope.order.aircraftModel = ''; $scope.getAircraft = function(company){ $scope.selectedCompanyName = company; - - + $scope.order.aircraftMake = ''; + $scope.order.aircraftModel = ''; + //console.log("===company====",company) $scope.showLoader = true; for (var i = 0; i < $scope.companyList.length; i++) { if ($scope.companyList[i].companyName == company) { @@ -84,6 +87,18 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http, } + $scope.getAircraftMakeAndModel=function (data) { + for(var i = 0; i < $scope.aircraftList.length; i++){ + if($scope.aircraftList[i].tail === data){ + $scope.order.aircraftMake = $scope.aircraftList[i].make; + $scope.order.aircraftModel = $scope.aircraftList[i].model; + } + + } + } + + + $scope.tiervalue=function(){ $scope.order.tierBreak=$scope.selectedTier.minTierBreak+'-'+$scope.selectedTier.maxTierBreak; } @@ -116,10 +131,10 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http, $scope.order.companyId = $scope.selectedCompanyId; $scope.order.companyName = $scope.order.companyName; - var aircraftObj =JSON.parse($scope.order.aircraftName); - $scope.order.aircraftName = aircraftObj.tail; - $scope.order.make = aircraftObj.make; - $scope.order.model = aircraftObj.model; + //var aircraftObj =JSON.parse($scope.order.aircraftName); + $scope.order.aircraftName = $scope.order.aircraftName; + $scope.order.make = $scope.order.aircraftMake; + $scope.order.model = $scope.order.aircraftModel; //$scope.order.fuelOn = $scope.order.fuelOn; $scope.order.invoiced = $scope.order.invoiced; @@ -177,7 +192,7 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http, } $scope.dispatchOrder.fuelOrderList.push($scope.order); - + //console.log("==$scope.order==",$scope.order) enterFuelOrderService.dispathFuelOrder($scope.dispatchOrder).then(function(result) { $scope.showLoader = false; $scope.order = {}; diff --git a/app/partials/enterFuelOrder/enterFuelOrder.html b/app/partials/enterFuelOrder/enterFuelOrder.html index 28f2b44..85a859d 100644 --- a/app/partials/enterFuelOrder/enterFuelOrder.html +++ b/app/partials/enterFuelOrder/enterFuelOrder.html @@ -26,7 +26,7 @@
-
+
@@ -65,15 +65,48 @@
- - +
+ +
+
+ +
+
+
+ +
+
+
+ +
+ +
+
+ +
+
+ +
+
+
+
+
@@ -84,7 +117,7 @@
-
+
diff --git a/app/partials/fuelOrders/fuelOrders.controller.js b/app/partials/fuelOrders/fuelOrders.controller.js index 9e3f368..a1de818 100644 --- a/app/partials/fuelOrders/fuelOrders.controller.js +++ b/app/partials/fuelOrders/fuelOrders.controller.js @@ -127,7 +127,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT } - // console.log("==result===",$scope.orderdata) + // console.log("==result===",$scope.orderdata) $scope.displayFuelOrderList = new NgTableParams({ page: 1, @@ -169,28 +169,41 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT $scope.getOrders(); $scope.optionSelected=''; + var checkFlag = 0; $scope.onFWSelect = function() { - if($scope.optionSelected == 'dt'){ - $('#demo-modal-4').css('display', 'block'); - $scope.optionSelected=''; - - } - if($scope.optionSelected == 'efo'){ - $scope.showLoader = true; - var fileName = "orders.csv"; - var a = document.createElement("a"); - document.body.appendChild(a); - fuelOrdersService.exportCompany().then(function(result) { - var file = new Blob([result], {type: 'application/csv'}); - var fileURL = URL.createObjectURL(file); - a.href = fileURL; - a.download = fileName; - a.click(); - $scope.showLoader = false; - $scope.optionSelected=''; - }) - } - } + if (checkFlag != 0) { + $(document).ready(function(){ + $('body').css('position', 'fixed'); + }) + if($scope.optionSelected == 'dt'){ + $('#demo-modal-4').css('display', 'block'); + $scope.optionSelected=''; + + } + if($scope.optionSelected == 'efo'){ + $scope.showLoader = true; + var fileName = "orders.csv"; + var a = document.createElement("a"); + document.body.appendChild(a); + fuelOrdersService.exportCompany().then(function(result) { + var file = new Blob([result], {type: 'application/csv'}); + var fileURL = URL.createObjectURL(file); + a.href = fileURL; + a.download = fileName; + a.click(); + $scope.showLoader = false; + $scope.optionSelected=''; + $(document).ready(function(){ + $('body').css('position', 'initial'); + }) + }) + } + checkFlag += 1; + }else{ + checkFlag += 1; + } + + } $scope.attachmentrowid = "" @@ -249,6 +262,9 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT $scope.editTableRow = function(rowData){ //console.log('row data', rowData); + $(document).ready(function(){ + $('body').css('position', 'fixed'); + }) $scope.editdata = rowData; $('#demo-modal-5').css('display', 'block'); } @@ -282,10 +298,10 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT $scope.fuelData.companyId = $scope.selectedCompanyId; $scope.fuelData.companyName = $scope.order.companyName; - var aircraftObj =JSON.parse($scope.order.aircraftName); - $scope.fuelData.aircraftName = aircraftObj.tail; - $scope.fuelData.make = aircraftObj.make; - $scope.fuelData.model = aircraftObj.model; + //var aircraftObj =JSON.parse($scope.order.aircraftName); + $scope.fuelData.aircraftName = $scope.order.aircraftName; + $scope.fuelData.make = $scope.order.aircraftMake; + $scope.fuelData.model = $scope.order.aircraftModel; // $scope.fuelData.fuelOn = $scope.order.fuelOn; $scope.fuelData.invoiced = $scope.order.invoiced; $scope.fuelData.volume = $scope.order.volume; @@ -345,7 +361,6 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT } $scope.dispatchOrder.fuelOrderList.push($scope.fuelData); - // console.log("=====$scope.fueldata======",$scope.fuelData) fuelOrdersService.dispathFuelOrder($scope.dispatchOrder).then(function(result) { $scope.showLoader = false; $scope.order = {}; @@ -358,6 +373,10 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT toastr.success('Fuel Order Dispatched Successfully', { closeButton: true }) + /*for datepicker position */ + $(document).ready(function(){ + $('body').css('position', 'initial'); + }) }) @@ -439,17 +458,18 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT } $scope.dispatchOrder.fuelOrderList.push($scope.fuelData); fuelOrdersService.updateFuelOrder($scope.dispatchOrder).then(function(result) { - $scope.showLoader = false; - $scope.editdata = {}; - $('#demo-modal-5').css('display', ''); - $scope.getOrders(); - toastr.success('Fuel Order Updated Successfully', { - closeButton: true - }) + $scope.showLoader = false; + $scope.editdata = {}; + $('#demo-modal-5').css('display', ''); + $scope.getOrders(); + toastr.success('Fuel Order Updated Successfully', { + closeButton: true + }) + /*for datepicker position */ + $(document).ready(function(){ + $('body').css('position', 'initial'); + }) }) - - - }else { @@ -504,12 +524,27 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT } + $scope.getAircraftMakeAndModel=function (data) { + for(var i = 0; i < $scope.aircraftList.length; i++){ + if($scope.aircraftList[i].tail === data){ + $scope.order.aircraftMake = $scope.aircraftList[i].make; + $scope.order.aircraftModel = $scope.aircraftList[i].model; + } + + } + } $scope.cancelData = function() { + $(document).ready(function(){ + $('body').css('position', 'initial'); + }) $('#demo-modal-4').css('display', ''); } $scope.canceleditdata = function() { + $(document).ready(function(){ + $('body').css('position', 'initial'); + }) $('#demo-modal-5').css('display', ''); } diff --git a/app/partials/fuelOrders/fuelOrders.html b/app/partials/fuelOrders/fuelOrders.html index 18f39ca..f3f4a07 100644 --- a/app/partials/fuelOrders/fuelOrders.html +++ b/app/partials/fuelOrders/fuelOrders.html @@ -144,7 +144,7 @@ @@ -582,9 +582,42 @@
- - + + +
+
+
+
+
+ +
+
+ +
+
+
+ +
+
+
+ +
+ +
+
+ +
+
+
@@ -1097,4 +1130,9 @@ sendEvent = function(sel, step) { return x instanceof Date; }; }) - \ No newline at end of file + + \ No newline at end of file -- 2.0.0