viithiisys / adminAcufuel

Commit db8e1f992cf3bc0f84f64c859751aa2dfc283f99

Authored by Rishav 2017-04-14 03:35:07 -0400

1 parent 1956e38441

Exists in master

pending user api, update company name with editable field, size according to mak…

…e modal, and some other ui changes

Showing 16 changed files with 236 additions and 104 deletions Show diff stats

app/scripts/controllers.js

Diff comments View file @db8e1f9

 /**
  * acuefuel - Responsive Admin Theme
  *
  */
 /**
  * MainCtrl - controller
  */
 function MainCtrl($scope, $location, $state, $rootScope, LoginService) {
     $scope.userName = 'Dylan Goodwin';
     $scope.helloText = 'Welcome in SeedProject';
     $scope.descriptionText = 'It is an application skeleton for a typical AngularJS web app. You can use it to quickly bootstrap your angular webapp projects and dev environment for these projects.';
+    LoginService.getActiveUser().then(function(result) {
+        $scope.pendingUser = result;
+    })
     $scope.logout = function(){
     	console.log("Called")
     	LoginService.logout();
     	$state.go('login')
     }
     console.log($location)
     $rootScope.$on('$stateChangeStart', function(event, next, nextParams, fromState) {
         console.log(next)
         if(next.name == "index.fboAdmin" || next.name == "index.dashboard" || next.name == "index.updateFBO"){
             $scope.headingName = 'FBO Admin Conductor';
         }else if(next.name == "index.flightDept" || next.name == "index.flight" || next.name == "index.updateFBODept"){
             $scope.headingName = 'Flight Department Admin Conductor';
         }else{
             $scope.headingName = '';
         }
     })
 };
 angular
     .module('acuefuel')
     .controller('MainCtrl', MainCtrl)

app/scripts/directives.js

Diff comments View file @db8e1f9

1	/**	1	/**
2	* acuefuel - Responsive Admin Theme	2	* acuefuel - Responsive Admin Theme
3	*	3	*
4	*/	4	*/
5		5
6		6
7	/**	7	/**
8	* pageTitle - Directive for set Page title - mata title	8	* pageTitle - Directive for set Page title - mata title
9	*/	9	*/
10	function pageTitle($rootScope, $timeout) {	10	function pageTitle($rootScope, $timeout) {
11	return {	11	return {
12	link: function(scope, element) {	12	link: function(scope, element) {
13	var listener = function(event, toState, toParams, fromState, fromParams) {	13	var listener = function(event, toState, toParams, fromState, fromParams) {
14	// Default title - load on Dashboard 1	14	// Default title - load on Dashboard 1
15	var title = 'Acuefuel';	15	var title = 'Acufuel';
16	// Create your own title pattern	16	// Create your own title pattern
17	if (toState.data && toState.data.pageTitle) title = 'INSPINIA \| ' + toState.data.pageTitle;	17	if (toState.data && toState.data.pageTitle) title = 'ACUFUEL \| ' + toState.data.pageTitle;
18	$timeout(function() {	18	$timeout(function() {
19	element.text(title);	19	element.text(title);
20	});	20	});
21	};	21	};
22	$rootScope.$on('$stateChangeStart', listener);	22	$rootScope.$on('$stateChangeStart', listener);
23	}	23	}
24	}	24	}
25	};	25	};
26		26
27	/**	27	/**
28	* sideNavigation - Directive for run metsiMenu on sidebar navigation	28	* sideNavigation - Directive for run metsiMenu on sidebar navigation
29	*/	29	*/
30	function sideNavigation($timeout) {	30	function sideNavigation($timeout) {
31	return {	31	return {
32	restrict: 'A',	32	restrict: 'A',
33	link: function(scope, element) {	33	link: function(scope, element) {
34	// Call the metsiMenu plugin and plug it to sidebar navigation	34	// Call the metsiMenu plugin and plug it to sidebar navigation
35	$timeout(function(){	35	$timeout(function(){
36	element.metisMenu();	36	element.metisMenu();
37		37
38	});	38	});
39		39
40	// Colapse menu in mobile mode after click on element	40	// Colapse menu in mobile mode after click on element
41	var menuElement = $('#side-menu a:not([href$="\\#"])');	41	var menuElement = $('#side-menu a:not([href$="\\#"])');
42	menuElement.click(function(){	42	menuElement.click(function(){
43	if ($(window).width() < 769) {	43	if ($(window).width() < 769) {
44	$("body").toggleClass("mini-navbar");	44	$("body").toggleClass("mini-navbar");
45	}	45	}
46	});	46	});
47		47
48	// Enable initial fixed sidebar	48	// Enable initial fixed sidebar
49	if ($("body").hasClass('fixed-sidebar')) {	49	if ($("body").hasClass('fixed-sidebar')) {
50	var sidebar = element.parent();	50	var sidebar = element.parent();
51	sidebar.slimScroll({	51	sidebar.slimScroll({
52	height: '100%',	52	height: '100%',
53	railOpacity: 0.9	53	railOpacity: 0.9
54	});	54	});
55	}	55	}
56	}	56	}
57	};	57	};
58	};	58	};
59		59
60	/**	60	/**
61	* iboxTools - Directive for iBox tools elements in right corner of ibox	61	* iboxTools - Directive for iBox tools elements in right corner of ibox
62	*/	62	*/
63	function iboxTools($timeout) {	63	function iboxTools($timeout) {
64	return {	64	return {
65	restrict: 'A',	65	restrict: 'A',
66	scope: true,	66	scope: true,
67	templateUrl: 'views/common/ibox_tools.html',	67	templateUrl: 'views/common/ibox_tools.html',
68	controller: function ($scope, $element) {	68	controller: function ($scope, $element) {
69	// Function for collapse ibox	69	// Function for collapse ibox
70	$scope.showhide = function () {	70	$scope.showhide = function () {
71	var ibox = $element.closest('div.ibox');	71	var ibox = $element.closest('div.ibox');
72	var icon = $element.find('i:first');	72	var icon = $element.find('i:first');
73	var content = ibox.children('.ibox-content');	73	var content = ibox.children('.ibox-content');
74	content.slideToggle(200);	74	content.slideToggle(200);
75	// Toggle icon from up to down	75	// Toggle icon from up to down
76	icon.toggleClass('fa-chevron-up').toggleClass('fa-chevron-down');	76	icon.toggleClass('fa-chevron-up').toggleClass('fa-chevron-down');
77	ibox.toggleClass('').toggleClass('border-bottom');	77	ibox.toggleClass('').toggleClass('border-bottom');
78	$timeout(function () {	78	$timeout(function () {
79	ibox.resize();	79	ibox.resize();
80	ibox.find('[id^=map-]').resize();	80	ibox.find('[id^=map-]').resize();
81	}, 50);	81	}, 50);
82	},	82	},
83	// Function for close ibox	83	// Function for close ibox
84	$scope.closebox = function () {	84	$scope.closebox = function () {
85	var ibox = $element.closest('div.ibox');	85	var ibox = $element.closest('div.ibox');
86	ibox.remove();	86	ibox.remove();
87	}	87	}
88	}	88	}
89	};	89	};
90	};	90	};
91		91
92	/**	92	/**
93	* minimalizaSidebar - Directive for minimalize sidebar	93	* minimalizaSidebar - Directive for minimalize sidebar
94	*/	94	*/
95	function minimalizaSidebar($timeout) {	95	function minimalizaSidebar($timeout) {
96	return {	96	return {
97	restrict: 'A',	97	restrict: 'A',
98	template: '<a class="navbar-minimalize minimalize-styl-2 btn btn-primary " href="" ng-click="minimalize()"><i class="fa fa-bars"></i></a>',	98	template: '<a class="navbar-minimalize minimalize-styl-2 btn btn-primary " href="" ng-click="minimalize()"><i class="fa fa-bars"></i></a>',
99	controller: function ($scope, $element) {	99	controller: function ($scope, $element) {
100	$scope.minimalize = function () {	100	$scope.minimalize = function () {
101	$("body").toggleClass("mini-navbar");	101	$("body").toggleClass("mini-navbar");
102	if (!$('body').hasClass('mini-navbar') \|\| $('body').hasClass('body-small')) {	102	if (!$('body').hasClass('mini-navbar') \|\| $('body').hasClass('body-small')) {
103	// Hide menu in order to smoothly turn on when maximize menu	103	// Hide menu in order to smoothly turn on when maximize menu
104	$('#side-menu').hide();	104	$('#side-menu').hide();
105	// For smoothly turn on menu	105	// For smoothly turn on menu
106	setTimeout(	106	setTimeout(
107	function () {	107	function () {
108	$('#side-menu').fadeIn(400);	108	$('#side-menu').fadeIn(400);
109	}, 200);	109	}, 200);
110	} else if ($('body').hasClass('fixed-sidebar')){	110	} else if ($('body').hasClass('fixed-sidebar')){
111	$('#side-menu').hide();	111	$('#side-menu').hide();
112	setTimeout(	112	setTimeout(
113	function () {	113	function () {
114	$('#side-menu').fadeIn(400);	114	$('#side-menu').fadeIn(400);
115	}, 100);	115	}, 100);
116	} else {	116	} else {
117	// Remove all inline style from jquery fadeIn function to reset menu state	117	// Remove all inline style from jquery fadeIn function to reset menu state
118	$('#side-menu').removeAttr('style');	118	$('#side-menu').removeAttr('style');
119	}	119	}
120	}	120	}
121	}	121	}
122	};	122	};
123	};	123	};
124		124
125	/**	125	/**
126	* iboxTools with full screen - Directive for iBox tools elements in right corner of ibox with full screen option	126	* iboxTools with full screen - Directive for iBox tools elements in right corner of ibox with full screen option
127	*/	127	*/
128	function iboxToolsFullScreen($timeout) {	128	function iboxToolsFullScreen($timeout) {
129	return {	129	return {
130	restrict: 'A',	130	restrict: 'A',
131	scope: true,	131	scope: true,
132	templateUrl: 'views/common/ibox_tools_full_screen.html',	132	templateUrl: 'views/common/ibox_tools_full_screen.html',
133	controller: function ($scope, $element) {	133	controller: function ($scope, $element) {
134	// Function for collapse ibox	134	// Function for collapse ibox
135	$scope.showhide = function () {	135	$scope.showhide = function () {
136	var ibox = $element.closest('div.ibox');	136	var ibox = $element.closest('div.ibox');
137	var icon = $element.find('i:first');	137	var icon = $element.find('i:first');
138	var content = ibox.children('.ibox-content');	138	var content = ibox.children('.ibox-content');
139	content.slideToggle(200);	139	content.slideToggle(200);
140	// Toggle icon from up to down	140	// Toggle icon from up to down
141	icon.toggleClass('fa-chevron-up').toggleClass('fa-chevron-down');	141	icon.toggleClass('fa-chevron-up').toggleClass('fa-chevron-down');
142	ibox.toggleClass('').toggleClass('border-bottom');	142	ibox.toggleClass('').toggleClass('border-bottom');
143	$timeout(function () {	143	$timeout(function () {
144	ibox.resize();	144	ibox.resize();
145	ibox.find('[id^=map-]').resize();	145	ibox.find('[id^=map-]').resize();
146	}, 50);	146	}, 50);
147	};	147	};
148	// Function for close ibox	148	// Function for close ibox
149	$scope.closebox = function () {	149	$scope.closebox = function () {
150	var ibox = $element.closest('div.ibox');	150	var ibox = $element.closest('div.ibox');
151	ibox.remove();	151	ibox.remove();
152	};	152	};
153	// Function for full screen	153	// Function for full screen
154	$scope.fullscreen = function () {	154	$scope.fullscreen = function () {
155	var ibox = $element.closest('div.ibox');	155	var ibox = $element.closest('div.ibox');
156	var button = $element.find('i.fa-expand');	156	var button = $element.find('i.fa-expand');
157	$('body').toggleClass('fullscreen-ibox-mode');	157	$('body').toggleClass('fullscreen-ibox-mode');
158	button.toggleClass('fa-expand').toggleClass('fa-compress');	158	button.toggleClass('fa-expand').toggleClass('fa-compress');
159	ibox.toggleClass('fullscreen');	159	ibox.toggleClass('fullscreen');
160	setTimeout(function() {	160	setTimeout(function() {
161	$(window).trigger('resize');	161	$(window).trigger('resize');
162	}, 100);	162	}, 100);
163	}	163	}
164	}	164	}
165	};	165	};
166	}	166	}
167		167
168		168
169		169
170	/**	170	/**
171	*	171	*
172	* Pass all functions into module	172	* Pass all functions into module
173	*/	173	*/
174	angular	174	angular
175	.module('acuefuel')	175	.module('acuefuel')
176	.directive('pageTitle', pageTitle)	176	.directive('pageTitle', pageTitle)
177	.directive('sideNavigation', sideNavigation)	177	.directive('sideNavigation', sideNavigation)
178	.directive('iboxTools', iboxTools)	178	.directive('iboxTools', iboxTools)
179	.directive('minimalizaSidebar', minimalizaSidebar)	179	.directive('minimalizaSidebar', minimalizaSidebar)
180	.directive('iboxToolsFullScreen', iboxToolsFullScreen);	180	.directive('iboxToolsFullScreen', iboxToolsFullScreen);
181		181

app/views/common/topnavbar.html

Diff comments View file @db8e1f9

1	<div class="row border-bottom">	1	<div class="row border-bottom">
2	<!-- <nav class="navbar navbar-static-top white-bg" role="navigation" style="margin-bottom: 0">	2	<!-- <nav class="navbar navbar-static-top white-bg" role="navigation" style="margin-bottom: 0">
3	<div class="navbar-header">	3	<div class="navbar-header">
4	<span minimaliza-sidebar></span>	4	<span minimaliza-sidebar></span>
5	<h1 style="font-weight: 500;margin-left: 10px;margin-top: 12px;float: left;">FBO Admin Conductor</h1>	5	<h1 style="font-weight: 500;margin-left: 10px;margin-top: 12px;float: left;">FBO Admin Conductor</h1>
6	<form role="search" class="navbar-form-custom" method="post" action="">	6	<form role="search" class="navbar-form-custom" method="post" action="">
7	<div class="form-group">	7	<div class="form-group">
8	<input type="text" placeholder="Search for something..." class="form-control" name="top-search" id="top-search">	8	<input type="text" placeholder="Search for something..." class="form-control" name="top-search" id="top-search">
9	</div>	9	</div>
10	</form>	10	</form>
11	</div>	11	</div>
12	<ul class="nav navbar-top-links navbar-right">	12	<ul class="nav navbar-top-links navbar-right">
13	<li>	13	<li>
14	<a href="">	14	<a href="">
15	<i class="fa fa-sign-out"></i> Log out	15	<i class="fa fa-sign-out"></i> Log out
16	</a>	16	</a>
17	</li>	17	</li>
18	</ul>	18	</ul>
19	</nav> -->	19	</nav> -->
20	<nav class="navbar navbar-static-top" role="navigation" style="margin-bottom: 0" ng-controller="MainCtrl">	20	<nav class="navbar navbar-static-top" role="navigation" style="margin-bottom: 0" ng-controller="MainCtrl">
21	<div class="navbar-header">	21	<div class="navbar-header">
22	<span minimaliza-sidebar></span>	22	<span minimaliza-sidebar></span>
23	<h1 style="font-weight: 500;margin-left: 10px;margin-top: 12px;float: left;">{{headingName}}</h1>	23	<h1 style="font-weight: 500;margin-left: 10px;margin-top: 12px;float: left;">{{headingName}}</h1>
24	</div>	24	</div>
25	<ul class="nav navbar-top-links navbar-right">	25	<ul class="nav navbar-top-links navbar-right">
26	<li>	26	<li>
27	<span class="m-r-sm text-muted welcome-message">Welcome to Acufuel Elite Admin</span>	27	<span class="m-r-sm text-muted welcome-message">Welcome to Acufuel Elite Admin</span>
28	</li>	28	</li>
29	<li class="dropdown">	29	<li class="dropdown">
30	<a class="dropdown-toggle count-info" data-toggle="dropdown" href="#">	30	<a class="dropdown-toggle count-info" data-toggle="dropdown" href="#">
31	<i class="fa fa-cog"></i> <span class="label label-warning"></span>	31	<i class="fa fa-cog"></i> <span class="label label-warning"></span>
32	</a>	32	</a>
33	<!-- <ul class="dropdown-menu dropdown-messages">	33	<!-- <ul class="dropdown-menu dropdown-messages">
34	<li>	34	<li>
35	<div class="dropdown-messages-box">	35	<div class="dropdown-messages-box">
36	<a href="profile.html" class="pull-left">	36	<a href="profile.html" class="pull-left">
37	<img alt="image" class="img-circle" src="img/a7.jpg">	37	<img alt="image" class="img-circle" src="img/a7.jpg">
38	</a>	38	</a>
39	<div class="media-body">	39	<div class="media-body">
40	<small class="pull-right">46h ago</small>	40	<small class="pull-right">46h ago</small>
41	<strong>Mike Loreipsum</strong> started following <strong>Monica Smith</strong>. <br>	41	<strong>Mike Loreipsum</strong> started following <strong>Monica Smith</strong>. <br>
42	<small class="text-muted">3 days ago at 7:58 pm - 10.06.2014</small>	42	<small class="text-muted">3 days ago at 7:58 pm - 10.06.2014</small>
43	</div>	43	</div>
44	</div>	44	</div>
45	</li>	45	</li>
46	<li class="divider"></li>	46	<li class="divider"></li>
47	<li>	47	<li>
48	<div class="dropdown-messages-box">	48	<div class="dropdown-messages-box">
49	<a href="profile.html" class="pull-left">	49	<a href="profile.html" class="pull-left">
50	<img alt="image" class="img-circle" src="img/a4.jpg">	50	<img alt="image" class="img-circle" src="img/a4.jpg">
51	</a>	51	</a>
52	<div class="media-body ">	52	<div class="media-body ">
53	<small class="pull-right text-navy">5h ago</small>	53	<small class="pull-right text-navy">5h ago</small>
54	<strong>Chris Johnatan Overtunk</strong> started following <strong>Monica Smith</strong>. <br>	54	<strong>Chris Johnatan Overtunk</strong> started following <strong>Monica Smith</strong>. <br>
55	<small class="text-muted">Yesterday 1:21 pm - 11.06.2014</small>	55	<small class="text-muted">Yesterday 1:21 pm - 11.06.2014</small>
56	</div>	56	</div>
57	</div>	57	</div>
58	</li>	58	</li>
59	<li class="divider"></li>	59	<li class="divider"></li>
60	<li>	60	<li>
61	<div class="dropdown-messages-box">	61	<div class="dropdown-messages-box">
62	<a href="profile.html" class="pull-left">	62	<a href="profile.html" class="pull-left">
63	<img alt="image" class="img-circle" src="img/profile.jpg">	63	<img alt="image" class="img-circle" src="img/profile.jpg">
64	</a>	64	</a>
65	<div class="media-body ">	65	<div class="media-body ">
66	<small class="pull-right">23h ago</small>	66	<small class="pull-right">23h ago</small>
67	<strong>Monica Smith</strong> love <strong>Kim Smith</strong>. <br>	67	<strong>Monica Smith</strong> love <strong>Kim Smith</strong>. <br>
68	<small class="text-muted">2 days ago at 2:30 am - 11.06.2014</small>	68	<small class="text-muted">2 days ago at 2:30 am - 11.06.2014</small>
69	</div>	69	</div>
70	</div>	70	</div>
71	</li>	71	</li>
72	<li class="divider"></li>	72	<li class="divider"></li>
73	<li>	73	<li>
74	<div class="text-center link-block">	74	<div class="text-center link-block">
75	<a href="mailbox.html">	75	<a href="mailbox.html">
76	<i class="fa fa-envelope"></i> <strong>Read All Messages</strong>	76	<i class="fa fa-envelope"></i> <strong>Read All Messages</strong>
77	</a>	77	</a>
78	</div>	78	</div>
79	</li>	79	</li>
80	</ul> -->	80	</ul> -->
81	</li>	81	</li>
82	<li class="dropdown">	82	<li class="dropdown">
83	<a class="dropdown-toggle count-info" data-toggle="dropdown" href="#">	83	<a class="dropdown-toggle count-info" data-toggle="dropdown" href="#">
84	<i class="fa fa-bell"></i> <span class="label label-primary">8</span>	84	<i class="fa fa-bell"></i> <span class="label label-primary">{{pendingUser}}</span>
85	</a>	85	</a>
86	<ul class="dropdown-menu dropdown-alerts">	86	<ul class="dropdown-menu dropdown-alerts">
87	<li>	87	<li>
88	<a href="mailbox.html">	88	<a href="mailbox.html">
89	<div>	89	<div>
90	<i class="fa fa-envelope fa-fw"></i> You have 16 messages	90	<i class="fa fa-envelope fa-fw"></i> You have 16 messages
91	<span class="pull-right text-muted small">4 minutes ago</span>	91	<span class="pull-right text-muted small">4 minutes ago</span>
92	</div>	92	</div>
93	</a>	93	</a>
94	</li>	94	</li>
95	<li class="divider"></li>	95	<li class="divider"></li>
96	<li>	96	<li>
97	<a href="profile.html">	97	<a href="profile.html">
98	<div>	98	<div>
99	<i class="fa fa-twitter fa-fw"></i> 3 New Followers	99	<i class="fa fa-twitter fa-fw"></i> 3 New Followers
100	<span class="pull-right text-muted small">12 minutes ago</span>	100	<span class="pull-right text-muted small">12 minutes ago</span>
101	</div>	101	</div>
102	</a>	102	</a>
103	</li>	103	</li>
104	<li class="divider"></li>	104	<li class="divider"></li>
105	<li>	105	<li>
106	<a href="grid_options.html">	106	<a href="grid_options.html">
107	<div>	107	<div>
108	<i class="fa fa-upload fa-fw"></i> Server Rebooted	108	<i class="fa fa-upload fa-fw"></i> Server Rebooted
109	<span class="pull-right text-muted small">4 minutes ago</span>	109	<span class="pull-right text-muted small">4 minutes ago</span>
110	</div>	110	</div>
111	</a>	111	</a>
112	</li>	112	</li>
113	<li class="divider"></li>	113	<li class="divider"></li>
114	<li>	114	<li>
115	<div class="text-center link-block">	115	<div class="text-center link-block">
116	<a href="notifications.html">	116	<a href="notifications.html">
117	<strong>See All Alerts</strong>	117	<strong>See All Alerts</strong>
118	<i class="fa fa-angle-right"></i>	118	<i class="fa fa-angle-right"></i>
119	</a>	119	</a>
120	</div>	120	</div>
121	</li>	121	</li>
122	</ul>	122	</ul>
123	</li>	123	</li>
124		124
125		125
126	<li>	126	<li>
127	<a ng-click="logout()">	127	<a ng-click="logout()">
128	<i class="fa fa-sign-out"></i> Log out	128	<i class="fa fa-sign-out"></i> Log out
129	</a>	129	</a>
130	</li>	130	</li>
131	</ul>	131	</ul>
132	</nav>	132	</nav>
133	</div>	133	</div>

app/views/fbo-Clients/fboClient.controller.js

Diff comments View file @db8e1f9

 'use strict';
  //Load controller
   angular.module('acuefuel')
 	.controller('fboClientsController', function($scope, $stateParams, FBOClient) {
   	    $(document).ready(function(){
   	      	$('.tab-pane').slimScroll({
     		        height: '600px'
     		    });
       	});
         $('#tab-2').css('display', 'none');
         getAllFbo();
         function getAllFbo(){
           FBOClient.getALlFBOList().then(function(result) {
             console.log(result)
             $scope.fboClient = result;
             $scope.clientLength = result.length;
           })
         }
         $scope.searchData = function(){
           var userType = $('#tabClient > li.active > a').attr('id');
           searchClient($scope.searchQuery, userType);
         }
         function searchClient(searchData, userType){
-          console.log(searchData)
           console.log(userType)
-          var data = {
+          if(searchData == null || searchData == undefined || searchData == "" && userType == 'fbo'){
-            "query" : searchData,
+            getAllFbo();
-            "userType" : userType
+          }else if(searchData == null || searchData == undefined || searchData == "" && userType == 'flightDetp'){
-          }
+            $scope.fboDept();
-          FBOClient.getSearchClient(data).then(function(result) {
+          }else{
-            for(var i=0; i<result.length; i++){
+            var data = {
-              result[i].user = [];
+              "query" : searchData,
-              result[i].user.companyName = result[i].companyName;
+              "userType" : userType
-              result[i].user.firstName = result[i].firstName;
-              result[i].user.lastName = result[i].lastName;
-              result[i].user.id = result[i].id;
-              result[i].user.account = [];
-              result[i].user.account.user = [];
-              result[i].user.account.user.status = result[i].account.user.status;
-            }
-            if(userType == 'fbo'){
-              $scope.fboClient = result;
-              console.log(result)
-              $scope.clientLength = result.length;
-            }else{
-              console.log("nai aaya")
-              $scope.fboDeptList = result;
-              $scope.clientLength = result.length;
             }
-          })
+            FBOClient.getSearchClient(data).then(function(result) {
+              for(var i=0; i<result.length; i++){
+                result[i].user = [];
+                result[i].user.companyName = result[i].companyName;
+                result[i].user.firstName = result[i].firstName;
+                result[i].user.lastName = result[i].lastName;
+                result[i].user.id = result[i].id;
+                result[i].user.account = [];
+                result[i].user.account.user = [];
+                result[i].user.account.user.status = result[i].account.user.status;
+              }
+              if(userType == 'fbo'){
+                $scope.fboClient = result;
+                console.log(result)
+                $scope.clientLength = result.length;
+              }else{
+                $scope.fboDeptList = result;
+                $scope.clientLength = result.length;
+              }
+            })
+          }
         }
       	$scope.fboAdmin = function(){
           getAllFbo();
       		$('#tab-1').css('display', 'block');
       		$('#tab-2').css('display', 'none');
       		$('.customTab1').addClass('active');
       		$('.customTab2').removeClass('active');
       		$('.slimScrollDiv:first-child').css('display', 'block');

app/views/fbo-admin/dashboard.controller.js

Diff comments View file @db8e1f9

1	'use strict';	1	'use strict';
2		2
3	//Load controller	3	//Load controller
4	angular.module('acuefuel')	4	angular.module('acuefuel')
5		5
6	.controller('DashboardController', function($scope, FBOAdmin) {	6	.controller('DashboardController', function($scope, $state, FBOAdmin) {
7	$(document).ready(function(){	7	$(document).ready(function(){
8	$('.i-checks').iCheck({	8	$('.i-checks').iCheck({
9	checkboxClass: 'icheckbox_square-green',	9	checkboxClass: 'icheckbox_square-green',
10	radioClass: 'iradio_square-green',	10	radioClass: 'iradio_square-green',
11	});	11	});
12	});	12	});
13		13	$scope.showCompany = true;
14	$scope.userName = 'Dylan Goodwin';	14	$scope.userName = 'Dylan Goodwin';
15	$scope.essAccountId = true;	15	$scope.essAccountId = true;
16	$("#esAccId").css({ opacity: 0.5 });	16	$("#esAccId").css({ opacity: 0.5 });
17	$scope.user = {};	17	$scope.user = {};
18	$scope.feature = {};	18	$scope.feature = {};
19	$scope.feature.level = 'silver';	19	$scope.feature.level = 'silver';
20	$scope.feature.essintaPosSystem = false;	20	$scope.feature.essintaPosSystem = false;
21	$scope.feature.acuQuote = false;	21	$scope.feature.acuQuote = false;
22	$scope.feature.acuTrack = false;	22	$scope.feature.acuTrack = false;
23	$scope.feature.fuelProgram = false;	23	$scope.feature.fuelProgram = false;
24	$scope.feature.amstatIntegration = false;	24	$scope.feature.amstatIntegration = false;
25	$scope.feature.posAccountingIntegration = false;	25	$scope.feature.posAccountingIntegration = false;
26	$scope.feature.posVeederRootIntegration = false;	26	$scope.feature.posVeederRootIntegration = false;
27	$scope.userData = function(){	27	$scope.userData = function(){
28	console.log("daadada", $scope.feature)	28	if($scope.user.email == undefined \|\| $scope.user.email == null){
29		29	toastr.error('Please enter your email first', {
		30	closeButton: true
		31	})
		32	}else if($scope.user.firstName == undefined \|\| $scope.user.firstName == null){
		33	toastr.error('Please enter your First Name', {
		34	closeButton: true
		35	})
		36	}else{
30	if($scope.status == true){	37	if($scope.status == true){
31	$scope.user.status = 'active';	38	$scope.user.status = 'active';
32	}else{	39	}else{
33	$scope.user.status = 'inactive';	40	$scope.user.status = 'inactive';
34	}	41	}
35	$scope.user.username = $scope.user.email;	42	$scope.user.username = $scope.user.email;
36	$scope.user.userType = 'fbo';	43	$scope.user.userType = 'fbo';
37	console.log($scope.user)	44	console.log($scope.user)
38	var formdata = "companyName=" + $scope.user.companyName + "&email=" + $scope.user.email + "&username=" + $scope.user.username + "&firstName=" + $scope.user.firstName + "&lastName=" + $scope.user.lastName + "&password=" + $scope.user.password + "&phone=" + $scope.user.phone + "&mobile=" + $scope.user.mobile + "&status=" + $scope.user.status + "&userType=" + $scope.user.userType + "&clientNote=" + $scope.user.clientNote;	45	var formdata = "companyName=" + $scope.user.companyName + "&email=" + $scope.user.email + "&username=" + $scope.user.username + "&firstName=" + $scope.user.firstName + "&lastName=" + $scope.user.lastName + "&password=" + $scope.user.password + "&phone=" + $scope.user.phone + "&mobile=" + $scope.user.mobile + "&status=" + $scope.user.status + "&userType=" + $scope.user.userType + "&clientNote=" + $scope.user.clientNote;
39	FBOAdmin.registerUser(formdata).then(function(result) {	46	FBOAdmin.registerUser(formdata).then(function(result) {
40	toastr.success('Created Successfully', {	47	toastr.success('Created Successfully', {
41	closeButton: true	48	closeButton: true
42	})	49	})
43	$scope.feature.accountId = result;	50	$scope.feature.accountId = result;
44	var featureControlData = "accountId=" + $scope.feature.accountId + "&level=" + $scope.feature.level + "&essintaPosSystem=" + $scope.feature.essintaPosSystem	51	var featureControlData = "accountId=" + $scope.feature.accountId + "&level=" + $scope.feature.level + "&essintaPosSystem=" + $scope.feature.essintaPosSystem
45	+ "&acuQuote=" + $scope.feature.acuQuote + "&acuTrack=" + $scope.feature.acuTrack + "&fuelProgram=" + $scope.feature.fuelProgram + "&amstatIntegration=" + $scope.feature.amstatIntegration+ "&posAccountingIntegration="	52	+ "&acuQuote=" + $scope.feature.acuQuote + "&acuTrack=" + $scope.feature.acuTrack + "&fuelProgram=" + $scope.feature.fuelProgram + "&amstatIntegration=" + $scope.feature.amstatIntegration+ "&posAccountingIntegration="
46	+ $scope.feature.posAccountingIntegration + "&posVeederRootIntegration=" + $scope.feature.posVeederRootIntegration	53	+ $scope.feature.posAccountingIntegration + "&posVeederRootIntegration=" + $scope.feature.posVeederRootIntegration
47	+ "&essintaAccountUid=" + $scope.feature.essintaAccountUid + "&additionalLicences=" + $scope.feature.additionalLicences;	54	+ "&essintaAccountUid=" + $scope.feature.essintaAccountUid + "&additionalLicences=" + $scope.feature.additionalLicences;
48		55
49	FBOAdmin.featureControl(featureControlData).then(function(response) {	56	FBOAdmin.featureControl(featureControlData).then(function(response) {
50	console.log(response)	57	console.log(response)
51		58
52	})	59	})
		60	$state.go('index.fboAdmin');
53	}, function (err) {	61	}, function (err) {
54	toastr.error('Error in registering', {	62	toastr.error('Error in registering', {
55	closeButton: true	63	closeButton: true
56	})	64	})
57	});	65	});
		66	}
		67
58	}	68	}
59		69
60	$scope.enableEssId = function(){	70	$scope.enableEssId = function(){
61	if($scope.feature.essintaPosSystem == true){	71	if($scope.feature.essintaPosSystem == true){
62	$scope.essAccountId = false;	72	$scope.essAccountId = false;
63	$("#esAccId").css({ opacity: 1 });	73	$("#esAccId").css({ opacity: 1 });
64	}else{	74	}else{
65	$scope.essAccountId = true;	75	$scope.essAccountId = true;
66	delete $scope.feature.essintaAccountUid;	76	delete $scope.feature.essintaAccountUid;
67	$("#esAccId").css({ opacity: 0.5 });	77	$("#esAccId").css({ opacity: 0.5 });
68	}	78	}
69	}	79	}
70		80
		81	$scope.editName = function(){
		82	$scope.showCompany = false;
		83
		84	}
		85
71	});	86	});

app/views/fbo-admin/dashboard.html

Diff comments View file @db8e1f9

 </div>
     <div class="row wrapper border-bottom white-bg page-heading">
         <div class="col-lg-8">
-            <h2>Tellus Institute</h2>
+            <h2 ng-click="editName()" ng-show="showCompany" style="cursor: pointer;">Tellus Institute</h2>
+            <div style="margin-top: 20px;" ng-hide="showCompany"><input type="text" style="width:50%;" placeholder="Enter Company Name" ng-model="user.companyName" class="form-control"></div>
         </div>
         <div class="col-lg-4" style="margin-top: 20px; text-align: right;">
             <button type="button" class="btn btn-default btn-sm" ui-sref="index.fboAdmin">Cancel</button>
             <button type="button" class="btn btn-primary btn-sm" ng-click="userData()">Save Changes</button>
         </div>
     </div>
 </div>
 <div class="wrapper wrapper-content animated fadeInRight">
     <div class="row">
         <div class="col-lg-7">
             <div class="ibox float-e-margins">
                 <div class="ibox-title">
                     <div class="pull-left">
                         <h5>Contact Information</h5>
                     </div>
                     <div class="pull-right my-toggle-switch">
                         <div class="switch">
                             <div class="onoffswitch">
                                 <input type="checkbox" ng-checked="status === true" ng-model="status" ng-init="status = true" class="onoffswitch-checkbox" id="example1">
                                 <label class="onoffswitch-label" for="example1">
                                     <span class="onoffswitch-inner"></span>
                                     <span class="onoffswitch-switch"></span>
                                 </label>
                             </div>
                         </div>
                     </div>
                     <div class="clearfix"></div>
                 </div>
                 <div class="ibox-content">
                     <div class="row">
                         <form role="form">
                             <div class="col-sm-6 b-r">
                                     <!-- <div class="form-group"><label>Company Name</label> <input type="text" placeholder="Company Name" ng-model="user.companyName" class="form-control"></div> -->
                                     <div class="form-group"><label>Username</label> <input type="email" placeholder="Email Username" ng-model="user.email" class="form-control"></div>
                                     <div class="form-group"><label>First Name</label> <input type="text" placeholder="First Name" ng-model="user.firstName" class="form-control"></div>
                                     <div class="form-group"><label>Last Name</label> <input type="text" placeholder="Last Name" ng-model="user.lastName" class="form-control"></div>
                                     <!-- <div>
                                         <button class="btn btn-sm btn-primary pull-right m-t-n-xs" type="submit"><strong>Log in</strong></button>
                                         <label> <input type="checkbox" class="i-checks"> Remember me </label>
                                     </div> -->
                             </div>
                             <div class="col-sm-6">
                                 <div class="form-group"><label>Password</label> <input type="password" ng-model="user.password" placeholder="Password" class="form-control"></div>
                                 <div class="form-group"><label>Phone</label> <input type="number" ng-model="user.phone" placeholder="Phone" class="form-control"></div>
                                 <div class="form-group"><label>Mobile</label> <input type="number" ng-model="user.mobile" placeholder="Mobile" class="form-control"></div>
                             </div>
                         </form>
                     </div>
                 </div>
             </div>
         </div>
         <div class="col-lg-5">
             <div class="ibox float-e-margins">
                 <div class="ibox-title">
                     <h5>Client Notes</h5>
                 </div>
                 <div class="ibox-content">
                     <div class="row">
                         <form role="form">
                             <textarea class="form-control" rows="10" ng-model="user.clientNote" id="comment"></textarea>
                         </form>
                     </div>
                 </div>
             </div>
         </div>
     </div>
 </div>
 <div class="wrapper wrapper-content animated fadeInRight">
     <div class="row">
         <div class="col-lg-12">
             <div class="ibox float-e-margins">
                 <div class="ibox-title" style="padding: 5px 15px 5px 15px;">
                     <div class="col-lg-8">
                         <h5 style="line-height: 34px;margin-bottom: 0;">Feature Account Control</h5>
                     </div>
                     <div class="col-lg-4">
                         <div class="form-group">
                             <label class="col-sm-2 control-label" style="line-height: 34px;margin-bottom: 0;">Level</label>
                             <div class="col-sm-10">
                                 <select class="form-control m-b" name="account" ng-model="feature.level" style="margin-bottom: 0;">
                                     <option value="silver" selected>Silver</option>
                                     <option value="gold">Gold</option>
                                 </select>
                             </div>
                         </div>
                     </div>
                     <div class="clearfix"></div>
                 </div>
                 <div class="ibox-content">
                     <div class="row">
                         <form role="form">
                             <div class="col-lg-3">
                                 <label style="color: #1ab394;">Modularized</label>
                                 <div>
                                     <label> <input type="checkbox" class="i-checks" ng-change="enableEssId()" ng-model="feature.essintaPosSystem" icheck> Essinta POS system </label>
                                 </div>
                                  <div>
                                     <label> <input type="checkbox" class="i-checks" ng-model="feature.acuQuote" icheck> AcuQuote </label>
                                 </div>
                                 <div>
                                     <label> <input type="checkbox" class="i-checks" ng-model="feature.acuTrack" icheck> AcuTrack </label>
                                 </div>
                                  <div>
                                     <label> <input type="checkbox" class="i-checks" ng-model="feature.fuelProgram" icheck> Fuel Program </label>
                                 </div>
                                 <div>
                                     <label> <input type="checkbox" class="i-checks" ng-model="feature.amstatIntegration" icheck> AMSTAT Integration </label>
                                 </div>
                                  <div>
                                     <label> <input type="checkbox" class="i-checks" ng-model="feature.posAccountingIntegration" icheck> POS Accounting Integration </label>
                                 </div>
                                 <div>
                                     <label> <input type="checkbox" class="i-checks" ng-model="feature.posVeederRootIntegration" icheck> POS VeederRoot Integration </label>
                                 </div>
                             </div>
                             <div class="col-lg-9" style="padding: 0;">
                                 <div class="col-lg-6">
                                     <div class="form-group" style="margin-top: 18px;" id="esAccId">
                                         <label class="control-label pull-left" style="color: #1ab394;line-height: 34px;">Essinta Account UID</label>
                                         <div class="col-lg-6">
                                             <input type="text" placeholder="" ng-disabled="essAccountId" style="border-color: #1ab394;" class="form-control" ng-model="feature.essintaAccountUid">
                                         </div>
                                     </div>
                                 </div>
                                 <div class="col-lg-6">
                                     <div class="form-group" style="margin-top: 18px;">
                                         <label class="control-label pull-left" style="color: #ffa149;line-height: 34px;">Additional Device Licences</label>
                                         <div class="col-lg-6">
                                             <input type="text" placeholder="" style="border-color: #ffa149 !important;" ng-model="feature.additionalLicences" class="form-control">
                                         </div>
                                     </div>
                                 </div>
                             </div>
                         </form>
                     </div>
                 </div>
             </div>
         </div>
     </div>
 </div>

app/views/fbo-flight/flight.html

Diff comments View file @db8e1f9

 </div>
     <div class="row wrapper border-bottom white-bg page-heading">
         <div class="col-lg-8">
-            <h2>Tellus Institute</h2>
+            <h2 ng-click="editName()" ng-show="showCompany" style="cursor: pointer;">Tellus Institute</h2>
+            <div style="margin-top: 20px;" ng-hide="showCompany"><input type="text" style="width:50%;" placeholder="Enter Company Name" ng-model="user.companyName" class="form-control"></div>
         </div>
         <div class="col-lg-4" style="margin-top: 20px; text-align: right;">
             <button type="button" class="btn btn-default btn-sm" ui-sref="index.flightDept">Cancel</button>
             <button type="button" class="btn btn-primary btn-sm" ng-click="userData()">Save Changes</button>
         </div>
     </div>
 </div>
 <div class="wrapper wrapper-content animated fadeInRight">
     <div class="row">
         <div class="col-lg-7">
             <div class="ibox float-e-margins">
                 <div class="ibox-title">
                     <div class="pull-left">
                         <h5>Contact Information</h5>
                     </div>
                     <div class="pull-right my-toggle-switch">
                         <div class="switch">
                             <div class="onoffswitch">
                                 <input type="checkbox" ng-checked="status === true" ng-model="status" ng-init="status = true" class="onoffswitch-checkbox" id="example1">
                                 <label class="onoffswitch-label" for="example1">
                                     <span class="onoffswitch-inner"></span>
                                     <span class="onoffswitch-switch"></span>
                                 </label>
                             </div>
                         </div>
                     </div>
                     <div class="clearfix"></div>
                 </div>
                 <div class="ibox-content">
                     <div class="row">
                         <form role="form">
                             <div class="col-sm-6 b-r">
                                     <!-- <div class="form-group"><label>Company Name</label> <input type="text" placeholder="Company Name" ng-model="user.companyName" class="form-control"></div> -->
                                     <div class="form-group"><label>Username</label> <input type="email" placeholder="Email Username" ng-model="user.email" class="form-control"></div>
                                     <div class="form-group"><label>First Name</label> <input type="text" placeholder="First Name" ng-model="user.firstName" class="form-control"></div>
                                     <div class="form-group"><label>Last Name</label> <input type="text" placeholder="Last Name" ng-model="user.lastName" class="form-control"></div>
                                     <!-- <div>
                                         <button class="btn btn-sm btn-primary pull-right m-t-n-xs" type="submit"><strong>Log in</strong></button>
                                         <label> <input type="checkbox" class="i-checks"> Remember me </label>
                                     </div> -->
                             </div>
                             <div class="col-sm-6">
                                 <div class="form-group"><label>Password</label> <input type="password" ng-model="user.password" placeholder="Password" class="form-control"></div>
                                 <div class="form-group"><label>Phone</label> <input type="number" ng-model="user.phone" placeholder="Phone" class="form-control"></div>
                                 <div class="form-group"><label>Mobile</label> <input type="number" ng-model="user.mobile" placeholder="Mobile" class="form-control"></div>
                             </div>
                         </form>
                     </div>
                 </div>
             </div>
         </div>
         <div class="col-lg-5">
             <div class="ibox float-e-margins">
                 <div class="ibox-title">
                     <h5>Client Notes</h5>
                 </div>
                 <div class="ibox-content">
                     <div class="row">
                         <form role="form">
                             <textarea class="form-control" rows="10" ng-model="user.clientNote" id="comment"></textarea>
                         </form>
                     </div>
                 </div>
             </div>
         </div>
     </div>
 </div>
 <div>
   <div class="row">
       <div class="col-lg-7">
           <div class="ibox float-e-margins">
               <div class="ibox-title">
                 <h5>Aircraft List</h5>
                 <div class="pull-right">
                   <button type="button" class="btn btn-primary btn-sm" ng-click="openModal()">+ Add</button>
                 </div>
                 <div class="clearfix"></div>
                 <div class="modal inmodal" id="myModal4" tabindex="-1" role="dialog"  aria-hidden="true">
                     <div class="modal-dialog">
                         <div class="modal-content animated fadeIn">
                             <div class="modal-header">
                                 <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
                                 <!-- <i class="fa fa-clock-o modal-icon"></i> -->
                                 <h4 class="modal-title">Add Aircraft</h4>
                                 <!-- <small>Lorem Ipsum is simply dummy text of the printing and typesetting industry.</small> -->
                             </div>
                             <div class="modal-body" style="padding: 15px;">
                                 <table class="table table-bordered table-hover table-striped">
                                   <thead>
                                     <tr>
                                       <th>Tail</th>
                                       <th>Make</th>
                                       <th>Model</th>
                                       <th>Size</th>
                                     </tr>
                                   </thead>
                                   <tbody>
                                     <tr>
                                       <td>
                                         <input type="text" style="width:100px;" ng-model="aircraft.tail" class="form-control">
                                       </td>
                                       <td style="width: 30%">
                                         <select class="form-control" ng-model="aircraft.make" ng-change="getModal()">
                                            <option ng-repeat="make in aircraftMakeList">{{make}}</option>
                                         </select>
                                       </td>
                                       <td style="width: 30%">
-                                        <select class="form-control">
+                                        <select class="form-control" ng-model="aircraft.model" ng-change="getSize()">
-                                           <option ng-repeat="model in aircraftModalList" ng-model="aircraft.model">{{model}}</option>
+                                           <option ng-repeat="model in aircraftModalList">{{model}}</option>
                                         </select>
                                       </td>
                                       <td style="width: 30%">
-                                        <select class="form-control">
+                                        <select class="form-control" ng-model="aircraft.size">
-                                           <option ng-repeat="size in aircraftSizeList" ng-model="aircraft.size">{{size}}</option>
+                                           <option ng-repeat="size in aircraftSizeList">{{size}}</option>
                                         </select>
                                       </td>
                                     </tr>
                                   </tbody>
                                 </table>
                             </div>
                             <div class="modal-footer">
                                 <button type="button" class="btn btn-white" data-dismiss="modal">Close</button>
                                 <button type="button" class="btn btn-primary" ng-click="addAircraft()">Save changes</button>
                             </div>
                         </div>
                     </div>
                 </div>
               </div>
               <div class="ibox-content">
                 <div class="table-responsive">
                   <table class="table table-bordered table-hover table-striped">
                     <thead>
                       <tr>
                         <th>Tail</th>
                         <th>Make</th>
                         <th>Model</th>
                         <th>Size</th>
                       </tr>
                     </thead>
                     <tbody>
                       <tr ng-repeat="airData in getCraftList track by $index">
                         <td>
                           <input type="text" style="width:100px;" ng-model="airData.tail" class="form-control">
                         </td>
                         <td>
                           <select class="form-control" ng-model="airData.make">
                              <option>{{airData.make}}</option>
                           </select>
                         </td>
                         <td>
                           <select class="form-control" ng-model="airData.model">
                              <option>{{airData.model}}</option>
                           </select>
                         </td>
                         <td>
                           <select class="form-control" ng-model="airData.size">
                              <option>{{airData.size}}</option>
                           </select>
                         </td>
                       </tr>
                     </tbody>
                   </table>
                 </div>
                      <div class="clearfix"></div>
                   </div>
                </div>
             </div>
             <div class="col-lg-5">
                 <div class="ibox float-e-margins">
                     <div class="ibox-title">
                         <h5>Account Authenticatio & Payment Method</h5>
                     </div>
                     <div class="ibox-content">
                        <!--  <div class="row">
                             <div class="col-md-3">
                                 <img src="images/master.png">
                             </div>
                             <div class="col-md-9">
                                 <div class="col">
                                     <span style="font-size: large; color: #909394;">**** **** **** 7002</span>
                                 </div>
                                 <div class="col">
                                     <span><strong>Expiry Date:</strong>10/16</span>
                                 </div>
                             </div>
                             <div class="clearfix"></div>
                             <br>
                             <div class="col-md-3">
                                 <img src="images/visa1.png">
                             </div>
                             <div class="col-md-9">
                                 <div class="col">
                                     <span style="font-size: large; color: #909394;">**** **** **** 1060</span>
                                 </div>
                                 <div class="col">
                                     <span><strong>Expiry Date:</strong>10/16</span>
                                 </div>
                             </div>
                             <div class="clearfix"></div>
                         </div> -->
                         <div class="row">
                             <!-- <form name="myForm">
                                 <div class="span3">
                                     <label for="">Card number</label>
                                     <input type="text" class="form-control" ng-model="number">
                                 </div>
                                 <div class="span3">
                                     <label for="">Name on card </label>
                                     <input type="text" class="form-control">
                                 </div>
                                 <div class="row">
                                     <div class="col-sm-6">
                                         <label for="">Expiry</label>
                                         <input type="text" class="form-control" ng-model="expiry">
                                     </div>
                                     <div class="col-sm-6">
                                         <label for="">CVV</label>
                                         <input type="text" class="form-control" ng-model="cvc">
                                     </div>
                                 </div>
                                 <div class="span4">
                                     <button type="submit" class="btn btn-primary btn-large">Add</button>
                                 </div>
                             </form> -->
                             <div class="container">
                                 <div class="row">
                                   <div class="col-xs-12 col-md-4">
                                      <div class="panel panel-default credit-card-box">
                                         <div class="panel-heading display-table" >
                                            <div class="row display-tr" >
                                               <h3 class="panel-title display-td" >Payment Details</h3>
                                               <div class="display-td" >
                                                  <img class="img-responsive pull-right" src="http://i76.imgup.net/accepted_c22e0.png">
                                               </div>
                                            </div>
                                         </div>
                                         <div class="panel-body">
                                            <form role="form" id="payment-form">
                                               <div class="row">
                                                  <div class="col-xs-12">
                                                     <div class="form-group">
                                                        <label for="cardNumber">CARD NUMBER</label>
                                                        <div class="input-group">
                                                           <input type="number" ng-model="data.cardNumber" maxlength="16" oninput="javascript: if (this.value.length > this.maxLength) this.value = this.value.slice(0, this.maxLength);" class="form-control" name="cardNumber" placeholder="Valid Card Number" autocomplete="cc-number" required autofocus>
                                                           <span class="input-group-addon"><i class="fa fa-credit-card"></i></span>
                                                        </div>
                                                     </div>
                                                  </div>
                                               </div>
                                               <div class="row">
                                                  <div class="col-xs-7 col-md-7">
                                                     <div class="form-group">
                                                        <label for="cardExpiry"><span class="hidden-xs">EXPIRATION</span><span class="visible-xs-inline">EXP</span> DATE</label>
                                                        <input type="text" ng-model="data.expiryDate" class="form-control" name="cardExpiry" placeholder="MM / YY" autocomplete="cc-exp"
                                                           required>
                                                     </div>
                                                  </div>
                                                  <div class="col-xs-5 col-md-5 pull-right">
                                                     <div class="form-group">
                                                        <label for="cardCVC">CVV CODE</label>
                                                        <input type="number"  maxlength="3" oninput="javascript: if (this.value.length > this.maxLength) this.value = this.value.slice(0, this.maxLength);" class="form-control" name="cardCVC" placeholder="CVC" autocomplete="cc-csc"
                                                           required>
                                                     </div>
                                                  </div>
                                               </div>
                                               <div class="row">
                                                  <div class="col-xs-12">
                                                     <div class="form-group">
                                                        <label for="name">Card Type</label>
                                                         <select class="form-control m-b" name="account" ng-model="data.cardType" style="margin-bottom: 0;">
                                                             <option value="creditCard" selected>Credit Card</option>
                                                             <option value="debitCard">Debit Card</option>
                                                         </select>
                                                     </div>
                                                  </div>
                                               </div>
                                               <div class="row">
                                                  <div class="col-xs-12">
                                                     <button class="btn btn-success btn-lg btn-block" type="submit" ng-click="addCard()">Add</button>
                                                  </div>
                                               </div>
                                               <div class="row" style="display:none;">
                                                  <div class="col-xs-12">
                                                     <p class="payment-errors"></p>
                                                  </div>
                                               </div>
                                            </form>
                                         </div>
                                      </div>
                                   </div>
                                 </div>
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
         </div>
     </div>
 </div>
 <script type="text/javascript" src="https://js.stripe.com/v2/"></script>

app/views/fbo-flight/flightDept.controller.js

Diff comments View file @db8e1f9

1	'use strict';	1	'use strict';
2		2
3	//Load controller	3	//Load controller
4	angular.module('acuefuel')	4	angular.module('acuefuel')
5		5
6	.controller('FlightDeptController', function ($scope, $uibModal, FBOFlight) {	6	.controller('FlightDeptController', function ($scope, $uibModal, FBOFlight) {
		7	$scope.showCompany = true;
		8	$scope.editName = function(){
		9	$scope.showCompany = false;
		10
		11	}
7	$scope.data = {};	12	$scope.data = {};
8	$scope.user = {};	13	$scope.user = {};
9	$scope.aircraft = {};	14	$scope.aircraft = {};
10	$scope.userData = function(){	15	$scope.userData = function(){
		16	if($scope.user.email == undefined \|\| $scope.user.email == null){
		17	toastr.error('Please enter your email first', {
		18	closeButton: true
		19	})
		20	}else if($scope.user.firstName == undefined \|\| $scope.user.firstName == null){
		21	toastr.error('Please enter your First Name', {
		22	closeButton: true
		23	})
		24	}else{
11	if($scope.status == true){	25	if($scope.status == true){
12	$scope.user.status = 'active';	26	$scope.user.status = 'active';
13	}else{	27	}else{
14	$scope.user.status = 'inactive';	28	$scope.user.status = 'inactive';
15	}	29	}
16	$scope.user.username = $scope.user.email;	30	$scope.user.username = $scope.user.email;
17	$scope.user.userType = 'flightDetp';	31	$scope.user.userType = 'flightDetp';
18	console.log($scope.user)	32	console.log($scope.user)
19	var formdata = "companyName=" + $scope.user.companyName + "&email=" + $scope.user.email + "&username=" + $scope.user.username + "&firstName=" + $scope.user.firstName + "&lastName=" + $scope.user.lastName + "&password=" + $scope.user.password + "&phone=" + $scope.user.phone + "&mobile=" + $scope.user.mobile + "&status=" + $scope.user.status + "&userType=" + $scope.user.userType + "&clientNote=" + $scope.user.clientNote;	33	var formdata = "companyName=" + $scope.user.companyName + "&email=" + $scope.user.email + "&username=" + $scope.user.username + "&firstName=" + $scope.user.firstName + "&lastName=" + $scope.user.lastName + "&password=" + $scope.user.password + "&phone=" + $scope.user.phone + "&mobile=" + $scope.user.mobile + "&status=" + $scope.user.status + "&userType=" + $scope.user.userType + "&clientNote=" + $scope.user.clientNote;
20	FBOFlight.registerUser(formdata).then(function(result) {	34	FBOFlight.registerUser(formdata).then(function(result) {
21	$scope.registerId = result;	35	$scope.registerId = result;
22	$scope.data.accountId = $scope.registerId;	36	$scope.data.accountId = $scope.registerId;
23	$scope.aircraft.accountId = $scope.registerId;	37	$scope.aircraft.accountId = $scope.registerId;
24	toastr.success('Created Successfully', {	38	toastr.success('Created Successfully', {
25	closeButton: true	39	closeButton: true
26	})	40	})
		41	$state.go('index.flightDept');
27	}, function (err) {	42	}, function (err) {
28	toastr.error('Error in registering', {	43	toastr.error('Error in registering', {
29	closeButton: true	44	closeButton: true
30	})	45	})
31	});	46	});
		47	}
32	}	48	}
33		49
34	$scope.data.cardType = 'creditCard';	50	$scope.data.cardType = 'creditCard';
35	var cardData = {}	51	var cardData = {}
36	cardData.paymentMethodList = [];	52	cardData.paymentMethodList = [];
37	$scope.addCard = function(){	53	$scope.addCard = function(){
38	if($scope.aircraft.accountId == undefined){	54	if($scope.aircraft.accountId == undefined){
39	toastr.error('Please Add Contact Information', {	55	toastr.error('Please Add Contact Information', {
40	closeButton: true	56	closeButton: true
41	})	57	})
42	}else{	58	}else{
43	cardData.paymentMethodList.push($scope.data);	59	cardData.paymentMethodList.push($scope.data);
44	console.log("cardData", cardData);	60	console.log("cardData", cardData);
45	FBOFlight.addCardInformation(cardData).then(function(result) {	61	FBOFlight.addCardInformation(cardData).then(function(result) {
46	console.log(result)	62	console.log(result)
47	toastr.success('Created Successfully', {	63	toastr.success('Created Successfully', {
48	closeButton: true	64	closeButton: true
49	})	65	})
50	})	66	})
51	}	67	}
52		68
53	}	69	}
54		70
55	getData();	71	getData();
56	function getData(){	72	function getData(){
57	FBOFlight.getAircraftMake().then(function(result) {	73	FBOFlight.getAircraftMake().then(function(result) {
58	$scope.aircraftMakeList = result;	74	$scope.aircraftMakeList = result;
59	$scope.aircraft.make = $scope.aircraftMakeList[0];	75	$scope.aircraft.make = $scope.aircraftMakeList[0];
60	FBOFlight.getModal($scope.aircraft.make).then(function(result) {	76	FBOFlight.getModal($scope.aircraft.make).then(function(result) {
61	$scope.aircraftModalList = result;	77	$scope.aircraftModalList = result;
62	$scope.aircraft.model = $scope.aircraftModalList[0];	78	$scope.aircraft.model = $scope.aircraftModalList[0];
63		79	FBOFlight.getAircraftSize($scope.aircraft.make, $scope.aircraft.model).then(function(result) {
		80	$scope.aircraftSizeList = result;
		81	$scope.aircraft.size = $scope.aircraftSizeList[0];
		82	})
64	})	83	})
65		84
66	})	85	})
67
68	FBOFlight.getAircraftSize().then(function(result) {
69	$scope.aircraftSizeList = result;
70	$scope.aircraft.size = $scope.aircraftSizeList[0];
71
72	})
73	}	86	}
74		87
75		88
76	$scope.getModal = function(){	89	$scope.getModal = function(){
77	var modelId = $scope.aircraft.make	90	var makeId = $scope.aircraft.make;
78	FBOFlight.getModal(modelId).then(function(result) {	91	FBOFlight.getModal(makeId).then(function(result) {
79	$scope.aircraftModalList = result;	92	$scope.aircraftModalList = result;
80	$scope.aircraft.model = $scope.aircraftModalList[0];	93	$scope.aircraft.model = $scope.aircraftModalList[0];
81		94	FBOFlight.getAircraftSize(makeId, $scope.aircraft.model).then(function(result) {
		95	$scope.aircraftSizeList = result;
		96	$scope.aircraft.size = $scope.aircraftSizeList[0];
		97	})
		98	})
		99	}
		100
		101	$scope.getSize = function(){
		102	FBOFlight.getAircraftSize($scope.aircraft.make, $scope.aircraft.model).then(function(result) {
		103	$scope.aircraftSizeList = result;
		104	$scope.aircraft.size = $scope.aircraftSizeList[0];
82	})	105	})
83	}	106	}
84		107
85	$scope.openModal = function(){	108	$scope.openModal = function(){
86	if($scope.aircraft.accountId == undefined){	109	if($scope.aircraft.accountId == undefined){
87	toastr.error('Please Add Contact Information', {	110	toastr.error('Please Add Contact Information', {
88	closeButton: true	111	closeButton: true
89	})	112	})
90	$('#myModal4').modal('hide');	113	$('#myModal4').modal('show');
91	}else{	114	}else{
92	$('#myModal4').modal('show');	115	$('#myModal4').modal('show');
93	}	116	}
94		117
95	}	118	}
96	$scope.aircraftData = {};	119	$scope.aircraftData = {};
97	$scope.aircraftData.aircraftList = [];	120	$scope.aircraftData.aircraftList = [];
98	$scope.getCraftList = [];	121	$scope.getCraftList = [];
99	$scope.addAircraft = function(){	122	$scope.addAircraft = function(){
100	console.log($scope.aircraft.accountId)
101	$scope.aircraftData.aircraftList.push($scope.aircraft);	123	$scope.aircraftData.aircraftList.push($scope.aircraft);
102	console.log($scope.aircraftData.aircraftList)
103	if ($scope.getCraftList.indexOf($scope.aircraft) == -1) {	124	if ($scope.getCraftList.indexOf($scope.aircraft) == -1) {
104	$scope.getCraftList.push($scope.aircraft);	125	$scope.getCraftList.push($scope.aircraft);
105
106	}	126	}
107		127
108	FBOFlight.addAircraft($scope.aircraftData).then(function(result) {	128	FBOFlight.addAircraft($scope.aircraftData).then(function(result) {
109	$('#myModal4').modal('hide');	129	$('#myModal4').modal('hide');
110	$scope.reset();	130	$scope.reset();
111	toastr.success('Created Successfully', {	131	toastr.success('Created Successfully', {
112	closeButton: true	132	closeButton: true
113	})	133	})
114	})	134	}, function (err) {
		135	toastr.error('Error in Adding Aircraft', {
		136	closeButton: true
		137	})
		138	$('#myModal4').modal('hide');
		139	$scope.getCraftList.splice($scope.aircraft);
		140	});
115		141

app/views/fbo-flight/flightDeptService.js

Diff comments View file @db8e1f9

 (function() {
   'use strict';
   angular.module('acuefuel')
       .service('FBOFlight', ['$rootScope', '$q', '$http', 'BE', FBOFlight])
    function FBOFlight($rootScope, $q, $http, BE) {
         this.registerUser = function(data) {
           var deferred = $q.defer();
           $http({
               method : 'POST',
               url : BE.url +'/account/user/registration',
               headers : {'Content-Type': 'application/x-www-form-urlencoded'},
               data : data
           })
           .success(function(result) {
               deferred.resolve(result);
           }).error(function(error){
             deferred.reject(error);
           })
           return deferred.promise;
         }
         this.addCardInformation = function(data) {
           var deferred = $q.defer();
           $http({
               method : 'POST',
               url : BE.url +'/account/user/addPaymentMethods',
               headers : {'Content-Type': 'application/json'},
               data : data
           })
           .success(function(result) {
               deferred.resolve(result);
           })
           return deferred.promise;
         }
         this.getAircraftMake = function(){
           var deferred = $q.defer();
           $http({
               method : 'GET',
               url : BE.url +'/fuelerlinx/acufuel/getAircraftMake',
               headers : {'Content-Type': 'application/json'},
           })
           .success(function(result) {
               deferred.resolve(result);
           })
           return deferred.promise;
         }
-        this.getAircraftSize = function(){
+        this.getAircraftSize = function(makeId, modelId){
           var deferred = $q.defer();
           $http({
               method : 'GET',
-              url : BE.url +'/fuelerlinx/acufuel/getAircraftSize',
+              url : BE.url +'/fuelerlinx/acufuel/getAircraftSize/' +makeId + '/' +modelId,
               headers : {'Content-Type': 'application/json'},
           })
           .success(function(result) {
               deferred.resolve(result);
           })
           return deferred.promise;
         }
         this.getModal = function(id){
           var deferred = $q.defer();
           $http({
               method : 'GET',
               url : BE.url +'/fuelerlinx/acufuel/getAircraftModel/' + id,
               headers : {'Content-Type': 'application/json'},
           })
           .success(function(result) {
               deferred.resolve(result);
           })
           return deferred.promise;
         }
         this.addAircraft = function(data){
           var deferred = $q.defer();
           $http({
               method : 'POST',
               url : BE.url +'/account/user/addAircraft',
               headers : {'Content-Type': 'application/json'},
               data: data
           })
           .success(function(result) {
               deferred.resolve(result);
+          }).error(function(error) {
+              deferred.reject(error);
           })
           return deferred.promise;
         }
    }
 })();

app/views/flightDept/flightDeptController.js

Diff comments View file @db8e1f9

 'use strict';
  //Load controller
   angular.module('acuefuel')
 	.controller('flightDeptController', function($scope, $stateParams, FBOClient) {
   	    $(document).ready(function(){
   	      	$('.tab-pane').slimScroll({
     		        height: '600px'
     		    });
       	});
         //$('#tab-2').css('display', 'none');
         getAllFbo();
         function getAllFbo(){
           FBOClient.getAllFlightDeptList().then(function(result) {
             console.log(result)
             $scope.fboDeptList = result;
             $scope.clientLength = result.length;
             $('#tab-1').css('display', 'none');
           $('#tab-2').css('display', 'block');
           $('.customTab2').addClass('active');
           $('.customTab1').removeClass('active');
           $('.slimScrollDiv:first-child').css('display', 'none');
           })
         }
         $scope.searchData = function(){
           var userType = $('#tabClient > li.active > a').attr('id');
           searchClient($scope.searchQuery, userType);
         }
         function searchClient(searchData, userType){
           console.log(searchData)
           console.log(userType)
-          var data = {
+          if(searchData == null || searchData == undefined || searchData == "" && userType == 'fbo'){
-            "query" : searchData,
+            $scope.fboAdmin();
-            "userType" : userType
+          }else if(searchData == null || searchData == undefined || searchData == "" && userType == 'flightDetp'){
-          }
+            getAllFbo();
-          FBOClient.getSearchClient(data).then(function(result) {
+          }else{
-            for(var i=0; i<result.length; i++){
+            var data = {
-              result[i].user = [];
+              "query" : searchData,
-              result[i].user.companyName = result[i].companyName;
+              "userType" : userType
-              result[i].user.firstName = result[i].firstName;
-              result[i].user.lastName = result[i].lastName;
-              result[i].user.id = result[i].id;
-              result[i].user.account = [];
-              result[i].user.account.user = [];
-              result[i].user.account.user.status = result[i].account.user.status;
-            }
-            if(userType == 'fbo'){
-              $scope.fboClient = result;
-              console.log(result)
-              $scope.clientLength = result.length;
-            }else{
-              console.log("nai aaya")
-              $scope.fboDeptList = result;
-              $scope.clientLength = result.length;
             }
-          })
+            FBOClient.getSearchClient(data).then(function(result) {
+              for(var i=0; i<result.length; i++){
+                result[i].user = [];
+                result[i].user.companyName = result[i].companyName;
+                result[i].user.firstName = result[i].firstName;
+                result[i].user.lastName = result[i].lastName;
+                result[i].user.id = result[i].id;
+                result[i].user.account = [];
+                result[i].user.account.user = [];
+                result[i].user.account.user.status = result[i].account.user.status;
+              }
+              if(userType == 'fbo'){
+                $scope.fboClient = result;
+                console.log(result)
+                $scope.clientLength = result.length;
+              }else{
+                console.log("nai aaya")
+                $scope.fboDeptList = result;
+                $scope.clientLength = result.length;
+              }
+            })
+          }
         }
       	$scope.fboAdmin = function(){
           FBOClient.getALlFBOList().then(function(result) {
             console.log(result)
             $scope.fboClient = result;

app/views/login/login.service.js

Diff comments View file @db8e1f9

 (function() {
   'use strict';
   angular.module('acuefuel')
       .service('LoginService', ['$rootScope', '$q', '$http', 'BE', '$state', LoginService])
    function LoginService($rootScope, $q, $http, BE, $state) {
         this.loginUser = function(data) {
           var deferred = $q.defer();
           $http({
               method : 'POST',
               url : BE.url +'/login',
               headers : {'Content-Type': 'application/x-www-form-urlencoded'},
               data : data
           })
           .success(function(result) {
               deferred.resolve(result.data);
           })
           return deferred.promise;
         }
         this.authenticate = function() {
             var deferred = $q.defer();
             $http({
                method : 'GET',
                url : BE.url+'/user/authenticate',
                headers : {'Content-Type': 'application/x-www-form-urlencoded'}
             }).then(function (result){
                 console.log(result)
                 if(result.data.user.admin == true){
                   window.localStorage.setItem('loginId', result.data.id);
                   window.localStorage.setItem('loginData', JSON.stringify(result.data.userProfile));
                   $state.go('index.fboAdmin');
                 }else{
                   localStorage.clear();
                   toastr.info("Unauthorized");
                 }
                 deferred.resolve(result.data);
             },function (result){
                 deferred.resolve(result.data);
             });
             return deferred.promise;
         }
         this.setAuth = function(data) {
             localStorage.setItem('loginStatus', data);
         }
         this.logout = function(data) {
           var deferred = $q.defer();
           $http({
               method : 'POST',
               url : BE.url +'/logout',
               headers : {'Content-Type': 'application/x-www-form-urlencoded'},
               data : data
           })
           .success(function(result) {
               deferred.resolve(result.data);
           })
           return deferred.promise;
         }
+        this.getActiveUser = function() {
+          var deferred = $q.defer();
+          $http({
+              method : 'GET',
+              url : BE.url +'/user/waitingForAuth/',
+              headers : {'Content-Type': 'application/json'}
+          })
+          .success(function(result) {
+              deferred.resolve(result);
+          })
+          return deferred.promise;
+        }
    }
 })();

app/views/updateAllFBO/updateAllFBO.controller.js

Diff comments View file @db8e1f9

1	'use strict';	1	'use strict';
2		2
3	//Load controller	3	//Load controller
4	angular.module('acuefuel')	4	angular.module('acuefuel')
5		5
6	.controller('updateAllFBOController', function($scope, $stateParams, UpdateAllFBO) {	6	.controller('updateAllFBOController', function($scope, $stateParams, UpdateAllFBO) {
7	$(document).ready(function(){	7	$(document).ready(function(){
8	$('.i-checks').iCheck({	8	$('.i-checks').iCheck({
9	checkboxClass: 'icheckbox_square-green',	9	checkboxClass: 'icheckbox_square-green',
10	radioClass: 'iradio_square-green',	10	radioClass: 'iradio_square-green',
11	});	11	});
12		12
13	});	13	});
		14	$scope.showCompany = true;
		15	$scope.editName = function(){
		16	$scope.showCompany = false;
		17
		18	}
14	$scope.feature = {};	19	$scope.feature = {};
15	var userProfileID = $stateParams.id;	20	var userProfileID = $stateParams.id;
16	UpdateAllFBO.getALlFBOData(userProfileID).then(function(result) {	21	UpdateAllFBO.getALlFBOData(userProfileID).then(function(result) {
17	console.log(result)	22	console.log(result)
18	$scope.user = result;	23	$scope.user = result;
19	$scope.user.userTypeId = result.userType.id;	24	$scope.user.userTypeId = result.userType.id;
20		25
21	if(result.accountFeatureControl != null){	26	if(result.accountFeatureControl != null){
22	$scope.feature = result.accountFeatureControl;	27	$scope.feature = result.accountFeatureControl;
23	$scope.feature.accountId = result.account.id;	28	$scope.feature.accountId = result.account.id;
24	console.log($scope.feature)	29	console.log($scope.feature)
25	if($scope.feature.essintaPosSystem == true){	30	if($scope.feature.essintaPosSystem == true){
26	$scope.essAccountId = false;	31	$scope.essAccountId = false;
27	$("#esAccId").css({ opacity: 1 });	32	$("#esAccId").css({ opacity: 1 });
28	}else{	33	}else{
29	$scope.essAccountId = true;	34	$scope.essAccountId = true;
30	delete $scope.feature.essintaAccountUid;	35	delete $scope.feature.essintaAccountUid;
31	$("#esAccId").css({ opacity: 0.5 });	36	$("#esAccId").css({ opacity: 0.5 });
32	}	37	}
33	}else{	38	}else{
34	$scope.feature.accountId = result.account.id;	39	$scope.feature.accountId = result.account.id;
35	}	40	}
36		41
37	UpdateAllFBO.getNotes(userProfileID).then(function(response) {	42	UpdateAllFBO.getNotes(userProfileID).then(function(response) {
38	$scope.user.clientNote = response[0].notes	43	$scope.user.clientNote = response[0].notes
39	$scope.user.userNoteId = response[0].id;	44	$scope.user.userNoteId = response[0].id;
40	})	45	})
41	console.log($scope.feature,"dsdsdsds")	46	console.log($scope.feature,"dsdsdsds")
42	if($scope.user.account.user.status == 'ACTIVE'){	47	if($scope.user.account.user.status == 'ACTIVE'){
43	$scope.status = true;	48	$scope.status = true;
44	}else {	49	}else {
45	$scope.status = false;	50	$scope.status = false;
46	}	51	}
47	})	52	})
48		53
49	$scope.enableEssId = function(){	54	$scope.enableEssId = function(){
50	if($scope.feature.essintaPosSystem == true){	55	if($scope.feature.essintaPosSystem == true){
51	$scope.essAccountId = false;	56	$scope.essAccountId = false;
52	$("#esAccId").css({ opacity: 1 });	57	$("#esAccId").css({ opacity: 1 });
53	}else{	58	}else{
54	$scope.essAccountId = true;	59	$scope.essAccountId = true;
55	delete $scope.feature.essintaAccountUid;	60	delete $scope.feature.essintaAccountUid;
56	$("#esAccId").css({ opacity: 0.5 });	61	$("#esAccId").css({ opacity: 0.5 });
57	}	62	}
58	}	63	}
59		64
60	$scope.userData = function(){	65	$scope.userData = function(){
61	console.log($scope.user.userTypeId)	66	console.log($scope.user.userTypeId)
62		67	if($scope.user.email == undefined \|\| $scope.user.email == null){
		68	toastr.error('Please enter your email first', {
		69	closeButton: true
		70	})
		71	}else if($scope.user.firstName == undefined \|\| $scope.user.firstName == null){
		72	toastr.error('Please enter your First Name', {
		73	closeButton: true
		74	})
		75	}else{
63	if($scope.status == true){	76	if($scope.status == true){
64	$scope.user.status = 'active';	77	$scope.user.status = 'active';
65	}else{	78	}else{
66	$scope.user.status = 'inactive';	79	$scope.user.status = 'inactive';
67	}	80	}
68	$scope.user.username = $scope.user.email;	81	$scope.user.username = $scope.user.email;
69	$scope.user.userType = 'fbo';	82	$scope.user.userType = 'fbo';
70	console.log($scope.user)	83	console.log($scope.user)
71	// if($scope.user.userNoteId == undefined){	84	// if($scope.user.userNoteId == undefined){
72	// $scope.user.userNoteId = null;	85	// $scope.user.userNoteId = null;
73	// }	86	// }
74	var updateData = "companyName=" + $scope.user.companyName + "&username=" + $scope.user.username + "&firstName=" + $scope.user.firstName + "&lastName=" + $scope.user.lastName + "&phone=" + $scope.user.phone + "&mobile=" + $scope.user.mobile + "&status=" + $scope.user.status + "&userType=" + $scope.user.userType + "&userNote=" + $scope.user.clientNote + "&userNoteId=" + $scope.user.userNoteId + "&userTypeId=" + $scope.user.userTypeId + "&userProfileId=" + userProfileID;	87	var updateData = "companyName=" + $scope.user.companyName + "&username=" + $scope.user.username + "&firstName=" + $scope.user.firstName + "&lastName=" + $scope.user.lastName + "&phone=" + $scope.user.phone + "&mobile=" + $scope.user.mobile + "&status=" + $scope.user.status + "&userType=" + $scope.user.userType + "&userNote=" + $scope.user.clientNote + "&userNoteId=" + $scope.user.userNoteId + "&userTypeId=" + $scope.user.userTypeId + "&userProfileId=" + userProfileID;
75	UpdateAllFBO.updateUser(updateData).then(function(result) {	88	UpdateAllFBO.updateUser(updateData).then(function(result) {
76	toastr.success(''+result.success+'', {	89	toastr.success(''+result.success+'', {
77	closeButton: true	90	closeButton: true
78	})	91	})
79	var updatefeatureControlData = "accountId=" + $scope.feature.accountId + "&level=" + $scope.feature.level + "&essintaPosSystem=" + $scope.feature.essintaPosSystem	92	var updatefeatureControlData = "accountId=" + $scope.feature.accountId + "&level=" + $scope.feature.level + "&essintaPosSystem=" + $scope.feature.essintaPosSystem
80	+ "&acuQuote=" + $scope.feature.acuQuote + "&acuTrack=" + $scope.feature.acuTrack + "&fuelProgram=" + $scope.feature.fuelProgram + "&amstatIntegration=" + $scope.feature.amstatIntegration+ "&posAccountingIntegration="	93	+ "&acuQuote=" + $scope.feature.acuQuote + "&acuTrack=" + $scope.feature.acuTrack + "&fuelProgram=" + $scope.feature.fuelProgram + "&amstatIntegration=" + $scope.feature.amstatIntegration+ "&posAccountingIntegration="
81	+ $scope.feature.posAccountingIntegration + "&posVeederRootIntegration=" + $scope.feature.posVeederRootIntegration	94	+ $scope.feature.posAccountingIntegration + "&posVeederRootIntegration=" + $scope.feature.posVeederRootIntegration
82	+ "&essintaAccountUid=" + $scope.feature.essintaAccountUid + "&additionalLicences=" + $scope.feature.additionalLicences + "&accountFeatureControlId=" + $scope.feature.id;	95	+ "&essintaAccountUid=" + $scope.feature.essintaAccountUid + "&additionalLicences=" + $scope.feature.additionalLicences + "&accountFeatureControlId=" + $scope.feature.id;
83		96
84	UpdateAllFBO.updatefeatureControl(updatefeatureControlData).then(function(response) {	97	UpdateAllFBO.updatefeatureControl(updatefeatureControlData).then(function(response) {
85	console.log(response)	98	console.log(response)
86	})	99	})
87	})	100	})
		101	}
88	}	102	}
89		103
90	});	104	});

app/views/updateAllFBO/updateAllFBO.html

Diff comments View file @db8e1f9

 </div>
     <div class="row wrapper border-bottom white-bg page-heading">
-        <div class="col-lg-2">
+        <div class="col-lg-3">
-            <h2>{{user.companyName}}</h2>
+            <h2 ng-click="editName()" ng-show="showCompany" style="cursor: pointer;">{{user.companyName}}</h2>
+            <div style="margin-top: 20px;" ng-hide="showCompany"><input type="text" placeholder="Enter Company Name" ng-model="user.companyName" class="form-control"></div>
         </div>
-        <div class="col-lg-4" style="margin-top: 20px;">
+        <div class="col-lg-3" style="margin-top: 20px;">
             <button type="button" class="btn btn-w-m btn-danger" ng-click="deleteData()">Delete Account</button>
         </div>
         <div class="col-lg-6" style="margin-top: 20px; text-align: right;">
             <button type="button" class="btn btn-default btn-sm" ui-sref="index.fboAdmin">Cancel</button>
             <button type="button" class="btn btn-primary btn-sm" ng-click="userData()">Save Changes</button>
         </div>
     </div>
 </div>
 <div class="wrapper wrapper-content animated fadeInRight">
     <div class="row">
         <div class="col-lg-7">
             <div class="ibox float-e-margins">
                 <div class="ibox-title">
                     <div class="pull-left">
                         <h5>Contact Information</h5>
                     </div>
                     <div class="pull-right my-toggle-switch">
                         <div class="switch">
                             <div class="onoffswitch">
                                 <input type="checkbox" ng-checked="status === true" ng-model="status" ng-init="status = true" class="onoffswitch-checkbox" id="example1">
                                 <label class="onoffswitch-label" for="example1">
                                     <span class="onoffswitch-inner"></span>
                                     <span class="onoffswitch-switch"></span>
                                 </label>
                             </div>
                         </div>
                     </div>
                     <div class="clearfix"></div>
                 </div>
                 <div class="ibox-content">
                     <div class="row">
                         <form role="form">
                             <div class="col-sm-6 b-r">
                                     <!-- <div class="form-group"><label>Company Name</label> <input type="text" placeholder="Company Name" ng-model="user.companyName" class="form-control"></div> -->
                                     <!-- <div class="form-group"><label>Username</label> <input type="email" placeholder="Email Username" ng-model="user.email" class="form-control"></div> -->
                                     <div class="form-group"><label>First Name</label> <input type="text" placeholder="First Name" ng-model="user.firstName" class="form-control"></div>
                                     <div class="form-group"><label>Last Name</label> <input type="text" placeholder="Last Name" ng-model="user.lastName" class="form-control"></div>
                                     <!-- <div>
                                         <button class="btn btn-sm btn-primary pull-right m-t-n-xs" type="submit"><strong>Log in</strong></button>
                                         <label> <input type="checkbox" class="i-checks"> Remember me </label>
                                     </div> -->
                             </div>
                             <div class="col-sm-6">
                                 <!-- <div class="form-group"><label>Password</label> <input type="password" ng-model="user.password" placeholder="Password" class="form-control"></div> -->
                                 <div class="form-group"><label>Phone</label> <input type="tel" ng-model="user.phone" placeholder="Phone" class="form-control"></div>
                                 <div class="form-group"><label>Mobile</label> <input type="tel" ng-model="user.mobile" placeholder="Mobile" class="form-control"></div>
                             </div>
                         </form>
                     </div>
                 </div>
             </div>
         </div>
         <div class="col-lg-5">
             <div class="ibox float-e-margins">
                 <div class="ibox-title">
                     <h5>Client Notes</h5>
                 </div>
                 <div class="ibox-content">
                     <div class="row">
                         <form role="form">
                             <textarea class="form-control" rows="10" ng-model="user.clientNote" id="comment"></textarea>
                         </form>
                     </div>
                 </div>
             </div>
         </div>
     </div>
 </div>
 <div class="wrapper wrapper-content animated fadeInRight">
     <div class="row">
         <div class="col-lg-12">
             <div class="ibox float-e-margins">
                 <div class="ibox-title" style="padding: 5px 15px 5px 15px;">
                     <div class="col-lg-8">
                         <h5 style="line-height: 34px;margin-bottom: 0;">Feature Account Control</h5>
                     </div>
                     <div class="col-lg-4">
                         <div class="form-group">
                             <label class="col-sm-2 control-label" style="line-height: 34px;margin-bottom: 0;">Level</label>
                             <div class="col-sm-10">
                                 <select class="form-control m-b" name="account" ng-model="feature.level" style="margin-bottom: 0;">
                                     <option value="silver" selected>Silver</option>
                                     <option value="gold">Gold</option>
                                 </select>
                             </div>
                         </div>
                     </div>
                     <div class="clearfix"></div>
                 </div>
                 <div class="ibox-content">
                     <div class="row">
                         <form role="form">
                             <div class="col-lg-3">
                                 <label style="color: #1ab394;">Modularized</label>
                                 <div>
                                     <label> <input type="checkbox" class="i-checks" ng-change="enableEssId()" ng-model="feature.essintaPosSystem" icheck> Essinta POS system </label>
                                 </div>
                                  <div>
                                     <label> <input type="checkbox" class="i-checks" ng-model="feature.acuQuote" icheck> AcuQuote </label>
                                 </div>
                                 <div>
                                     <label> <input type="checkbox" class="i-checks" ng-model="feature.acuTrack" icheck> AcuTrack </label>
                                 </div>
                                  <div>
                                     <label> <input type="checkbox" class="i-checks" ng-model="feature.fuelProgram" icheck> Fuel Program </label>
                                 </div>
                                 <div>
                                     <label> <input type="checkbox" class="i-checks" ng-model="feature.amstatIntegration" icheck> AMSTAT Integration </label>
                                 </div>
                                  <div>
                                     <label> <input type="checkbox" class="i-checks" ng-model="feature.posAccountingIntegration" icheck> POS Accounting Integration </label>
                                 </div>
                                 <div>
                                     <label> <input type="checkbox" class="i-checks" ng-model="feature.posVeederRootIntegration" icheck> POS VeederRoot Integration </label>
                                 </div>
                             </div>
                             <div class="col-lg-9" style="padding: 0;">
                                 <div class="col-lg-6">
                                     <div class="form-group" style="margin-top: 18px;" id="esAccId">
                                         <label class="control-label pull-left" style="color: #1ab394;line-height: 34px;">Essinta Account UID</label>
                                         <div class="col-lg-6">
                                             <input type="text" placeholder="" ng-disabled="essAccountId" style="border-color: #1ab394;" class="form-control" ng-model="feature.essintaAccountUid">
                                         </div>
                                     </div>
                                 </div>
                                 <div class="col-lg-6">
                                     <div class="form-group" style="margin-top: 18px;">
                                         <label class="control-label pull-left" style="color: #ffa149;line-height: 34px;">Additional Device Licences</label>
                                         <div class="col-lg-6">
                                             <input type="text" placeholder="" style="border-color: #ffa149 !important;" ng-model="feature.additionalLicences" class="form-control">
                                         </div>
                                     </div>
                                 </div>
                             </div>
                         </form>
                     </div>
                 </div>
             </div>
         </div>
     </div>
 </div>

app/views/updateFBODept/updateFBODept.controller.js

Diff comments View file @db8e1f9

1	'use strict';	1	'use strict';
2		2
3	//Load controller	3	//Load controller
4	angular.module('acuefuel')	4	angular.module('acuefuel')
5		5
6	.controller('updateFBODeptController', function($scope, $stateParams, UpdateAllFBODept, UpdateAllFBO, FBOFlight) {	6	.controller('updateFBODeptController', function($scope, $stateParams, UpdateAllFBODept, UpdateAllFBO, FBOFlight) {
		7	$scope.showCompany = true;
		8	$scope.editName = function(){
		9	$scope.showCompany = false;
		10
		11	}
7	$scope.showPayments = true;	12	$scope.showPayments = true;
8	$scope.aircraft = {};	13	$scope.aircraft = {};
9	$scope.updateData = {};	14	$scope.updateData = {};
10	var userProfileID = $stateParams.id;	15	var userProfileID = $stateParams.id;
11	UpdateAllFBODept.getALlFBOData(userProfileID).then(function(result) {	16	UpdateAllFBODept.getALlFBOData(userProfileID).then(function(result) {
12	console.log(result)	17	console.log(result)
13	$scope.user = result;	18	$scope.user = result;
14	$scope.aircraft.accountId = result.account.id;	19	$scope.aircraft.accountId = result.account.id;
15	$scope.user.userTypeId = result.userType.id;	20	$scope.user.userTypeId = result.userType.id;
16	UpdateAllFBODept.getNotes(userProfileID).then(function(response) {	21	UpdateAllFBODept.getNotes(userProfileID).then(function(response) {
17	$scope.user.clientNote = response[0].notes	22	$scope.user.clientNote = response[0].notes
18	$scope.user.userNoteId = response[0].id;	23	$scope.user.userNoteId = response[0].id;
19	})	24	})
20	// $scope.feature = result.accountFeatureControl;	25	// $scope.feature = result.accountFeatureControl;
21	// console.log($scope.feature,"dsdsdsds")	26	// console.log($scope.feature,"dsdsdsds")
22	if($scope.user.account.user.status == 'ACTIVE'){	27	if($scope.user.account.user.status == 'ACTIVE'){
23	$scope.status = true;	28	$scope.status = true;
24	}else {	29	}else {
25	$scope.status = false;	30	$scope.status = false;
26	}	31	}
27	})	32	})
28		33
29	getCrafts();	34	getCrafts();
30	function getCrafts(){	35	function getCrafts(){
31	UpdateAllFBODept.getAircrafts(userProfileID).then(function(response) {	36	UpdateAllFBODept.getAircrafts(userProfileID).then(function(response) {
32	$scope.getCraftList = response;	37	$scope.getCraftList = response;
33	})	38	})
34	}	39	}
35		40
36	UpdateAllFBODept.getPaymentMethod(userProfileID).then(function(response) {	41	UpdateAllFBODept.getPaymentMethod(userProfileID).then(function(response) {
37	$scope.paymentList = response;	42	$scope.paymentList = response;
38		43
39	})	44	})
40		45
41	$scope.openCard = function(payment){	46	$scope.openCard = function(payment){
42	console.log(payment)	47	console.log(payment)
43	$scope.showPayments = false;	48	$scope.showPayments = false;
44	$scope.data = {};	49	$scope.data = {};
45	$scope.data.cardNumber = payment.cardNumber;	50	$scope.data.cardNumber = payment.cardNumber;
46	$scope.data.cardType = payment.cardType;	51	$scope.data.cardType = payment.cardType;
47	$scope.data.expiryDate = payment.expiryDate;	52	$scope.data.expiryDate = payment.expiryDate;
48	$scope.data.id = payment.id;	53	$scope.data.id = payment.id;
49	$scope.data.accountId = payment.user.account.id;	54	$scope.data.accountId = payment.user.account.id;
50	}	55	}
51		56
52	var cardData = {}	57	var cardData = {}
53	cardData.paymentMethodList = [];	58	cardData.paymentMethodList = [];
54	$scope.updateCard = function(){	59	$scope.updateCard = function(){
55	console.log($scope.data)	60	console.log($scope.data)
56	cardData.paymentMethodList.push($scope.data);	61	cardData.paymentMethodList.push($scope.data);
57	console.log("cardData", cardData);	62	console.log("cardData", cardData);
58	UpdateAllFBODept.updatePaymentMethod(cardData).then(function(result) {	63	UpdateAllFBODept.updatePaymentMethod(cardData).then(function(result) {
59	console.log(result)	64	console.log(result)
60	toastr.success('Updated Successfully', {	65	toastr.success('Updated Successfully', {
61	closeButton: true	66	closeButton: true
62	})	67	})
63	$scope.reset();	68	$scope.reset();
64	})	69	})
65	}	70	}
66		71
67		72
68	$scope.reset = function(){	73	$scope.reset = function(){
69	cardData.paymentMethodList = [];	74	cardData.paymentMethodList = [];
70	}	75	}
71		76
72	$scope.userData = function(){	77	$scope.userData = function(){
73	console.log($scope.user.userTypeId)	78	console.log($scope.user.userTypeId)
74		79	if($scope.user.email == undefined \|\| $scope.user.email == null){
		80	toastr.error('Please enter your email first', {
		81	closeButton: true
		82	})
		83	}else if($scope.user.firstName == undefined \|\| $scope.user.firstName == null){
		84	toastr.error('Please enter your First Name', {
		85	closeButton: true
		86	})
		87	}else{
75	if($scope.status == true){	88	if($scope.status == true){
76	$scope.user.status = 'active';	89	$scope.user.status = 'active';
77	}else{	90	}else{
78	$scope.user.status = 'inactive';	91	$scope.user.status = 'inactive';
79	}	92	}
80	$scope.user.username = $scope.user.email;	93	$scope.user.username = $scope.user.email;
81	$scope.user.userType = 'flightDetp';	94	$scope.user.userType = 'flightDetp';
82	console.log($scope.user)	95	console.log($scope.user)
83	// if($scope.user.userNoteId == undefined){	96	// if($scope.user.userNoteId == undefined){
84	// $scope.user.userNoteId = null;	97	// $scope.user.userNoteId = null;
85	// }	98	// }
86	var updateData = "companyName=" + $scope.user.companyName + "&username=" + $scope.user.username + "&firstName=" + $scope.user.firstName + "&lastName=" + $scope.user.lastName + "&phone=" + $scope.user.phone + "&mobile=" + $scope.user.mobile + "&status=" + $scope.user.status + "&userType=" + $scope.user.userType + "&userNote=" + $scope.user.clientNote + "&userNoteId=" + $scope.user.userNoteId + "&userTypeId=" + $scope.user.userTypeId + "&userProfileId=" + userProfileID;	99	var updateData = "companyName=" + $scope.user.companyName + "&username=" + $scope.user.username + "&firstName=" + $scope.user.firstName + "&lastName=" + $scope.user.lastName + "&phone=" + $scope.user.phone + "&mobile=" + $scope.user.mobile + "&status=" + $scope.user.status + "&userType=" + $scope.user.userType + "&userNote=" + $scope.user.clientNote + "&userNoteId=" + $scope.user.userNoteId + "&userTypeId=" + $scope.user.userTypeId + "&userProfileId=" + userProfileID;
87	UpdateAllFBO.updateUser(updateData).then(function(result) {	100	UpdateAllFBO.updateUser(updateData).then(function(result) {
88	toastr.success(''+result.success+'', {	101	toastr.success(''+result.success+'', {
89	closeButton: true	102	closeButton: true
90	})	103	})
91	})	104	})
		105	}
92	}	106	}
93		107
94	getData();	108	getData();
95	function getData(){	109	function getData(){
96	FBOFlight.getAircraftMake().then(function(result) {	110	FBOFlight.getAircraftMake().then(function(result) {
97	$scope.aircraftMakeList = result;	111	$scope.aircraftMakeList = result;
98	$scope.aircraft.make = $scope.aircraftMakeList[0];	112	$scope.aircraft.make = $scope.aircraftMakeList[0];
99	FBOFlight.getModal($scope.aircraft.make).then(function(result) {	113	FBOFlight.getModal($scope.aircraft.make).then(function(result) {
100	$scope.aircraftModalList = result;	114	$scope.aircraftModalList = result;
101	$scope.aircraft.model = $scope.aircraftModalList[0];	115	$scope.aircraft.model = $scope.aircraftModalList[0];
102
103	})
104
105	})
106		116
107	FBOFlight.getAircraftSize().then(function(result) {	117	FBOFlight.getAircraftSize($scope.aircraft.make, $scope.aircraft.model).then(function(result) {
108	$scope.aircraftSizeList = result;	118	$scope.aircraftSizeList = result;
109	$scope.aircraft.size = $scope.aircraftSizeList[0];	119	$scope.aircraft.size = $scope.aircraftSizeList[0];
		120
		121	})
		122	})
110		123
111	})	124	})
112	}	125	}
113
114		126
115	$scope.getModal = function(){	127	$scope.getModal = function(){
116	var modelId = $scope.aircraft.make	128	var makeId = $scope.aircraft.make
117	FBOFlight.getModal(modelId).then(function(result) {	129	FBOFlight.getModal(makeId).then(function(result) {
118	$scope.aircraftModalList = result;	130	$scope.aircraftModalList = result;
119	$scope.aircraft.model = $scope.aircraftModalList[0];	131	$scope.aircraft.model = $scope.aircraftModalList[0];
		132
		133	FBOFlight.getAircraftSize(makeId, $scope.aircraft.model).then(function(result) {
		134	$scope.aircraftSizeList = result;
		135	$scope.aircraft.size = $scope.aircraftSizeList[0];
		136	})
120	})	137	})
121	}	138	}
		139
		140	$scope.getSize = function(){
		141	FBOFlight.getAircraftSize($scope.aircraft.make, $scope.aircraft.model).then(function(result) {
		142	$scope.aircraftSizeList = result;
		143	$scope.aircraft.size = $scope.aircraftSizeList[0];
		144	})
		145	}
		146
122	$scope.aircraftData = {};	147	$scope.aircraftData = {};
123	$scope.aircraftData.aircraftList = [];	148	$scope.aircraftData.aircraftList = [];
124	$scope.addAircraft = function(){	149	$scope.addAircraft = function(){
125	$scope.aircraftData.aircraftList.push($scope.aircraft);	150	$scope.aircraftData.aircraftList.push($scope.aircraft);
126		151
127	FBOFlight.addAircraft($scope.aircraftData).then(function(result) {	152	FBOFlight.addAircraft($scope.aircraftData).then(function(result) {
128	$('#myModal4').modal('hide');	153	$('#myModal4').modal('hide');
129	getCrafts();	154	getCrafts();
130	$scope.resetData();	155	$scope.resetData();
131	toastr.success('Created Successfully', {	156	toastr.success('Created Successfully', {
132	closeButton: true	157	closeButton: true
133	})	158	})
134	})	159	}, function (err) {
		160	toastr.error('Error in Adding Aircraft', {
		161	closeButton: true
		162	})
		163	$('#myModal4').modal('hide');
		164	$scope.getCraftList.splice($scope.aircraft);
		165	});
135	}	166	}
136		167
137	$scope.closeModal = function(){	168	$scope.closeModal = function(){
138	$("#myModal5").modal('hide');	169	$("#myModal5").modal('hide');
139	$scope.resetData();	170	$scope.resetData();
140	}	171	}
141		172
142	$scope.update = function(airdata){	173	$scope.update = function(airdata){
143	console.log(airdata)	174	$("#myModal5").modal('show');
144	$scope.aircraft = airdata;	175	$scope.aircraft = airdata;
		176	console.log($scope.aircraft)
145	$scope.aircraft.accountId = $scope.user.account.id;	177	$scope.aircraft.accountId = $scope.user.account.id;
146	$("#myModal5").modal('show');	178
147	FBOFlight.getModal($scope.aircraft.make).then(function(result) {	179	FBOFlight.getModal($scope.aircraft.make).then(function(result) {
148	$scope.aircraftModalList = result;	180	$scope.aircraftModalList = result;
149		181	FBOFlight.getAircraftSize($scope.aircraft.make, $scope.aircraft.model).then(function(result) {
		182	$scope.aircraftSizeList = result;
		183
		184	})
150	})	185	})
151	}	186	}
152		187
153	$scope.updatecraftData = {};	188	$scope.updatecraftData = {};
154	$scope.updatecraftData.aircraftList = [];	189	$scope.updatecraftData.aircraftList = [];
155	$scope.updateAircraftData = {};	190	$scope.updateAircraftData = {};
156		191
157	$scope.updateAircraft = function(updateAircraft){	192	$scope.updateAircraft = function(updateAircraft){
158	$scope.updateAircraftData.id = updateAircraft.id;	193	$scope.updateAircraftData.id = updateAircraft.id;
159	$scope.updateAircraftData.make = updateAircraft.make;	194	$scope.updateAircraftData.make = updateAircraft.make;
160	$scope.updateAircraftData.model = updateAircraft.model;	195	$scope.updateAircraftData.model = updateAircraft.model;
161	$scope.updateAircraftData.size = updateAircraft.size;	196	$scope.updateAircraftData.size = updateAircraft.size;
162	$scope.updateAircraftData.tail = updateAircraft.tail;	197	$scope.updateAircraftData.tail = updateAircraft.tail;
163	$scope.updateAircraftData.accountId = updateAircraft.accountId;	198	$scope.updateAircraftData.accountId = updateAircraft.accountId;
164	console.log($scope.updateAircraftData)	199	console.log($scope.updateAircraftData)
165		200
166	$scope.updatecraftData.aircraftList.push($scope.updateAircraftData);	201	$scope.updatecraftData.aircraftList.push($scope.updateAircraftData);
167	console.log($scope.updatecraftData.aircraftList)	202	console.log($scope.updatecraftData.aircraftList)
168		203
169	UpdateAllFBODept.updateAircraft($scope.updatecraftData).then(function(result) {	204	UpdateAllFBODept.updateAircraft($scope.updatecraftData).then(function(result) {
170	$('#myModal5').modal('hide');	205	$('#myModal5').modal('hide');
171	$scope.resetData();	206	$scope.resetData();
172	toastr.success('Updated Successfully', {	207	toastr.success('Updated Successfully', {
173	closeButton: true	208	closeButton: true
174	})	209	})
175	})	210	}, function (err) {
		211	toastr.error('Error in Updating Aircraft', {
		212	closeButton: true
		213	})
		214	$('#myModal5').modal('hide');
		215	$scope.getCraftList.splice($scope.aircraft);
		216	});
176	}	217	}
177		218
178	$scope.remove = function(data){	219	$scope.remove = function(data){
179	console.log(data)	220	console.log(data)
180	UpdateAllFBODept.removeAircraft(data.id).then(function(result) {	221	UpdateAllFBODept.removeAircraft(data.id).then(function(result) {
181	toastr.success(''+result.success+'', {	222	toastr.success(''+result.success+'', {
182	closeButton: true	223	closeButton: true
183	})	224	})
184	getCrafts();	225	getCrafts();
185	})	226	})
186	}	227	}
187		228
188	$scope.resetData = function() {	229	$scope.resetData = function() {
189	$scope.aircraft = {};	230	$scope.aircraft = {};
190	$scope.aircraft.accountId = $scope.user.account.id;	231	$scope.aircraft.accountId = $scope.user.account.id;

app/views/updateFBODept/updateFBODept.html

Diff comments View file @db8e1f9

 <div class="row wrapper border-bottom white-bg page-heading">
-     <div class="col-lg-2">
+     <div class="col-lg-3">
-        <h2>{{user.companyName}}</h2>
+        <h2 ng-click="editName()" ng-show="showCompany" style="cursor: pointer;">{{user.companyName}}</h2>
+        <div style="margin-top: 20px;" ng-hide="showCompany"><input type="text" placeholder="Enter Company Name" ng-model="user.companyName" class="form-control"></div>
     </div>
-    <div class="col-lg-4" style="margin-top: 20px;">
+    <div class="col-lg-3" style="margin-top: 20px;">
         <button type="button" class="btn btn-w-m btn-danger" ng-click="deleteData()">Delete Account</button>
     </div>
     <div class="col-lg-6" style="margin-top: 20px; text-align: right;">
         <button type="button" class="btn btn-default btn-sm" ui-sref="index.flightDept">Cancel</button>
         <button type="button" class="btn btn-primary btn-sm" ng-click="userData()">Save Changes</button>
     </div>
 </div>
 <div class="wrapper wrapper-content animated fadeInRight">
     <div class="row">
         <div class="col-lg-7">
             <div class="ibox float-e-margins">
                 <div class="ibox-title">
                     <div class="pull-left">
                         <h5>Contact Information</h5>
                     </div>
                     <div class="pull-right my-toggle-switch">
                         <div class="switch">
                             <div class="onoffswitch">
                                 <input type="checkbox" ng-checked="status === true" ng-model="status" ng-init="status = true" class="onoffswitch-checkbox" id="example1">
                                 <label class="onoffswitch-label" for="example1">
                                     <span class="onoffswitch-inner"></span>
                                     <span class="onoffswitch-switch"></span>
                                 </label>
                             </div>
                         </div>
                     </div>
                     <div class="clearfix"></div>
                 </div>
                 <div class="ibox-content">
                     <div class="row">
                         <form role="form">
                             <div class="col-sm-6 b-r">
                                     <!-- <div class="form-group"><label>Company Name</label> <input type="text" placeholder="Company Name" ng-model="user.companyName" class="form-control"></div> -->
                                     <!-- <div class="form-group"><label>Username</label> <input type="email" placeholder="Email Username" ng-model="user.email" class="form-control"></div> -->
                                     <div class="form-group"><label>First Name</label> <input type="text" placeholder="First Name" ng-model="user.firstName" class="form-control"></div>
                                     <div class="form-group"><label>Last Name</label> <input type="text" placeholder="Last Name" ng-model="user.lastName" class="form-control"></div>
                                     <!-- <div>
                                         <button class="btn btn-sm btn-primary pull-right m-t-n-xs" type="submit"><strong>Log in</strong></button>
                                         <label> <input type="checkbox" class="i-checks"> Remember me </label>
                                     </div> -->
                             </div>
                             <div class="col-sm-6">
                                 <!-- <div class="form-group"><label>Password</label> <input type="password" ng-model="user.password" placeholder="Password" class="form-control"></div> -->
                                 <div class="form-group"><label>Phone</label> <input type="tel" ng-model="user.phone" placeholder="Phone" class="form-control"></div>
                                 <div class="form-group"><label>Mobile</label> <input type="tel" ng-model="user.mobile" placeholder="Mobile" class="form-control"></div>
                             </div>
                         </form>
                     </div>
                 </div>
             </div>
         </div>
         <div class="col-lg-5">
             <div class="ibox float-e-margins">
                 <div class="ibox-title">
                     <h5>Client Notes</h5>
                 </div>
                 <div class="ibox-content">
                     <div class="row">
                         <form role="form">
                             <textarea class="form-control" rows="10" ng-model="user.clientNote" id="comment"></textarea>
                         </form>
                     </div>
                 </div>
             </div>
         </div>
     </div>
 </div>
 <div>
   <div class="row">
       <div class="col-lg-7">
           <div class="ibox float-e-margins">
               <div class="ibox-title">
                 <div>
                   <h3 style="float: left;">Aircraft List</h3>
                 </div>
                 <div class="pull-right">
                   <button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#myModal4">+ Add</button>
                 </div>
                 <div class="clearfix"></div>
                 <div class="modal inmodal" id="myModal4" tabindex="-1" role="dialog"  aria-hidden="true">
                     <div class="modal-dialog">
                         <div class="modal-content animated fadeIn">
                             <div class="modal-header">
                                 <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
                                 <!-- <i class="fa fa-clock-o modal-icon"></i> -->
                                 <h4 class="modal-title">Add Aircraft</h4>
                                 <!-- <small>Lorem Ipsum is simply dummy text of the printing and typesetting industry.</small> -->
                             </div>
                             <div class="modal-body" style="padding: 15px;">
                                 <table class="table table-bordered table-hover table-striped">
                                   <thead>
                                     <tr>
                                       <th>Tail</th>
                                       <th>Make</th>
                                       <th>Model</th>
                                       <th>Size</th>
                                     </tr>
                                   </thead>
                                   <tbody>
                                     <tr>
                                       <td>
                                         <input type="text" style="width:100px;" ng-model="aircraft.tail" class="form-control">
                                       </td>
                                       <td style="width: 30%">
                                         <select class="form-control" ng-model="aircraft.make" ng-change="getModal()">
                                            <option ng-repeat="make in aircraftMakeList">{{make}}</option>
                                         </select>
                                       </td>
                                       <td style="width: 30%">
-                                        <select class="form-control" ng-model="aircraft.model">
+                                        <select class="form-control" ng-model="aircraft.model" ng-change="getSize()">
                                            <option ng-repeat="model in aircraftModalList">{{model}}</option>
                                         </select>
                                       </td>
                                       <td style="width: 30%">
                                         <select class="form-control" ng-model="aircraft.size">
                                            <option ng-repeat="size in aircraftSizeList">{{size}}</option>
                                         </select>
                                       </td>
                                     </tr>
                                   </tbody>
                                 </table>
                             </div>
                             <div class="modal-footer">
                                 <button type="button" class="btn btn-white" data-dismiss="modal">Close</button>
                                 <button type="button" class="btn btn-primary" ng-click="addAircraft()">Save changes</button>
                             </div>
                         </div>
                     </div>
                 </div>
               </div>
               <div class="ibox-content">
                 <div class="table-responsive">
                   <table class="table table-bordered table-hover table-striped">
                     <thead>
                       <tr>
                         <th>Tail</th>
                         <th>Make</th>
                         <th>Model</th>
                         <th>Size</th>
                         <th>Actions</th>
                       </tr>
                     </thead>
                     <tbody>
                       <tr ng-repeat="airData in getCraftList track by $index">
                         <td>
                           <input type="text" style="width:100px;" ng-model="airData.tail" class="form-control">
                         </td>
                         <td>
                           <select class="form-control" ng-model="airData.make">
                              <option>{{airData.make}}</option>
                           </select>
                         </td>
                         <td>
                           <select class="form-control" ng-model="airData.model">
                              <option>{{airData.model}}</option>
                           </select>
                         </td>
                         <td>
                           <select class="form-control" ng-model="airData.size">
                              <option>{{airData.size}}</option>
                           </select>
                         </td>
                         <td>
                           <i style="margin-top: 10px;" class="fa fa-pencil" ng-click="update(airData)"></i>&nbsp;
                           <i class="fa fa-trash" ng-click="remove(airData)"></i>
                         </td>
                       </tr>
                     </tbody>
                   </table>
                 </div>
                      <div class="clearfix"></div>
                   </div>
                </div>
             </div>
             <div class="modal inmodal" id="myModal5" tabindex="-1" role="dialog"  aria-hidden="true">
                     <div class="modal-dialog">
                         <div class="modal-content animated fadeIn">
                             <div class="modal-header">
                                 <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
                                 <!-- <i class="fa fa-clock-o modal-icon"></i> -->
                                 <h4 class="modal-title">Update Aircraft</h4>
                                 <!-- <small>Lorem Ipsum is simply dummy text of the printing and typesetting industry.</small> -->
                             </div>
                             <div class="modal-body" style="padding: 15px;">
                                 <table class="table table-bordered table-hover table-striped">
                                   <thead>
                                     <tr>
                                       <th>Tail</th>
                                       <th>Make</th>
                                       <th>Model</th>
                                       <th>Size</th>
                                     </tr>
                                   </thead>
                                   <tbody>
                                     <tr>
                                       <td>
                                         <input type="text" style="width:100px;" ng-model="aircraft.tail" class="form-control">
                                       </td>
                                       <td style="width: 30%">
                                         <select class="form-control" ng-model="aircraft.make" ng-change="getModal()">
                                            <option ng-repeat="make in aircraftMakeList">{{make}}</option>
                                         </select>
                                       </td>
                                       <td style="width: 30%">
-                                        <select class="form-control" ng-model="aircraft.model">
+                                        <select class="form-control" ng-model="aircraft.model" ng-change="getSize()">
                                            <option ng-repeat="model in aircraftModalList">{{model}}</option>
                                         </select>
                                       </td>
                                       <td style="width: 30%">
                                         <select class="form-control" ng-model="aircraft.size">
                                            <option ng-repeat="size in aircraftSizeList">{{size}}</option>
                                         </select>
                                       </td>
                                     </tr>
                                   </tbody>
                                 </table>
                             </div>
                             <div class="modal-footer">
                                 <button type="button" class="btn btn-white" ng-click="closeModal()">Close</button>
                                 <button type="button" class="btn btn-primary" ng-click="updateAircraft(aircraft)">Save changes</button>
                             </div>
                         </div>
                     </div>
                 </div>
             <div class="col-lg-5">
                 <div class="ibox float-e-margins">
                     <div class="ibox-title">
                         <h5>Account Authenticatio & Payment Method</h5>
                     </div>
                     <div class="ibox-content">
                         <div class="row" ng-repeat="payment in paymentList" ng-click="openCard(payment)" style="cursor: pointer;" ng-show="showPayments">
                             <div class="col-md-3">
                                 <img src="images/master.png">
                             </div>
                             <div class="col-md-9">
                                 <div class="col">
                                     <span style="font-size: large; color: #909394;">**** **** **** {{payment.cardNumber | limitTo: -4}}</span>
                                 </div>
                                 <div class="col">
                                     <span><strong>Expiry Date: </strong>{{payment.expiryDate}}</span>
                                 </div>
                             </div>
                             <div class="clearfix"></div>
                             <!-- <br>
                             <div class="col-md-3">
                                 <img src="images/visa1.png">
                             </div>
                             <div class="col-md-9">
                                 <div class="col">
                                     <span style="font-size: large; color: #909394;">**** **** **** 1060</span>
                                 </div>
                                 <div class="col">
                                     <span><strong>Expiry Date:</strong>10/16</span>
                                 </div>
                             </div>
                             <div class="clearfix"></div> -->
                         </div>
                         <div class="row" ng-hide="showPayments">
                             <div class="container">
                                 <div class="row">
                                   <div class="col-xs-12 col-md-4">
                                      <div class="panel panel-default credit-card-box">
                                         <div class="panel-heading display-table" >
                                            <div class="row display-tr" >
                                               <h3 class="panel-title display-td" >Payment Details</h3>
                                               <div class="display-td" >
                                                  <img class="img-responsive pull-right" src="http://i76.imgup.net/accepted_c22e0.png">
                                               </div>
                                            </div>
                                         </div>
                                         <div class="panel-body">
                                            <form role="form" id="payment-form">
                                               <div class="row">
                                                  <div class="col-xs-12">
                                                     <div class="form-group">
                                                        <label for="cardNumber">CARD NUMBER</label>
                                                        <div class="input-group">
                                                           <input type="tel" ng-model="data.cardNumber" maxlength="16" oninput="javascript: if (this.value.length > this.maxLength) this.value = this.value.slice(0, this.maxLength);" class="form-control" name="cardNumber" placeholder="Valid Card Number" autocomplete="cc-number" required autofocus>
                                                           <span class="input-group-addon"><i class="fa fa-credit-card"></i></span>
                                                        </div>
                                                     </div>
                                                  </div>
                                               </div>
                                               <div class="row">
                                                  <div class="col-xs-7 col-md-7">
                                                     <div class="form-group">
                                                        <label for="cardExpiry"><span class="hidden-xs">EXPIRATION</span><span class="visible-xs-inline">EXP</span> DATE</label>
                                                        <input type="text" ng-model="data.expiryDate" class="form-control" name="cardExpiry" placeholder="MM / YY" autocomplete="cc-exp"
                                                           required>
                                                     </div>
                                                  </div>
                                                  <div class="col-xs-5 col-md-5 pull-right">
                                                     <div class="form-group">
                                                        <label for="cardCVC">CVV CODE</label>
                                                        <input type="number"  maxlength="3" oninput="javascript: if (this.value.length > this.maxLength) this.value = this.value.slice(0, this.maxLength);" class="form-control" name="cardCVC" placeholder="CVC" autocomplete="cc-csc"
                                                           required>
                                                     </div>
                                                  </div>
                                               </div>
                                               <div class="row">
                                                  <div class="col-xs-12">
                                                     <div class="form-group">
                                                        <label for="name">Card Type</label>
                                                         <select class="form-control m-b" name="account" ng-model="data.cardType" style="margin-bottom: 0;">
                                                             <option value="creditCard" selected>Credit Card</option>
                                                             <option value="debitCard">Debit Card</option>
                                                         </select>
                                                     </div>
                                                  </div>
                                               </div>
                                               <div class="row">
                                                  <div class="col-xs-12">
                                                     <button class="btn btn-success btn-lg btn-block" type="submit" ng-click="updateCard()">Update Card</button>
                                                  </div>
                                               </div>
                                               <div class="row" style="display:none;">
                                                  <div class="col-xs-12">
                                                     <p class="payment-errors"></p>
                                                  </div>
                                               </div>
                                            </form>
                                         </div>
                                      </div>
                                   </div>
                                 </div>
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
         </div>
     </div>
 </div>
 <script type="text/javascript" src="https://js.stripe.com/v2/"></script>

app/views/updateFBODept/updateFBODept.service.js

Diff comments View file @db8e1f9

 (function() {
   'use strict';
   angular.module('acuefuel')
       .service('UpdateAllFBODept', ['$rootScope', '$q', '$http', 'BE', UpdateAllFBODept])
    function UpdateAllFBODept($rootScope, $q, $http, BE) {
         this.getALlFBOData = function(id) {
           var deferred = $q.defer();
           $http({
               method : 'GET',
               url : BE.url +'/account/user/'+id,
               headers : {'Content-Type': 'application/json'},
           })
           .success(function(result) {
               deferred.resolve(result);
           })
           return deferred.promise;
         }
         this.getNotes = function(id) {
           var deferred = $q.defer();
           $http({
               method : 'GET',
               url : BE.url +'/account/user/'+id + '/notes',
               headers : {'Content-Type': 'application/json'},
           })
           .success(function(result) {
               deferred.resolve(result);
           })
           return deferred.promise;
         }
         this.getAircrafts = function(id) {
           var deferred = $q.defer();
           $http({
               method : 'GET',
               url : BE.url +'/account/user/'+id + '/airCrafts',
               headers : {'Content-Type': 'application/json'},
           })
           .success(function(result) {
               deferred.resolve(result);
           })
           return deferred.promise;
         }
         this.getPaymentMethod = function(id) {
           var deferred = $q.defer();
           $http({
               method : 'GET',
               url : BE.url +'/account/user/'+id + '/paymentMethods',
               headers : {'Content-Type': 'application/json'},
           })
           .success(function(result) {
               deferred.resolve(result);
           })
           return deferred.promise;
         }
         this.updatePaymentMethod = function(data) {
           var deferred = $q.defer();
           $http({
               method : 'POST',
               url : BE.url +'/account/user/updatePaymentMethods',
               headers : {'Content-Type': 'application/json'},
               data: data
           })
           .success(function(result) {
               deferred.resolve(result);
           })
           return deferred.promise;
         }
         this.updateAircraft = function(data) {
           var deferred = $q.defer();
           $http({
               method : 'PUT',
               url : BE.url +'/account/user/updateAircraft',
               headers : {'Content-Type': 'application/json'},
               data: data
           })
           .success(function(result) {
               deferred.resolve(result);
+          }).error(function(error) {
+              deferred.reject(error);
           })
           return deferred.promise;
         }
         this.removeAircraft = function(id) {
           var deferred = $q.defer();
           $http({
               method : 'DELETE',
               url : BE.url +'/account/user/airCraft/'+id,
               headers : {'Content-Type': 'application/json'},
           })
           .success(function(result) {
               deferred.resolve(result);
           })
           return deferred.promise;
         }
    }
 })();