diff --git a/app/partials/viewCompany/viewCompany.controller.js b/app/partials/viewCompany/viewCompany.controller.js index d8d8148..011d4a9 100644 --- a/app/partials/viewCompany/viewCompany.controller.js +++ b/app/partials/viewCompany/viewCompany.controller.js @@ -237,7 +237,7 @@ angular.module('acufuel') function getAircraftList() { ViewCompanyService.getAircraft(companyId).then(function(result) { - console.log("aircrafts",result) + //console.log("aircrafts",result) $scope.contactAircraftList = result; for (var i = 0; i < $scope.contactAircraftList.length; i++) { if ($scope.contactAircraftList[i].aircraftsMargin != null) { @@ -608,18 +608,26 @@ angular.module('acufuel') } } - /* editing */ + /* omit strike out*/ updateFuelManagerService.getFuelPricingNew().then(function(result) { $scope.fuelPricing = result; $scope.omitData; ViewCompanyService.getOmitCompany($scope.compId).then(function(result){ $scope.omitData = result; - console.log("omit data===", $scope.omitData); + //console.log("omit data===", $scope.omitData); + for(var i = 0 ; i< $scope.fuelPricing.length; i++){ + for(var j = 0; j<$scope.omitData.length; j++){ + if($scope.omitData[j].marginId == $scope.fuelPricing[i].fuelPricing.id){ + $scope.fuelPricing[i].fuelPricing.omit = $scope.omitData[j].omit; + } + } + } + }) - console.log("$scope.fuelPricing",$scope.fuelPricing) + // console.log("$scope.fuelPricing",$scope.fuelPricing) for (var i = 0; i < $scope.fuelPricing.length; i++) { - console.log('$scope.fuelPricing[i].fuelPricing', $scope.fuelPricing[i].fuelPricing); + // console.log('$scope.fuelPricing[i].fuelPricing', $scope.fuelPricing[i].fuelPricing); //console.log("fuelid",$scope.fuelPricing[i].fuelPricing.id,"getid",$scope.omitData[j].id) if ($scope.fuelPricing[i].fuelPricing.expirationDate != null) { $scope.fuelPricing[i].fuelPricing.expirationDate = new Date($scope.fuelPricing[i].fuelPricing.expirationDate); @@ -725,6 +733,16 @@ angular.module('acufuel') }) } + /*omitStrikeout(); + function omitStrikeout(){ + for(var i = 0; i < $scope.omitData.length; i++){ + if($scope.omitData.marginId === $scope.fuelPricing.id){ + console.log(hi) + $scope.fuelPricing.omit = 'true'; + } + } + }*/ + $scope.updateOmit = function(fuel, omit) { $scope.fuelData = {}; @@ -735,11 +753,8 @@ angular.module('acufuel') $scope.fuelData.papTotal = fuel.papTotal; $scope.fuelData.cost = fuel.cost; $scope.fuelData.companyId = $scope.compId ; - console.log("companyId",$scope.compId) - console.log("omit checked",$scope.fuelData.omit) if($scope.fuelData.omit == true) { - console.log("Insert API called",$scope.fuelData.customMarginId) var customData = "companyId=" + $scope.fuelData.companyId + "&customMarginId=" + $scope.fuelData.customMarginId; ViewCompanyService.omitAddCompanyFuel(customData).then(function(result) { if (result.success) { @@ -753,9 +768,8 @@ angular.module('acufuel') } }) }else{ - console.log("Delete API called",$scope.compId) - // var Id = "companyId=" + $scope.fuelData.companyId + "&customMarginId=" + $scope.fuelData.customMarginId; - ViewCompanyService.omitDeleteCompanyFuel($scope.fuelData.customMarginId).then(function(result){ + var data ="companyId=" + $scope.fuelData.companyId + "&customMarginId=" + $scope.fuelData.customMarginId; + ViewCompanyService.omitDeleteCompanyFuel(data).then(function(result){ if (result.success) { toastr.success('' + result.success + '', { closeButton: true diff --git a/app/partials/viewCompany/viewCompany.html b/app/partials/viewCompany/viewCompany.html index 0a52e7e..5aa794d 100644 --- a/app/partials/viewCompany/viewCompany.html +++ b/app/partials/viewCompany/viewCompany.html @@ -424,8 +424,8 @@
- - +
+ @@ -437,8 +437,8 @@ - - + + diff --git a/app/partials/viewCompany/viewCompany.service.js b/app/partials/viewCompany/viewCompany.service.js index 7cc68df..096a8d3 100644 --- a/app/partials/viewCompany/viewCompany.service.js +++ b/app/partials/viewCompany/viewCompany.service.js @@ -314,7 +314,7 @@ return deferred.promise; } - this.omitDeleteCompanyFuel = function(id) { + /*this.omitDeleteCompanyFuel = function(id) { var deferred = $q.defer(); $http({ @@ -330,6 +330,24 @@ return deferred.promise; } + +*/ + this.omitDeleteCompanyFuel = function(data){ + var deferred = $q.defer(); + $http({ + method : 'POST', + url : BASE_URL.url +'/company/omitData/delete', + data : data, + headers : {'Content-Type': 'application/json'}, + }) + .then(function (result){ + deferred.resolve(result.data); + },function (result){ + deferred.resolve(result.data); + }) + return deferred.promise; + } + this.omitAddCompanyFuel = function(data){ var deferred = $q.defer(); $http({ diff --git a/app/partials/viewFuelVendor/viewFuelVendor.controller.js b/app/partials/viewFuelVendor/viewFuelVendor.controller.js index 796c1c2..bf9ed87 100644 --- a/app/partials/viewFuelVendor/viewFuelVendor.controller.js +++ b/app/partials/viewFuelVendor/viewFuelVendor.controller.js @@ -33,17 +33,7 @@ }) } - $scope.omitData ={}; - getOmitVendorFuel(); - function getOmitVendorFuel() { - console.log("sada" ,vendorId) - ViewFuelVendorService.getOmitVendor(vendorId).then(function(result){ - $scope.omitData = result; - console.log("omit data===",$scope.omitData ) - }) - - } - + $scope.changeCompanyStatus = function(){ $('#deleteVendor').css('display', 'block'); if($scope.vendorData.activate == true){ @@ -166,7 +156,7 @@ $scope.sendMail = function(){ $('#confirm2').css('display', 'none'); ViewFuelVendorService.sendMail(vendorId).then(function(result) { - console.log("email", vendorId) + // console.log("email", vendorId) if(result != null && result.success){ toastr.success(''+result.success+'', { closeButton: true @@ -304,18 +294,32 @@ } } + /* omit strike out here */ updateFuelManagerService.getFuelPricingNew().then(function(result) { $scope.fuelPricing = result; - for (var i = 0; i<$scope.fuelPricing.length; i++) { - if ($scope.fuelPricing[i].fuelPricing.expirationDate != null) { - $scope.fuelPricing[i].fuelPricing.expirationDate = new Date($scope.fuelPricing[i].fuelPricing.expirationDate); - var newTime = new Date($scope.fuelPricing[i].fuelPricing.expirationDate); - var dmonth = newTime.getUTCMonth() + 1; //months from 1-12 - var dday = newTime.getUTCDate(); - var dyear = newTime.getUTCFullYear(); - $scope.fuelPricing[i].fuelPricing.expirationDate = dmonth+'/'+dday+'/'+dyear; - } - } + $scope.omitData; + ViewFuelVendorService.getOmitVendor(vendorId).then(function(result){ + $scope.omitData = result; + // console.log("omit data===",$scope.omitData); + for(var i = 0 ; i< $scope.fuelPricing.length; i++){ + for(var j = 0; j<$scope.omitData.length; j++){ + if($scope.omitData[j].marginId == $scope.fuelPricing[i].fuelPricing.id){ + $scope.fuelPricing[i].fuelPricing.omit = $scope.omitData[j].omit; + } + } + } + }) + // console.log("$scope.fuelPricing",$scope.fuelPricing) + for (var i = 0; i<$scope.fuelPricing.length; i++) { + if ($scope.fuelPricing[i].fuelPricing.expirationDate != null) { + $scope.fuelPricing[i].fuelPricing.expirationDate = new Date($scope.fuelPricing[i].fuelPricing.expirationDate); + var newTime = new Date($scope.fuelPricing[i].fuelPricing.expirationDate); + var dmonth = newTime.getUTCMonth() + 1; //months from 1-12 + var dday = newTime.getUTCDate(); + var dyear = newTime.getUTCFullYear(); + $scope.fuelPricing[i].fuelPricing.expirationDate = dmonth+'/'+dday+'/'+dyear; + } + } }) @@ -372,9 +376,9 @@ } }) }else{ - console.log("Delete API called",vendorId) - // var Id = "vendorId=" + vendorId + "&customMarginId=" + $scope.fuelData.customMarginId; - ViewFuelVendorService.omitDeleteVendorFuel(vendorId).then(function(result){ + // console.log("Delete API called",vendorId) + var data ="vendorId=" + vendorId + "&customMarginId=" + $scope.fuelData.customMarginId; + ViewFuelVendorService.omitDeleteVendorFuel(data).then(function(result){ if (result.success) { toastr.success('' + result.success + '', { closeButton: true diff --git a/app/partials/viewFuelVendor/viewFuelVendor.html b/app/partials/viewFuelVendor/viewFuelVendor.html index c70a9e5..22e6481 100644 --- a/app/partials/viewFuelVendor/viewFuelVendor.html +++ b/app/partials/viewFuelVendor/viewFuelVendor.html @@ -243,8 +243,8 @@
- -
Omit
{{fuel.name}} ${{fuel.fuelPricing.cost | number :4}}
+
+ @@ -256,8 +256,8 @@ - - + + diff --git a/app/partials/viewFuelVendor/viewFuelVendor.service.js b/app/partials/viewFuelVendor/viewFuelVendor.service.js index dace2a4..291a653 100644 --- a/app/partials/viewFuelVendor/viewFuelVendor.service.js +++ b/app/partials/viewFuelVendor/viewFuelVendor.service.js @@ -251,7 +251,7 @@ return deferred.promise; } - this.omitDeleteVendorFuel = function(id) { + /*this.omitDeleteVendorFuel = function(id) { var deferred = $q.defer(); $http({ @@ -265,8 +265,24 @@ deferred.resolve(result.data); }) return deferred.promise; - } + } */ + this.omitDeleteVendorFuel = function(data){ + var deferred = $q.defer(); + $http({ + method : 'POST', + url : BASE_URL.url +'/vendor/omitData/delete', + data : data, + headers : {'Content-Type': 'application/json'}, + }) + .then(function (result){ + deferred.resolve(result.data); + },function (result){ + deferred.resolve(result.data); + }) + return deferred.promise; + } + this.omitAddvendorFuel = function(data){ var deferred = $q.defer(); $http({
Omit
{{fuel.name}} ${{fuel.fuelPricing.cost}}