diff --git a/app/partials/customers/customers.controller.js b/app/partials/customers/customers.controller.js index 5663565..b79471d 100644 --- a/app/partials/customers/customers.controller.js +++ b/app/partials/customers/customers.controller.js @@ -103,7 +103,7 @@ CustomersService.addAircraft($scope.aircraftListData).then(function(result) { console.log(result) - if(result.success){ + if(result != null && result.success){ toastr.success(''+result.success+'', { closeButton: true }) diff --git a/app/partials/customers/customers.html b/app/partials/customers/customers.html index 7a6104d..f89c2c8 100644 --- a/app/partials/customers/customers.html +++ b/app/partials/customers/customers.html @@ -367,8 +367,10 @@
@@ -380,8 +382,11 @@
diff --git a/app/partials/viewCompany/viewCompany.controller.js b/app/partials/viewCompany/viewCompany.controller.js index e98a0e7..c5f3732 100644 --- a/app/partials/viewCompany/viewCompany.controller.js +++ b/app/partials/viewCompany/viewCompany.controller.js @@ -4,17 +4,18 @@ //Load controller angular.module('acufuel') - .controller('viewCompanyController', ['$scope','$uibModal', '$stateParams', 'ViewCompanyService', function($scope , $uibModal, $stateParams, ViewCompanyService) { + .controller('viewCompanyController', ['$scope','$uibModal', '$stateParams', 'ViewCompanyService', 'CustomersService', function($scope , $uibModal, $stateParams, ViewCompanyService, CustomersService) { $scope.data = {}; $scope.data.priceEmail = true; + $scope.aircraft = {}; + // $scope.open = function(){ + // $scope.editSmsModal = $uibModal.open({ + // templateUrl: 'partials/NewCompany/NewCompany.html', + // backdrop: true, + // scope: $scope, + // }) + // } - $scope.open = function(){ - $scope.editSmsModal = $uibModal.open({ - templateUrl: 'partials/NewCompany/NewCompany.html', - backdrop: true, - scope: $scope, - }) - } $(function() { $('#toggle-one2').bootstrapToggle(); }) @@ -41,21 +42,27 @@ }) var companyId = $stateParams.id; - console.log(companyId) ViewCompanyService.getCompany(companyId).then(function(result) { - $scope.aircraftMakeList = result; + $scope.companyData = result; }) ViewCompanyService.getContact(companyId).then(function(result) { - $scope.aircraftMakeList = result; + $scope.companyContactList = result; }) + getAircraftList(); + function getAircraftList(){ + ViewCompanyService.getAircraft(companyId).then(function(result) { + $scope.contactAircraftList = result; + }) + } + + $scope.contactData = {}; $scope.contactData.contactList = []; $scope.addContact = function(){ $scope.data.companyId = companyId; $scope.contactData.contactList.push($scope.data); - console.log($scope.contactData) ViewCompanyService.addContact($scope.contactData).then(function(result) { if(result.success){ toastr.success(''+result.success+'', { @@ -70,4 +77,91 @@ }) } + getData(); + function getData(){ + CustomersService.getAircraftMake().then(function(result) { + $scope.aircraftMakeList = result; + }) + } + + $scope.aircraftDetails = [{ + 'tail':'', + 'make': '', + 'model': '', + 'size' : '' + }]; + + $scope.addNew = function(){ + $scope.aircraftDetails.push({ + 'tail':'', + 'make': '', + 'model': '', + 'size' : '' + }); + }; + + $scope.getModal = function(makeId, index){ + $scope.aircraft.make = makeId; + //var makeId = makeId; + CustomersService.getModal($scope.aircraft.make).then(function(result) { + $scope.aircraftDetails[index].aircraftModalList = result; + //$scope.aircraftDetails[index].model = $scope.aircraftModalList[0]; + }) + } + + $scope.getSize = function(model, index){ + CustomersService.getAircraftSize($scope.aircraft.make, model).then(function(result) { + $scope.aircraftDetails[index].aircraftSizeList = result; + //$scope.aircraftDetails[index].size = $scope.aircraftSizeList[0]; + }) + } + + $scope.aircraftListData = {}; + $scope.addData = []; + $scope.saveCompanyData = function(){ + for(var i=0; i<$scope.aircraftDetails.length;i++){ + $scope.addData.push({ + 'tail': $scope.aircraftDetails[i].tail, + 'make': $scope.aircraftDetails[i].make, + 'model': $scope.aircraftDetails[i].model, + 'size' : $scope.aircraftDetails[i].size + }); + } + $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').modal('hide'); + getAircraftList(); + }else{ + toastr.error(''+result.statusText+'', { + closeButton: true + }) + } + }); + + } + $scope.showNoteData = true; + $scope.showCompanyName = true; + $scope.showNote = function(){ + $scope.showNoteData = false; + } + + $scope.company = function(){ + $scope.showCompanyName = false; + } + + $scope.editData = function(inputName) { + if(inputName == 'showNoteData'){ + $scope.showNoteData = true; + }else if(inputName == 'showCompanyName'){ + $scope.showCompanyName = true; + } + + } + }]); \ No newline at end of file diff --git a/app/partials/viewCompany/viewCompany.html b/app/partials/viewCompany/viewCompany.html index 4fa07e4..7683bcf 100644 --- a/app/partials/viewCompany/viewCompany.html +++ b/app/partials/viewCompany/viewCompany.html @@ -50,6 +50,73 @@ color: #999 !important; cursor: pointer !important; } + + .button1 { + display: inline-block; + height: 35px; + line-height: 35px; + padding-right: 15px; + padding-left: 50px; + position: relative; + background-color:rgb(41,127,184); + color:rgb(255,255,255); + text-decoration: none; + text-transform: uppercase; + letter-spacing: 1px; + margin-bottom: 15px; + border: 0; + + + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + text-shadow:0px 1px 0px rgba(0,0,0,0.5); + -ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ff123852,Positive=true)";zoom:1; + filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ff123852,Positive=true); + + -moz-box-shadow:0px 2px 2px rgba(0,0,0,0.2); + -webkit-box-shadow:0px 2px 2px rgba(0,0,0,0.2); + box-shadow:0px 2px 2px rgba(0,0,0,0.2); + -ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=2,Color=#33000000,Positive=true)"; + filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=2,Color=#33000000,Positive=true); + } + + .button1 span { + position: absolute; + left: 0; + top: 0; + width: 35px; + background-color:rgba(0,0,0,0.5); + + -webkit-border-top-left-radius: 5px; + -webkit-border-bottom-left-radius: 5px; + -moz-border-radius-topleft: 5px; + -moz-border-radius-bottomleft: 5px; + border-top-left-radius: 5px; + border-bottom-left-radius: 5px; + border-right: 1px solid rgba(0,0,0,0.15); + } + + .button1:hover span, .button1.active span { + background-color:rgb(0,102,26); + border-right: 1px solid rgba(0,0,0,0.3); + } + + .button1:active { + margin-top: 2px; + margin-bottom: 13px; + + -moz-box-shadow:0px 1px 0px rgba(255,255,255,0.5); + -webkit-box-shadow:0px 1px 0px rgba(255,255,255,0.5); + box-shadow:0px 1px 0px rgba(255,255,255,0.5); + -ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ccffffff,Positive=true)"; + filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ccffffff,Positive=true); + } + + .button1.turquoise { + background: #449d44; + } +
@@ -74,20 +141,21 @@
-
+
-

- Antioch Flight Department -

+

+ {{companyData.companyName}}   +

+
@@ -98,21 +166,26 @@ - See Aircrart List +  See Aircrart List

-
- Tenant/Base Customer +
+
+ Tenant/Base Customer +
+
+ FuelerLinx Customer +
- CAA Member + CAA Member

-

Reviera State Rd32

-

(310) 2342-3433

-

freed@gmail.com

+

Reviera State Rd32  

+

(310) 2342-3433  

+

freed@gmail.com  

-

Company Notes

-

This is the test data. note will be written in this

+

Company Notes  

+

{{companyData.internalNote}}

+
@@ -138,7 +212,7 @@

Aircraft List

- +
@@ -146,7 +220,7 @@ - + @@ -157,70 +231,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + +
Trial #Tail # Make Model JET-A
N817C6MarkV - - $3659 - - $3659
N817C6MarkV - - $3659 - - $3659
N817C6MarkV - - $3659 - - $3659
N817C6MarkV
{{aircraft.tail}}{{aircraft.make}}{{aircraft.model}}
MarkOttoDispatcher
MarkOttoDispatcher
MarkOttoDispatcher
MarkOttoDispatcher
{{contact.firstName}}{{contact.lastName}}{{contact.title}}
@@ -525,6 +521,87 @@
+ + diff --git a/app/partials/viewCompany/viewCompany.service.js b/app/partials/viewCompany/viewCompany.service.js index 8069dad..1c4827c 100644 --- a/app/partials/viewCompany/viewCompany.service.js +++ b/app/partials/viewCompany/viewCompany.service.js @@ -53,6 +53,22 @@ }) return deferred.promise; } + + this.getAircraft = function(id) { + + var deferred = $q.defer(); + $http({ + method : 'GET', + url : BASE_URL.url +'/company/aircrafts/'+id, + headers : {'Content-Type': 'application/json'}, + }) + .then(function (result){ + deferred.resolve(result.data); + },function (result){ + deferred.resolve(result.data); + }) + return deferred.promise; + } }