From 1926e07b600cfa54b0d82ab33fcf9961f6e24489 Mon Sep 17 00:00:00 2001 From: amrinder Date: Thu, 18 May 2017 19:52:56 +0530 Subject: [PATCH] implement fuel vendor api --- app/partials/FuelVendors/FuelVendors.controller.js | 126 ++++++- app/partials/FuelVendors/FuelVendors.html | 399 ++++++++++++++++++++- app/partials/FuelVendors/FuelVendors.service.js | 45 ++- 3 files changed, 558 insertions(+), 12 deletions(-) diff --git a/app/partials/FuelVendors/FuelVendors.controller.js b/app/partials/FuelVendors/FuelVendors.controller.js index b3134fd..b8e222a 100644 --- a/app/partials/FuelVendors/FuelVendors.controller.js +++ b/app/partials/FuelVendors/FuelVendors.controller.js @@ -3,7 +3,9 @@ //Load controller angular.module('acufuel') - .controller('FuelVendorsController', ['$scope',function($scope) { + .controller('FuelVendorsController', ['$scope', '$rootScope', '$uibModal', '$filter', '$http', 'FuelVendorsService', 'CustomersService', FuelVendorsController]); + + function FuelVendorsController($scope, $rootScope, $uibModal, $filter, $http, FuelVendorsService, CustomersService) { $scope.vendorList = [{ "companyName": "Name and inc", @@ -35,6 +37,126 @@ "status":'Active', "source": "tenant", "allIn" : "$123" + },{ + "companyName": "Name and inc", + "phone":"1010101010", + "contact":"kuldeep", + "Base":"Kiad", + "status":'Inactive', + "source": "tenant", + "allIn" : "$123" }] - }]); \ No newline at end of file + + $(document).ready(function() { + $('#example').DataTable(); + }); + $scope.data = {}; + $scope.aircraft = {}; + $scope.data.activate = true; + + // FuelVendorsService.getAllVendor().then(function(result) { + // console.log(result) + // $scope.vendorList = result; + // }) + + $(function() { + $('#vendor-toggle-one2').bootstrapToggle(); + $('#vendor-toggle-one2').change(function() { + $('#console-event').html('Toggle: ' + $(this).prop('checked')); + $scope.data.activate = $(this).prop('checked'); + }) + }) + + getData(); + function getData(){ + CustomersService.getAircraftMake().then(function(result) { + $scope.aircraftMakeList = result; + }) + } + + $scope.addFirstData = function(sel, step){ + // console.log($scope.data) + + var vendorData = "vendorName=" + $scope.data.vendorName + "&masterMargin=" + $scope.data.masterMargin + + "&addressOne=" + $scope.data.addressOne + "&addressTwo=" + $scope.data.addressTwo + "&city=" + $scope.data.city + "&state=" + + $scope.data.state + "&country=" + $scope.data.country + "&zipcode=" + $scope.data.zipcode + "&internalNote=" + + $scope.data.internalNote + "&certificateType=" + $scope.data.certificateType + "&baseTenant=" + $scope.data.baseTenant + + "&fuelerlinxCustomer=" + $scope.data.fuelerlinxCustomer + "&contractFuelVendor=" + $scope.data.contractFuelVendor + + "&activate=" + $scope.data.activate + "&baseIcao=" + $scope.data.baseIcao; + + FuelVendorsService.addVendor(vendorData).then(function(result) { + console.log("result",result) + $scope.vendorId = result; + console.log("$scope.vendorId",$scope.vendorId) + $scope.aircraft.vendorId = $scope.vendorId; + console.log("$scope.aircraft.vendorId",$scope.aircraft.vendorId); + }) + $(sel).trigger('next.m.' + step); + getData(); + } + + $scope.aircraftDetails = [{ + 'tail':'', + 'make': '', + 'model': '', + 'sizeId' : '' + }]; + + $scope.addNew = function(){ + $scope.aircraftDetails.push({ + 'tail':'', + 'make': '', + 'model': '', + 'sizeId' : '' + }); + console.log($scope.aircraftDetails) + }; + + $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) { + console.log("result",result) + $scope.aircraftDetails[index].aircraftSizeList = result; + //$scope.aircraftDetails[index].size = $scope.aircraftSizeList[0]; + console.log($scope.aircraftDetails[index].size) + }) + } + + $scope.aircraftListData = {}; + $scope.addData = []; + $scope.saveVendorData = 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, + 'sizeId' : $scope.aircraftDetails[i].sizeId + }); + } + $scope.aircraftListData.aircraftList = $scope.addData; + $scope.aircraftListData.vendorId = $scope.aircraft.vendorId; + + CustomersService.addAircraft($scope.aircraftListData).then(function(result) { + console.log(result) + if(result != null && result.success){ + toastr.success(''+result.success+'', { + closeButton: true + }) + $('#demo-modal-3').modal('hide'); + }else{ + toastr.error(''+result.statusText+'', { + closeButton: true + }) + } + }); + } + } \ No newline at end of file diff --git a/app/partials/FuelVendors/FuelVendors.html b/app/partials/FuelVendors/FuelVendors.html index c47f41b..4cd2bcb 100644 --- a/app/partials/FuelVendors/FuelVendors.html +++ b/app/partials/FuelVendors/FuelVendors.html @@ -1,7 +1,74 @@
@@ -28,7 +95,7 @@
    • -
    • +

    • @@ -219,4 +286,330 @@
    - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/app/partials/FuelVendors/FuelVendors.service.js b/app/partials/FuelVendors/FuelVendors.service.js index c1f30a9..2800779 100644 --- a/app/partials/FuelVendors/FuelVendors.service.js +++ b/app/partials/FuelVendors/FuelVendors.service.js @@ -1,13 +1,44 @@ (function(){ 'use strict'; angular.module('acufuel') - .service('FuelVendorsService', ['$q', '$http', 'BE', FuelVendorsService]); + .service('FuelVendorsService', ['$q', '$http','BASE_URL', FuelVendorsService]); - function FuelVendorsService($q, $http, BE) { - var temp = {}; + function FuelVendorsService($q, $http, BASE_URL) { + + this.getAllVendor = function() { + + var deferred = $q.defer(); + $http({ + method : 'GET', + url : BASE_URL.url +'/user/allVendors', + headers : {'Content-Type': 'application/json'}, + }) + .then(function (result){ + deferred.resolve(result.data); + },function (result){ + deferred.resolve(result.data); + }) + return deferred.promise; + } + + + this.addVendor = function(data) { + console.log("data",data); + + var deferred = $q.defer(); + $http({ + method : 'POST', + url : BASE_URL.url +'/vendor/add/aircrafts', + headers : {'Content-Type': 'application/json'}, + data: data + }) + .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