viithiisys / Acufuel

Browse Code »

Commit cd330b5ee3811f232ab183f4ea9334ebc50a1bac

Authored by Rishav 2017-05-19 01:12:57 -0400

1 parent b6f0311a35

Exists in master

fuel vendor and view fuel vendor page with design and api implemented

Showing 8 changed files with 1035 additions and 63 deletions Show diff stats

app/index.html

Diff comments View file @cd330b5

 <html ng-app="acufuel">
    <head lang="en">
       <meta charset="utf-8">
       <meta name="viewport" content="width=device-width, initial-scale=1.0">
       <meta name="description" content="">
       <meta name="author" content="">
       <title>Acefuel</title>
       <!-- styles -->
       <link rel="stylesheet" href="css/ui-lightness/jquery-ui-1.10.0.custom.min.css"/>
       <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css"/>
       <link rel="stylesheet" href="bower_components/font-awesome/css/font-awesome.min.css"/>
       <link rel="stylesheet" href="bower_components/bootstrap-toggle/css/bootstrap-toggle.min.css" />
       <link rel="stylesheet" href="bower_components/fullcalendar/dist/fullcalendar.min.css"/>
       <link rel="stylesheet" href="bower_components/fullcalendar/dist/fullcalendar.print.min.css"/>
       <link rel="stylesheet" href="bower_components/toastr/toastr.min.css"/>
       <link rel="stylesheet" href="bower_components/angular-bootstrap/ui-bootstrap-csp.css"/>
       <link href="bower_components/jqGrid/css/ui.jqgrid.css" rel="stylesheet">
       <link href="bower_components/angular-xeditable/dist/css/xeditable.css" rel="stylesheet">
       <link rel="stylesheet" href="css/main.css"/>
       <link rel="stylesheet" href="css/base-admin-3.css"/>
       <link rel="stylesheet" href="css/base-admin-3-responsive.css"/>
       <link rel="stylesheet" href="css/custom.css"/>
       <link href="css/bootstrap-responsive.min.css" rel="stylesheet">
       <link href="http://fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,400,600" rel="stylesheet">
       <link href="js/plugins/cirque/cirque.css" rel="stylesheet">
       <link href="css/pages/dashboard.css" rel="stylesheet">
       <link href="js/plugins/faq/faq.css" rel="stylesheet">
       <link href="css/pages/plans.css" rel="stylesheet">
       <link href="js/plugins/lightbox/themes/evolution-dark/jquery.lightbox.css" rel="stylesheet">
       <link href="js/plugins/msgGrowl/css/msgGrowl.css" rel="stylesheet">
       <link href="js/plugins/msgbox/jquery.msgbox.css" rel="stylesheet">
       <link href="css/pages/pricing.css" rel="stylesheet">
       <link href="css/pages/reports.css" rel="stylesheet">
       <link rel="stylesheet" type="text/css" href="css/datepicker3.css">
    </head>
    <body>
       <!-- views -->
       <!-- scripts -->
       <script src="bower_components/jquery/dist/jquery.min.js"></script>
       <script src="js/libs/jquery-ui-1.10.0.custom.min.js"></script>
       <!--<script src="js/plugins/flot/jquery.flot.js"></script>
       <script src="js/plugins/flot/jquery.flot.pie.js"></script>
       <script src="js/plugins/flot/jquery.flot.resize.js"></script>
       <script src="js/plugins/flot/jquery.flot.orderBars.js"></script>-->
       <script src="js/plugins/hoverIntent/jquery.hoverIntent.minified.js"></script>
       <script src="js/plugins/lightbox/jquery.lightbox.min.js"></script>
       <script src="js/plugins/validate/jquery.validate.js"></script>
       <script src="js/plugins/msgbox/jquery.msgbox.min.js"></script>
       <script src="bower_components/angular/angular.min.js"></script>
       <script src="bower_components/angular-route/angular-route.js"></script>
       <script src="bower_components/angular-cookies/angular-cookies.min.js"></script>
       <script src="bower_components/angular-resource/angular-resource.min.js"></script>
       <script src="bower_components/angular-animate/angular-animate.js"></script>
       <script src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
       <script src="bower_components/bootstrap-toggle/js/bootstrap-toggle.min.js"></script>
       <script src="bower_components/angular-ui-router/release/angular-ui-router.min.js"></script>
       <script src='bower_components/moment/min/moment.min.js'></script>
       <script src="bower_components/fullcalendar/dist/fullcalendar.min.js"></script>
       <script src='bower_components/toastr/toastr.min.js'></script>
       <script src="bower_components/angular-bootstrap/ui-bootstrap.min.js"></script>
       <script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
       <script src="bower_components/jqGrid/js/i18n/grid.locale-en.js"></script>
       <script src="bower_components/jqGrid/js/jquery.jqGrid.min.js"></script>
       <script src="bower_components/angular-xeditable/dist/js/xeditable.js"></script>
       <!--
       <script src="scripts/inspinia.js"></script>
       <script src="plugins/iCheck/icheck.min.js"></script>
        -->
 <!--       <script src="./js/Application.js"></script>
      <script src="js/charts/area.js"></script>
       <script src="js/charts/donut.js"></script>
       <script src="js/charts/pie.js"></script>
       <script src="js/charts/bar.js"></script>
       <script src="js/demo/validation.js"></script>
       <script src="js/charts/line.js"></script> -->
       <script src="js/demo/faq.js"></script>
       <script src="js/plugins/faq/faq.js"></script>
       <script src="js/demo/gallery.js"></script>
       <script src="js/demo/sliders.js"></script>
       <script src="js/plugins/msgGrowl/js/msgGrowl.js"></script>
       <script src="js/demo/notifications.js"></script>
       <script src="http://cdn.ckeditor.com/4.6.1/standard-all/ckeditor.js"></script>
       <script src="https://code.highcharts.com/maps/highmaps.js"></script>
       <script src="https://code.highcharts.com/maps/modules/data.js"></script>
       <script src="https://code.highcharts.com/mapdata/countries/us/us-all.js"></script>
  <!-- Controllers -->
       <script src="js/app.js"></script>
       <script src="js/app.constant.js"></script>
       <script src="partials/login/login.controller.js"></script>
       <script src="partials/customers/customers.controller.js"></script>
       <script src="partials/analytics/analytics.controller.js"></script>
       <script src="partials/account/account.controller.js"></script>
       <script src="partials/elements/elements.controller.js"></script>
       <script src="partials/error/error.controller.js"></script>
       <script src="partials/faq/faq.controller.js"></script>
       <script src="partials/forms/forms.controller.js"></script>
       <script src="partials/fuelManager/fuelManager.controller.js"></script>
       <script src="partials/pricing/pricing.controller.js"></script>
       <script src="partials/reports/reports.controller.js"></script>
       <script src="partials/scheduler/scheduler.controller.js"></script>
       <script src="partials/signup/signup.controller.js"></script>
       <script src="partials/updateFuelManager/updateFuelManager.controller.js"></script>
       <script src="partials/viewCompany/viewCompany.controller.js"></script>
       <script src="partials/dashboard/dashboard.controller.js"></script>
       <script src="partials/fuelOrders/fuelOrders.controller.js"></script>
       <script src="partials/DispatchFuel/DispatchFuel.controller.js"></script>
       <script src="partials/searchDispatchFuel/searchDispatchFuel.controller.js"></script>
       <script src="partials/Accept/Accept.controller.js"></script>
       <!-- <script src="partials/AircraftList/AircraftList.controller.js"></script> -->
       <script src="partials/ContactView/ContactView.controller.js"></script>
       <script src="partials/FuelVendors/FuelVendors.controller.js"></script>
       <script src="partials/delselected/delselected.controller.js"></script>
       <script src="partials/pricingcontact/pricingcontact.controller.js"></script>
       <script src="partials/viewcontact/viewcontact.controller.js"></script>
+      <script src="partials/viewFuelOrder/viewFuelOrder.controller.js"></script>
       <script src="partials/main/main.controller.js"></script>
       <div ui-view></div>
  <!-- End controllers -->
  <!-- services -->
       <script src="partials/login/login.service.js"></script>
       <script src="partials/customers/customers.service.js"></script>
       <script src="partials/analytics/analytics.service.js"></script>
       <script src="partials/account/account.service.js"></script>
       <script src="partials/elements/elements.service.js"></script>
       <script src="partials/error/error.service.js"></script>
       <script src="partials/faq/faq.service.js"></script>
       <script src="partials/forms/forms.service.js"></script>
       <script src="partials/fuelManager/fuelManager.service.js"></script>
       <script src="partials/pricing/pricing.service.js"></script>
       <script src="partials/reports/reports.service.js"></script>
       <script src="partials/scheduler/scheduler.service.js"></script>
       <script src="partials/signup/signup.service.js"></script>
       <script src="partials/updateFuelManager/updateFuelManager.service.js"></script>
       <script src="partials/viewCompany/viewCompany.service.js"></script>
       <script src="partials/dashboard/dashboard.service.js"></script>
       <script src="partials/fuelOrders/fuelOrders.service.js"></script>
       <script src="partials/DispatchFuel/DispatchFuel.service.js"></script>
       <script src="partials/searchDispatchFuel/searchDispatchFuel.service.js"></script>
       <script src="partials/Accept/Accept.service.js"></script>
       <!-- <script src="partials/AircraftList/AircraftList.controller.js"></script> -->
       <script src="partials/ContactView/ContactView.service.js"></script>
       <script src="partials/FuelVendors/FuelVendors.service.js"></script>
       <script src="partials/delselected/delselected.service.js"></script>
       <script src="partials/pricingcontact/pricingcontact.service.js"></script>
       <script src="partials/viewcontact/viewcontact.service.js"></script>
+      <script src="partials/viewFuelOrder/viewFuelOrder.service.js"></script>
       <script src="partials/main/main.service.js"></script>
    </body>
 </html>

app/js/app.js

Diff comments View file @cd330b5

 'use strict';
   angular.module('acufuel', ['ngCookies', 'ngResource', 'ui.router', 'ngAnimate', 'ui.bootstrap', 'xeditable'])
     .config(['$httpProvider', function($httpProvider) {
       $httpProvider.defaults.withCredentials = true;
       $httpProvider.interceptors.push('myCSRF');
       $httpProvider.interceptors.push('httpRequestInterceptor');
     }])
     .factory('httpRequestInterceptor', ['$q', '$rootScope', '$location', function($q, $rootScope, $location) {
        return {
            request: function($config) {
              return $config;
            },
            responseError: function(rejection) {
              if (rejection.status === 401) {
                if($location.path() != "/login"){
                    localStorage.clear();
                    window.location.reload();
                }
              }
              return $q.reject(rejection);
            }
          }
      }])
     .provider('myCSRF',[function(){
       var headerName = 'X-CSRFToken';
       var cookieName = 'csrftoken';
       var allowedMethods = ['GET'];
       this.setHeaderName = function(n) {
         headerName = n;
       }
       this.setCookieName = function(n) {
         cookieName = n;
       }
       this.setAllowedMethods = function(n) {
         allowedMethods = n;
       }
       this.$get = ['$cookies', function($cookies){
         return {
           'request': function(config) {
             if(allowedMethods.indexOf(config.method) === -1) {
               // do something on success
               config.headers[headerName] = $cookies[cookieName];
             }
             return config;
           }
         }
       }];
     }])
   .config(
       ['$locationProvider', '$stateProvider', '$urlRouterProvider',
         function($locationProvider, $stateProvider, $urlRouterProvider) {
           $locationProvider.hashPrefix('!');
           // routes
           $urlRouterProvider
               .otherwise('/login');
           $stateProvider
             .state("app", {
               url: "",
               templateUrl: "partials/main/main.html",
               controller: "MainController",
               abstract: true
             })
             .state("login", {
               url: "/login",
               templateUrl: "partials/login/login.html",
               controller: "LoginController"
             })
             .state("app.customers", {
               url: "/customers",
               templateUrl: "partials/customers/customers.html",
               controller: "customersController"
             })
             .state("app.ContactView", {
               url: "/ContactView",
               templateUrl: "partials/ContactView/ContactView.html",
               controller: "ContactViewController"
             })
             .state("app.FuelVendors", {
               url: "/FuelVendors",
               templateUrl: "partials/FuelVendors/FuelVendors.html",
               controller: "FuelVendorsController"
             })
             .state("app.analytics", {
               url: "/analytics",
               templateUrl: "partials/analytics/analytics.html",
               controller: "analyticsController"
             })
             .state("app.account", {
               url: "/account",
               templateUrl: "partials/account/account.html",
               controller: "accountController"
             })
               .state("app.dashboard", {
               url: "/dashboard",
               templateUrl: "partials/dashboard/dashboard.html",
               controller: "dashboardController"
             })
             .state("app.elements", {
               url: "/elements",
               templateUrl: "partials/elements/elements.html",
               controller: "elementsController"
             })
             .state("app.charts", {
               url: "/charts",
               templateUrl: "partials/charts/charts.html",
               controller: "chartsController"
             })
             .state("app.error", {
               url: "/error",
               templateUrl: "partials/error/error.html",
               controller: "errorController"
             })
             .state("app.faq", {
               url: "/faq",
               templateUrl: "partials/faq/faq.html",
               controller: "faqController"
             })
             .state("app.forms", {
               url: "/forms",
               templateUrl: "partials/forms/forms.html",
               controller: "formsController"
             })
             .state("app.fuelManager", {
               url: "/fuelManager",
               templateUrl: "partials/fuelManager/fuelManager.html",
               controller: "fuelManagerController"
             })
             .state("app.pricing", {
               url: "/pricing",
               templateUrl: "partials/pricing/pricing.html",
               controller: "pricingController"
             })
             .state("app.reports", {
               url: "/reports",
               templateUrl: "partials/reports/reports.html",
               controller: "reportsController"
             })
             .state("app.scheduler", {
               url: "/scheduler",
               templateUrl: "partials/scheduler/scheduler.html",
               controller: "schedulerController"
             })
             .state("app.signup", {
               url: "/signup",
               templateUrl: "partials/signup/signup.html",
               controller: "signupController"
             })
             .state("app.updateFuelManager", {
               url: "/updateFuelManager",
               templateUrl: "partials/updateFuelManager/updateFuelManager.html",
               controller: "updateFuelManagerController",
               // data: {
               //     authorizedRoles: ["fbo"],
               // }
             })
-             .state("app.viewCompany", {
+            .state("app.viewCompany", {
               url: "/viewCompany/:id",
               templateUrl: "partials/viewCompany/viewCompany.html",
               controller: "viewCompanyController"
             })
+            .state("app.viewFuelOrder", {
+              url: "/viewFuelOrder/:id",
+              templateUrl: "partials/viewFuelOrder/viewFuelOrder.html",
+              controller: "ViewFuelOrderController"
+            })
             .state("app.fuelOrders", {
               url: "/fuelOrders",
               templateUrl: "partials/fuelOrders/fuelOrders.html",
               controller: "fuelOrdersController"
             })
              .state("app.DispatchFuel", {
               url: "/DispatchFuel",
               templateUrl: "partials/DispatchFuel/DispatchFuel.html",
               controller: "DispatchFuelController"
             })
              .state("app.searchDispatchFuel", {
               url: "/searchDispatchFuel",
               templateUrl: "partials/searchDispatchFuel/searchDispatchFuel.html",
               controller: "searchDispatchFuelController"
             })
              .state("app.Accept", {
               url: "/Accept",
               templateUrl: "partials/Accept/Accept.html",
               controller: "AcceptController"
             })
              .state("app.delselected", {
               url: "/delselected",
               templateUrl: "partials/delselected/delselected.html",
               controller: "delselectedController"
             })
             .state("app.pricingcontact", {
               url: "/pricingcontact",
               templateUrl: "partials/pricingcontact/pricingcontact.html",
               controller: "pricingcontactController"
             })
              .state("app.viewContact", {
               url: "/viewContact/:id",
               templateUrl: "partials/viewcontact/viewcontact.html",
               controller: "viewcontactController"
             })
         }
   ])
   .run(['$rootScope', '$state', 'LoginService', 'AUTH_EVENTS', function($rootScope, $state, LoginService, AUTH_EVENTS) {
       $rootScope.$on('$stateChangeStart', function (event, next, nextParams, fromState) {
           $rootScope.currentUser = JSON.parse(window.localStorage.getItem('currentUser'));
           LoginService.isAuthorized = function (authorizedRoles) {
               if (!angular.isArray(authorizedRoles)) {
                   authorizedRoles = [authorizedRoles];
               }
               var userdata = JSON.parse(window.localStorage.getItem('currentUser'));
               return (userdata? (authorizedRoles.indexOf(userdata.type) !== -1): false);
           }
           if ('data' in next && 'authorizedRoles' in next.data) {
             var authorizedRoles = next.data.authorizedRoles;
             if (!LoginService.isAuthorized(authorizedRoles)) {
               event.preventDefault();
               if($state.current.name.length == 0) {
                 $state.go('login')
               } else {
                 $state.go($state.current, {}, {reload: true});
                 $rootScope.$broadcast(AUTH_EVENTS.notAuthorized);
               }
             }
           }
           if (LoginService.isAuthenticated()) {
             if (next.name == 'login') {
               event.preventDefault();
               $state.go('app.dashboard');
             }
           }
       });
   }])

app/partials/FuelVendors/FuelVendors.controller.js

Diff comments View file @cd330b5

1	'use strict';	1	'use strict';
2		2
3	//Load controller	3	//Load controller
4	angular.module('acufuel')	4	angular.module('acufuel')
5		5
6	.controller('FuelVendorsController', ['$scope', '$rootScope', '$uibModal', '$filter', '$http', 'FuelVendorsService', 'CustomersService', FuelVendorsController]);	6	.controller('FuelVendorsController', ['$scope', '$rootScope', '$uibModal', '$filter', '$http', 'FuelVendorsService', 'CustomersService', FuelVendorsController]);
7		7
8	function FuelVendorsController($scope, $rootScope, $uibModal, $filter, $http, FuelVendorsService, CustomersService) {	8	function FuelVendorsController($scope, $rootScope, $uibModal, $filter, $http, FuelVendorsService, CustomersService) {
9		9
10	$scope.vendorList = [{
11	"companyName": "Name and inc",
12	"phone":"1010101010",
13	"contact":"jimmy",
14	"status":'Active',
15	"source": "tenant",
16	"allIn" : "$123"
17	},{
18	"companyName": "Name and inc",
19	"phone":"1010101010",
20	"contact":"jimmy",
21	"status":'Active',
22	"source": "tenant",
23	"allIn" : "$123"
24	},{
25	"companyName": "Name and inc",
26	"Fleet": 3,
27	"phone":"1010101010",
28	"contact":"jimmy",
29	"Base":"Kiad",
30	"status":'Inactive',
31	"source": "tenant",
32	"allIn" : "$123"
33	},{
34	"companyName": "Name and inc",
35	"phone":"1010101010",
36	"contact":"jimmy",
37	"status":'Active',
38	"source": "tenant",
39	"allIn" : "$123"
40	},{
41	"companyName": "Name and inc",
42	"phone":"1010101010",
43	"contact":"kuldeep",
44	"Base":"Kiad",
45	"status":'Inactive',
46	"source": "tenant",
47	"allIn" : "$123"
48	}]
49
50
51	$(document).ready(function() {	10	$(document).ready(function() {
52	$('#example').DataTable();	11	$('#example').DataTable();
53	});	12	});
54	$scope.data = {};	13	$scope.data = {};
55	$scope.aircraft = {};	14	$scope.aircraft = {};
56	$scope.data.activate = true;	15	$scope.data.activate = true;
57		16
58	// FuelVendorsService.getAllVendor().then(function(result) {	17	getAllVendor();
59	// console.log(result)	18
60	// $scope.vendorList = result;	19	function getAllVendor(){
61	// })	20	FuelVendorsService.getAllVendor().then(function(result) {
		21	console.log(result)
		22	$scope.vendorList = result;
		23	})
		24	}
		25
62		26
63	$(function() {	27	$(function() {
64	$('#vendor-toggle-one2').bootstrapToggle();	28	$('#vendor-toggle-one2').bootstrapToggle();
65	$('#vendor-toggle-one2').change(function() {	29	$('#vendor-toggle-one2').change(function() {
66	$('#console-event').html('Toggle: ' + $(this).prop('checked'));	30	$('#console-event').html('Toggle: ' + $(this).prop('checked'));
67	$scope.data.activate = $(this).prop('checked');	31	$scope.data.activate = $(this).prop('checked');
68	})	32	})
69	})	33	})
70		34
71	getData();	35	getData();
72	function getData(){	36	function getData(){
73	CustomersService.getAircraftMake().then(function(result) {	37	CustomersService.getAircraftMake().then(function(result) {
74	$scope.aircraftMakeList = result;	38	$scope.aircraftMakeList = result;
75	})	39	})
76	}	40	}
77		41
78	$scope.addFirstData = function(sel, step){	42	$scope.addFirstData = function(sel, step){
79	// console.log($scope.data)	43	// console.log($scope.data)
80		44
81	var vendorData = "vendorName=" + $scope.data.vendorName + "&masterMargin=" + $scope.data.masterMargin	45	var vendorData = "vendorName=" + $scope.data.vendorName + "&masterMargin=" + $scope.data.masterMargin
82	+ "&addressOne=" + $scope.data.addressOne + "&addressTwo=" + $scope.data.addressTwo + "&city=" + $scope.data.city + "&state="	46	+ "&addressOne=" + $scope.data.addressOne + "&addressTwo=" + $scope.data.addressTwo + "&city=" + $scope.data.city + "&state="
83	+ $scope.data.state + "&country=" + $scope.data.country + "&zipcode=" + $scope.data.zipcode + "&internalNote="	47	+ $scope.data.state + "&country=" + $scope.data.country + "&zipcode=" + $scope.data.zipcode + "&internalNote="
84	+ $scope.data.internalNote + "&certificateType=" + $scope.data.certificateType + "&baseTenant=" + $scope.data.baseTenant	48	+ $scope.data.internalNote + "&certificateType=" + $scope.data.certificateType + "&baseTenant=" + $scope.data.baseTenant
85	+ "&fuelerlinxCustomer=" + $scope.data.fuelerlinxCustomer + "&contractFuelVendor=" + $scope.data.contractFuelVendor	49	+ "&fuelerlinxCustomer=" + $scope.data.fuelerlinxCustomer + "&contractFuelVendor=" + $scope.data.contractFuelVendor
86	+ "&activate=" + $scope.data.activate + "&baseIcao=" + $scope.data.baseIcao;	50	+ "&activate=" + $scope.data.activate + "&baseIcao=" + $scope.data.baseIcao;
87		51
88	FuelVendorsService.addVendor(vendorData).then(function(result) {	52	FuelVendorsService.addVendor(vendorData).then(function(result) {
89	console.log("result",result)	53	console.log("result",result)
90	$scope.vendorId = result;	54	$scope.accountId = result;
91	console.log("$scope.vendorId",$scope.vendorId)	55	$scope.aircraft.accountId = $scope.accountId;
92	$scope.aircraft.vendorId = $scope.vendorId;
93	console.log("$scope.aircraft.vendorId",$scope.aircraft.vendorId);
94	})	56	})
95	$(sel).trigger('next.m.' + step);	57	$(sel).trigger('next.m.' + step);
96	getData();	58	getData();
97	}	59	}
98		60
99	$scope.aircraftDetails = [{	61	$scope.aircraftDetails = [{
100	'tail':'',	62	'tail':'',
101	'make': '',	63	'make': '',
102	'model': '',	64	'model': '',
103	'sizeId' : ''	65	'sizeId' : ''
104	}];	66	}];
105		67
106	$scope.addNew = function(){	68	$scope.addNew = function(){
107	$scope.aircraftDetails.push({	69	$scope.aircraftDetails.push({
108	'tail':'',	70	'tail':'',
109	'make': '',	71	'make': '',
110	'model': '',	72	'model': '',
111	'sizeId' : ''	73	'sizeId' : ''
112	});	74	});
113	console.log($scope.aircraftDetails)	75	console.log($scope.aircraftDetails)
114	};	76	};
115		77
116	$scope.getModal = function(makeId, index){	78	$scope.getModal = function(makeId, index){
117	$scope.aircraft.make = makeId;	79	$scope.aircraft.make = makeId;
118	//var makeId = makeId;	80	//var makeId = makeId;
119	CustomersService.getModal($scope.aircraft.make).then(function(result) {	81	CustomersService.getModal($scope.aircraft.make).then(function(result) {
120	$scope.aircraftDetails[index].aircraftModalList = result;	82	$scope.aircraftDetails[index].aircraftModalList = result;
121	//$scope.aircraftDetails[index].model = $scope.aircraftModalList[0];	83	//$scope.aircraftDetails[index].model = $scope.aircraftModalList[0];
122	})	84	})
123	}	85	}
124		86
125	$scope.getSize = function(model, index){	87	$scope.getSize = function(model, index){
126	CustomersService.getAircraftSize($scope.aircraft.make, model).then(function(result) {	88	CustomersService.getAircraftSize($scope.aircraft.make, model).then(function(result) {
127	console.log("result",result)	89	console.log("result",result)
128	$scope.aircraftDetails[index].aircraftSizeList = result;	90	$scope.aircraftDetails[index].aircraftSizeList = result;
129	//$scope.aircraftDetails[index].size = $scope.aircraftSizeList[0];	91	//$scope.aircraftDetails[index].size = $scope.aircraftSizeList[0];
130	console.log($scope.aircraftDetails[index].size)	92	console.log($scope.aircraftDetails[index].size)
131	})	93	})
132	}	94	}
133		95
134	$scope.aircraftListData = {};	96	$scope.aircraftListData = {};
135	$scope.addData = [];	97	$scope.addData = [];
136	$scope.saveVendorData = function(){	98	$scope.saveVendorData = function(){
137	for(var i=0; i<$scope.aircraftDetails.length;i++){	99	for(var i=0; i<$scope.aircraftDetails.length;i++){
138	$scope.addData.push({	100	$scope.addData.push({
139	'tail': $scope.aircraftDetails[i].tail,	101	'tail': $scope.aircraftDetails[i].tail,
140	'make': $scope.aircraftDetails[i].make,	102	'make': $scope.aircraftDetails[i].make,
141	'model': $scope.aircraftDetails[i].model,	103	'model': $scope.aircraftDetails[i].model,
142	'sizeId' : $scope.aircraftDetails[i].sizeId	104	'sizeId' : $scope.aircraftDetails[i].sizeId
143	});	105	});
144	}	106	}
145	$scope.aircraftListData.aircraftList = $scope.addData;	107	$scope.aircraftListData.aircraftList = $scope.addData;
146	$scope.aircraftListData.vendorId = $scope.aircraft.vendorId;	108	$scope.aircraftListData.accountId = $scope.aircraft.accountId;
147		109
148	CustomersService.addAircraft($scope.aircraftListData).then(function(result) {	110	FuelVendorsService.addVendorAicraft($scope.aircraftListData).then(function(result) {
149	console.log(result)	111	console.log(result)
		112
150	if(result != null && result.success){	113	if(result != null && result.success){
151	toastr.success(''+result.success+'', {	114	toastr.success(''+result.success+'', {
152	closeButton: true	115	closeButton: true
153	})	116	})
154	$('#demo-modal-3').modal('hide');	117	$('#vendor-modal-3').modal('hide');
		118	getAllVendor();
155	}else{	119	}else{

app/partials/FuelVendors/FuelVendors.html

Diff comments View file @cd330b5

 <style>
    .subnavbar .mainnav > li:nth-child(3) > a{
       color: #ff9900;
    }
    .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;
    }
 </style>
 <div class="main">
    <div class="container">
       <div class="row">
          <div class="col-md-12">
             <div class="widget stacked ">
                <div class="widget-content">
                   <div class="tabbable">
                      <ul class="nav nav-tabs">
                         <li>
                            <a ui-sref="app.customers">Company View
                               <i class="fa fa-caret-down" aria-hidden="true"></i>
                            </a>
                         </li>
                         <li>
                            <a ui-sref="app.ContactView">Contact View
                               <i class="fa fa-caret-down" aria-hidden="true"></i>
                            </a>
                         </li>
                         <li class="active">
                            <a ui-sref="app.FuelVendors">Fuel Vendors
                               <i class="fa fa-caret-down" aria-hidden="true"></i>
                            </a>
                         </li>
                         <li style="margin: 0px 10px 4px 40px;"><input type="text" style="height:31px;"class="form-control" name="name" id="name" placeholder="Search In Table"></li>
                         <li><button type="button" class="btn btn-default btn-sm">Clear Search And Filters</button></li>
-                        <li style="float:right"><button type="submit" data-toggle="modal" data-target="#demo-modal-3" class="btn btn-success btn-sm"><i class="fa fa-plus" aria-hidden="true"></i> Add Vendor</button></li>
+                        <li style="float:right"><button type="submit" data-toggle="modal" data-target="#vendor-modal-3" class="btn btn-success btn-sm"><i class="fa fa-plus" aria-hidden="true"></i> Add Vendor</button></li>
                      </ul>
                      <br>
                      <div class="tab-content customer-table" style="margin:0px">
                         <div class="tab-pane active" id="companyView">
                            <table class="table table-striped">
                               <thead>
                                  <tr>
                                     <th>
                                        <input type="text" class="form-control" style="height:31px;" name="name" id="name">
-                                       <label class="font-company">Company Name <i class="fa fa-sort" aria-hidden="true"></i></label>
+                                       <label class="font-company">Vendor Name <i class="fa fa-sort" aria-hidden="true"></i></label>
                                     </th>
                                     <th>
                                        <input type="text" class="form-control" style="height:31px;" name="name" id="name">
                                        <label class="font-company">Main Phone <i class="fa fa-sort" aria-hidden="true"></i></label>
                                     </th>
                                     <th>
                                        <input type="text" class="form-control" style="height:31px;" name="name" id="name">
                                        <label class="font-company">Primary Contact <i class="fa fa-sort" aria-hidden="true"></i></label>
                                     </th>
                                     <th>
                                        <input type="text" class="form-control" style="height:31px;" name="name" id="name">
                                        <label class="font-company">Status <i class="fa fa-sort" aria-hidden="true"></i></label>
                                     <th>
                                        <input type="text" class="form-control" style="height:31px;" name="name" id="name">
                                        <label class="font-company">Source <i class="fa fa-sort" aria-hidden="true"></i></label>
                                     </th>
                                     <th>
                                        <input type="text" class="form-control" style="height:31px;" name="name" id="name">
                                        <label class="font-company">Margin Setting <i class="fa fa-sort" aria-hidden="true"></i></label>
                                     </th>
                                     <th>
                                        <input type="text" class="form-control" style="height:31px;" name="name" id="name">
                                        <label class="font-company">All In <i class="fa fa-sort" aria-hidden="true"></i></label>
                                     </th>
                                  </tr>
                               </thead>
                               <tbody>
                                  <tr ng-repeat="vendor in vendorList">
-                                    <td class="font-company">{{vendor.companyName}}</td>
+                                    <td class="font-company">
+                                      <a style="color: #333; text-decoration: none;" href="#!/viewFuelOrder/{{vendor.id}}">{{vendor.vendorName}}</a>
+                                    </td>
                                     <td class="font-company">{{vendor.phone}}</td>
                                     <td class="font-company">{{vendor.contact}}</td>
                                     <td class="font-company">
-                                       <button type="button" ng-if="vendor.status == 'Active'" class="btn btn-success btn-xs">{{vendor.status}}</button>
+                                       <button type="button" ng-if="vendor.activate == true" class="btn btn-success btn-xs">Active</button>
-                                       <button type="button" ng-if="vendor.status == 'Inactive'" class="btn btn-warning btn-xs">{{vendor.status}}</button>
+                                       <button type="button" ng-if="vendor.activate == false" class="btn btn-warning btn-xs">InActive</button>
                                     </td>
                                     <td class="font-company">{{vendor.source}}</td>
                                     <td class="font-company">
                                        <select class="form-control" style="height:31px;">
                                           <option>Margin1</option>
                                           <option>Margin2</option>
                                        </select>
                                     </td>
                                     <td class="font-company">{{vendor.allIn}}</td>
                                  </tr>
                               </tbody>
                            </table>
                            <div class="row" style="margin-left: 0px;">
                               <div class="col-md-2">
                                  <button type="button" class="btn btn-warning">Export Customers</button>
                               </div>
                               <div class="col-md-10">
                                  <div class="row" style="margin-left: 0px;">
                                     <div class="col-md-6">
                                     </div>
                                     <div class="col-md-2">
                                        <select class="form-control">
                                           <option>20 Records Per Page</option>
                                           <option>50 Records Per Page</option>
                                           <option>100 Records Per Page</option>
                                        </select>
                                     </div>
                                     <div class="col-md-4">
                                        <ul class="pagination" style="margin:0px">
                                           <li><a href="javascript:;">«</a></li>
                                           <li class="active"><a href="#">1</a></li>
                                           <li><a href="javascript:;">2</a></li>
                                           <li><a href="javascript:;">3</a></li>
                                           <li><a href="javascript:;">4</a></li>
                                           <li><a href="javascript:;">5</a></li>
                                           <li><a href="javascript:;">»</a></li>
                                        </ul>
                                     </div>
                                  </div>
                               </div>
                            </div>
                         </div>
                         <div class="tab-pane" id="contactView">
                            <table class="table table-striped">
                               <thead>
                                  <tr>
                                     <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name"> Last Name</th>
                                     <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">First Name</th>
                                     <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">Company Name</th>
                                     <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">Work Phone</th>
                                     <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">Mobile Phone</th>
                                     <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">Title</th>
                                     <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">Pricing Email</th>
                                     <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">Username</th>
                                     <th> <input type="text" class="form-control" style="height:31px;" name="name" id="name">Password</th>
                                     <th></th>
                                     <th></th>
                                  </tr>
                               </thead>
                               <tbody>
                                  <tr>
                                     <td>Name and inc.</td>
                                     <td>3</td>
                                     <td>03423233</td>
                                     <td>Jemmy</td>
                                     <td>KIAD</td>
                                     <td></td>
                                     <td><input type="checkbox" data-toggle="toggle" data-size="mini"></td>
                                     <td></td>
                                     <td>$123</td>
                                     <td></td>
                                     <td></td>
                                  </tr>
                                  <tr>
                                     <td>Name and inc.</td>
                                     <td>3</td>
                                     <td>03423233</td>
                                     <td>Jemmy</td>
                                     <td>KIAD</td>
                                     <td></td>
                                     <td><input type="checkbox" data-toggle="toggle" data-size="mini"></td>
                                     <td></td>
                                     <td>$123</td>
                                     <td></td>
                                     <td></td>
                                  </tr>
                               </tbody>
                            </table>
                            <div class="row" style="margin-left: 0px;">
                               <div class="col-md-2">
                                  <button type="button" class="btn btn-info">Export CSV</button>
                               </div>
                               <div class="col-md-10">
                                  <div class="row" style="margin-left: 0px;">
                                     <div class="col-md-6">
                                     </div>
                                     <div class="col-md-2">
                                        <select class="form-control">
                                           <option>20 Records Per Page</option>
                                           <option>50 Records Per Page</option>
                                           <option>100 Records Per Page</option>
                                        </select>
                                     </div>
                                     <div class="col-md-4">
                                        <ul class="pagination" style="margin:0px">
                                           <li><a href="javascript:;">«</a></li>
                                           <li class="active"><a href="#">1</a></li>
                                           <li><a href="javascript:;">2</a></li>
                                           <li><a href="javascript:;">3</a></li>
                                           <li><a href="javascript:;">4</a></li>
                                           <li><a href="javascript:;">5</a></li>
                                           <li><a href="javascript:;">»</a></li>
                                        </ul>
                                     </div>
                                  </div>
                               </div>
                            </div>
                         </div>
                         <div class="tab-pane" id="fuelVendors">
                            <table class="table table-striped table-bordered">
                               <thead>
                                  <tr>
                                     <th>Engine</th>
                                     <th>Browser</th>
                                     <th class="td-actions"></th>
                                  </tr>
                               </thead>
                               <tbody>
                               </tbody>
                            </table>
                         </div>
                      </div>
                   </div>
                </div>
                <!-- /widget-content -->
             </div>
             <!-- /widget -->
          </div>
          <!-- /span8 -->
       </div>
       <!-- /row -->
    </div>
    <!-- /container -->
 </div>
 <!-- /main -->
-<form class="modal multi-step" id="demo-modal-3" name="vendorForm">
+<form class="modal multi-step" id="vendor-modal-3" name="vendorForm">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body step-1" data-step="1" style="padding: 0;">
                <div>
                   <div class="row" style="margin: 0;">
                      <div>
                         <div class="widget" style="margin-bottom: 0;">
                            <div class="widget-header">
                               <i class="icon-pencil"></i>
                               <i class="fa fa-tasks" aria-hidden="true"></i>
                               <h3>Add a New Vendor</h3>
                               <div class="pull-right my-toggle-switch" style="margin-right: 30px;">
                                  <div style="color: #ff9a01;">Activate &nbsp &nbsp
                                     <input id="vendor-toggle-one2" checked type="checkbox" data-size="mini" data-width="55" data-toggle="toggle" data-on="On" data-off="Off">
                                  </div>
                               </div>
                               <div class="clearfix"></div>
                            </div>
                            <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">
                               <div class="col-xs-12">
                                  <div class="col-md-8">
                                     <div class="pull-left">
                                        <label class="new-input-label"><b>Vendor Name</b></label>
                                     </div>
                                     <div class="pull-left" style="margin-left: 15px;">
                                        <input type="text" ng-model="data.vendorName" class="form-control" id="Address" placeholder="">
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                  <div class="col-md-4">
                                     <div class="pull-right">
                                        <input type="text" ng-model="data.baseIcao" style="width: 100px;" class="form-control" id="Address" placeholder="">
                                     </div>
                                     <div class="pull-right">
                                        <label style="margin-right: 15px;" class="new-input-label"><b>Base ICAO</b></label>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                               </div>
                               <div class="clearfix"></div><br>
                               <div class="col-xs-12">
                                  <div class="col-md-8">
                                     <div class="pull-left">
                                        <label class="new-input-label"><b>Relationship&nbsp;</b></label>
                                     </div>
                                     <div class="pull-left" style="margin-left: 32px;">
                                        <input type="checkbox" ng-model="data.baseTenant" name="vehicle" value="Bike"> Check here if this is a Base Tenant<br>
                                        <input type="checkbox" ng-model="data.fuelerlinxCustomer" name="vehicle" value="Car" checked> Check here if this is a FuelerLinx Customer<br>
                                        <input type="checkbox" ng-model="data.contractFuelVendor" name="vehicle" value="Car" checked> Check here if this is a Contract Fuel Vendor
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                               </div>
                               <div class="clearfix"></div>
                               <br/>
                               <div class="col-xs-12">
                                  <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <b>Master Margin</b>
                                     </div>
                                     <div class="pull-left">
                                        <select required class="form-control" style="max-width: 250px;" ng-model="data.masterMargin">
                                           <option value="" disabled selected hidden>Select </option>
                                           <option value="margin1">Margin1</option>
                                           <option value="margin2">Margin2</option>
                                           <option value="vendorsonly">Vendors Only</option>
                                           <option value="margintenants">Margin Tenants</option>
                                        </select>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                  <div class="col-md-3 Airport" style="text-align: right;">
                                     <b>Certificate Type</b>
                                  </div>
                                  <div class="col-md-3 Airport">
                                     <select required class="form-control" ng-model="data.certificateType">
                                        <option value="" disabled selected hidden>Select </option>
                                        <option value="corporate">Part 91 (Corporate)</option>
                                        <option value="charter">Part 135 (Charter)</option>
                                        <option value="scheduled">Part 121 (Scheduled)</option>
                                        <option value="military">Military</option>
                                        <option value="government">Government</option>
                                     </select>
                                  </div>
                               </div>
                               <div class="clearfix"></div>
                               <br/>
                               <div class="col-xs-12">
                                   <div class="col-md-12">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Address</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <input type="text" class="form-control" ng-model="data.addressOne" id="Address" placeholder="">
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                               </div>
                               <div class="clearfix"></div>
                               <br/>
                               <div class="col-xs-12">
                                   <div class="col-md-12">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Address2</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <input type="text" ng-model="data.addressTwo" class="form-control" id="Address" placeholder="">
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                               </div>
                               <div class="clearfix"></div>
                               <br/>
                               <div class="col-xs-12">
                                  <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>City</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <input type="text" ng-model="data.city" class="form-control" id="Address" placeholder="">
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                  <div class="col-md-3">
                                     <div class="pull-left" style="width: 40px;">
                                        <label class="new-input-label"><b>State</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <input type="text" ng-model="data.state" class="form-control" id="Address" placeholder="">
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                  <div class="col-md-3">
                                     <div class="pull-left">
                                        <label class="new-input-label"><b>Zip Code</b></label>
                                     </div>
                                     <div class="pull-right" style="width: calc(100% - 60px);">
                                        <input type="tel" ng-model="data.zipcode" class="form-control" id="Address" placeholder="">
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                               </div>
                               <div class="clearfix"></div>
                               <br/>
                               <div class="col-xs-12">
                                  <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Country</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <input type="text" ng-model="data.country" class="form-control" id="Address" placeholder="">
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                                  <div class="col-md-6">
                                     <div class="pull-left" style="width: 110px;">
                                        <label class="new-input-label"><b>Internal Note</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <textarea  name="message" ng-model="data.internalNote" rows="4" cols="34"></textarea>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                               </div>
                               <div class="clearfix"></div>
                              <!--  <br/>
                               <div class="col-xs-12">
                                  <div class="col-md-2 Airport"></div>
                                  <div class="col-md-10 Airport">
                                     <div class="pull-right">
                                        <button type="button" class="btn btn-default" ng-click="cancel()">Cancel</button>
                                        <button type="button" class="btn btn-warning" ng-click="addAircraft()">Next: Add Aircraft</button>
                                     </div>
                                  </div>
                               </div> -->
                            </div>
                         </div>
                         <div class="clearfix"></div>
                      </div>
                   </div>
                </div>
             </div>
             <div class="modal-body step-2" data-step="2" style="padding: 0;">
                <div>
                   <div class="row" style="margin: 0;">
                      <div>
                         <div class="widget" style="margin-bottom: 0;">
                            <div class="widget-header">
                               <i class="icon-pencil"></i>
                               <i class="fa fa-tasks" aria-hidden="true"></i>
                               <h3>Add a New Vendor</h3>
                               <div class="clearfix"></div>
                            </div>
                            <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">
                               <div class="col-xs-12">
                                  <div class="widget-header">
                                     <i class="fa fa-list"></i>
                                     <h3>Aircraft List</h3>
                                  </div>
                                  <div class="widget-content" style="padding:0px;border: 0px; ">
                                     <div class="table-responsive">
                                        <!-- <table class="table table-bordered table-hover table-striped addRow" style="margin-bottom: 0px;">
                                           <thead>
                                              <tr>
                                                 <th>Tail</th>
                                                 <th>Make</th>
                                                 <th>Model</th>
                                                 <th>Size</th>
                                                 <th>Margin</th>
                                              </tr>
                                           </thead>
                                           <tbody>
                                              <tr>
                                                 <td>
                                                    <input type="text" style="width:100px;" ng-model="aircraft.tail" class="form-control">
                                                 </td>
                                                 <td style="width: 25%;">
                                                    <select class="form-control" ng-model="aircraft.make" ng-change="getModal()">
                                                       <option ng-repeat="make in aircraftMakeList">{{make}}</option>
                                                    </select>
                                                 </td>
                                                 <td style="width: 20%;">
                                                    <select class="form-control" ng-model="aircraft.model" ng-change="getSize()">
                                                       <option ng-repeat="model in aircraftModalList">{{model}}</option>
                                                    </select>
                                                 </td>
                                                 <td style="width: 25%;">
                                                    <select class="form-control" ng-model="aircraft.size">
                                                       <option ng-repeat="size in aircraftSizeList">{{size}}</option>
                                                    </select>
                                                 </td>
                                                 <td>
                                                    <select class="form-control">
                                                       <option>Margin1</option>
                                                       <option>Margin2</option>
                                                    </select>
                                                 </td>
                                              </tr>
                                           </tbody>
                                        </table> -->
                                       <table class="table table-striped table-bordered">
                                         <thead>
                                             <tr>
                                                 <!-- <th><input type="checkbox" ng-model="selectedAll" ng-click="checkAll()" /></th> -->
                                                 <th>Tail</th>
                                                 <th>Make</th>
                                                 <th>Model</th>
                                                 <th>Size</th>
                                             </tr>
                                         </thead>
                                         <tbody>
                                             <tr ng-repeat="aircraftData in aircraftDetails track by $index">
                                                 <!-- <td>
                                                     <input type="checkbox" ng-model="aircraftData.selected"/>
                                                 </td> -->
                                                 <td style="width: 20%">
                                                     <input type="text" class="form-control" ng-model="aircraftData.tail" required/>
                                                 </td>
                                                 <td style="width: 20%">
                                                     <select class="form-control" ng-model="aircraftData.make" ng-change="getModal(aircraftData.make, $index)">
                                                       <option ng-repeat="make in aircraftMakeList">{{make}}</option>
                                                     </select>
                                                 </td>
                                                 <td style="width: 20%">
                                                     <select class="form-control" ng-model="aircraftData.model" ng-change="getSize(aircraftData.model, $index)">
                                                         <option ng-repeat="model in aircraftData.aircraftModalList">{{model}}</option>
                                                     </select>
                                                 </td>
                                                 <td style="width: 20%">
                                                    <select class="form-control" ng-model="aircraftData.sizeId" ng-options="size.aircraftSize.id as size.aircraftSize.size for size in aircraftData.aircraftSizeList"></select>
                                                     <!-- <select class="form-control" ng-model="aircraftData.size">
                                                       <option ng-repeat="size in aircraftData.aircraftSizeList">{{size}}</option>
                                                     </select> -->
                                                 </td>
                                             </tr>
                                           </tbody>
                                       </table>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
                               </div>
                               <div class="clearfix"></div>
                               <div class="col-xs-12" style="margin-bottom: 50px;margin-top: 10px;">
                                  <button ng-click="addNew()" class="button1 turquoise pull-right"><span>+</span>Add Aircraft</button>
                               </div>
                               <!-- <div class="col-xs-12" style="margin-bottom: 20px;">
                                  <div class="pull-right">
                                     <button type="button" class="btn btn-default" ng-click="cancelCraft()">Cancel</button>
                                     <button type="button" class="btn btn-warning" ng-click="goBack()">Go Back</button>
                                     <button type="button" class="btn btn-success" ng-click="goBack()">Save</button>
                                  </div>
                               </div> -->
                            </div>
                         </div>
                         <div class="clearfix"></div>
                      </div>
                   </div>
                </div>
             </div>
             <!-- <div class="modal-body step-3" data-step="3">
                 This is the final step.
             </div> -->
             <div class="modal-footer" style="border-top: 0;">
                 <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-                <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="addFirstData('#demo-modal-3', 2)">Next: Add Aircraft</button>
+                <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="addFirstData('#vendor-modal-3', 2)">Next: Add Aircraft</button>
-                <button type="button" class="btn btn-primary step step-2" data-step="2" onclick="sendEvent('#demo-modal-3', 1)">Go Back</button>
+                <button type="button" class="btn btn-primary step step-2" data-step="2" onclick="sendEvent('#vendor-modal-3', 1)">Go Back</button>
-                <!-- <button type="button" class="btn btn-primary step step-2" data-step="2" onclick="sendEvent('#demo-modal-3', 3)">Continue</button> -->
+                <!-- <button type="button" class="btn btn-primary step step-2" data-step="2" onclick="sendEvent('#vendor-modal-3', 3)">Continue</button> -->
                 <button type="button" class="btn btn-success step step-2" data-step="2" ng-click="saveVendorData()">Save</button>
             </div>
         </div>
     </div>
 </form>
 <script src="js/multi-step-modal.js"></script>
 <script>
 sendEvent = function(sel, step) {
     $(sel).trigger('next.m.' + step);
 }
 </script>

app/partials/FuelVendors/FuelVendors.service.js

Diff comments View file @cd330b5

 (function(){
  'use strict';
     angular.module('acufuel')
       .service('FuelVendorsService', ['$q', '$http','BASE_URL', FuelVendorsService]);
       	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',
+	              headers : {'Content-Type': 'application/json'},
+	              data: data
+	          })
+	          .then(function (result){
+	              deferred.resolve(result.data);
+	          },function (result){
+	              deferred.resolve(result.data);
+	          })
+	          return deferred.promise;
+	        }
-	      	this.addVendor = function(data) {
+	      	this.addVendorAicraft = 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;
 	        }
     	}
 })();

app/partials/viewFuelOrder/viewFuelOrder.controller.js

Diff comments View file @cd330b5

File was created	1
	2	'use strict';
	3
	4	//Load controller
	5	angular.module('acufuel')
	6
	7	.controller('ViewFuelOrderController', ['$scope','$uibModal', '$stateParams', 'ViewFuelOrderService', 'CustomersService', function($scope , $uibModal, $stateParams, ViewFuelOrderService, CustomersService) {
	8	$scope.data = {};
	9	$scope.data.priceEmail = true;
	10	$scope.aircraft = {};
	11
	12	$(function() {
	13	$('#company-one2').bootstrapToggle();
	14	})
	15
	16	$(function() {
	17	$('#toggle-one1').bootstrapToggle();
	18	})
	19	$(function() {
	20	$('#toggle-two').bootstrapToggle();
	21	})
	22	$(function() {
	23	$('#toggle-three').bootstrapToggle();
	24	})
	25	$(function() {
	26	$('#toggle-four').bootstrapToggle();
	27	})
	28
	29	$(function() {
	30	$('#price-one2').bootstrapToggle();
	31	$('#price-one2').change(function() {
	32	$('#console-event').html('Toggle: ' + $(this).prop('checked'));
	33	$scope.data.priceEmail = $(this).prop('checked');
	34	})
	35	})
	36
	37	var value = "";
	38	var vendorId = $stateParams.id;
	39	ViewFuelOrderService.getFuelOrder(vendorId).then(function(result) {
	40	$scope.vendorData = result;
	41	if($scope.vendorData.activate == true){
	42	value = 'on';
	43	}else{
	44	value = 'off'
	45	}
	46	$('#company-one2').bootstrapToggle(value)
	47	})
	48
	49	getContactList();
	50	function getContactList(){
	51	ViewFuelOrderService.getContact(vendorId).then(function(result) {
	52	$scope.vendorContactList = result;
	53	for(var i=0;i<$scope.vendorContactList.length; i++){
	54	if($scope.vendorContactList[i].priceEmail == true){
	55	$scope.vendorContactList[i].value1 = 'on';
	56	console.log('aya')
	57	}else{
	58	$scope.vendorContactList[i].value1 = 'off';
	59
	60	}
	61	console.log($scope.vendorContactList[i])
	62	$('#'+$scope.vendorContactList[i].id).bootstrapToggle($scope.vendorContactList[i].value1)
	63	}
	64	})
	65	}
	66
	67	getAircraftList();
	68	function getAircraftList(){
	69	ViewFuelOrderService.getAircraft(vendorId).then(function(result) {
	70	$scope.contactAircraftList = result;
	71	})
	72	}
	73
	74
	75	$scope.contactData = {};
	76	$scope.contactData.contactList = [];
	77	$scope.addContact = function(){
	78	$scope.data.vendorId = vendorId;
	79	$scope.contactData.contactList.push($scope.data);
	80	ViewFuelOrderService.addContact($scope.contactData).then(function(result) {
	81	if(result.success){
	82	toastr.success(''+result.success+'', {
	83	closeButton: true
	84	})
	85	$('#contact-modal-3').modal('hide');
	86	getContactList();
	87	}else{
	88	toastr.error(''+result.statusText+'', {
	89	closeButton: true
	90	})
	91	}
	92	})
	93	}
	94
	95	getData();
	96	function getData(){
	97	CustomersService.getAircraftMake().then(function(result) {
	98	$scope.aircraftMakeList = result;
	99	})
	100	}
	101
	102	$scope.aircraftDetails = [{
	103	'tail':'',
	104	'make': '',
	105	'model': '',
	106	'sizeId' : ''
	107	}];
	108
	109	$scope.addNew = function(){
	110	$scope.aircraftDetails.push({
	111	'tail':'',
	112	'make': '',
	113	'model': '',
	114	'sizeId' : ''
	115	});
	116	console.log($scope.aircraftDetails)
	117	};
	118
	119	$scope.getModal = function(makeId, index){
	120	$scope.aircraft.make = makeId;
	121	//var makeId = makeId;
	122	CustomersService.getModal($scope.aircraft.make).then(function(result) {
	123	$scope.aircraftDetails[index].aircraftModalList = result;
	124	//$scope.aircraftDetails[index].model = $scope.aircraftModalList[0];
	125	})
	126	}
	127
	128	$scope.getSize = function(model, index){
	129	CustomersService.getAircraftSize($scope.aircraft.make, model).then(function(result) {
	130	$scope.aircraftDetails[index].aircraftSizeList = result;
	131	//$scope.aircraftDetails[index].size = $scope.aircraftSizeList[0];
	132	})
	133	}
	134
	135	$scope.aircraftListData = {};
	136	$scope.addData = [];
	137	$scope.saveVendorData = function(){
	138	for(var i=0; i<$scope.aircraftDetails.length;i++){
	139	$scope.addData.push({
	140	'tail': $scope.aircraftDetails[i].tail,
	141	'make': $scope.aircraftDetails[i].make,
	142	'model': $scope.aircraftDetails[i].model,
	143	'sizeId' : $scope.aircraftDetails[i].sizeId
	144	});
	145	}
	146	console.log($scope.addData)
	147	$scope.aircraftListData.aircraftList = $scope.addData;
	148	$scope.aircraftListData.accountId = vendorId;
	149
	150	CustomersService.addAircraft($scope.aircraftListData).then(function(result) {
	151	if(result != null && result.success){
	152	toastr.success(''+result.success+'', {
	153	closeButton: true
	154	})
	155	$('#aircraft-modal-3').modal('hide');
	156	getAircraftList();
	157	}else{
	158	toastr.error(''+result.statusText+'', {
	159	closeButton: true
	160	})
	161	}
	162	});
	163
	164	}
	165	$scope.showNoteData = true;
	166	$scope.showCompanyName = true;
	167	$scope.showAddress = true;
	168	$scope.showNote = function(){
	169	$scope.showNoteData = false;
	170	}
	171
	172	$scope.company = function(){
	173	$scope.showCompanyName = false;
	174	}
	175
	176	$scope.addressChange = function(){
	177	$scope.showAddress = false;
	178	}
	179
	180	$scope.editData = function(inputName) {
	181	console.log($scope.vendorData)
	182	if(inputName == 'showNoteData'){
	183	$scope.showNoteData = true;
	184	}else if(inputName == 'showCompanyName'){
	185	$scope.showCompanyName = true;
	186	}else if(inputName == 'showAddress'){
	187	$scope.showAddress = true;
	188	}
	189
	190	var vendorData = "companyName=" + $scope.vendorData.companyName + "&masterMargin=" + $scope.vendorData.masterMargin
	191	+ "&addressOne=" + $scope.vendorData.addressOne + "&addressTwo=" + $scope.vendorData.addressTwo + "&city=" + $scope.vendorData.city + "&state="
	192	+ $scope.vendorData.state + "&country=" + $scope.vendorData.country + "&zipcode=" + $scope.vendorData.zipcode + "&internalNote="
	193	+ $scope.vendorData.internalNote + "&certificateType=" + $scope.vendorData.certificateType + "&baseTenant=" + $scope.vendorData.baseTenant
	194	+ "&fuelerlinxCustomer=" + $scope.vendorData.fuelerlinxCustomer + "&contractFuelVendor=" + $scope.vendorData.contractFuelVendor
	195	+ "&activate=" + $scope.vendorData.activate + "&baseIcao=" + $scope.vendorData.baseIcao + "&vendorId=" + vendorId;
	196
	197	ViewFuelOrderService.updateContact(vendorData).then(function(result) {
	198	if(result != null && result.success){
	199	toastr.success(''+result.success+'', {
	200	closeButton: true
	201	})
	202	}else{
	203	toastr.error(''+result.statusText+'', {
	204	closeButton: true
	205	})
	206	}
	207	})
	208
	209	}
	210
	211	$scope.sendMail = function(){
	212	ViewFuelOrderService.sendMail(vendorId).then(function(result) {
	213	if(result != null && result.success){
	214	toastr.success(''+result.success+'', {
	215	closeButton: true
	216	})
	217	}else{
	218	toastr.error(''+result.statusText+'', {
	219	closeButton: true
	220	})
	221	}
	222	})
	223	}
	224
	225	}]);

app/partials/viewFuelOrder/viewFuelOrder.html

Diff comments View file @cd330b5

File was created	1	<style>
	2	.subnavbar .mainnav > li:nth-child(3) > a{
	3	color: #ff9900;
	4	}
	5	.widget-content{
	6	padding: 10px !important;
	7	}
	8	.widget-content input[type="text"], .widget-content select{
	9	height: 31px;
	10	padding: 0;
	11	}
	12	.new-label span{
	13	float: left;
	14	line-height: 31px;
	15	}
	16	.new-label span:first-child{
	17	margin-right: 5px;
	18	font-weight: bold;
	19	}
	20	.new-label span:last-child{
	21	margin-left: 5px;
	22	}
	23	.new-label select{
	24	display: -webkit-inline-box;
	25	display: inline-box;
	26	float: left;
	27	}
	28	.new-address p{
	29	margin-bottom: 0;
	30	}
	31	.new-add-select{
	32	padding-left: 15px;
	33	margin: 10px 0;
	34	}
	35	.new-add-select select{
	36	width: 100px;
	37	}
	38	.widget{
	39	-moz-box-shadow: 0px 3px 8px rgba(100,100,100, 0.7);
	40	-webkit-box-shadow: 0px 3px 8px rgba(100,100,100, 0.7);
	41	box-shadow: 0px 3px 8px rgba(100,100,100, 0.7);
	42	}
	43	.optionclass {
	44	background: #fff;
	45	}
	46	.timess {
	47	float: right !important;
	48	margin-top: 10px !important;
	49	margin-right: 10px !important;
	50	color: #999 !important;
	51	cursor: pointer !important;
	52	}
	53
	54	.button1 {
	55	display: inline-block;
	56	height: 35px;
	57	line-height: 35px;
	58	padding-right: 15px;
	59	padding-left: 50px;
	60	position: relative;
	61	background-color:rgb(41,127,184);
	62	color:rgb(255,255,255);
	63	text-decoration: none;
	64	text-transform: uppercase;
	65	letter-spacing: 1px;
	66	margin-bottom: 15px;
	67	border: 0;
	68
	69
	70	border-radius: 5px;
	71	-moz-border-radius: 5px;
	72	-webkit-border-radius: 5px;
	73	text-shadow:0px 1px 0px rgba(0,0,0,0.5);
	74	-ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ff123852,Positive=true)";zoom:1;
	75	filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ff123852,Positive=true);
	76
	77	-moz-box-shadow:0px 2px 2px rgba(0,0,0,0.2);
	78	-webkit-box-shadow:0px 2px 2px rgba(0,0,0,0.2);
	79	box-shadow:0px 2px 2px rgba(0,0,0,0.2);
	80	-ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=2,Color=#33000000,Positive=true)";
	81	filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=2,Color=#33000000,Positive=true);
	82	}
	83
	84	.button1 span {
	85	position: absolute;
	86	left: 0;
	87	top: 0;
	88	width: 35px;
	89	background-color:rgba(0,0,0,0.5);
	90
	91	-webkit-border-top-left-radius: 5px;
	92	-webkit-border-bottom-left-radius: 5px;
	93	-moz-border-radius-topleft: 5px;
	94	-moz-border-radius-bottomleft: 5px;
	95	border-top-left-radius: 5px;
	96	border-bottom-left-radius: 5px;
	97	border-right: 1px solid rgba(0,0,0,0.15);
	98	}
	99
	100	.button1:hover span, .button1.active span {
	101	background-color:rgb(0,102,26);
	102	border-right: 1px solid rgba(0,0,0,0.3);
	103	}
	104
	105	.button1:active {
	106	margin-top: 2px;
	107	margin-bottom: 13px;
	108
	109	-moz-box-shadow:0px 1px 0px rgba(255,255,255,0.5);
	110	-webkit-box-shadow:0px 1px 0px rgba(255,255,255,0.5);
	111	box-shadow:0px 1px 0px rgba(255,255,255,0.5);
	112	-ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ccffffff,Positive=true)";
	113	filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ccffffff,Positive=true);
	114	}
	115
	116	.button1.turquoise {
	117	background: #449d44;
	118	}
	119
	120	</style>
	121	<div class="col-xs-12 col-md-11">
	122	<div class="row" style="margin-left:0px">
	123	<div class="col-md-12">
	124	<div class="widget">
	125	<div class="widget-header">
	126	<i class="fa fa-building-o" aria-hidden="true"></i>
	127	<h3>Antioch Flight Department</h3>
	128	<i class="fa fa-times timess" ui-sref="app.customers" aria-hidden="true"></i>
	129	</div>
	130	<!-- /widget-header -->
	131	<div class="widget-content">
	132	<div class="row" style="margin-left:0px">
	133	<div class="col-md-6">
	134	<div class="widget">
	135	<div class="widget-header">
	136	<i class="fa fa-building-o" aria-hidden="true"></i>
	137	<h3>Company Details</h3>
	138	<label>BASE ICAO</label>
	139	<input type="tel" ng-model="vendorData.baseIcao" style="line-height: 18px;width: 50px;padding: 0px 9px;" ng-blur="editData()"/>
	140	<div class="pull-right my-toggle-switch" style="margin-top: 10px; margin-right: 10px;">
	141	<div><input id="company-one2" checked type="checkbox" data-size="mini" data-width="55" data-toggle="toggle" data-on="Active" data-off="Dactive">
	142	</div>
	143	</div>
	144	</div>
	145	<div class="widget-content">
	146	<div class="row" style="margin-left:0px;">
	147	<div class="col-md-7" style="padding-left: 0;">
	148	<h4 ng-show="showCompanyName">
	149	<b style="color:#F90;">{{vendorData.vendorName}}</b>  <i class="fa fa-pencil-square-o" ng-click="company()" style="font-size: 14px;" aria-hidden="true"></i>
	150	</h4>
	151	<input type="tel" ng-hide="showCompanyName" ng-model="vendorData.vendorName" class="form-control" ng-blur="editData('showCompanyName')"/>
	152	</div>
	153	<div class="col-md-5">
	154	<select class="form-control" style="padding: 4px 8px;background: #ebebeb;" ng-model="vendorData.certificateType" ng-click="editData()">
	155	<option class="optionclass" disabled selected>Certificate Type</option>
	156	<option class="optionclass" value="corporate">Part 91 (Corporate)</option>
	157	<option class="optionclass" value="charter">Part 135 (Charter)</option>
	158	<option class="optionclass" value="scheduled">Part 121 (Scheduled)</option>
	159	<option class="optionclass" value="military">Military</option>
	160	<option class="optionclass" value="government">Government</option>
	161	</select>
	162	</div>
	163	</div>
	164	<div>
	165	<p class="new-label">
	166	<span>Master Margin Setting </span>
	167	<select class="form-control" style="width: 135px;padding: 4px 8px;" ng-model="vendorData.masterMargin" ng-click="editData()">
	168	<option value="margin1">Margin1</option>
	169	<option value="margin2">Margin2</option>
	170	<option value="vendorsonly">Vendors Only</option>
	171	<option value="margintenants">Margin Tenants</option>
	172	</select>
	173	<span> See Aircrart List</span>
	174	<div class="clearfix"></div>
	175	</p>
	176	</div>
	177	<div class="row" style="margin-left:0px;">
	178	<div class="col-md-5" style="padding-left: 0;">
	179	<input type="checkbox" name="" ng-click="editData()" ng-model="vendorData.baseTenant"> Tenant/Base Customer
	180	</div>
	181	<div class="col-md-5" style="padding-left: 0;">
	182	<input type="checkbox" name="" ng-click="editData()" ng-model="vendorData.fuelerlinxCustomer"> FuelerLinx Customer
	183	</div>
	184	</div>
	185	<div>
	186	<input type="checkbox" name="" ng-click="editData()" ng-model="vendorData.contractFuelVendor"> CAA Member
	187	</div>
	188	</br>
	189	<div class="new-address">
	190	<p ng-show="showAddress"><i class="fa fa-map-marker"></i> {{vendorData.addressOne}} {{vendorData.addressTwo}}  <i class="fa fa-pencil-square-o" ng-click="addressChange()" aria-hidden="true"></i> </p>
	191
	192	<div ng-hide="showAddress">
	193	<label>Address1</label>
	194	<input type="tel" ng-hide="showAddress" ng-model="vendorData.addressOne" class="form-control" ng-blur="editData('showAddress')"/>
	195	<label>Address2</label>
	196	<input type="tel" ng-hide="showAddress" ng-model="vendorData.addressTwo" class="form-control" ng-blur="editData('showAddress')"/>
	197	</div>
	198
	199	<p><i class="fa fa-phone"></i> (310) 2342-3433  <i class="fa fa-pencil-square-o" aria-hidden="true"></i></p>
	200	<p><i class="fa fa-envelope"></i> freed@gmail.com  <i class="fa fa-pencil-square-o" aria-hidden="true"></i></p>
	201	</div>
	202	<div class="new-add-select">
	203	<select class="form-control" style="background: #ebebeb;padding: 4px 8px;width: 115px;">
	204	<option disabled selected>Add Field</option>
	205	<option class="optionclass">Add Phone</option>
	206	<option class="optionclass">Add Email</option>
	207	</select>
	208	</div>
	209	<div>
	210	<p style="margin-bottom: 0;"><b>Company Notes</b>  <i class="fa fa-pencil-square-o" ng-click="showNote()" aria-hidden="true"></i></p>
	211	<p ng-show="showNoteData">{{vendorData.internalNote}}</p>
	212	<textarea name="message" ng-hide="showNoteData" style="margin-bottom: 6px;" class="form-control" ng-model="vendorData.internalNote" ng-blur="editData('showNoteData')" rows="4" cols="34"></textarea>
	213	</div>
	214	<div class="dis">
	215	<button type="button" data-toggle="modal" data-target="#distribute-modal-3" class="btn btn-primary">Distribute Price to Company Contacts</button>
	216	</div>
	217	<div><button type="button" class="btn btn-info">Setup Fuel</button></div>
	218	</div>
	219	</div>
	220	</div>
	221	<div class="col-md-6">
	222	<div class="widget">
	223	<div class="widget-header">
	224	<i class="fa fa-plane"></i>
	225	<h3>Aircraft List</h3>
	226	<div class="pull-right">
	227	<button type="submit" class="btn btn-success btn-sm" data-toggle="modal" data-target="#aircraft-modal-3" style="margin-top: 4px; margin-right: 9px;"><i class="fa fa-plus" aria-hidden="true"></i>  Add Aircraft</button>
	228	</div>
	229	</div>
	230	<div class="widget-content" style="padding:0px">
	231	<div class="table-responsive">
	232	<table class="table table-bordered table-hover table-striped">
	233	<thead>
	234	<tr>
	235	<th>Tail #</th>
	236	<th>Make</th>
	237	<th>Model</th>
	238	<th>JET-A</th>
	239	<th>All in</th>
	240	<th>AVGAS</th>
	241	<th>All in</th>
	242	<th></th>
	243	</tr>
	244	</thead>
	245	<tbody>
	246	<tr ng-repeat="aircraft in contactAircraftList">
	247	<td>{{aircraft.tail}}</td>
	248	<td>{{aircraft.make}}</td>
	249	<td>{{aircraft.model}}</td>
	250	<td>
	251	<select class="form-control" style="height:31px;">
	252	<option>Margin1</option>
	253	<option>Margin2</option>
	254	</select>
	255	</td>
	256	<td style="color:#55AF8B;">$3659</td>
	257	<td>
	258	<select class="form-control" style="height:31px;">
	259	<option>Margin1</option>
	260	<option>Margin2</option>
	261	</select>
	262	</td>
	263	<td style="color:#55AF8B;">$3659</td>
	264	<td></td>
	265	</tr>
	266	</tbody>
	267	</table>
	268	</div>
	269	</div>
	270	</div>
	271	</div>
	272	</div>
	273	<div class="row" style="margin-left:0px">
	274	<div class="col-md-6">
	275	<div class="widget">
	276	<div class="widget-header">
	277	<i class="fa fa-user"></i>
	278	<h3>Contact List</h3>
	279	<div class="pull-right">
	280	<button type="submit" data-toggle="modal" data-target="#contact-modal-3" class="btn btn-success btn-sm" style="margin-top: 4px; margin-right: 9px;"><i class="fa fa-plus" aria-hidden="true"></i>  Add Contact</button>
	281	</div>
	282	</div>
	283	<div class="widget-content" style="padding:0px">
	284	<div class="table-responsive">
	285	<table class="table table-bordered table-hover table-striped">
	286	<thead>
	287	<tr>
	288	<th>Price Email</th>
	289	<th>First Name</th>
	290	<th>Last Name</th>
	291	<th>Title</th>
	292	</tr>
	293	</thead>
	294	<tbody>
	295	<tr ng-repeat="contact in vendorContactList">
	296	<td class="my-toggle-switch"><input id="{{contact.id}}" checked type="checkbox" data-size="mini" data-toggle="toggle"></td>
	297	<td>
	298	<a href="#!/viewContact/{{contact.id}}">
	299	{{contact.firstName}}
	300	</a>
	301	</td>
	302	<td>{{contact.lastName}}</td>
	303	<td>{{contact.title}}</td>
	304	</tr>
	305	</tbody>
	306	</table>
	307	</div>
	308	</div>
	309	</div>
	310	</div>
	311	<div class="col-md-6">
	312	<div class="widget">
	313	<div class="widget-header">
	314	<i class="fa fa-pencil"></i>
	315	<h3>Price Manager Reference</h3>
	316	</div>
	317	<div class="widget-content">
	318	<div class="table-responsive">
	319	<table class="table table-hover table-striped">
	320	<thead>
	321	<tr>
	322	<th>Omit</th>
	323	<th>Product</th>
	324	<th>Cost</th>
	325	<th>PAP (Margin)</th>
	326	<th>PAP (Total)</th>
	327	<th style="color:#F90">Expires</th>
	328	</tr>
	329	</thead>
	330	<tbody>
	331	<tr>
	332	<td><input type="checkbox"></td>
	333	<td>Jet-A Full Service</td>
	334	<td>$2.123</td>
	335	<td>$23000</td>
	336	<td style="color:#55AF8B;">$3659</td>
	337	<td style="color:#F90">3/15/2017</td>
	338	</tr>
	339	<tr>
	340	<td><input type="checkbox"></td>
	341	<td>Jet-A Full Service</td>
	342	<td>$2.123</td>
	343	<td>$23000</td>
	344	<td style="color:#55AF8B;">$3659</td>
	345	<td style="color:#F90">3/15/2017</td>
	346	</tr>
	347	<tr>
	348	<tr>
	349	<td><input type="checkbox"></td>
	350	<td>Jet-A Full Service</td>
	351	<td>$2.123</td>
	352	<td>$23000</td>
	353	<td style="color:#55AF8B;">$3659</td>
	354	<td style="color:#F90">3/15/2017</td>
	355	</tr>
	356	<tr>
	357	<td><input type="checkbox"></td>
	358	<td>Jet-A Full Service</td>
	359	<td>$2.123</td>
	360	<td>$23000</td>
	361	<td style="color:#55AF8B;">$3659</td>
	362	<td style="color:#F90">3/15/2017</td>
	363	</tr>
	364	</tbody>
	365	</table>
	366	</div>
	367	</div>
	368	</div>
	369	</div>
	370	</div>
	371	</div>
	372	<!-- /widget-content -->
	373	</div>
	374	<!-- /widget -->
	375	</div>
	376	<!-- /span6 -->
	377	</div>
	378	<!-- /widget -->
	379	</div>
	380	<!-- /container -->
	381	<form class="modal multi-step" id="contact-modal-3" name="companyForm">
	382	<div class="modal-dialog modal-lg">
	383	<div class="modal-content">
	384	<div class="modal-body step-1" data-step="1" style="padding: 0;">
	385	<div>
	386	<div class="row" style="margin: 0;">
	387	<div>
	388	<div class="widget" style="margin-bottom: 0; box-shadow: none;">
	389	<div class="widget-header">
	390	<i class="icon-pencil"></i>
	391	<i class="fa fa-tasks" aria-hidden="true"></i>
	392	<h3>Add a New Contact</h3>
	393	<div class="clearfix"></div>
	394	</div>
	395	<div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">
	396	<div class="col-xs-12">
	397	<div class="col-md-6">
	398	<div class="pull-left" style="width: 110px;">
	399	<label class="new-input-label"><b>First Name</b></label>
	400	</div>
	401	<div class="pull-left" style="margin-left: 15px;">
	402	<input type="tel" ng-model="data.firstName" class="form-control" placeholder="">
	403	</div>
	404	<div class="clearfix"></div>
	405	</div>
	406	<div class="col-md-6">
	407
	408	<div class="pull-left" style="width: 110px;">
	409	<label class="new-input-label"><b>Last Name</b></label>
	410	</div>
	411	<div class="pull-left" style="margin-left: 15px;">
	412	<input type="tel" ng-model="data.lastName" class="form-control" id="Address" placeholder="">
	413	</div>
	414	<div class="clearfix"></div>
	415	</div>
	416	</div>
	417	<div class="clearfix"></div><br>
	418	<div class="col-xs-12">
	419	<div class="col-md-6">
	420	<div class="pull-left" style="width: 110px;">
	421	<label class="new-input-label"><b>Title</b></label>
	422	</div>
	423	<div class="pull-left" style="margin-left: 15px;">
	424	<input type="tel" ng-model="data.title" class="form-control" id="Address" placeholder="">
	425	</div>
	426	<div class="clearfix"></div>
	427	</div>
	428	<div class="col-md-6">
	429
	430	<div class="pull-left" style="width: 110px;">
	431	<label class="new-input-label"><b>Email</b></label>
	432	</div>
	433	<div class="pull-left" style="margin-left: 15px;">
	434	<input type="email" ng-model="data.email" class="form-control" id="Address" placeholder="">
	435	</div>
	436	<div class="clearfix"></div>
	437	</div>
	438	</div>
	439	<div class="clearfix"></div><br>
	440	<div class="col-xs-12">
	441	<div class="col-md-6">
	442	<div class="pull-left" style="width: 110px;">
	443	<label class="new-input-label"><b>Username</b></label>
	444	</div>
	445	<div class="pull-left" style="margin-left: 15px;">
	446	<input type="tel" ng-model="data.userName" class="form-control" id="Address" placeholder="">
	447	</div>
	448	<div class="clearfix"></div>
	449	</div>
	450	<div class="col-md-6">
	451
	452	<div class="pull-left" style="width: 110px;">
	453	<label class="new-input-label"><b>Password</b></label>
	454	</div>
	455	<div class="pull-left" style="margin-left: 15px;">
	456	<input type="password" ng-model="data.password" class="form-control" id="Address" placeholder="">
	457	</div>
	458	<div class="clearfix"></div>
	459	</div>
	460	</div>
	461	<div class="clearfix"></div><br>
	462	<div class="col-xs-12">
	463	<div class="col-md-6">
	464	<div class="pull-left" style="width: 110px;">
	465	<label class="new-input-label"><b>Work Phone</b></label>
	466	</div>
	467	<div class="pull-left" style="margin-left: 15px;">
	468	<input type="tel" ng-model="data.workPhone" class="form-control" id="Address" placeholder="">
	469	</div>
	470	<div class="clearfix"></div>
	471	</div>
	472	<div class="col-md-6">
	473
	474	<div class="pull-left" style="width: 110px;">
	475	<label class="new-input-label"><b>Mobile Phone</b></label>
	476	</div>
	477	<div class="pull-left" style="margin-left: 15px;">
	478	<input type="tel" ng-model="data.mobilePhone" class="form-control" id="Address" placeholder="">
	479	</div>
	480	<div class="clearfix"></div>
	481	</div>
	482	</div>
	483	<div class="clearfix"></div><br>
	484	<div class="col-xs-12">
	485	<div class="col-md-12">
	486	<div class="pull-left" style="width: 110px;">
	487	<label class="new-input-label"><b>Address</b></label>
	488	</div>
	489	<div class="pull-right" style="width: calc(100% - 123px);">
	490	<input type="tel" class="form-control" ng-model="data.address" id="Address" placeholder="">
	491	</div>
	492	<div class="clearfix"></div>
	493	</div>
	494	</div>
	495	<div class="clearfix"></div>
	496	<br/>
	497	<div class="col-xs-12">
	498	<div class="col-md-3">
	499	<div class="pull-left my-toggle-switch">
	500	<div style="color: #ff9a01;">Price Email &nbsp &nbsp
	501	<input id="price-one2" checked type="checkbox" data-size="mini" data-width="55" data-toggle="toggle" data-on="On" data-off="Off">
	502	</div>
	503	</div>
	504	<div class="clearfix"></div>
	505	</div>
	506	<div class="col-md-3">
	507	<div class="pull-left my-toggle-switch">
	508	<div style="color: #ff9a01;">Primary Contact &nbsp &nbsp
	509	<input type="checkbox" ng-model="data.primaryContact">
	510	</div>
	511	</div>
	512	<div class="clearfix"></div>
	513	</div>
	514	<div class="col-md-6">
	515	<div class="pull-left" style="width: 110px;">
	516	<label class="new-input-label"><b>Internal Note</b></label>
	517	</div>
	518	<div class="pull-left" style="width: calc(100% - 110px);">
	519	<textarea name="message" ng-model="data.note" rows="4" cols="34"></textarea>
	520	</div>
	521	</div>
	522	<div class="clearfix"></div>
	523	</div>
	524	<div class="clearfix"></div><br>
	525	</div>
	526	</div>
	527	<div class="clearfix"></div>
	528	</div>
	529	</div>
	530	</div>
	531	</div>
	532	<div class="modal-footer" style="border-top: 0;">
	533	<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
	534	<button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="addContact()">Save</button>
	535	</div>
	536	</div>
	537	</div>
	538	</form>
	539	<div class="clearfix"></div>
	540
	541	<form class="modal multi-step" id="aircraft-modal-3" name="aircraftForm">
	542	<div class="modal-dialog modal-lg">
	543	<div class="modal-content">
	544	<div class="modal-body step-2" data-step="2" style="padding: 0;">
	545	<div>
	546	<div class="row" style="margin: 0;">
	547	<div>
	548	<div class="widget" style="margin-bottom: 0;box-shadow: none;">
	549	<div class="widget-header">
	550	<i class="icon-pencil"></i>
	551	<i class="fa fa-tasks" aria-hidden="true"></i>
	552	<h3>Add a New Aircraft</h3>
	553	<div class="clearfix"></div>
	554	</div>
	555	<div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">
	556	<div class="col-xs-12">
	557	<div class="widget-header">
	558	<i class="fa fa-list"></i>
	559	<h3>Aircraft List</h3>
	560	</div>
	561	<div class="widget-content" style="padding:0px;border: 0px; padding: 0px !important;">
	562	<div class="table-responsive">
	563	<table class="table table-striped table-bordered">
	564	<thead>
	565	<tr>
	566	<!-- <th><input type="checkbox" ng-model="selectedAll" ng-click="checkAll()" /></th> -->
	567	<th>Tail</th>
	568	<th>Make</th>
	569	<th>Model</th>
	570	<th>Size</th>
	571	</tr>
	572	</thead>
	573	<tbody>
	574	<tr ng-repeat="aircraftData in aircraftDetails track by $index">
	575	<!-- <td>
	576	<input type="checkbox" ng-model="aircraftData.selected"/>
	577	</td> -->
	578	<td style="width: 20%">
	579	<input type="tel" class="form-control" ng-model="aircraftData.tail" required/>
	580	</td>
	581	<td style="width: 20%">
	582	<select class="form-control" ng-model="aircraftData.make" ng-change="getModal(aircraftData.make, $index)">
	583	<option ng-repeat="make in aircraftMakeList">{{make}}</option>
	584	</select>
	585	</td>
	586	<td style="width: 20%">
	587	<select class="form-control" ng-model="aircraftData.model" ng-change="getSize(aircraftData.model, $index)">
	588	<option ng-repeat="model in aircraftData.aircraftModalList">{{model}}</option>
	589	</select>
	590	</td>
	591	<td style="width: 20%">
	592	<select class="form-control" ng-model="aircraftData.sizeId" ng-options="size.aircraftSize.id as size.aircraftSize.size for size in aircraftData.aircraftSizeList"></select>
	593	<!-- <select class="form-control" ng-model="aircraftData.size">
	594	<option ng-repeat="size in aircraftData.aircraftSizeList">{{size}}</option>
	595	</select> -->
	596	</td>
	597	</tr>
	598	</tbody>
	599	</table>
	600	</div>
	601	<div class="clearfix"></div>
	602	</div>
	603	</div>
	604	<div class="clearfix"></div>
	605	<div class="col-xs-12" style="margin-bottom: 50px;margin-top: 10px;">
	606	<button ng-click="addNew()" class="button1 turquoise pull-right"><span>+</span>Add Aircraft</button>
	607	</div>
	608	</div>
	609	</div>
	610	<div class="clearfix"></div>
	611	</div>
	612	</div>
	613	</div>
	614	</div>
	615	<div class="modal-footer" style="border-top: 0;">
	616	<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
	617	<button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="saveVendorData()">Save</button>
	618	</div>
	619	</div>
	620	</div>
	621	</form>
	622
	623	<form class="modal multi-step" id="distribute-modal-3" name="aircraftForm">
	624	<div class="modal-dialog">
	625	<div class="modal-content">
	626	<div class="modal-body step-2" data-step="2" style="padding: 0;">
	627	<div>
	628	<div class="row" style="margin: 0;">
	629	<p>Are you sure that you want to email pricing to everyone in your contact list</p>
	630	</div>
	631	</div>
	632	</div>
	633	<div class="modal-footer" style="border-top: 0;">
	634	<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
	635	<button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="sendMail()">Save</button>
	636	</div>
	637	</div>
	638	</div>
	639	</form>
	640	<!-- Le javascript
	641	================================================== -->
	642	<!-- Placed at the end of the document so the pages load faster -->
	643	<!-- <script
	644	CKEDITOR.replace( 'editor2', {
	645	height: 250,
	646	extraPlugins: 'divarea'
	647	} );
	648	</script> -->
	649

app/partials/viewFuelOrder/viewFuelOrder.service.js

Diff comments View file @cd330b5

File was created	1	(function(){
	2	'use strict';
	3	angular.module('acufuel')
	4	.service('ViewFuelOrderService', ['$q', '$http', 'BASE_URL', ViewFuelOrderService]);
	5
	6	function ViewFuelOrderService($q, $http, BASE_URL) {
	7
	8	this.getFuelOrder = function(id) {
	9
	10	var deferred = $q.defer();
	11	$http({
	12	method : 'GET',
	13	url : BASE_URL.url +'/vendor/'+id,
	14	headers : {'Content-Type': 'application/json'},
	15	})
	16	.then(function (result){
	17	deferred.resolve(result.data);
	18	},function (result){
	19	deferred.resolve(result.data);
	20	})
	21	return deferred.promise;
	22	}
	23
	24	this.getContact = function(id) {
	25
	26	var deferred = $q.defer();
	27	$http({
	28	method : 'GET',
	29	url : BASE_URL.url +'/vendor/contacts/'+id,
	30	headers : {'Content-Type': 'application/json'},
	31	})
	32	.then(function (result){
	33	deferred.resolve(result.data);
	34	},function (result){
	35	deferred.resolve(result.data);
	36	})
	37	return deferred.promise;
	38	}
	39
	40	this.addContact = function(data) {
	41
	42	var deferred = $q.defer();
	43	$http({
	44	method : 'POST',
	45	url : BASE_URL.url +'/vendor/add/contact',
	46	data : data,
	47	headers : {'Content-Type': 'application/json'},
	48	})
	49	.then(function (result){
	50	deferred.resolve(result.data);
	51	},function (result){
	52	deferred.resolve(result.data);
	53	})
	54	return deferred.promise;
	55	}
	56
	57	this.sendMail = function(id) {
	58
	59	var deferred = $q.defer();
	60	$http({
	61	method : 'POST',
	62	url : BASE_URL.url +'/mailPriceToContacts/'+id,
	63	headers : {'Content-Type': 'application/json'},
	64	})
	65	.then(function (result){
	66	deferred.resolve(result.data);
	67	},function (result){
	68	deferred.resolve(result.data);
	69	})
	70	return deferred.promise;
	71	}
	72
	73	this.updateContact = function(data) {
	74
	75	var deferred = $q.defer();
	76	$http({
	77	method : 'PUT',
	78	url : BASE_URL.url +'/vendor',
	79	data : data,
	80	headers : {'Content-Type': 'application/json'},
	81	})
	82	.then(function (result){
	83	deferred.resolve(result.data);
	84	},function (result){
	85	deferred.resolve(result.data);
	86	})
	87	return deferred.promise;
	88	}
	89
	90	this.getAircraft = function(id) {
	91
	92	var deferred = $q.defer();
	93	$http({
	94	method : 'GET',
	95	url : BASE_URL.url +'/vendor/aircrafts/'+id,
	96	headers : {'Content-Type': 'application/json'},
	97	})
	98	.then(function (result){
	99	deferred.resolve(result.data);
	100	},function (result){
	101	deferred.resolve(result.data);
	102	})
	103	return deferred.promise;
	104	}
	105
	106	}
	107
	108	})();