diff --git a/app/partials/ContactView/ContactView.controller.js b/app/partials/ContactView/ContactView.controller.js index b768daa..2508f19 100644 --- a/app/partials/ContactView/ContactView.controller.js +++ b/app/partials/ContactView/ContactView.controller.js @@ -19,15 +19,15 @@ $scope.changePriceEmail = function(id, index){ event.stopPropagation(); - var contactId = id; - var statusData = "status=" + $scope.contactList[index].priceEmail; - ViewcontactService.changePriceEmail(contactId, statusData).then(function(result) { - if(result.success){ - toastr.success(''+result.success+'', { - closeButton: true - }) - } - }) + // var contactId = id; + // var statusData = "status=" + $scope.contactList[index].priceEmail; + // ViewcontactService.changePriceEmail(contactId, statusData).then(function(result) { + // if(result.success){ + // toastr.success(''+result.success+'', { + // closeButton: true + // }) + // } + // }) } ContactViewService.getCompanies().then(function(result) { diff --git a/app/partials/ContactView/ContactView.html b/app/partials/ContactView/ContactView.html index 10dd1ad..fd8dde6 100644 --- a/app/partials/ContactView/ContactView.html +++ b/app/partials/ContactView/ContactView.html @@ -70,10 +70,6 @@ - - - - @@ -88,7 +84,6 @@ {{contact.userName}} - {{contact.password}} diff --git a/app/partials/customers/customers.controller.js b/app/partials/customers/customers.controller.js index 306694b..2f9ad70 100644 --- a/app/partials/customers/customers.controller.js +++ b/app/partials/customers/customers.controller.js @@ -2,9 +2,9 @@ //Load controller angular.module('acufuel') - .controller('customersController', ['$scope', '$rootScope', '$uibModal', '$filter', '$http', 'CustomersService', 'ViewCompanyService', customersController]); + .controller('customersController', ['$scope', '$rootScope', '$uibModal', '$filter', '$http', '$state', 'CustomersService', 'ViewCompanyService', customersController]); - function customersController($scope, $rootScope, $uibModal, $filter, $http, CustomersService, ViewCompanyService) { + function customersController($scope, $rootScope, $uibModal, $filter, $http, $state, CustomersService, ViewCompanyService) { $(document).ready(function() { $('#example').DataTable(); }); @@ -176,5 +176,10 @@ // $('table.addRow').append(newRow); // } + $scope.setFuel = function(){ + event.stopPropagation(); + $state.go('app.updateFuelManager'); + } + } \ No newline at end of file diff --git a/app/partials/customers/customers.html b/app/partials/customers/customers.html index 865879e..6a3338c 100644 --- a/app/partials/customers/customers.html +++ b/app/partials/customers/customers.html @@ -147,8 +147,8 @@ {{customer.companyName}} {{customer.companyAircraftSize}} - {{customer.phone}} - {{customer.contact}} + {{customer.companyCustomContacts[0].contactNumber}} + {{customer.companyPrimaryContacts[0].firstName}} {{customer.companyPrimaryContacts[0].lastName}} {{customer.baseIcao}} @@ -163,7 +163,7 @@ {{customer.allIn}} - + diff --git a/app/partials/viewCompany/viewCompany.controller.js b/app/partials/viewCompany/viewCompany.controller.js index cfe7a4a..1fd9883 100644 --- a/app/partials/viewCompany/viewCompany.controller.js +++ b/app/partials/viewCompany/viewCompany.controller.js @@ -390,5 +390,12 @@ } } }) + + $scope.deleteAircraft = function(id){ + ViewCompanyService.deleteAircraft(id).then(function(result) { + console.log(result) + getAircraftList(); + }) + } }]); \ No newline at end of file diff --git a/app/partials/viewCompany/viewCompany.html b/app/partials/viewCompany/viewCompany.html index e01c6fe..b8b9a49 100644 --- a/app/partials/viewCompany/viewCompany.html +++ b/app/partials/viewCompany/viewCompany.html @@ -242,7 +242,7 @@
- +
@@ -291,7 +291,9 @@ $3659 - + + + diff --git a/app/partials/viewCompany/viewCompany.service.js b/app/partials/viewCompany/viewCompany.service.js index ae06745..ed3f480 100644 --- a/app/partials/viewCompany/viewCompany.service.js +++ b/app/partials/viewCompany/viewCompany.service.js @@ -181,6 +181,21 @@ }) return deferred.promise; } + + this.deleteAircraft = function(id){ + var deferred = $q.defer(); + $http({ + method : 'DELETE', + url : BASE_URL.url +'/company/aircraft/'+id, + headers : {'Content-Type': 'application/json'}, + }) + .then(function (result){ + deferred.resolve(result); + },function (result){ + deferred.resolve(result); + }) + return deferred.promise; + } }