From a7a7cfeca7d51ea363d2c320341b5fb24af42180 Mon Sep 17 00:00:00 2001 From: Rishav Date: Mon, 5 Jun 2017 17:35:42 +0530 Subject: [PATCH] fuel vendor page implementation --- app/partials/FuelVendors/FuelVendors.controller.js | 98 ++--------- app/partials/FuelVendors/FuelVendors.html | 181 +++------------------ app/partials/customers/customers.controller.js | 30 ++-- app/partials/customers/customers.html | 77 +++++---- app/partials/customers/customers.service.js | 30 ++++ app/partials/viewCompany/viewCompany.html | 2 +- app/partials/viewFuelVendor/viewFuelVendor.html | 166 +++++++------------ 7 files changed, 192 insertions(+), 392 deletions(-) diff --git a/app/partials/FuelVendors/FuelVendors.controller.js b/app/partials/FuelVendors/FuelVendors.controller.js index d81fca8..bf1ce8c 100644 --- a/app/partials/FuelVendors/FuelVendors.controller.js +++ b/app/partials/FuelVendors/FuelVendors.controller.js @@ -10,13 +10,12 @@ $(document).ready(function() { $('#example').DataTable(); }); - + $scope.userProfileId = JSON.parse(localStorage.getItem('userProfileId')) $scope.reset = function(){ $("input").val(""); } $scope.data = {}; - $scope.aircraft = {}; $scope.data.activate = true; $scope.showLoader = false; getAllVendor(); @@ -54,15 +53,16 @@ }) } - getData(); - function getData(){ - CustomersService.getAircraftMake().then(function(result) { - $scope.aircraftMakeList = result; - }) - } - - CustomersService.getMargin().then(function(result) { - $scope.marginList = result; + // CustomersService.getMargin().then(function(result) { + // $scope.marginList = result; + // }) + + CustomersService.getJetMargin($scope.userProfileId).then(function(result) { + $scope.jetMarginList = result; + }) + + CustomersService.getAvgMargin($scope.userProfileId).then(function(result) { + $scope.avgsMarginList = result; }) $scope.showCompanyError = false; @@ -97,83 +97,9 @@ FuelVendorsService.addVendor(vendorData).then(function(result) { console.log("result",result) $scope.accountId = result; - $scope.aircraft.accountId = $scope.accountId; }) - $(sel).trigger('next.m.' + step); - getData(); } + $('#vendor-modal-3').modal('hide'); } - $scope.aircraftDetails = [{ - 'tail':'', - 'make': '', - 'model': '', - 'sizeId' : '', - 'marginId': $scope.data.masterMargin - }]; - - $scope.addNew = function(){ - $scope.aircraftDetails.push({ - 'tail':'', - 'make': '', - 'model': '', - 'sizeId' : '', - 'marginId': '' - }); - console.log($scope.aircraftDetails) - }; - - $scope.getModal = function(makeId, index){ - $scope.showLoader = true; - $scope.aircraft.make = makeId; - //var makeId = makeId; - CustomersService.getModal($scope.aircraft.make).then(function(result) { - $scope.showLoader = false; - $scope.aircraftDetails[index].aircraftModalList = result; - //$scope.aircraftDetails[index].model = $scope.aircraftModalList[0]; - }) - } - - $scope.getSize = function(model, index){ - $scope.showLoader = true; - CustomersService.getAircraftSize($scope.aircraft.make, model).then(function(result) { - $scope.showLoader = false; - console.log("result",result) - $scope.aircraftDetails[index].aircraftSizeList = result; - //$scope.aircraftDetails[index].size = $scope.aircraftSizeList[0]; - console.log($scope.aircraftDetails[index].size) - }) - } - - $scope.aircraftListData = {}; - $scope.addData = []; - $scope.saveVendorData = function(){ - for(var i=0; i<$scope.aircraftDetails.length;i++){ - $scope.addData.push({ - 'tail': $scope.aircraftDetails[i].tail, - 'make': $scope.aircraftDetails[i].make, - 'model': $scope.aircraftDetails[i].model, - 'sizeId' : $scope.aircraftDetails[i].sizeId, - 'marginId': $scope.aircraftDetails[i].marginId - }); - } - $scope.aircraftListData.aircraftList = $scope.addData; - $scope.aircraftListData.accountId = $scope.aircraft.accountId; - - FuelVendorsService.addVendorAicraft($scope.aircraftListData).then(function(result) { - console.log(result) - - if(result != null && result.success){ - toastr.success(''+result.success+'', { - closeButton: true - }) - $('#vendor-modal-3').modal('hide'); - getAllVendor(); - }else{ - toastr.error(''+result.statusText+'', { - closeButton: true - }) - } - }); - } } \ No newline at end of file diff --git a/app/partials/FuelVendors/FuelVendors.html b/app/partials/FuelVendors/FuelVendors.html index 6b6aef9..c10b63f 100644 --- a/app/partials/FuelVendors/FuelVendors.html +++ b/app/partials/FuelVendors/FuelVendors.html @@ -336,7 +336,7 @@

-
+
@@ -347,41 +347,46 @@
+
+ Certificate Type +
+
+ +
+

- Master Margin + JET A Margin
- - +
- Certificate Type + AVGAS 100LL Margin
- +
+

@@ -465,138 +470,6 @@
- - - -
- - - - -
-
-
-
-
-
- - -

Add a New Vendor

-
-
-
-
-
- -

Aircraft List

-
-
-
- - - - - - - - - - - - - - - - - - - - - - -
TailMakeModelSizeMargin
- - - - - - - - - - -
-
-
-
-
-
-
- -
-
@@ -604,15 +477,9 @@
-
- - - - +
diff --git a/app/partials/customers/customers.controller.js b/app/partials/customers/customers.controller.js index 70920f9..aff612b 100644 --- a/app/partials/customers/customers.controller.js +++ b/app/partials/customers/customers.controller.js @@ -8,7 +8,7 @@ $(document).ready(function() { $('#example').DataTable(); }); - + $scope.userProfileId = JSON.parse(localStorage.getItem('userProfileId')) $scope.reset2 = function(){ $("input").val(""); } @@ -122,9 +122,13 @@ }) } - $scope.marginFilterOptions = []; - CustomersService.getMargin().then(function(result) { - $scope.marginList = result; + + // CustomersService.getMargin().then(function(result) { + // $scope.marginList = result; + // }) + $scope.marginFilterOptions = []; + CustomersService.getJetMargin($scope.userProfileId).then(function(result) { + $scope.jetMarginList = result; $scope.marginFilterOptions.push({ 'id': '', 'title': 'Show All' }); @@ -134,10 +138,13 @@ 'title': result[i].marginName }) } - console.log('$scope.marginFilterOptions', $scope.marginFilterOptions); + }) - //$scope.marginFilter = $scope.marginList; + CustomersService.getAvgMargin($scope.userProfileId).then(function(result) { + $scope.avgsMarginList = result; }) + + $scope.showCompanyError = false; $scope.showMarginError = false; @@ -164,7 +171,7 @@ + $scope.data.state + "&country=" + $scope.data.country + "&zipcode=" + $scope.data.zipcode + "&internalNote=" + $scope.data.internalNote + "&certificateType=" + $scope.data.certificateType + "&baseTenant=" + $scope.data.baseTenant + "&fuelerlinxCustomer=" + $scope.data.fuelerlinxCustomer + "&contractFuelVendor=" + $scope.data.contractFuelVendor - + "&activate=" + $scope.data.activate + "&baseIcao=" + $scope.data.baseIcao; + + "&activate=" + $scope.data.activate + "&baseIcao=" + $scope.data.baseIcao + "&avgasMargin=" + $scope.data.avgasMargin; CustomersService.addCompany(companyData).then(function(result) { $scope.accountId = result; @@ -180,7 +187,8 @@ 'make': '', 'model': '', 'sizeId' : '', - 'marginId': $scope.data.masterMargin + 'marginId': $scope.data.masterMargin, + 'avgasMarginId': $scope.data.avgasMargin }]; $scope.addNew = function(){ @@ -189,7 +197,8 @@ 'make': '', 'model': '', 'sizeId' : '', - 'marginId': '' + 'marginId': $scope.data.masterMargin, + 'avgasMarginId': $scope.data.avgasMargin }); }; @@ -222,7 +231,8 @@ 'make': $scope.aircraftDetails[i].make, 'model': $scope.aircraftDetails[i].model, 'sizeId' : $scope.aircraftDetails[i].sizeId, - 'marginId': $scope.aircraftDetails[i].marginId + 'marginId': $scope.aircraftDetails[i].marginId, + 'avgasMarginId': $scope.aircraftDetails[i].avgasMarginId }); } $scope.aircraftListData.aircraftList = $scope.addData; diff --git a/app/partials/customers/customers.html b/app/partials/customers/customers.html index 9bff2fc..833e6b8 100644 --- a/app/partials/customers/customers.html +++ b/app/partials/customers/customers.html @@ -122,7 +122,7 @@ - + {{row.allIn}} @@ -286,7 +286,7 @@

-
+
@@ -297,42 +297,47 @@
+
+ Certificate Type +
+
+ +
+

- Master Margin + JET A Margin
- - + + - +
-
-
+
- Certificate Type + AVGAS 100LL Margin
- +
+

@@ -500,7 +505,8 @@ Make Model Size - Margin + JET A Margin + AVGS 100LL Margin @@ -508,27 +514,38 @@ - + - + - + - - + + - - + + + + + diff --git a/app/partials/customers/customers.service.js b/app/partials/customers/customers.service.js index 3555a8a..d795c3a 100644 --- a/app/partials/customers/customers.service.js +++ b/app/partials/customers/customers.service.js @@ -37,6 +37,36 @@ return deferred.promise; } + this.getJetMargin = function(id){ + var deferred = $q.defer(); + $http({ + method : 'GET', + url : BASE_URL.url +'/margin/getJetAType/'+id, + headers : {'Content-Type': 'application/json'}, + }) + .then(function (result){ + deferred.resolve(result.data); + },function (result){ + deferred.resolve(result.data); + }) + return deferred.promise; + } + + this.getAvgMargin = function(id){ + var deferred = $q.defer(); + $http({ + method : 'GET', + url : BASE_URL.url +'/margin/getAVGASType/'+id, + headers : {'Content-Type': 'application/json'}, + }) + .then(function (result){ + deferred.resolve(result.data); + },function (result){ + deferred.resolve(result.data); + }) + return deferred.promise; + } + this.addCompany = function(data) { var deferred = $q.defer(); diff --git a/app/partials/viewCompany/viewCompany.html b/app/partials/viewCompany/viewCompany.html index b8b9a49..5ba9926 100644 --- a/app/partials/viewCompany/viewCompany.html +++ b/app/partials/viewCompany/viewCompany.html @@ -292,7 +292,7 @@ $3659 - + diff --git a/app/partials/viewFuelVendor/viewFuelVendor.html b/app/partials/viewFuelVendor/viewFuelVendor.html index 950fe16..4643563 100644 --- a/app/partials/viewFuelVendor/viewFuelVendor.html +++ b/app/partials/viewFuelVendor/viewFuelVendor.html @@ -221,55 +221,63 @@
-
-
- -

Aircraft List

-
- -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
Tail #MakeModelJET-AAll inAVGASAll in
{{aircraft.tail}}{{aircraft.make}}{{aircraft.model}} - - $3659 - - $3659
-
-
-
+
+
+ +

Price Manager Reference

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
OmitProductCostPAP (Margin)PAP (Total)Expires
Jet-A Full Service$2.123$23000$36593/15/2017
Jet-A Full Service$2.123$23000$36593/15/2017
Jet-A Full Service$2.123$23000$36593/15/2017
Jet-A Full Service$2.123$23000$36593/15/2017
+
+
+
@@ -310,65 +318,7 @@
-
-
-
- -

Price Manager Reference

-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
OmitProductCostPAP (Margin)PAP (Total)Expires
Jet-A Full Service$2.123$23000$36593/15/2017
Jet-A Full Service$2.123$23000$36593/15/2017
Jet-A Full Service$2.123$23000$36593/15/2017
Jet-A Full Service$2.123$23000$36593/15/2017
-
-
-
-
+ -- 2.0.0