diff --git a/app/partials/viewCompany/viewCompany.controller.js b/app/partials/viewCompany/viewCompany.controller.js index 7675f49..6698d10 100644 --- a/app/partials/viewCompany/viewCompany.controller.js +++ b/app/partials/viewCompany/viewCompany.controller.js @@ -245,6 +245,7 @@ angular.module('acufuel') ViewCompanyService.getAircraft(companyId).then(function(result) { $scope.contactAircraftList = result; + console.log("===contactAircraftList===",result) for (var i = 0; i < $scope.contactAircraftList.length; i++) { if ($scope.contactAircraftList[i].aircraftsMargin != null) { $scope.aircraftmargins.push({ @@ -295,8 +296,6 @@ angular.module('acufuel') getContactList(); $scope.contactData.contactList = []; $scope.data.email = ''; - //console.log("data2==",$scope.contactData) - //toastr.success(''+result.success+'', { toastr.success('Created Successfully', { closeButton: true }) @@ -388,10 +387,14 @@ angular.module('acufuel') } $scope.aircraftListData = {}; - //$scope.addData = []; + $scope.addData = []; + $scope.tailArray = []; + function check(array){ + return (new Set(array)).size !== array.length; + } $scope.saveCompanyData = function() { + $scope.tailArray = []; for (var i = 0; i < $scope.aircraftDetails.length; i++) { - $scope.addData = []; $scope.addData.push({ 'tail': $scope.aircraftDetails[i].tail, 'make': $scope.aircraftDetails[i].make, @@ -400,25 +403,31 @@ angular.module('acufuel') 'marginId': $scope.aircraftDetails[i].marginId, 'avgasMarginId': $scope.aircraftDetails[i].avgasMarginId }); + $scope.tailArray.push($scope.aircraftDetails[i].tail); + } + console.log('check', check($scope.tailArray)); + if (check($scope.tailArray)) { + toastr.error('Duplicate Tail Added.', { + closeButton: true + }) + }else{ + $scope.aircraftListData.aircraftList = $scope.addData; + $scope.aircraftListData.accountId = companyId; + CustomersService.addAircraft($scope.aircraftListData).then(function(result) { + if (result != null && result.success) { + toastr.success('' + result.success + '', { + closeButton: true + }) + $('#aircraft-modal-3').css('display', 'none'); + $('.modal-backdrop').css('display', 'none'); + getAircraftList(); + } else { + toastr.error('' + result.statusText + '', { + closeButton: true + }) + } + }); } - //console.log($scope.addData) - $scope.aircraftListData.aircraftList = $scope.addData; - $scope.aircraftListData.accountId = companyId; - - CustomersService.addAircraft($scope.aircraftListData).then(function(result) { - if (result != null && result.success) { - toastr.success('' + result.success + '', { - closeButton: true - }) - $('#aircraft-modal-3').css('display', 'none'); - $('.modal-backdrop').css('display', 'none'); - getAircraftList(); - } else { - toastr.error('' + result.statusText + '', { - closeButton: true - }) - } - }); } diff --git a/app/partials/viewCompany/viewCompany.html b/app/partials/viewCompany/viewCompany.html index b35d0f6..0800125 100644 --- a/app/partials/viewCompany/viewCompany.html +++ b/app/partials/viewCompany/viewCompany.html @@ -340,7 +340,7 @@