From 48ed0c7bb0a12432d10414ec40aaf50262eb4ade Mon Sep 17 00:00:00 2001 From: Rishav Date: Wed, 10 May 2017 17:20:31 +0530 Subject: [PATCH] update company code implemented --- app/partials/viewCompany/viewCompany.controller.js | 46 ++++++++++++++++++++-- app/partials/viewCompany/viewCompany.html | 44 +++++++++++++-------- app/partials/viewCompany/viewCompany.service.js | 17 ++++++++ 3 files changed, 86 insertions(+), 21 deletions(-) diff --git a/app/partials/viewCompany/viewCompany.controller.js b/app/partials/viewCompany/viewCompany.controller.js index c5f3732..fdc0bf4 100644 --- a/app/partials/viewCompany/viewCompany.controller.js +++ b/app/partials/viewCompany/viewCompany.controller.js @@ -17,7 +17,7 @@ // } $(function() { - $('#toggle-one2').bootstrapToggle(); + $('#company-one2').bootstrapToggle(); }) $(function() { @@ -41,14 +41,24 @@ }) }) + var value = ""; var companyId = $stateParams.id; ViewCompanyService.getCompany(companyId).then(function(result) { $scope.companyData = result; + if($scope.companyData.activate == true){ + value = 'on'; + }else{ + value = 'off' + } + $('#company-one2').bootstrapToggle(value) }) - ViewCompanyService.getContact(companyId).then(function(result) { - $scope.companyContactList = result; - }) + getContactList(); + function getContactList(){ + ViewCompanyService.getContact(companyId).then(function(result) { + $scope.companyContactList = result; + }) + } getAircraftList(); function getAircraftList(){ @@ -69,6 +79,7 @@ closeButton: true }) $('#contact-modal-3').modal('hide'); + getContactList(); }else{ toastr.error(''+result.statusText+'', { closeButton: true @@ -147,6 +158,7 @@ } $scope.showNoteData = true; $scope.showCompanyName = true; + $scope.showAddress = true; $scope.showNote = function(){ $scope.showNoteData = false; } @@ -155,12 +167,38 @@ $scope.showCompanyName = false; } + $scope.addressChange = function(){ + $scope.showAddress = false; + } + $scope.editData = function(inputName) { + console.log($scope.companyData) if(inputName == 'showNoteData'){ $scope.showNoteData = true; }else if(inputName == 'showCompanyName'){ $scope.showCompanyName = true; + }else if(inputName == 'showAddress'){ + $scope.showAddress = true; } + + var companyData = "companyName=" + $scope.companyData.companyName + "&masterMargin=" + $scope.companyData.masterMargin + + "&addressOne=" + $scope.companyData.addressOne + "&addressTwo=" + $scope.companyData.addressTwo + "&city=" + $scope.companyData.city + "&state=" + + $scope.companyData.state + "&country=" + $scope.companyData.country + "&zipcode=" + $scope.companyData.zipcode + "&internalNote=" + + $scope.companyData.internalNote + "&certificateType=" + $scope.companyData.certificateType + "&baseTenant=" + $scope.companyData.baseTenant + + "&fuelerlinxCustomer=" + $scope.companyData.fuelerlinxCustomer + "&contractFuelVendor=" + $scope.companyData.contractFuelVendor + + "&activate=" + $scope.companyData.activate + "&baseIcao=" + $scope.companyData.baseIcao + "&companyId=" + companyId; + + ViewCompanyService.updateContact(companyData).then(function(result) { + if(result != null && result.success){ + toastr.success(''+result.success+'', { + closeButton: true + }) + }else{ + toastr.error(''+result.statusText+'', { + closeButton: true + }) + } + }) } diff --git a/app/partials/viewCompany/viewCompany.html b/app/partials/viewCompany/viewCompany.html index 7683bcf..cf4bbe5 100644 --- a/app/partials/viewCompany/viewCompany.html +++ b/app/partials/viewCompany/viewCompany.html @@ -136,35 +136,37 @@

Company Details

-
+
-
+

{{companyData.companyName}}  

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

Master Margin Setting - + + + +  See Aircrart List

@@ -172,23 +174,31 @@
- Tenant/Base Customer + Tenant/Base Customer
- FuelerLinx Customer + FuelerLinx Customer
- CAA Member + CAA Member

-

Reviera State Rd32  

+

{{companyData.addressOne}} {{companyData.addressTwo}}  

+ +
+ + + + +
+

(310) 2342-3433  

freed@gmail.com  

- diff --git a/app/partials/viewCompany/viewCompany.service.js b/app/partials/viewCompany/viewCompany.service.js index 1c4827c..349ee24 100644 --- a/app/partials/viewCompany/viewCompany.service.js +++ b/app/partials/viewCompany/viewCompany.service.js @@ -54,6 +54,23 @@ return deferred.promise; } + this.updateContact = function(data) { + + var deferred = $q.defer(); + $http({ + method : 'PUT', + url : BASE_URL.url +'/company', + data : data, + headers : {'Content-Type': 'application/json'}, + }) + .then(function (result){ + deferred.resolve(result.data); + },function (result){ + deferred.resolve(result.data); + }) + return deferred.promise; + } + this.getAircraft = function(id) { var deferred = $q.defer(); -- 2.0.0