From cf43d578ac4ccf826a2ad2fbfdbb724515ece04c Mon Sep 17 00:00:00 2001 From: "kuldeep.arora" Date: Mon, 19 Feb 2018 18:27:51 +0530 Subject: [PATCH] delete company update --- app/partials/viewCompany/viewCompany.controller.js | 86 +++++++++++++++------- app/partials/viewCompany/viewCompany.html | 23 +++++- app/partials/viewCompany/viewCompany.service.js | 17 ++++- 3 files changed, 98 insertions(+), 28 deletions(-) diff --git a/app/partials/viewCompany/viewCompany.controller.js b/app/partials/viewCompany/viewCompany.controller.js index 4e4855e..525693b 100644 --- a/app/partials/viewCompany/viewCompany.controller.js +++ b/app/partials/viewCompany/viewCompany.controller.js @@ -4,7 +4,7 @@ //Load controller angular.module('acufuel') - .controller('viewCompanyController', ['$scope','$uibModal', '$stateParams', 'ViewCompanyService', 'CustomersService', 'updateFuelManagerService', 'ViewFuelVendorService', 'ViewcontactService', function($scope , $uibModal, $stateParams, ViewCompanyService, CustomersService, updateFuelManagerService, ViewFuelVendorService, ViewcontactService) { + .controller('viewCompanyController', ['$scope','$uibModal', '$stateParams', 'ViewCompanyService', 'CustomersService', 'updateFuelManagerService', 'ViewFuelVendorService', 'ViewcontactService','$state', function($scope , $uibModal, $stateParams, ViewCompanyService, CustomersService, updateFuelManagerService, ViewFuelVendorService, ViewcontactService,$state) { $scope.data = {}; $scope.data.priceEmail = true; $scope.aircraft = {}; @@ -53,7 +53,7 @@ $scope.companyData.contractFuelVendor = false; } - console.log($scope.companyData) + // console.log($scope.companyData) } @@ -96,21 +96,21 @@ if($scope.companyData.baseTenant){ $scope.selected.push({'first': 'Tenant/Base Customer'}) - console.log("$scope.selected",$scope.selected) + // console.log("$scope.selected",$scope.selected) } if($scope.companyData.fuelerlinxCustomer){ $scope.selected.push({'first': 'FuelerLinx Customer'}) - console.log("$scope.selected",$scope.selected) + // console.log("$scope.selected",$scope.selected) } if($scope.companyData.contractFuelVendor){ $scope.selected.push({'first': 'CAA Member'}) - console.log("$scope.selected",$scope.selected) + // console.log("$scope.selected",$scope.selected) } - console.log("$scope.companyData",$scope.companyData) + // console.log("$scope.companyData",$scope.companyData) getAircraftList(); $scope.showLoader = false; }) @@ -186,16 +186,18 @@ $scope.data.companyId = companyId; $scope.contactData.contactList.push($scope.data); ViewCompanyService.addContact($scope.contactData).then(function(result) { - console.log(result) + console.log(result) if(result.status == 200){ - // toastr.success(''+result.success+'', { - // closeButton: true - // }) + $('#contact-modal-3').modal('hide'); $scope.primayData.id = result.data; $scope.data = {}; $scope.sendPrimaryContact(); getContactList(); + // toastr.success(''+result.success+'', { + toastr.success('Created Successfully',{ + closeButton: true + }) }else{ toastr.error(''+result.statusText+'', { closeButton: true @@ -235,7 +237,7 @@ 'marginId': '', 'avgasMarginId': '' }); - console.log($scope.aircraftDetails) + // console.log($scope.aircraftDetails) }; $scope.getModal = function(makeId, index){ @@ -272,7 +274,7 @@ 'avgasMarginId': $scope.aircraftDetails[i].avgasMarginId }); } - console.log($scope.addData) + //console.log($scope.addData) $scope.aircraftListData.aircraftList = $scope.addData; $scope.aircraftListData.accountId = companyId; @@ -314,7 +316,7 @@ } $scope.editData = function(inputName) { - console.log($scope.companyData) + //console.log($scope.companyData) $scope.showLoader = true; /*if(inputName == 'showNoteData'){ $scope.showNoteData = true; @@ -392,7 +394,7 @@ if($scope.primaryContact == true){ $scope.primaryContact = true; ViewCompanyService.checkPrimaryContact(companyId).then(function(result) { - console.log(result) + //console.log(result) if(result.status == 422){ $('#primaryContact').css('display', 'block'); } @@ -406,7 +408,7 @@ var priamryContactData = "companyContactId=" + $scope.primayData.id + "&primary=" + $scope.primaryContact; ViewCompanyService.addPrimaryContact(priamryContactData).then(function(result) { - console.log(result) + // console.log(result) }) } @@ -418,7 +420,7 @@ $('#updateContact').css('display', 'block'); $scope.updateData = data; newContactName = value; - console.log($scope.updateData) + // console.log($scope.updateData) if($scope.updateData.email == null){ $scope.updateData.content = data.contactNumber; }else{ @@ -427,7 +429,7 @@ } $scope.acceptUpdateField = function(){ - console.log($scope.updateData) + // console.log($scope.updateData) if($scope.updateData.content == undefined){ toastr.error('Please add some content', { closeButton: true @@ -441,7 +443,7 @@ + "&title=" + $scope.updateData.title; } ViewCompanyService.updateCustomField(updateCustomData).then(function(result) { - console.log(result) + //console.log(result) if(result != null && result.success){ $('#updateContact').css('display', 'none'); getCompanyDetail(); @@ -455,7 +457,7 @@ } $scope.showEditTier2 = function(number){ - console.log(number) + // console.log(number) $scope.contactNumber = number; } @@ -463,7 +465,7 @@ var contactName = ''; $scope.addCustom = function(value){ - console.log(value) + //console.log(value) if(value != null){ contactName = value; $('#customField').css('display', 'block'); @@ -488,9 +490,9 @@ var customData = "companyId=" + companyId + "&email=" + $scope.custom.content + "&title=" + $scope.custom.title; } - console.log(customData.email) + // console.log(customData.email) ViewCompanyService.addCustomField(customData).then(function(result) { - console.log(result) + // console.log(result) if(result != null && result.success){ $('#customField').css('display', 'none'); getCompanyDetail(); @@ -521,7 +523,7 @@ $scope.aircraftDelete = function(){ ViewCompanyService.deleteAircraft(deleteAircraftId).then(function(result) { - console.log(result) + // console.log(result) getAircraftList(); getCompanyDetail(); $('#delete1').css('display', 'none'); @@ -561,7 +563,7 @@ } $scope.checkboxStatus = function(value){ - console.log("checkbox",value) + // console.log("checkbox",value) $scope.showUpdateBtn = true; } @@ -625,9 +627,9 @@ // $scope.aircraftData = {} $scope.checkJetWithTail = function(tail, index){ - console.log("tail==============",tail, index) + // console.log("tail==============",tail, index) ViewCompanyService.checkJetType(tail).then(function(result) { - console.log("result",result) + // console.log("result",result) if(result.jetA == "true"){ $scope.jetShow[index] = false; $scope.marginShow[index] = true; @@ -637,5 +639,37 @@ } }) } + + + + /*delete company*/ + var deletecompanyId = ""; + $scope.deleteComp = function(companyDataid){ + $('#delete2').css('display', 'block'); + //console.log("asda",companyDataid) + deletecompanyId = companyDataid; + } + + $scope.deleteCompanyData = function(){ + ViewCompanyService.deleteCompany(deletecompanyId).then(function(result) { + + $('#delete2').css('display', 'none'); + if(result.success){ + toastr.success(''+result.success+'', { + closeButton: true + + }) + }else{ + toastr.error(''+result.statusText+'', { + closeButton: true + + }) + } + $state.go('app.customers') + }) + } + $scope.cancelDelete = function(){ + $('#delete2').css('display', 'none'); + } }]); \ No newline at end of file diff --git a/app/partials/viewCompany/viewCompany.html b/app/partials/viewCompany/viewCompany.html index 72f051b..db2898c 100644 --- a/app/partials/viewCompany/viewCompany.html +++ b/app/partials/viewCompany/viewCompany.html @@ -129,7 +129,7 @@
-

{{companyData.companyName}}

+

{{companyData.companyName}}

@@ -852,6 +852,27 @@
+
+
+
+ + + + + +
+ + +

Please confirm! Are you sure you want to DELETE this Company & its related data?

+
+
+
+ + +
+
+
+
diff --git a/app/partials/viewCompany/viewCompany.service.js b/app/partials/viewCompany/viewCompany.service.js index 5ba4d39..58ad9ca 100644 --- a/app/partials/viewCompany/viewCompany.service.js +++ b/app/partials/viewCompany/viewCompany.service.js @@ -229,8 +229,23 @@ return deferred.promise; } - } + this.deleteCompany = function(id) { + + var deferred = $q.defer(); + $http({ + method : 'DELETE', + url : BASE_URL.url +'/company/cid/'+id, + headers : {'Content-Type': 'application/json'}, + }) + .then(function (result){ + deferred.resolve(result.data); + },function (result){ + deferred.resolve(result.data); + }) + return deferred.promise; + } + } })(); \ No newline at end of file -- 2.0.0