diff --git a/app/partials/enterFuelOrder/enterFuelOrder.html b/app/partials/enterFuelOrder/enterFuelOrder.html index 1f9baee..775b3b1 100644 --- a/app/partials/enterFuelOrder/enterFuelOrder.html +++ b/app/partials/enterFuelOrder/enterFuelOrder.html @@ -26,80 +26,6 @@
- -
@@ -108,9 +34,9 @@
+ + +
@@ -120,9 +46,9 @@
+ + +
@@ -140,9 +66,9 @@
+ + +
@@ -151,7 +77,6 @@
-
@@ -208,14 +133,11 @@ Date -
Time - -
@@ -228,7 +150,6 @@
-
diff --git a/app/partials/fuelOrders/fuelOrders.controller.js b/app/partials/fuelOrders/fuelOrders.controller.js index 965f5b0..b963423 100644 --- a/app/partials/fuelOrders/fuelOrders.controller.js +++ b/app/partials/fuelOrders/fuelOrders.controller.js @@ -262,6 +262,14 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT } } + $scope.setCost = function(cost){ + if(cost != null) { + var obj =JSON.parse(cost); + $scope.order.fboCost = obj.cost; + } + + } + $scope.addTotal = function(value, valueOf){ if(valueOf == 'v'){ $scope.order.total = value * $scope.order.invoiced @@ -271,62 +279,67 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT } $scope.addFuelData = function() { - $scope.showLoader = true; - - if ($scope.order.priceQuote === null || $scope.order.priceQuote == '') { - $scope.showLoader = false; - toastr.error('Please select Company and Price Quote.', { - closeButton: true - }) - }else{ + $scope.showLoader = true; + $scope.fuelData = {}; + $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; + $scope.fuelData.fuelOn = $scope.order.fuelOn; + $scope.fuelData.invoiced = $scope.order.invoiced; + $scope.fuelData.volume = $scope.order.volume; + $scope.fuelData.source = $scope.order.source; + $scope.fuelData.status = $scope.order.status; + $scope.fuelData.total = $scope.order.total; + //tier no use + $scope.fuelData.tierBreak = $scope.order.tierBreak; + + var obj =JSON.parse($scope.order.priceQuote); + $scope.fuelData.priceQuote = obj.papTotal; + $scope.fuelData.fboCost = obj.cost; + $scope.fuelData.productName = obj.productName; + + $scope.fuelData.etaTime = $scope.order.etaTime; + $scope.fuelData.etdTime = $scope.order.etdTime; + $scope.fuelData.certificateType = $scope.order.certificateType; + var currentDate = new Date(); + var hours = currentDate.getHours(); + var min = currentDate.getMinutes(); + var sec = currentDate.getSeconds(); + if ($scope.order.upliftDate != '') { + $scope.order.upliftDate = $scope.order.upliftDate + ' ' + hours + ':' + min + ':' + sec; + $scope.order.upliftDate = new Date($scope.order.upliftDate); + $scope.fuelData.upliftDate = $scope.order.upliftDate.getTime(); + } - if ($scope.order.upliftDate != '') { - $scope.order.upliftDate = new Date($scope.order.upliftDate); - $scope.order.upliftDate = $scope.order.upliftDate.getTime(); - } - if ($scope.order.departingDate != '') { - $scope.order.departingDate = new Date($scope.order.departingDate); - $scope.order.departingDate = $scope.order.departingDate.getTime(); - } - var obj =JSON.parse($scope.order.priceQuote); - //$scope.order.priceQuote = obj.papMargin; - $scope.order.priceQuote = obj.papTotal; - $scope.fuelData = {}; - $scope.fuelData.aircraftName = $scope.order.aircraftName; - $scope.fuelData.companyName = $scope.order.companyName; - $scope.fuelData.departingDate = $scope.order.departingDate; - $scope.fuelData.fboCost = $scope.order.fboCost; - $scope.fuelData.id = $scope.order.id; - $scope.fuelData.invoiced = $scope.order.invoiced; - $scope.fuelData.priceQuote = $scope.order.priceQuote; - $scope.fuelData.productName = obj.productName; - $scope.fuelData.volume = $scope.order.volume; - $scope.fuelData.source = $scope.order.source; - $scope.fuelData.status = $scope.order.status; - $scope.fuelData.tierBreak = $scope.order.tierBreak; - $scope.fuelData.total = $scope.order.total; - $scope.fuelData.upliftDate = $scope.order.upliftDate; - $scope.fuelData.companyId = $scope.selectedCompanyId; + + if ($scope.order.departingDate != '') { + $scope.order.departingDate = $scope.order.departingDate + ' ' + hours + ':' + min + ':' + sec; + $scope.order.departingDate = new Date($scope.order.departingDate); + $scope.fuelData.departingDate = $scope.order.departingDate.getTime(); + } + - - - $scope.dispatchOrder.fuelOrderList.push($scope.fuelData); - //console.log("=====$scope.fueldata======",$scope.fuelData) - fuelOrdersService.dispathFuelOrder($scope.dispatchOrder).then(function(result) { - $scope.showLoader = false; - $scope.order = {}; - $scope.dispatchOrder.fuelOrderList = []; - $('#demo-modal-4').css('display', ''); - $scope.getOrders(); - toastr.success('Fuel Order Dispatched Successfully', { - closeButton: true - }) - }) - - } + + $scope.dispatchOrder.fuelOrderList.push($scope.fuelData); + //console.log("=====$scope.fueldata======",$scope.fuelData) + fuelOrdersService.dispathFuelOrder($scope.dispatchOrder).then(function(result) { + $scope.showLoader = false; + $scope.order = {}; + $scope.dispatchOrder.fuelOrderList = []; + $('#demo-modal-4').css('display', ''); + $scope.getOrders(); + toastr.success('Fuel Order Dispatched Successfully', { + closeButton: true + }) + }) - + } + $scope.updateStatus = function(row, status) { $scope.showLoader = true; $scope.fuelData = {}; @@ -460,13 +473,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT } } - $scope.setCost = function(cost){ - if(cost != null) { - var obj =JSON.parse(cost); - $scope.order.fboCost = obj.cost; - } - - } + $scope.cancelData = function() { @@ -600,6 +607,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT $scope.aircraftListData = {}; $scope.addData = []; + $scope.saveCompanyData = function(){ CustomersService.addCompany($scope.data).then(function(result) { $scope.accountId = result; diff --git a/app/partials/fuelOrders/fuelOrders.html b/app/partials/fuelOrders/fuelOrders.html index 068ffc3..f936a23 100644 --- a/app/partials/fuelOrders/fuelOrders.html +++ b/app/partials/fuelOrders/fuelOrders.html @@ -527,160 +527,168 @@ -
-
-
-
-
-
-
-
- - -

Add a Fuel Order

-
-
-
-
-
+
+
+
+
+
+
+
+
+ + +

Add a Fuel Order

+
+
+
+
+
- +
- - +
-
+
- +
- +
-
-

+ +
+
+
-
+ +
- +
- +
-
+
- - $ +
- +
-
+
-
- - -
+
- -
+
+ +
- +
-
- +
+
+ Date + +
+
+ Time + + +
-
+ +
- + $
- - +
-
-
-
-
+
+

- -
+ +
+ +
- +
-
- - +
+
+ Date + +
+
+ Time + + +
-
+ +
- + + $
-
- -
-
+
+
- -
-
-
-
+
+
+

- -
+ +
+ +
- +
- +
+
@@ -691,35 +699,78 @@
-
-
-
-
+
+

- +
+
+
+ +
+
+ +
+
-
-
-
+
+
+
+
+ + +
+
+ +
+
+ +
+
+
+
+
+ +
+
+ +
+
+
+
+

-
-
-
-
-
- - -
-
-
-
+ + +
+
+
+
@@ -750,13 +801,11 @@ Date
-
Time -
@@ -788,7 +837,6 @@ -
@@ -802,9 +850,7 @@ - -
@@ -818,10 +864,6 @@
- {{editdata.companyName}}
@@ -849,7 +891,6 @@
- {{editdata.aircraftName}}
@@ -861,7 +902,6 @@
-
@@ -881,9 +921,7 @@ - -
@@ -892,7 +930,6 @@
- {{editdata.productName}}
@@ -916,7 +953,6 @@ -