viithiisys / Acufuel

Browse Code »

Commit e95d89b77f5b51cf5ec5ec8c74bfc65bd6c5fdbb

Authored by Swarn Singh 2017-06-12 09:34:49 -0400

1 parent a55ef20b57

Exists in master

integrate editor on update fuel manager page, fix enter fuel order page

Showing 8 changed files with 126 additions and 76 deletions Show diff stats

app/index.html

Diff comments View file @e95d89b

app/js/app.js

Diff comments View file @e95d89b

1	'use strict';	1	'use strict';
2		2
3		3
4	angular.module('acufuel', ['ngCookies', 'ngResource', 'ui.router', 'ngAnimate', 'ui.bootstrap', 'xeditable', 'ui.toggle', 'ngTable', 'ui.select2'])	4	angular.module('acufuel', ['ngCookies', 'ngResource', 'ui.router', 'ngAnimate', 'ui.bootstrap', 'xeditable', 'ui.toggle', 'ngTable', 'ui.select2', 'ckeditor'])
5		5
6	.config(['$httpProvider', function($httpProvider) {	6	.config(['$httpProvider', function($httpProvider) {
7	$httpProvider.defaults.withCredentials = true;	7	$httpProvider.defaults.withCredentials = true;
8	$httpProvider.interceptors.push('myCSRF');	8	$httpProvider.interceptors.push('myCSRF');
9	$httpProvider.interceptors.push('httpRequestInterceptor');	9	$httpProvider.interceptors.push('httpRequestInterceptor');
10	}])	10	}])
11		11
12		12
13	.factory('httpRequestInterceptor', ['$q', '$rootScope', '$location', function($q, $rootScope, $location) {	13	.factory('httpRequestInterceptor', ['$q', '$rootScope', '$location', function($q, $rootScope, $location) {
14	return {	14	return {
15	request: function($config) {	15	request: function($config) {
16	return $config;	16	return $config;
17	},	17	},
18	responseError: function(rejection) {	18	responseError: function(rejection) {
19	if (rejection.status === 401) {	19	if (rejection.status === 401) {
20	if($location.path() != "/login"){	20	if($location.path() != "/login"){
21	localStorage.clear();	21	localStorage.clear();
22	window.location.reload();	22	window.location.reload();
23	}	23	}
24	}	24	}
25	return $q.reject(rejection);	25	return $q.reject(rejection);
26	}	26	}
27	}	27	}
28	}])	28	}])
29		29
30	.provider('myCSRF',[function(){	30	.provider('myCSRF',[function(){
31	var headerName = 'X-CSRFToken';	31	var headerName = 'X-CSRFToken';
32	var cookieName = 'csrftoken';	32	var cookieName = 'csrftoken';
33	var allowedMethods = ['GET'];	33	var allowedMethods = ['GET'];
34		34
35	this.setHeaderName = function(n) {	35	this.setHeaderName = function(n) {
36	headerName = n;	36	headerName = n;
37	}	37	}
38	this.setCookieName = function(n) {	38	this.setCookieName = function(n) {
39	cookieName = n;	39	cookieName = n;
40	}	40	}
41	this.setAllowedMethods = function(n) {	41	this.setAllowedMethods = function(n) {
42	allowedMethods = n;	42	allowedMethods = n;
43	}	43	}
44	this.$get = ['$cookies', function($cookies){	44	this.$get = ['$cookies', function($cookies){
45	return {	45	return {
46	'request': function(config) {	46	'request': function(config) {
47	if(allowedMethods.indexOf(config.method) === -1) {	47	if(allowedMethods.indexOf(config.method) === -1) {
48	// do something on success	48	// do something on success
49	config.headers[headerName] = $cookies[cookieName];	49	config.headers[headerName] = $cookies[cookieName];
50	}	50	}
51	return config;	51	return config;
52	}	52	}
53	}	53	}
54	}];	54	}];
55	}])	55	}])
56		56
57	.config(	57	.config(
58	['$locationProvider', '$stateProvider', '$urlRouterProvider',	58	['$locationProvider', '$stateProvider', '$urlRouterProvider',
59	function($locationProvider, $stateProvider, $urlRouterProvider) {	59	function($locationProvider, $stateProvider, $urlRouterProvider) {
60	$locationProvider.hashPrefix('!');	60	$locationProvider.hashPrefix('!');
61	// routes	61	// routes
62	$urlRouterProvider	62	$urlRouterProvider
63	.otherwise('/login');	63	.otherwise('/login');
64		64
65	$stateProvider	65	$stateProvider
66		66
67	.state("app", {	67	.state("app", {
68	url: "",	68	url: "",
69	templateUrl: "partials/main/main.html",	69	templateUrl: "partials/main/main.html",
70	controller: "MainController",	70	controller: "MainController",
71	abstract: true	71	abstract: true
72	})	72	})
73		73
74	.state("login", {	74	.state("login", {
75	url: "/login",	75	url: "/login",
76	templateUrl: "partials/login/login.html",	76	templateUrl: "partials/login/login.html",
77	controller: "LoginController"	77	controller: "LoginController"
78	})	78	})
79		79
80	.state("app.customers", {	80	.state("app.customers", {
81	url: "/customers",	81	url: "/customers",
82	templateUrl: "partials/customers/customers.html",	82	templateUrl: "partials/customers/customers.html",
83	controller: "customersController"	83	controller: "customersController"
84	})	84	})
85		85
86	.state("app.accountSetting", {	86	.state("app.accountSetting", {
87	url: "/accountSetting",	87	url: "/accountSetting",
88	templateUrl: "partials/accountSetting/accountSetting.html",	88	templateUrl: "partials/accountSetting/accountSetting.html",
89	controller: "AccountSettingController"	89	controller: "AccountSettingController"
90	})	90	})
91		91
92	.state("app.ContactView", {	92	.state("app.ContactView", {
93	url: "/ContactView",	93	url: "/ContactView",
94	templateUrl: "partials/ContactView/ContactView.html",	94	templateUrl: "partials/ContactView/ContactView.html",
95	controller: "ContactViewController"	95	controller: "ContactViewController"
96	})	96	})
97	.state("app.FuelVendors", {	97	.state("app.FuelVendors", {
98	url: "/FuelVendors",	98	url: "/FuelVendors",
99	templateUrl: "partials/FuelVendors/FuelVendors.html",	99	templateUrl: "partials/FuelVendors/FuelVendors.html",
100	controller: "FuelVendorsController"	100	controller: "FuelVendorsController"
101	})	101	})
102		102
103	.state("app.analytics", {	103	.state("app.analytics", {
104	url: "/analytics",	104	url: "/analytics",
105	templateUrl: "partials/analytics/analytics.html",	105	templateUrl: "partials/analytics/analytics.html",
106	controller: "analyticsController"	106	controller: "analyticsController"
107	})	107	})
108		108
109	.state("app.account", {	109	.state("app.account", {
110	url: "/account",	110	url: "/account",
111	templateUrl: "partials/account/account.html",	111	templateUrl: "partials/account/account.html",
112	controller: "accountController"	112	controller: "accountController"
113	})	113	})
114		114
115	.state("app.dashboard", {	115	.state("app.dashboard", {
116	url: "/dashboard",	116	url: "/dashboard",
117	templateUrl: "partials/dashboard/dashboard.html",	117	templateUrl: "partials/dashboard/dashboard.html",
118	controller: "dashboardController"	118	controller: "dashboardController"
119	})	119	})
120		120
121	.state("app.elements", {	121	.state("app.elements", {
122	url: "/elements",	122	url: "/elements",
123	templateUrl: "partials/elements/elements.html",	123	templateUrl: "partials/elements/elements.html",
124	controller: "elementsController"	124	controller: "elementsController"
125	})	125	})
126		126
127	.state("app.error", {	127	.state("app.error", {
128	url: "/error",	128	url: "/error",
129	templateUrl: "partials/error/error.html",	129	templateUrl: "partials/error/error.html",
130	controller: "errorController"	130	controller: "errorController"
131	})	131	})
132		132
133	.state("app.faq", {	133	.state("app.faq", {
134	url: "/faq",	134	url: "/faq",
135	templateUrl: "partials/faq/faq.html",	135	templateUrl: "partials/faq/faq.html",
136	controller: "faqController"	136	controller: "faqController"
137	})	137	})
138		138
139	.state("app.forms", {	139	.state("app.forms", {
140	url: "/forms",	140	url: "/forms",
141	templateUrl: "partials/forms/forms.html",	141	templateUrl: "partials/forms/forms.html",
142	controller: "formsController"	142	controller: "formsController"
143	})	143	})
144		144
145	.state("app.fuelManager", {	145	.state("app.fuelManager", {
146	url: "/fuelManager",	146	url: "/fuelManager",
147	templateUrl: "partials/fuelManager/fuelManager.html",	147	templateUrl: "partials/fuelManager/fuelManager.html",
148	controller: "fuelManagerController"	148	controller: "fuelManagerController"
149	})	149	})
150		150
151	.state("app.pricing", {	151	.state("app.pricing", {
152	url: "/pricing",	152	url: "/pricing",
153	templateUrl: "partials/pricing/pricing.html",	153	templateUrl: "partials/pricing/pricing.html",
154	controller: "pricingController"	154	controller: "pricingController"
155	})	155	})
156		156
157	.state("app.reports", {	157	.state("app.reports", {
158	url: "/reports",	158	url: "/reports",
159	templateUrl: "partials/reports/reports.html",	159	templateUrl: "partials/reports/reports.html",
160	controller: "reportsController"	160	controller: "reportsController"
161	})	161	})
162		162
163	.state("app.scheduler", {	163	.state("app.scheduler", {
164	url: "/scheduler",	164	url: "/scheduler",
165	templateUrl: "partials/scheduler/scheduler.html",	165	templateUrl: "partials/scheduler/scheduler.html",
166	controller: "schedulerController"	166	controller: "schedulerController"
167	})	167	})
168	.state("app.signup", {	168	.state("app.signup", {
169	url: "/signup",	169	url: "/signup",
170	templateUrl: "partials/signup/signup.html",	170	templateUrl: "partials/signup/signup.html",
171	controller: "signupController"	171	controller: "signupController"
172	})	172	})
173		173
174	.state("app.updateFuelManager", {	174	.state("app.updateFuelManager", {
175	url: "/updateFuelManager",	175	url: "/updateFuelManager",
176	templateUrl: "partials/updateFuelManager/updateFuelManager.html",	176	templateUrl: "partials/updateFuelManager/updateFuelManager.html",
177	controller: "updateFuelManagerController",	177	controller: "updateFuelManagerController",
178	// data: {	178	// data: {
179	// authorizedRoles: ["fbo"],	179	// authorizedRoles: ["fbo"],
180	// }	180	// }
181	})	181	})
182		182
183	.state("app.viewCompany", {	183	.state("app.viewCompany", {
184	url: "/viewCompany/:id",	184	url: "/viewCompany/:id",
185	templateUrl: "partials/viewCompany/viewCompany.html",	185	templateUrl: "partials/viewCompany/viewCompany.html",
186	controller: "viewCompanyController"	186	controller: "viewCompanyController"
187	})	187	})
188		188
189	.state("app.viewFuelVendor", {	189	.state("app.viewFuelVendor", {
190	url: "/viewFuelVendor/:id",	190	url: "/viewFuelVendor/:id",
191	templateUrl: "partials/viewFuelVendor/viewFuelVendor.html",	191	templateUrl: "partials/viewFuelVendor/viewFuelVendor.html",
192	controller: "ViewFuelVendorController"	192	controller: "ViewFuelVendorController"
193	})	193	})
194		194
195	.state("app.fuelOrders", {	195	.state("app.fuelOrders", {
196	url: "/fuelOrders",	196	url: "/fuelOrders",
197	templateUrl: "partials/fuelOrders/fuelOrders.html",	197	templateUrl: "partials/fuelOrders/fuelOrders.html",
198	controller: "fuelOrdersController"	198	controller: "fuelOrdersController"
199	})	199	})
200		200
201	.state("app.DispatchFuel", {	201	.state("app.DispatchFuel", {
202	url: "/DispatchFuel",	202	url: "/DispatchFuel",
203	templateUrl: "partials/DispatchFuel/DispatchFuel.html",	203	templateUrl: "partials/DispatchFuel/DispatchFuel.html",
204	controller: "DispatchFuelController"	204	controller: "DispatchFuelController"
205	})	205	})
206		206
207	.state("app.searchDispatchFuel", {	207	.state("app.searchDispatchFuel", {
208	url: "/searchDispatchFuel",	208	url: "/searchDispatchFuel",
209	templateUrl: "partials/searchDispatchFuel/searchDispatchFuel.html",	209	templateUrl: "partials/searchDispatchFuel/searchDispatchFuel.html",
210	controller: "searchDispatchFuelController"	210	controller: "searchDispatchFuelController"
211	})	211	})
212		212
213	.state("app.Accept", {	213	.state("app.Accept", {
214	url: "/Accept",	214	url: "/Accept",
215	templateUrl: "partials/Accept/Accept.html",	215	templateUrl: "partials/Accept/Accept.html",
216	controller: "AcceptController"	216	controller: "AcceptController"
217	})	217	})
218		218
219	.state("app.delselected", {	219	.state("app.delselected", {
220	url: "/delselected",	220	url: "/delselected",
221	templateUrl: "partials/delselected/delselected.html",	221	templateUrl: "partials/delselected/delselected.html",
222	controller: "delselectedController"	222	controller: "delselectedController"
223	})	223	})
224		224
225	.state("app.pricingcontact", {	225	.state("app.pricingcontact", {
226	url: "/pricingcontact",	226	url: "/pricingcontact",
227	templateUrl: "partials/pricingcontact/pricingcontact.html",	227	templateUrl: "partials/pricingcontact/pricingcontact.html",
228	controller: "pricingcontactController"	228	controller: "pricingcontactController"
229	})	229	})
230		230
231	.state("app.viewContact", {	231	.state("app.viewContact", {
232	url: "/viewContact/:id",	232	url: "/viewContact/:id",
233	templateUrl: "partials/viewcontact/viewcontact.html",	233	templateUrl: "partials/viewcontact/viewcontact.html",
234	controller: "viewcontactController"	234	controller: "viewcontactController"
235	})	235	})
236		236
237	.state("app.viewVendorContact", {	237	.state("app.viewVendorContact", {
238	url: "/viewVendorContact/:id",	238	url: "/viewVendorContact/:id",
239	templateUrl: "partials/viewVendorContact/viewVendorContact.html",	239	templateUrl: "partials/viewVendorContact/viewVendorContact.html",
240	controller: "viewVendorContactController"	240	controller: "viewVendorContactController"
241	})	241	})
242		242
243	.state("app.enterFuelOrder", {	243	.state("app.enterFuelOrder", {
244	url: "/enterFuelOrder",	244	url: "/enterFuelOrder",
245	templateUrl: "partials/enterFuelOrder/enterFuelOrder.html",	245	templateUrl: "partials/enterFuelOrder/enterFuelOrder.html",
246	controller: "enterFuelOrderController"	246	controller: "enterFuelOrderController"
247	})	247	})
248		248
249	}	249	}
250	])	250	])
251		251
252	.run(['$rootScope', '$state', 'LoginService', 'AUTH_EVENTS', function($rootScope, $state, LoginService, AUTH_EVENTS) {	252	.run(['$rootScope', '$state', 'LoginService', 'AUTH_EVENTS', function($rootScope, $state, LoginService, AUTH_EVENTS) {
253	$rootScope.$on('$stateChangeStart', function (event, next, nextParams, fromState) {	253	$rootScope.$on('$stateChangeStart', function (event, next, nextParams, fromState) {
254	$rootScope.currentUser = JSON.parse(window.localStorage.getItem('currentUser'));	254	$rootScope.currentUser = JSON.parse(window.localStorage.getItem('currentUser'));
255		255
256	LoginService.isAuthorized = function (authorizedRoles) {	256	LoginService.isAuthorized = function (authorizedRoles) {
257	if (!angular.isArray(authorizedRoles)) {	257	if (!angular.isArray(authorizedRoles)) {
258	authorizedRoles = [authorizedRoles];	258	authorizedRoles = [authorizedRoles];
259	}	259	}
260	var userdata = JSON.parse(window.localStorage.getItem('currentUser'));	260	var userdata = JSON.parse(window.localStorage.getItem('currentUser'));
261	return (userdata? (authorizedRoles.indexOf(userdata.type) !== -1): false);	261	return (userdata? (authorizedRoles.indexOf(userdata.type) !== -1): false);
262	}	262	}
263		263
264	if ('data' in next && 'authorizedRoles' in next.data) {	264	if ('data' in next && 'authorizedRoles' in next.data) {
265	var authorizedRoles = next.data.authorizedRoles;	265	var authorizedRoles = next.data.authorizedRoles;
266	if (!LoginService.isAuthorized(authorizedRoles)) {	266	if (!LoginService.isAuthorized(authorizedRoles)) {
267	event.preventDefault();	267	event.preventDefault();
268	if($state.current.name.length == 0) {	268	if($state.current.name.length == 0) {
269	$state.go('login')	269	$state.go('login')
270	} else {	270	} else {
271	$state.go($state.current, {}, {reload: true});	271	$state.go($state.current, {}, {reload: true});
272	$rootScope.$broadcast(AUTH_EVENTS.notAuthorized);	272	$rootScope.$broadcast(AUTH_EVENTS.notAuthorized);
273	}	273	}
274	}	274	}
275	}	275	}
276		276
277	if (LoginService.isAuthenticated()) {	277	if (LoginService.isAuthenticated()) {
278	if (next.name == 'login') {	278	if (next.name == 'login') {
279	event.preventDefault();	279	event.preventDefault();
280	$state.go('app.dashboard');	280	$state.go('app.dashboard');
281	}	281	}
282	}	282	}
283	});	283	});
284	}])	284	}])
285		285
286		286
287	.directive("datepicker",function(){	287	.directive("datepicker",function(){
288	return {	288	return {
289	restrict:"A",	289	restrict:"A",
290	link:function(scope,el,attr){	290	link:function(scope,el,attr){
291	el.datepicker();	291	el.datepicker();
292	}	292	}
293	};	293	};
294	})	294	})
295		295
296		296
297		297
298		298
299		299
300		300
301		301

app/partials/enterFuelOrder/enterFuelOrder.controller.js

Diff comments View file @e95d89b

 'use strict';
 angular.module('acufuel')
 .controller('enterFuelOrderController', ['$scope', '$rootScope', '$uibModal', '$filter', '$http', 'enterFuelOrderService', enterFuelOrderController]);
 function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http, enterFuelOrderService) {
 	$scope.showLoader = true;
 	$scope.companyList = {};
 	enterFuelOrderService.getAllCompanies().then(function(result) {
 		$scope.showLoader = false;
 		$scope.companyList = result;
 	})
 	$scope.order = {};
 	$scope.dispatchOrder = {};
-	$scope.dispatchOrder.fuelOrderObj = [];
+	$scope.dispatchOrder.fuelOrderList = [];
 	$scope.order.upliftDate = '';
 	$scope.order.departingDate = '';
 	$scope.selectedCompanyName = '';
 	$scope.selectedCompanyId = '';
 	$scope.marginId = '';
 	enterFuelOrderService.getFuelPricingNew().then(function(margins) {
 		$scope.marginList = margins;
 		//console.log('$scope.marginList', $scope.marginList);
 	})
 	$scope.getAircraft = function(company){
 		$scope.selectedCompanyName = company;
 		$scope.showLoader = true;
 		for (var i = 0; i < $scope.companyList.length; i++) {
 			if ($scope.companyList[i].companyName == company) {
 				$scope.selectedCompanyId = $scope.companyList[i].id;
 				$scope.marginId = $scope.companyList[i].margin.id;
 				if ($scope.selectedCompanyId != '') {
 					enterFuelOrderService.getAircraft($scope.selectedCompanyId).then(function(aircraft) {
 						$scope.aircraftList = aircraft;
 					})
 				}
 				if ($scope.marginId != '') {
 					enterFuelOrderService.getJetTiers($scope.marginId).then(function(tiers) {
 		                $scope.tierList = tiers;
 		                $scope.showLoader = false;
 		            })
 				}else{
 					$scope.showLoader = false;
 				}
 			}
 		}
 	}
 	$scope.dispatchFuel = function(){
+		$scope.showLoader = true;
 		$scope.order.companyId = $scope.selectedCompanyId;
 		if ($scope.order.upliftDate != '') {
 			$scope.order.upliftDate = new Date($scope.order.upliftDate);
 			$scope.order.upliftDate = $scope.order.upliftDate.getTime();
 		}
 		if ($scope.order.departingDate != '') {
 			$scope.order.departingDate = new Date($scope.order.departingDate);
 			$scope.order.departingDate = $scope.order.departingDate.getTime();
 		}
-		$scope.dispatchOrder.fuelOrderObj.push($scope.order);
+		$scope.dispatchOrder.fuelOrderList.push($scope.order);
 		console.log('$scope.order', $scope.dispatchOrder);
 		enterFuelOrderService.dispathFuelOrder($scope.dispatchOrder).then(function(result) {
 			console.log('result', result);
+			$scope.showLoader = false;
+			$scope.order = {};
+			toastr.success('Fuel Order Dispatched Successfully', {
+              closeButton: true
+            })
 		})
 	}
 }

app/partials/scheduler/scheduler.controller.js

Diff comments View file @e95d89b

 'use strict';
 //Load controller
 angular.module('acufuel')
    .controller('schedulerController', ['$scope', function($scope) {
       $scope.test = "Testing...";
-      $(document).ready(function() {
-    $('#calendar').fullCalendar({
+    /*$('#calendar').fullCalendar({
       header: {
         left: 'prev,next today',
         center: 'title',
         right: 'month,agendaWeek,agendaDay,listWeek'
       },
       defaultDate: '2017-05-12',
       navLinks: true, // can click day/week names to navigate views
       editable: true,
       eventLimit: true, // allow "more" link when too many events
       events: [
         {
           title: 'All Day Event',
           start: '2017-05-01'
         },
         {
           title: 'Long Event',
           start: '2017-05-07',
           end: '2017-05-10'
         },
         {
           id: 999,
           title: 'Repeating Event',
           start: '2017-05-09T16:00:00'
         },
         {
           id: 999,
           title: 'Repeating Event',
           start: '2017-05-16T16:00:00'
         },
         {
           title: 'Conference',
           start: '2017-05-11',
           end: '2017-05-13'
         },
         {
           title: 'Meeting',
           start: '2017-05-12T10:30:00',
           end: '2017-05-12T12:30:00'
         },
         {
           title: 'Lunch',
           start: '2017-05-12T12:00:00'
         },
         {
           title: 'Meeting',
           start: '2017-05-12T14:30:00'
         },
         {
           title: 'Happy Hour',
           start: '2017-05-12T17:30:00'
         },
         {
           title: 'Dinner',
           start: '2017-05-12T20:00:00'
         },
         {
           title: 'Birthday Party',
           start: '2017-05-13T07:00:00'
         },
         {
           title: 'Click for Google',
           start: '2017-05-28'
         }
       ]
     });
-  });
+  });*/
    }]);

app/partials/scheduler/scheduler.html

Diff comments View file @e95d89b

1	<style type="text/css">	1	<style type="text/css">
2	.newUlView {	2	.newUlView {
3	padding: 5px;	3	padding: 5px;
4	margin: 3px;	4	margin: 3px;
5	}	5	}
6	.subnavbar .mainnav > li:nth-child(4) > a{	6	.subnavbar .mainnav > li:nth-child(4) > a{
7	color: #ff9900;	7	color: #ff9900;
8	}	8	}
9	.fc button, .fc-button-group, .fc-time-grid .fc-event .fc-time span{	9	.fc button, .fc-button-group, .fc-time-grid .fc-event .fc-time span{
10	display: block;	10	display: block;
11	}	11	}
12	.fc-state-default{	12	.fc-state-default{
13	background-color: #fff;	13	background-color: #fff;
14	background-image: none;	14	background-image: none;
15	}	15	}
16	.fc-state-active, .fc-state-down{	16	.fc-state-active, .fc-state-down{
17	box-shadow: none;	17	box-shadow: none;
18	color: #fff;	18	color: #fff;
19	background-color: #ff9900;	19	background-color: #ff9900;
20	}	20	}
		21
		22
		23	/*#wrap {
		24	width: 1100px;
		25	margin: 0 auto;
		26	}
		27
		28	#external-events {
		29	float: left;
		30	width: 150px;
		31	padding: 0 10px;
		32	border: 1px solid #ccc;
		33	background: #eee;
		34	text-align: left;
		35	}
		36
		37	#external-events h4 {
		38	font-size: 16px;
		39	margin-top: 0;
		40	padding-top: 1em;
		41	}
		42
		43	#external-events .fc-event {
		44	margin: 10px 0;
		45	cursor: pointer;
		46	}
		47
		48	#external-events p {
		49	margin: 1.5em 0;
		50	font-size: 11px;
		51	color: #666;
		52	}
		53
		54	#external-events p input {
		55	margin: 0;
		56	vertical-align: middle;
		57	}
		58
		59	#calendar {
		60	float: right;
		61	width: 900px;
		62	}*/
21	</style>	63	</style>
22	<div class="main">	64	<div class="main">
23	<div class="container">	65	<div class="container">
24	<div class="row">	66	<div class="row">
25	<div class="col-md-3 col-xs-12">	67	<div class="col-xs-12">
26	<div class="widget stacked">	68	<!-- <div id='wrap'>
27	<div class="widget-header">	69
28	<i class="fa fa-plane"></i>	70	<div id='external-events'>
29	<h3>Entry Support Service</h3>	71	<h4>Draggable Events</h4>
30	</div>	72	<div class='fc-event'>My Event 1</div>
31	<!-- /widget-header -->	73	<div class='fc-event'>My Event 2</div>
32	<div class="widget-content">	74	<div class='fc-event'>My Event 3</div>
33	<div id='external-events'>	75	<div class='fc-event'>My Event 4</div>
34	<h6>Drag a event and drop into callender</h6>	76	<div class='fc-event'>My Event 5</div>
35	<ul style="list-style: none;padding: 0px">	77	<p>
36	<li class="active">	78	<input type='checkbox' id='drop-remove' />
37	<div class='fc-event newUlView'>My Event 1</div>	79	<label for='drop-remove'>remove after drop</label>
38	</li>	80	</p>
39	<li class="active">	81	</div>
40	<div class='fc-event newUlView' >My Event 2</div>	82
41	</li>	83	<div id='calendar'></div>
42	<li class="active">	84
43	<div class='fc-event newUlView'>My Event 3</div>	85	<div style='clear:both'></div>
44	</li>
45	<li class="active">
46	<div class='fc-event newUlView'>My Event 4</div>
47	</li>
48	<li class="active">
49	<div class='fc-event newUlView'>My Event 5</div>
50	</li>
51	<li class="active">
52	<div class='fc-event newUlView'>My Event 6</div>
53	</li>
54	</ul>
55	</div>

app/partials/updateFuelManager/updateFuelManager.controller.js

Diff comments View file @e95d89b

 'use strict';
  //Load controller
   angular.module('acufuel')
       .controller('updateFuelManagerController', ['$scope','$uibModal', 'updateFuelManagerService', function($scope , $uibModal, updateFuelManagerService) {
 		$scope.showLoader = true;
         $scope.yes = function(data){
             console.log('========');
             console.log('value', data);
             $uibModal.yes({
                 templateUrl: 'partials/pricingcontact/pricingcontact.html',
                 backdrop: true,
                 scope: $scope,
             })
         }
+        $scope.options = {
+            language: 'en',
+            allowedContent: true,
+            entities: false
+          };
+          // Called when the editor is completely ready.
+          $scope.onReady = function () {
+            // ...
+          };
         $scope.userProfileId = JSON.parse(localStorage.getItem('userProfileId'));
         updateFuelManagerService.getATypeJets($scope.userProfileId).then(function(result) {
           $scope.aTypeJets = result;
           $scope.showLoader = false;
         })
         updateFuelManagerService.getVTypeJets($scope.userProfileId).then(function(result) {
           $scope.vTypeJets = result;
           $scope.showLoader = false;
         })
         $scope.toggleJestAccordian = function(id, index){
             $scope.showLoader = true;
             $('.'+id).slideDown();
             $('#'+id).addClass('customActive');
             $('#'+id+' select, #'+id+' input').prop("disabled", false);
             $('#'+id+' .btn-success, #'+id+' .btn-danger').css('display', 'inline-block');
             $('#'+id+' .btn-default').css('display', 'none');
             updateFuelManagerService.getJetTiers(id).then(function(tiers) {
                 $scope.aTypeJets[index].tierList = tiers;
                 $scope.showLoader = false;
             })
         }
         $scope.toggleVtypeJestAccordian = function(id, index){
             $scope.showLoader = true;
             $('.'+id).slideDown();
             $('#'+id).addClass('customActive');
             $('#'+id+' select, #'+id+' input').prop("disabled", false);
             $('#'+id+' .btn-success, #'+id+' .btn-danger').css('display', 'inline-block');
             $('#'+id+' .btn-default').css('display', 'none');
             updateFuelManagerService.getJetTiers(id).then(function(tiers) {
                 $scope.vTypeJets[index].tierList = tiers;
                 $scope.showLoader = false;
             })
         }
         //$scope.trData = {};
         $scope.addNewTier = function(id, trData, index){
             $scope.showLoader = true;
             $scope.tr = {};
             $scope.tr[index] = {};
             $scope.tr[index].minTierBreak = trData[index].minTierBreak;
             $scope.tr[index].maxTierBreak = trData[index].maxTierBreak;
             $scope.tr[index].margin = trData[index].margin;
             $scope.tr[index].marginTotal = '1.00';
             $scope.tr[index].marginTemplateId = id;
             var tierData = 'minTierBreak='+$scope.tr[index].minTierBreak+'&maxTierBreak='+$scope.tr[index].maxTierBreak+'&margin='+$scope.tr[index].margin+
             '&marginTotal='+$scope.tr[index].marginTotal+'&marginTemplateId='+$scope.tr[index].marginTemplateId;
             updateFuelManagerService.addNewTier(tierData).then(function(result) {
                 toastr.success('Successfully Added', {
                   closeButton: true
                 })
                 trData[index].minTierBreak = '';
                 trData[index].maxTierBreak = '';
                 trData[index].margin = '';
                 updateFuelManagerService.getJetTiers(id).then(function(tiers) {
                   $scope.aTypeJets[index].tierList = tiers;
                   $scope.showLoader = false;
                 })
             })
         }
         $scope.addNewVtypeTier = function(id, vtrData, index){
             $scope.showLoader = true;
             $scope.tr = {};
             $scope.tr[index] = {};
             $scope.tr[index].minTierBreak = vtrData[index].minTierBreak;
             $scope.tr[index].maxTierBreak = vtrData[index].maxTierBreak;
             $scope.tr[index].margin = vtrData[index].margin;
             $scope.tr[index].marginTotal = '1.00';
             $scope.tr[index].marginTemplateId = id;
             var tierData = 'minTierBreak='+$scope.tr[index].minTierBreak+'&maxTierBreak='+$scope.tr[index].maxTierBreak+'&margin='+$scope.tr[index].margin+
             '&marginTotal='+$scope.tr[index].marginTotal+'&marginTemplateId='+$scope.tr[index].marginTemplateId;
             updateFuelManagerService.addNewTier(tierData).then(function(result) {
                 toastr.success('Successfully Added', {
                   closeButton: true
                 })
                 vtrData[index].minTierBreak = '';
                 vtrData[index].maxTierBreak = '';
                 vtrData[index].margin = '';
                 updateFuelManagerService.getJetTiers(id).then(function(tiers) {
                   $scope.vTypeJets[index].tierList = tiers;
                   $scope.showLoader = false;
                 })
             })
         }
         $scope.editTier = function(tier, index){
             $scope.showLoader = true;
             var editTierData = 'minTierBreak='+tier.minTierBreak+'&maxTierBreak='+tier.maxTierBreak+'&margin='+tier.margin+
             '&marginTotal='+tier.marginTotal+'&marginTemplateId='+tier.marginTemplate.id+'&marginId='+tier.id;
             updateFuelManagerService.editTier(editTierData).then(function(result) {
                 toastr.success('Successfully Updated', {
                   closeButton: true
                 })
                 updateFuelManagerService.getJetTiers(tier.marginTemplate.id).then(function(tiers) {
                   $scope.aTypeJets[index].tierList = tiers;
                   $scope.showLoader = false;
                 })
             })
         }
         $scope.editVtypeTier = function(tier, index){
             $scope.showLoader = true;
             var editTierData = 'minTierBreak='+tier.minTierBreak+'&maxTierBreak='+tier.maxTierBreak+'&margin='+tier.margin+
             '&marginTotal='+tier.marginTotal+'&marginTemplateId='+tier.marginTemplate.id+'&marginId='+tier.id;
             updateFuelManagerService.editTier(editTierData).then(function(result) {
                 toastr.success('Successfully Updated', {
                   closeButton: true
                 })
                 updateFuelManagerService.getJetTiers(tier.marginTemplate.id).then(function(tiers) {
                   $scope.vTypeJets[index].tierList = tiers;
                   $scope.showLoader = false;
                 })
             })
         }
         $scope.deleteTierObject = {};
         $scope.deleteTier = function(id, jetid, index){
             $scope.deleteTierObject.id = id;
             $scope.deleteTierObject.jetId = jetid;
             $scope.deleteTierObject.index = index;
             $('#deleteTierConfirm').css('display', 'block');
         }
         $scope.confirmDeleteTier = function(){
             $scope.showLoader = true;
             updateFuelManagerService.deleteTier($scope.deleteTierObject.id).then(function(result) {
                 toastr.success(''+result.success+'', {
                   closeButton: true
                 })
                 updateFuelManagerService.getJetTiers($scope.deleteTierObject.jetId).then(function(tiers) {
                   $scope.aTypeJets[$scope.deleteTierObject.index].tierList = tiers;
                   $scope.showLoader = false;
                   $scope.deleteTierObject = {};
                 })
             })
             $('#deleteTierConfirm').css('display', 'none');
         }
         $scope.cancelTierDelete = function(){
             console.log('cancel');
             $('#deleteTierConfirm').css('display', 'none');
             $scope.deleteTierObject = {};
         }
         /*$scope.deleteVtypeTier = function(id, jetid, index){
             $scope.showLoader = true;
             updateFuelManagerService.deleteTier(id).then(function(result) {
                 toastr.success(''+result.success+'', {
                   closeButton: true
                 })
                 updateFuelManagerService.getJetTiers(jetid).then(function(tiers) {
                   $scope.vTypeJets[index].tierList = tiers;
                   $scope.showLoader = false;
                 })
             })
         }*/
         $scope.deleteVtypeTierObject = {};
         $scope.deleteVtypeTier = function(id, jetid, index){
             $scope.deleteVtypeTierObject.id = id;
             $scope.deleteVtypeTierObject.jetId = jetid;
             $scope.deleteVtypeTierObject.index = index;
             $('#deleteVtypeTierConfirm').css('display', 'block');
         }
         $scope.confirmDeleteVtypeTier = function(){
             $scope.showLoader = true;
             updateFuelManagerService.deleteTier($scope.deleteVtypeTierObject.id).then(function(result) {
                 toastr.success(''+result.success+'', {
                   closeButton: true
                 })
                 updateFuelManagerService.getJetTiers($scope.deleteVtypeTierObject.jetId).then(function(tiers) {
                   $scope.vTypeJets[$scope.deleteVtypeTierObject.index].tierList = tiers;
                   $scope.showLoader = false;
                   $scope.deleteVtypeTierObject = {};
                 })
             })
             $('#deleteVtypeTierConfirm').css('display', 'none');
         }
         $scope.cancelVtypeTierDelete = function(){
             console.log('cancel');
             $('#deleteVtypeTierConfirm').css('display', 'none');
             $scope.deleteVtypeTierObject = {};
         }
         $scope.saveJetAccordian = function(jets){
             $scope.showLoader = true;
             $scope.jetsDetail = jets;
             $scope.jetsDetail.userProfileId = $scope.userProfileId;
             //console.log('jets', $scope.jetsDetail);
             $('.'+$scope.jetsDetail.id).slideUp();
             $('#'+$scope.jetsDetail.id).removeClass('customActive');
             $('#'+$scope.jetsDetail.id+' select, #'+$scope.jetsDetail.id+' input').prop("disabled", true);
             $('#'+$scope.jetsDetail.id+' .btn-success, #'+$scope.jetsDetail.id+' .btn-danger').css('display', 'none');
             $('#'+$scope.jetsDetail.id+' .btn-default').css('display', 'inline-block');
             var editJetData = 'productType='+$scope.jetsDetail.productType+'&marginName='+$scope.jetsDetail.marginName+'&pricingStructure='+$scope.jetsDetail.pricingStructure+'&marginValue='+$scope.jetsDetail.marginValue+'&userProfileId='+$scope.jetsDetail.userProfileId+'&marginId='+$scope.jetsDetail.id+'&message='+$scope.jetsDetail.message;
             updateFuelManagerService.editAtypeJetMargin(editJetData).then(function(result) {
                 console.log('newJet', editJetData);
                 toastr.success('Successfully Updated', {
                   closeButton: true
                 })
                 updateFuelManagerService.getATypeJets($scope.userProfileId).then(function(result) {
                   console.log('result', result);
                   $scope.aTypeJets = result;
                   $scope.showLoader = false;
                 })
             })
         }
+        $scope.closeAccordian = function(jets){
+            $('.'+jets.id).slideUp();
+            $('#'+jets.id).removeClass('customActive');
+            $('#'+jets.id+' select, #'+jets.id+' input').prop("disabled", true);
+            $('#'+jets.id+' .btn-success, #'+jets.id+' .btn-danger').css('display', 'none');
+            $('#'+jets.id+' .btn-default').css('display', 'inline-block');
+        }
+        $scope.closeAccordianVtype = function(jets){
+            $('.'+jets.id).slideUp();
+            $('#'+jets.id).removeClass('customActive');
+            $('#'+jets.id+' select, #'+jets.id+' input').prop("disabled", true);
+            $('#'+jets.id+' .btn-success, #'+jets.id+' .btn-danger').css('display', 'none');
+            $('#'+jets.id+' .btn-default').css('display', 'inline-block');
+        }
         $scope.saveVtypeJetAccordian = function(jets){
             $scope.showLoader = true;
             $scope.jetsDetail = jets;
             $scope.jetsDetail.userProfileId = $scope.userProfileId;
             //console.log('jets', $scope.jetsDetail);
             $('.'+$scope.jetsDetail.id).slideUp();
             $('#'+$scope.jetsDetail.id).removeClass('customActive');
             $('#'+$scope.jetsDetail.id+' select, #'+$scope.jetsDetail.id+' input').prop("disabled", true);
             $('#'+$scope.jetsDetail.id+' .btn-success, #'+$scope.jetsDetail.id+' .btn-danger').css('display', 'none');
             $('#'+$scope.jetsDetail.id+' .btn-default').css('display', 'inline-block');
             var editVtypeJetData = 'productType='+$scope.jetsDetail.productType+'&marginName='+$scope.jetsDetail.marginName+'&pricingStructure='+$scope.jetsDetail.pricingStructure+'&marginValue='+$scope.jetsDetail.marginValue+'&userProfileId='+$scope.jetsDetail.userProfileId+'&marginId='+$scope.jetsDetail.id+'&message='+$scope.jetsDetail.message;
             updateFuelManagerService.editVtypeJetMargin(editVtypeJetData).then(function(result) {
                 console.log('newJet', editVtypeJetData);
                 toastr.success('Successfully Updated', {
                   closeButton: true
                 })
                 updateFuelManagerService.getVTypeJets($scope.userProfileId).then(function(result) {
                   $scope.vTypeJets = result;
                   console.log('second jets', result);
                   $scope.showLoader = false;
                 })
             })
         }
         $scope.newJet = {};
         $scope.addNewMarginBtn = function(){
             $('.addNewMargin').css('display', 'block');
         }
         $scope.closeMarginPopup = function(){
             $('.addNewMargin').css('display', 'none');
             $scope.newJet = {};
         }
         //$scope.newJet.productType = '';
         $scope.addNewATypeJet = function(){
             $scope.showLoader = true;
             $scope.newJet.productType = 'JET-A';
             $scope.newJet.userProfileId = $scope.userProfileId;
             var jetData = 'productType='+$scope.newJet.productType+'&marginName='+$scope.newJet.marginName+'&pricingStructure='+$scope.newJet.pricingStructure+'&marginValue='+$scope.newJet.marginValue+'&userProfileId='+$scope.newJet.userProfileId+'&message='+$scope.newJet.message;
             updateFuelManagerService.addNewAtypeJetMargin(jetData).then(function(result) {
                 console.log('newJet', jetData);
                 toastr.success('Successfully Added', {
                   closeButton: true
                 })
                 $('.addNewMargin').css('display', 'none');
                 updateFuelManagerService.getATypeJets($scope.userProfileId).then(function(result) {
                   console.log('result', result);
                   $scope.aTypeJets = result;
                   $scope.showLoader = false;
                 })
             })
         }
         $scope.newVtypeJet = {};
         $scope.addNewVtypePop = function(){
             $('.addNewVtype').css('display', 'block');
         }
         $scope.closeNewVtypePop = function(){
             $('.addNewVtype').css('display', 'none');
             $scope.newVtypeJet = {};
         }
         $scope.addNewVTypeJet = function(){
             $scope.showLoader = true;
             $scope.newVtypeJet.productType = 'AVGAS';
             $scope.newVtypeJet.userProfileId = $scope.userProfileId;
             var vJetData = 'productType='+$scope.newVtypeJet.productType+'&marginName='+$scope.newVtypeJet.marginName+'&pricingStructure='+$scope.newVtypeJet.pricingStructure+'&marginValue='+$scope.newVtypeJet.marginValue+'&userProfileId='+$scope.newVtypeJet.userProfileId+'&message='+$scope.newVtypeJet.message;
             updateFuelManagerService.addNewVtypeJet(vJetData).then(function(result) {
                 toastr.success('Successfully Added', {
                   closeButton: true
                 })
                 $('.addNewVtype').css('display', 'none');
                 updateFuelManagerService.getVTypeJets($scope.userProfileId).then(function(result) {
                   $scope.vTypeJets = result;
                   $scope.showLoader = false;
                 })
             })
         }
         $scope.sendEmail = {};
         $scope.confirmMail = function(){
             if ($scope.sendEmail.pricing != '' && $scope.sendEmail.pricing != null && $scope.sendEmail.pricing != undefined) {
                 $('#confirm1').css('display', 'block');
             }
         }
         $scope.saveAndCloseConfirm = function(){
             $('#confirm1').css('display', 'none');
             updateFuelManagerService.sendMailToMargin($scope.sendEmail.pricing).then(function(result) {
                 toastr.success(''+result.success+'', {
                   closeButton: true
                 })
             })
         }
         $scope.cancelAndCloseConfirm = function(){
             $scope.sendEmail = {};
             $scope.sendEmail.pricing = '';
             $('#confirm1').css('display', 'none');
         }
         $scope.newFuelPricing = {};
         updateFuelManagerService.getFuelPricingNew().then(function(result) {
             $scope.newFuelPricing = result;
               for (var i = 0; i<$scope.newFuelPricing.length; i++) {
                 if ($scope.newFuelPricing[i].fuelPricing != null) {
                     if ($scope.newFuelPricing[i].fuelPricing.expirationDate != null && $scope.newFuelPricing[i].fuelPricing.expirationDate != '') {
                         var newTime = new Date($scope.newFuelPricing[i].fuelPricing.expirationDate);
                         var month = newTime.getUTCMonth() + 1; //months from 1-12
                         var day = newTime.getUTCDate();
                         var year = newTime.getUTCFullYear();
                         $scope.newFuelPricing[i].fuelPricing.expirationDate = month+'/'+day+'/'+year;
                     }
                 }
                 if ($scope.newFuelPricing[i].futureFuelPricing != null) {
                     if ($scope.newFuelPricing[i].futureFuelPricing != null) {
                         if ($scope.newFuelPricing[i].futureFuelPricing.nextExpiration != null && $scope.newFuelPricing[i].futureFuelPricing.nextExpiration != '') {
                             var newTime = new Date($scope.newFuelPricing[i].futureFuelPricing.nextExpiration);
                             var nextMonth = newTime.getUTCMonth() + 1; //months from 1-12
                             var nextDay = newTime.getUTCDate();
                             var nextYear = newTime.getUTCFullYear();
                             $scope.newFuelPricing[i].futureFuelPricing.nextExpiration = nextMonth+'/'+nextDay+'/'+nextYear;
                         }
                     }
                     if ($scope.newFuelPricing[i].futureFuelPricing != null) {
                         if ($scope.newFuelPricing[i].futureFuelPricing.deployDate != null && $scope.newFuelPricing[i].futureFuelPricing.deployDate != '') {
                             var newTime = new Date($scope.newFuelPricing[i].futureFuelPricing.deployDate);
                             var dmonth = newTime.getUTCMonth() + 1; //months from 1-12
                             var dday = newTime.getUTCDate();
                             var dyear = newTime.getUTCFullYear();
                             $scope.newFuelPricing[i].futureFuelPricing.deployDate = dmonth+'/'+dday+'/'+dyear;
                         }
                     }
                 }
               }
               $scope.showLoader = false;
         })
         $scope.$watch("fuelPricing.fuelPricing.expirationDate",function(old,newv){
         });
         $scope.updateFuelPricing = {};
         $scope.updateFuelPricing.fuelPricingList = [];
         $scope.updateFuelPricing.userProfileId = $scope.userProfileId;
         $scope.updateFuelPricingClick = function(){
             $scope.showLoader = true;
             for (var i = 0; i<$scope.newFuelPricing.length; i++) {
                 if ($scope.newFuelPricing[i].fuelPricing != null) {
                     $scope.newFuelPricing[i].fuelPricing.papTotal = parseFloat($scope.newFuelPricing[i].fuelPricing.cost) + parseFloat($scope.newFuelPricing[i].fuelPricing.papMargin);
                     if ($scope.newFuelPricing[i].fuelPricing.cost == null) {
                         $scope.newFuelPricing[i].fuelPricing.cost = '';
                     }
                     if ($scope.newFuelPricing[i].fuelPricing.papMargin == null) {
                         $scope.newFuelPricing[i].fuelPricing.papMargin = '';
                     }
                     if ($scope.newFuelPricing[i].fuelPricing.papTotal == null) {
                         $scope.newFuelPricing[i].fuelPricing.papTotal = '';
                     }
                     if ($scope.newFuelPricing[i].fuelPricing.expirationDate == null) {
                         $scope.newFuelPricing[i].fuelPricing.expirationDate = '';
                     }else{
                         $scope.newFuelPricing[i].fuelPricing.expirationDate = new Date($scope.newFuelPricing[i].fuelPricing.expirationDate);
                         console.log('$scope.newFuelPricing[i].fuelPricing.expirationDate', $scope.newFuelPricing[i].fuelPricing.expirationDate);
                         $scope.newFuelPricing[i].fuelPricing.expirationDate = $scope.newFuelPricing[i].fuelPricing.expirationDate.getTime();
                     }
                     $scope.newFuelPricing[i].fuelPricing.papTotal = parseFloat($scope.newFuelPricing[i].fuelPricing.cost) + parseFloat($scope.newFuelPricing[i].fuelPricing.papMargin);
                     $scope.updateFuelPricing.fuelPricingList.push({
                         'cost': $scope.newFuelPricing[i].fuelPricing.cost,
                         'papMargin': $scope.newFuelPricing[i].fuelPricing.papMargin,
                         'papTotal': $scope.newFuelPricing[i].fuelPricing.papTotal,
                         'expirationDate': $scope.newFuelPricing[i].fuelPricing.expirationDate,
                         'productId': $scope.newFuelPricing[i].id,
                         'id': $scope.newFuelPricing[i].fuelPricing.id,
                     })
                 }else{
                     /*$scope.newFuelPricing[i].fuelPricing.cost = '';
                     $scope.newFuelPricing[i].fuelPricing.papMargin = '';
                     $scope.newFuelPricing[i].fuelPricing.papTotal = '';
                     $scope.newFuelPricing[i].fuelPricing.expirationDate = '';*/
                 }
             }
             updateFuelManagerService.updateFuelPricing($scope.updateFuelPricing).then(function(result) {
                 toastr.success('Successfully Updated', {
                   closeButton: true
                 })
                 updateFuelManagerService.getFuelPricingNew().then(function(result) {
                     $scope.newFuelPricing = result;
                       for (var i = 0; i<$scope.newFuelPricing.length; i++) {
                         if ($scope.newFuelPricing[i].fuelPricing != null) {
                             if ($scope.newFuelPricing[i].fuelPricing.expirationDate != null && $scope.newFuelPricing[i].fuelPricing.expirationDate != '') {
                                 var newTime = new Date($scope.newFuelPricing[i].fuelPricing.expirationDate);
                                 var month = newTime.getUTCMonth() + 1; //months from 1-12
                                 var day = newTime.getUTCDate();
                                 var year = newTime.getUTCFullYear();
                                 $scope.newFuelPricing[i].fuelPricing.expirationDate = month+'/'+day+'/'+year;
                             }
                         }
                         if ($scope.newFuelPricing[i].futureFuelPricing != null) {
                             if ($scope.newFuelPricing[i].futureFuelPricing != null) {
                                 if ($scope.newFuelPricing[i].futureFuelPricing.nextExpiration != null && $scope.newFuelPricing[i].futureFuelPricing.nextExpiration != '') {
                                     var newTime = new Date($scope.newFuelPricing[i].futureFuelPricing.nextExpiration);
                                     var nextMonth = newTime.getUTCMonth() + 1; //months from 1-12
                                     var nextDay = newTime.getUTCDate();
                                     var nextYear = newTime.getUTCFullYear();
                                     $scope.newFuelPricing[i].futureFuelPricing.nextExpiration = nextMonth+'/'+nextDay+'/'+nextYear;
                                 }
                             }
                             if ($scope.newFuelPricing[i].futureFuelPricing != null) {
                                 if ($scope.newFuelPricing[i].futureFuelPricing.deployDate != null && $scope.newFuelPricing[i].futureFuelPricing.deployDate != '') {
                                     var newTime = new Date($scope.newFuelPricing[i].futureFuelPricing.deployDate);
                                     var dmonth = newTime.getUTCMonth() + 1; //months from 1-12
                                     var dday = newTime.getUTCDate();
                                     var dyear = newTime.getUTCFullYear();
                                     $scope.newFuelPricing[i].futureFuelPricing.deployDate = dmonth+'/'+dday+'/'+dyear;
                                 }
                             }
                         }
                       }
                       $scope.showLoader = false;
                 })
             })
         }
         $scope.updateFutureFuelPricing = {};
         $scope.updateFutureFuelPricing.futureFuelPricingList = [];
         $scope.updateFutureFuelPricing.userProfileId = $scope.userProfileId;
         $scope.updateFutureFuelPricingClick = function(){
             $scope.showLoader = true;
             for (var i = 0; i<$scope.newFuelPricing.length; i++) {
                 //console.log(parseFloat($scope.newFuelPricing[i].futureFuelPricing.cost) + parseFloat($scope.newFuelPricing[i].fuelPricing.papMargin));
                 if ($scope.newFuelPricing[i].futureFuelPricing != null) {
                     if ($scope.newFuelPricing[i].futureFuelPricing.cost != null || $scope.newFuelPricing[i].futureFuelPricing.cost != '' || $scope.newFuelPricing[i].futureFuelPricing.cost != undefined) {
                         $scope.newFuelPricing[i].futureFuelPricing.papTotal = parseFloat($scope.newFuelPricing[i].futureFuelPricing.cost) + parseFloat($scope.newFuelPricing[i].fuelPricing.papMargin);
                         if ($scope.newFuelPricing[i].futureFuelPricing.cost == null) {
                             $scope.newFuelPricing[i].futureFuelPricing.cost = '';
                         }
                         if ($scope.newFuelPricing[i].futureFuelPricing.papMargin == null) {
                             $scope.newFuelPricing[i].futureFuelPricing.papMargin = '';
                         }
                         if ($scope.newFuelPricing[i].futureFuelPricing.papTotal == null) {
                             $scope.newFuelPricing[i].futureFuelPricing.papTotal = '';
                         }
                         if ($scope.newFuelPricing[i].futureFuelPricing.nextExpiration == null) {
                             $scope.newFuelPricing[i].futureFuelPricing.nextExpiration = '';
                         }else{
                             $scope.newFuelPricing[i].futureFuelPricing.nextExpiration = new Date($scope.newFuelPricing[i].futureFuelPricing.nextExpiration);
                             console.log('$scope.newFuelPricing[i].futureFuelPricing.nextExpiration', $scope.newFuelPricing[i].futureFuelPricing.nextExpiration);
                             $scope.newFuelPricing[i].futureFuelPricing.nextExpiration = $scope.newFuelPricing[i].futureFuelPricing.nextExpiration.getTime();
                         }
                         if ($scope.newFuelPricing[i].futureFuelPricing.deployDate == null) {
                             $scope.newFuelPricing[i].futureFuelPricing.deployDate = '';
                         }else{
                             $scope.newFuelPricing[i].futureFuelPricing.deployDate = new Date($scope.newFuelPricing[i].futureFuelPricing.deployDate);
                             $scope.newFuelPricing[i].futureFuelPricing.deployDate = $scope.newFuelPricing[i].futureFuelPricing.deployDate.getTime();
                         }
                         $scope.newFuelPricing[i].futureFuelPricing.papTotal = parseFloat($scope.newFuelPricing[i].futureFuelPricing.cost) + parseFloat($scope.newFuelPricing[i].fuelPricing.papMargin);
                         $scope.updateFutureFuelPricing.futureFuelPricingList.push({
                             'cost': $scope.newFuelPricing[i].futureFuelPricing.cost,
                             'papMargin': $scope.newFuelPricing[i].fuelPricing.papMargin,
                             //'papTotal': $scope.newFuelPricing[i].futureFuelPricing.papTotal,
                             'papTotal': $scope.newFuelPricing[i].futureFuelPricing.papTotal,
                             'expirationDate': $scope.newFuelPricing[i].futureFuelPricing.nextExpiration,
                             'deployDate': $scope.newFuelPricing[i].futureFuelPricing.deployDate,
                             'productId': $scope.newFuelPricing[i].id,
                             'id': $scope.newFuelPricing[i].futureFuelPricing.id,
                         })
                     }
                 }else{
                     /*$scope.newFuelPricing[i].futureFuelPricing.cost = '';
                     $scope.newFuelPricing[i].futureFuelPricing.papMargin = '';
                     $scope.newFuelPricing[i].futureFuelPricing.papTotal = '';
                     $scope.newFuelPricing[i].futureFuelPricing.expirationDate = '';
                     $scope.newFuelPricing[i].futureFuelPricing.deployDate = '';*/
                 }
             }
             updateFuelManagerService.updateFutureFuelPricing($scope.updateFutureFuelPricing).then(function(result) {
                 toastr.success('Successfully Updated', {
                   closeButton: true
                 })
                 updateFuelManagerService.getFuelPricingNew().then(function(result) {
                     $scope.newFuelPricing = result;
                       for (var i = 0; i<$scope.newFuelPricing.length; i++) {
                         if ($scope.newFuelPricing[i].fuelPricing != null) {
                             if ($scope.newFuelPricing[i].fuelPricing.expirationDate != null && $scope.newFuelPricing[i].fuelPricing.expirationDate != '') {
                                 var newTime = new Date($scope.newFuelPricing[i].fuelPricing.expirationDate);
                                 var month = newTime.getUTCMonth() + 1; //months from 1-12
                                 var day = newTime.getUTCDate();
                                 var year = newTime.getUTCFullYear();
                                 $scope.newFuelPricing[i].fuelPricing.expirationDate = month+'/'+day+'/'+year;
                             }
                         }
                         if ($scope.newFuelPricing[i].futureFuelPricing != null) {
                             if ($scope.newFuelPricing[i].futureFuelPricing != null) {
                                 if ($scope.newFuelPricing[i].futureFuelPricing.nextExpiration != null && $scope.newFuelPricing[i].futureFuelPricing.nextExpiration != '') {
                                     var newTime = new Date($scope.newFuelPricing[i].futureFuelPricing.nextExpiration);
                                     var nextMonth = newTime.getUTCMonth() + 1; //months from 1-12
                                     var nextDay = newTime.getUTCDate();
                                     var nextYear = newTime.getUTCFullYear();
                                     $scope.newFuelPricing[i].futureFuelPricing.nextExpiration = nextMonth+'/'+nextDay+'/'+nextYear;
                                 }
                             }
                             if ($scope.newFuelPricing[i].futureFuelPricing != null) {
                                 if ($scope.newFuelPricing[i].futureFuelPricing.deployDate != null && $scope.newFuelPricing[i].futureFuelPricing.deployDate != '') {
                                     var newTime = new Date($scope.newFuelPricing[i].futureFuelPricing.deployDate);
                                     var dmonth = newTime.getUTCMonth() + 1; //months from 1-12
                                     var dday = newTime.getUTCDate();
                                     var dyear = newTime.getUTCFullYear();
                                     $scope.newFuelPricing[i].futureFuelPricing.deployDate = dmonth+'/'+dday+'/'+dyear;
                                 }
                             }
                       }
                   }
                       $scope.showLoader = false;
                 })
             })
         }
         updateFuelManagerService.getMargin().then(function(result) {
           $scope.marginList = result;
         })
         $scope.marginIdDelete = '';
         $scope.deleteJetAccordian = function(id){
             $scope.marginIdDelete = id;
             $('#deleteMargin').css('display', 'block');
         }
         $scope.confirmDeleteMargin = function(){
             $('#deleteMargin').css('display', 'none');
             $scope.showLoader = true;
             updateFuelManagerService.deleteMargin($scope.marginIdDelete).then(function(result) {
                 toastr.success(''+result.success+'', {
                   closeButton: true
                 })
                 updateFuelManagerService.getATypeJets($scope.userProfileId).then(function(result) {
                   $scope.aTypeJets = result;
                   $scope.showLoader = false;
                 })
             })
         }
         $scope.cancelMarginDelete = function(){
             $scope.marginIdDelete = '';
             $('#deleteMargin').css('display', 'none');
         }
         $scope.marginVtypeIdDelete = '';
         $scope.deleteVtypeJetAccordian = function(id){
             $scope.marginVtypeIdDelete = id;
             $('#deleteVtypeMargin').css('display', 'block');
         }
         $scope.confirmDeletVtypeMargin = function(){
             $('#deleteVtypeMargin').css('display', 'none');
             $scope.showLoader = true;
             updateFuelManagerService.deleteMargin($scope.marginVtypeIdDelete).then(function(result) {
                 toastr.success(''+result.success+'', {
                   closeButton: true
                 })
                 updateFuelManagerService.getVTypeJets($scope.userProfileId).then(function(result) {
                   $scope.vTypeJets = result;
                   $scope.showLoader = false;
                 })
             })
         }
         $scope.cancelVtypeMarginDelete = function(){
             $scope.marginVtypeIdDelete = '';
             $('#deleteVtypeMargin').css('display', 'none');
         }
     }]);

app/partials/updateFuelManager/updateFuelManager.html

Diff comments View file @e95d89b

 <style>
    .subnavbar .mainnav > li:nth-child(2) > a{
    color: #ff9900;
    }
 </style>
 <div class="myLoader" ng-show="showLoader">
   <img src="../img/hourglass.gif" width="50px;">
 </div>
 <div class="container">
    <div class="row">
       <div class="col-md-5">
          <div class="widget stacked">
             <div class="widget-header">
                <i class="fa fa-pencil"></i>
                <h3>Price Manager</h3>
                <select style="float: right; margin: 7px 10px; width: 150px; height: 26px; padding: 0 0;" class="form-control" ng-model="sendEmail.pricing" ng-change="confirmMail()">
                   <option value="" disabled selected="selected">Send Pricing Email</option>
                   <option ng-repeat="margins in marginList" value="{{margins.id}}">{{margins.marginName}}</option>
                   <option disabled>_______________</option>
                   <option value="all">Distribute All</option>
                </select>
             </div>
             <!-- /widget-header -->
             <div class="widget-content">
                <h4>Update Fuel Price Here</h4>
                <table class="table">
                   <thead>
                      <tr>
                         <th> Product</th>
                         <th> Cost</th>
                         <th> Margin</th>
                         <th> PAP(Total)</th>
                         <th style="color: #F90;"> Expires</th>
                      </tr>
                   </thead>
                   <tbody>
                      <tr ng-repeat="fuelPricing in newFuelPricing">
                         <td>
                            <span>{{fuelPricing.name}}</span>
                         </td>
                         <td>
                            <input type="text" class="form-control" ng-model="fuelPricing.fuelPricing.cost" style="height:31px; width: 50px; padding: 6px 6px">
                         </td>
                         <td>
                            <input type="text" class="form-control" ng-model="fuelPricing.fuelPricing.papMargin" style="height:31px; width: 50px; padding: 6px 6px;">
                         </td>
                         <td>
                            <span style="line-height: 31px; color: #1ab394;">$ {{fuelPricing.fuelPricing.cost -- fuelPricing.fuelPricing.papMargin  | number : 2 }}</span>
                         </td>
                         <td>
                            <input type="text" class="form-control" datepicker ng-model="fuelPricing.fuelPricing.expirationDate" style="height:31px; width: 100px; padding: 6px 6px;">
                         </td>
                      </tr>
                   </tbody>
                </table>
                <div class="row" style="margin-left: 0px;">
                   <div class="col-md-12" style= "text-align: right;">
                      <button type="button" class="btn btn-success btn-xs" ng-click="updateFuelPricingClick()">Save</button>
                   </div>
                </div>
             </div>
             <!-- /widget-content -->
          </div>
          <!-- /widget -->
       </div>
       <div class="col-md-7">
          <div class="widget stacked">
             <div class="widget-header">
                <i class="fa fa-pencil"></i>
                <h3><b>JET-A</b> Customer Margin Template</h3>
                <div class="pull-right">
                   <button type="submit" class="btn btn-success btn-sm" ng-click="addNewMarginBtn()" style="margin-top: 4px; margin-right: 10px;"><i class="fa fa-plus" aria-hidden="true"></i> Add New Margin</button>
                </div>
             </div>
             <!-- /widget-header -->
             <div class="widget-content" style="padding-top: 10px;">
                <section id="accordions">
                   <div class="newCustomAccordian">
                      <!-- tab 1 -->
                      <div ng-repeat="jets in aTypeJets">
                         <div class="customAccordianHeader" id="{{jets.id}}">
                            <span>{{jets.marginName}}</span>
                            <select class="form-control" disabled="true" ng-model="jets.pricingStructure">
                               <option value="" disabled selected>Pricing Structure</option>
                               <option value="minus">Retail-(minus)</option>
                               <option value="plus">Cost+(plus)</option>
                               <option value="equal">Direct=(equal)</option>
                            </select>
                            <span style="margin-right: 0;">$</span>
                            <input type="text" disabled="true" class="form-control" ng-model="jets.marginValue">
                            <div class="pull-right">
+                              <button class="btn btn-success" style="display: none; background-image: none; background-color: #f3f3f3; color: #333; border:0;" ng-click="closeAccordian(jets)">Close</button>
                               <button class="btn btn-success" style="display: none;" ng-click="saveJetAccordian(jets)">Save</button>
                               <button class="btn btn-danger" style="display: none;" ng-click="deleteJetAccordian(jets.id)">Delete</button>
                               <button class="btn btn-default" ng-click="toggleJestAccordian(jets.id, $index)">Edit</button>
                            </div>
                            <div class="clearfix"></div>
                         </div>
                         <div class="customAccordianTabBody {{jets.id}}" style="display: none;">
                            <div class="tierListWrap" ng-repeat="tier in aTypeJets[$index].tierList">
                               <div class="tierListHead" style="height: 36px;">
                                  <span class="pull-left tierHeadingSpan" ng-hide="showEditTier">{{tier.minTierBreak}}-{{tier.maxTierBreak}} gal.
                                  </span>
                                  <i class="fa fa-pencil-square-o pull-right" ng-click="showEditTier = ! showEditTier" ng-hide="showEditTier" style="margin-top: 5px; cursor: pointer;" aria-hidden="true"></i>
                                  <input type="text" placeholder="min" style="width: 36px;" ng-model="tier.minTierBreak" ng-show="showEditTier">
                                  <span ng-show="showEditTier">-</span>
                                  <input type="text" placeholder="max" style="width: 36px;" ng-model="tier.maxTierBreak" ng-show="showEditTier"> <b ng-show="showEditTier">gal.</b>
                                  <div class="clearfix"></div>
                               </div>
                               <div class="tierListBody" style="height: 35px;">
                                  <span class="pull-left minTierSpan" ng-hide="showEditTier">-${{tier.margin}}</span>
                                  <input type="text" placeholder="max" style="width: 36px;" ng-model="tier.margin" ng-show="showEditTier"> &nbsp;
                                  <span class="pull-right maxTierSpan" ng-hide="showEditTier">(${{tier.marginTotal | number : 2}})</span>
                                  <button class="addTierBtn" ng-click="editTier(tier, $parent.$index)" ng-show="showEditTier">Save</button>
                                  <i class="fa fa-trash-o deleteTierIcon" ng-click="deleteTier(tier.id, jets.id, $parent.$index)" aria-hidden="true" ng-show="showEditTier"></i>
                                  <div class="clearfix"></div>
                               </div>
                            </div>
                            <div class="tierListWrap" style="width: 160px;">
                               <div class="tierListHead" style="border-right: 1px solid #ddd;">
                                  <input type="text" placeholder="min" ng-model="trData[$index].minTierBreak">
                                  <span>-</span>
                                  <input type="text" placeholder="max" ng-model="trData[$index].maxTierBreak"> <b>gal.</b>
                                  <div class="clearfix"></div>
                               </div>
                               <div class="tierListBody" style="border-right: 1px solid #ddd;">
                                  <span style="color: #449d44;">$</span>
                                  <input type="text" placeholder="margin" ng-model="trData[$index].margin" class="tierTextBox" style="width: 70px; height: 24px;">
                                  <button class="addTierBtn" ng-click="addNewTier(jets.id, trData, $index)">Add Tier</button>
                                  <div class="clearfix"></div>
                               </div>
                            </div>
                            <!-- <div class="tierListWrap" style="width: 32px;">
                               <div class="tierListHead" style="height: 36px; border-right: 1px solid #ddd;">
                                  &nbsp;
                               </div>
                               <div class="tierListBody" style="height: 35px; border-right: 1px solid #ddd;">
                                  <i class="fa fa-trash-o deleteTierIcon" aria-hidden="true"></i>
                               </div>
                            </div> -->
                            <div class="clearfix"></div>
-                           <textarea class="form-control resizeTextarea" ng-model="jets.message" placeholder="Message..."></textarea>
+                           <!-- <textarea class="form-control resizeTextarea" ng-model="jets.message" placeholder="Message..."></textarea> -->
+                           <br/>
+                           <div ckeditor="options" ng-model="jets.message" ready="onReady()"></div>
                         </div>
                      </div>
                   </div>
                </section>
                <!-- <div class="row">&nbsp;</div>
                <div class="row">
                   <div class="form-group">
                      <div class="col-lg-12 text-right">
                         <button type="submit" class="btn btn-success"><i class="icon-ok"></i> Save Form</button>&nbsp;&nbsp;
                         <button type="reset" class="btn btn-default">Cancel</button>
                      </div>
                   </div>
                </div> -->
             </div>
             <!-- /widget-content -->
          </div>
          <!-- /widget -->
       </div>
       <!-- /span6 -->
    </div>
    <!-- /span12 -->
 </div>
 <!-- /row -->
 <div class="container">
 <div class="row">
    <div class="col-md-5">
          <div class="widget stacked">
             <div class="widget-header">
                <i class="fa fa-pencil"></i>
                <h3>Queue Future Pricing</h3>
             </div>
             <!-- /widget-header -->
             <div class="widget-content">
                <h4>Update Queue Future Fuel Pricing Here</h4>
                <table class="table">
                   <thead>
                      <tr>
                         <th> Product</th>
                         <th> Cost</th>
                         <th> PAP(Total)</th>
                         <th> Deploy</th>
                         <th style="color: #F90;"> Next Expiration</th>
                      </tr>
                   </thead>
                   <tbody>
                      <tr ng-repeat="fuelPricing in newFuelPricing">
                         <td>
                            <span>{{fuelPricing.name}}</span>
                         </td>
                         <td>
                            <input type="text" class="form-control" ng-model="fuelPricing.futureFuelPricing.cost" style="height:31px; width: 50px; padding: 6px 6px;">
                         </td>
                         <td>
                            <span style="line-height: 31px; color: #1ab394;">$ {{fuelPricing.futureFuelPricing.cost -- fuelPricing.fuelPricing.papMargin  | number : 2}}</span>
                         </td>
                         <td>
                            <input type="text" class="form-control" ng-disabled="fuelPricing.futureFuelPricing.cost == undefined || fuelPricing.futureFuelPricing.cost == null || fuelPricing.futureFuelPricing.cost == ''" datepicker ng-model="fuelPricing.futureFuelPricing.deployDate" style="height:31px; width: 100px; padding: 6px 6px;">
                         </td>
                         <td>
                            <input type="text" class="form-control" datepicker  ng-disabled="fuelPricing.futureFuelPricing.cost == undefined || fuelPricing.futureFuelPricing.cost == null || fuelPricing.futureFuelPricing.cost == ''" ng-model="fuelPricing.futureFuelPricing.nextExpiration" style="height:31px; width: 100px; padding: 6px 6px;">
                         </td>
                      </tr>
                   </tbody>
                </table>
                <div class="row" style="margin-left: 0px;">
                   <div class="col-md-12" style= "text-align: right;">
                      <button type="button" class="btn btn-success btn-xs" ng-click="updateFutureFuelPricingClick()">Save</button>
                   </div>
                </div>
             </div>
             <!-- /widget-content -->
          </div>
          <!-- /widget -->
    </div>
    <div class="col-md-7">
          <div class="widget stacked">
             <div class="widget-header">
                <i class="fa fa-pencil"></i>
                <h3><b style="color: 39c;">AVGAS 100LL </b> <i>Customer Margin Template</i></h3>
                <div class="pull-right">
                   <button type="submit" class="btn btn-success btn-sm" ng-click="addNewVtypePop()" style="margin-top: 4px; margin-right: 10px;"><i class="fa fa-plus" aria-hidden="true"></i> Add New Margin</button>
                </div>
             </div>
             <!-- /widget-header -->
             <div class="widget-content" style="padding-top: 10px;">
                <section id="accordions">
                   <div class="newCustomAccordian">
                      <!-- tab 1 -->
                      <div ng-repeat="jets in vTypeJets">
                         <div class="customAccordianHeader" id="{{jets.id}}">
                            <span>{{jets.marginName}}</span>
                            <select class="form-control" disabled="true" ng-model="jets.pricingStructure">
                               <option value="" disabled selected>Pricing Structure</option>
                               <option value="minus">Retail-(minus)</option>
                               <option value="plus">Cost+(plus)</option>
                               <option value="equal">Direct=(equal)</option>
                            </select>
                            <span style="margin-right: 0;">$</span>
                            <input type="text" disabled="true" class="form-control" ng-model="jets.marginValue">
                            <div class="pull-right">
+                              <button class="btn btn-success" style="display: none; background-image: none; background-color: #f3f3f3; color: #333; border:0;" ng-click="closeAccordianVtype(jets)">Close</button>
                               <button class="btn btn-success" style="display: none;" ng-click="saveVtypeJetAccordian(jets)">Save</button>
                               <button class="btn btn-danger" style="display: none;" ng-click="deleteVtypeJetAccordian(jets.id)">Delete</button>
                               <button class="btn btn-default" ng-click="toggleVtypeJestAccordian(jets.id, $index)">Edit</button>
                            </div>
                            <div class="clearfix"></div>
                         </div>
                         <div class="customAccordianTabBody {{jets.id}}" style="display: none;">
                            <div class="tierListWrap" ng-repeat="tier in vTypeJets[$index].tierList">
                               <div class="tierListHead" style="height: 36px;">
                                  <span class="pull-left tierHeadingSpan" ng-hide="showEditTier">{{tier.minTierBreak}}-{{tier.maxTierBreak}} gal.
                                  </span>
                                  <i class="fa fa-pencil-square-o pull-right" ng-click="showEditTier = ! showEditTier" ng-hide="showEditTier" style="margin-top: 5px; cursor: pointer;" aria-hidden="true"></i>
                                  <input type="text" placeholder="min" style="width: 36px;" ng-model="tier.minTierBreak" ng-show="showEditTier">
                                  <span ng-show="showEditTier">-</span>
                                  <input type="text" placeholder="max" style="width: 36px;" ng-model="tier.maxTierBreak" ng-show="showEditTier"> <b ng-show="showEditTier">gal.</b>
                                  <div class="clearfix"></div>
                               </div>
                               <div class="tierListBody" style="height: 35px;">
                                  <span class="pull-left minTierSpan" ng-hide="showEditTier">-${{tier.margin}}</span>
                                  <input type="text" placeholder="max" style="width: 36px;" ng-model="tier.margin" ng-show="showEditTier"> &nbsp;
                                  <span class="pull-right maxTierSpan" ng-hide="showEditTier">(${{tier.marginTotal | number : 2}})</span>
                                  <button class="addTierBtn" ng-click="editVtypeTier(tier, $parent.$index)" ng-show="showEditTier">Save</button>
                                  <i class="fa fa-trash-o deleteTierIcon" ng-click="deleteVtypeTier(tier.id, jets.id, $parent.$index)" aria-hidden="true" ng-show="showEditTier"></i>
                                  <div class="clearfix"></div>
                               </div>
                            </div>
                            <div class="tierListWrap" style="width: 160px;">
                               <div class="tierListHead" style="border-right: 1px solid #ddd;">
                                  <input type="text" placeholder="min" ng-model="vtrData[$index].minTierBreak">
                                  <span>-</span>
                                  <input type="text" placeholder="max" ng-model="vtrData[$index].maxTierBreak"> <b>gal.</b>
                                  <div class="clearfix"></div>
                               </div>
                               <div class="tierListBody" style="border-right: 1px solid #ddd;">
                                  <span style="color: #449d44;">$</span>
                                  <input type="text" placeholder="margin" ng-model="vtrData[$index].margin" class="tierTextBox" style="width: 70px; height: 24px;">
                                  <button class="addTierBtn" ng-click="addNewVtypeTier(jets.id, vtrData, $index)">Add Tier</button>
                                  <div class="clearfix"></div>
                               </div>
                            </div>
                            <!-- <div class="tierListWrap" style="width: 32px;">
                               <div class="tierListHead" style="height: 36px; border-right: 1px solid #ddd;">
                                  &nbsp;
                               </div>
                               <div class="tierListBody" style="height: 35px; border-right: 1px solid #ddd;">
                                  <i class="fa fa-trash-o deleteTierIcon" aria-hidden="true"></i>
                               </div>
                            </div> -->
                            <div class="clearfix"></div>
-                           <textarea class="form-control resizeTextarea" ng-model="jets.message" placeholder="Message..."></textarea>
+                           <br/>
+                           <div ckeditor="options" ng-model="jets.message" ready="onReady()"></div>
                         </div>
                      </div>
                   </div>
                </section>
                <!-- <div class="row">&nbsp;</div>
                <div class="row">
                   <div class="form-group">
                      <div class="col-lg-12 text-right">
                         <button type="submit" class="btn btn-success"><i class="icon-ok"></i> Save Form</button>&nbsp;&nbsp;
                         <button type="reset" class="btn btn-default">Cancel</button>
                      </div>
                   </div>
                </div> -->
             </div>
             <!-- /widget-content -->
          </div>
          <!-- /widget -->
    </div>
       <!-- /span6 -->
 </div>
 </div>
 </div>
 </div> <!-- /container -->
 <div class="addNewMargin" style="display: none;">
    <div class="customBackdrop">
       <div class="customModalInner" style="max-width: 700px;">
          <div class="customModelHead">
             <p class="pull-left">
                <i class="fa fa-list-alt" aria-hidden="true"></i>
                Add New JET-A Customer Margin
             </p>
             <p class="pull-right">
                <i class="fa fa-times" aria-hidden="true" style="cursor: pointer;" ng-click="closeMarginPopup()"></i>
             </p>
             <div class="clearfix"></div>
          </div>
          <div class="customModelBody">
             <div class="customAccordianHeader customActive">
                <input type="text" class="form-control" style="width: 120px; margin-right: 10px;" placeholder="Margin Name" ng-model="newJet.marginName">
                <select class="form-control" ng-model="newJet.pricingStructure">
                   <option value="" disabled selected>Pricing Structure</option>
                   <option value="minus">Retail-(minus)</option>
                   <option value="plus">Cost+(plus)</option>
                   <option value="equal">Direct=(equal)</option>
                </select>
                <span style="margin-right: 0;">$</span>
                <input type="text" class="form-control" style="width: 120px;" placeholder="Margin Price" ng-model="newJet.marginValue">
                <div class="clearfix"></div>
             </div>
             <div class="customAccordianTabBody">
-               <textarea class="form-control resizeTextarea" ng-model="newJet.message" placeholder="Message..."></textarea>
+               <div ckeditor="options" ng-model="newJet.message" ready="onReady()"></div>
             </div>
          </div>
          <div class="customModelFooter text-center">
             <input type="submit" value="Save" class="btn" ng-click="addNewATypeJet()">
             <button class="btn" ng-click="closeMarginPopup()">Cancel</button>
          </div>
       </div>
    </div>
 </div>
 <div class="addNewVtype" style="display: none;">
    <div class="customBackdrop">
       <div class="customModalInner" style="max-width: 700px;">
          <div class="customModelHead">
             <p class="pull-left">
                <i class="fa fa-list-alt" aria-hidden="true"></i>
                Add New AVGAS 100LL Customer Margin Template
             </p>
             <p class="pull-right">
                <i class="fa fa-times" aria-hidden="true" style="cursor: pointer;" ng-click="closeNewVtypePop()"></i>
             </p>
             <div class="clearfix"></div>
          </div>
          <div class="customModelBody">
             <div class="customAccordianHeader customActive">
                <input type="text" class="form-control" style="width: 120px; margin-right: 10px;" placeholder="Margin Name" ng-model="newVtypeJet.marginName">
                <select class="form-control" ng-model="newVtypeJet.pricingStructure">
                   <option value="" disabled selected>Pricing Structure</option>
                   <option value="minus">Retail-(minus)</option>
                   <option value="plus">Cost+(plus)</option>
                   <option value="equal">Direct=(equal)</option>
                </select>
                <span style="margin-right: 0;">$</span>
                <input type="text" class="form-control" style="width: 120px;" placeholder="Margin Price" ng-model="newVtypeJet.marginValue">
                <div class="clearfix"></div>
             </div>
             <div class="customAccordianTabBody">
-               <textarea class="form-control resizeTextarea" ng-model="newVtypeJet.message" placeholder="Message..."></textarea>
+               <div ckeditor="options" ng-model="newVtypeJet.message" ready="onReady()"></div>
             </div>
          </div>
          <div class="customModelFooter text-center">
             <input type="submit" value="Save" class="btn" ng-click="addNewVTypeJet()">
             <button class="btn" ng-click="closeNewVtypePop()">Cancel</button>
          </div>
       </div>
    </div>
 </div>
 <div class="customConfirmPopBackdrop" id="confirm1" style="display: none;">
   <div class="customModalInner">
      <div class="customModelBody" style="border-radius: 5px 5px 0 0;">
         <table>
            <tr>
               <td>
                  <img src="img/info.png" style="width: 50px;">
               </td>
               <td>
                  <p style="padding: 5px 10px; margin-bottom: 0;">Are you sure that you want to email pricing to everyone in your contact list?</p>
               </td>
            </tr>
         </table>
      </div>
      <div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;">
         <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="saveAndCloseConfirm()">Yes</button>
         <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelAndCloseConfirm()">Cancel</button>
      </div>
   </div>
 </div>
 <div class="customConfirmPopBackdrop" id="deleteTierConfirm" style="display: none;">
   <div class="customModalInner">
      <div class="customModelBody" style="border-radius: 5px 5px 0 0;">
         <table>
            <tr>
               <td>
                  <img src="img/info.png" style="width: 50px;">
               </td>
               <td>
                  <p style="padding: 5px 10px; margin-bottom: 0;">Are you sure that you want to delete this Tier ?</p>
               </td>
            </tr>
         </table>
      </div>
      <div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;">
         <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="confirmDeleteTier()">Yes</button>
         <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelTierDelete()">Cancel</button>
      </div>
   </div>
 </div>
 <div class="customConfirmPopBackdrop" id="deleteVtypeTierConfirm" style="display: none;">
   <div class="customModalInner">
      <div class="customModelBody" style="border-radius: 5px 5px 0 0;">
         <table>
            <tr>
               <td>
                  <img src="img/info.png" style="width: 50px;">
               </td>
               <td>
                  <p style="padding: 5px 10px; margin-bottom: 0;">Are you sure that you want to delete this Tier ?</p>
               </td>
            </tr>
         </table>
      </div>
      <div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;">
         <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="confirmDeleteVtypeTier()">Yes</button>
         <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelVtypeTierDelete()">Cancel</button>
      </div>
   </div>
 </div>
 <div class="customConfirmPopBackdrop" id="deleteMargin" style="display: none;">
   <div class="customModalInner">
      <div class="customModelBody" style="border-radius: 5px 5px 0 0;">
         <table>
            <tr>
               <td>
                  <img src="img/info.png" style="width: 50px;">
               </td>
               <td>
                  <p style="padding: 5px 10px; margin-bottom: 0;">Are you sure that you want to delete this Margin Template ?</p>
               </td>
            </tr>
         </table>
      </div>
      <div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;">
         <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="confirmDeleteMargin()">Yes</button>
         <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelMarginDelete()">Cancel</button>
      </div>
   </div>
 </div>
 <div class="customConfirmPopBackdrop" id="deleteVtypeMargin" style="display: none;">
   <div class="customModalInner">
      <div class="customModelBody" style="border-radius: 5px 5px 0 0;">
         <table>
            <tr>
               <td>
                  <img src="img/info.png" style="width: 50px;">
               </td>
               <td>
                  <p style="padding: 5px 10px; margin-bottom: 0;">Are you sure that you want to delete this Margin Template ?</p>
               </td>
            </tr>
         </table>
      </div>
      <div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;">
         <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="confirmDeletVtypeMargin()">Yes</button>
         <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelVtypeMarginDelete()">Cancel</button>
      </div>
   </div>
 </div>
 <!-- Le javascript
    ================================================== -->
 <!-- Placed at the end of the document so the pages load faster -->
 <!-- <script>
    CKEDITOR.replace( 'editor2', {
       height: 250,
       extraPlugins: 'divarea'
    } );
 </script> -->

bower.json

Diff comments View file @e95d89b

 {
   "name": "acufuel",
   "description": "",
   "main": "index.js",
   "authors": [
     "Rishav <rsingla.rishu@gmail.com>"
   ],
   "license": "ISC",
   "homepage": "",
   "ignore": [
     "**/.*",
     "node_modules",
     "bower_components",
     "test",
     "tests"
   ],
   "dependencies": {
     "angular": "^1.6.2",
     "angular-animate": "^1.6.2",
     "angular-route": "^1.6.2",
     "jquery": "^3.1.1",
     "animate.css": "^3.5.2",
     "bootstrap": "^3.3.7",
     "font-awesome": "fontawesome#^4.7.0",
     "angular-ui-router": "^0.4.2",
     "bootstrap-toggle": "^2.2.2",
     "fullcalendar": "^3.2.0",
     "toastr": "^2.1.3",
     "angular-bootstrap": "^2.5.0",
     "jqGrid": "^5.2.0",
     "Autocomplete": "autocomplete#^2.0.5",
     "DataTables": "~1.10.15",
     "angular-cookies": "~1.6.4",
     "angular-resource": "~1.6.4",
     "angular-xeditable": "~0.7.1",
     "angular-bootstrap-toggle": "~0.1.2",
-    "angular-ui-select2": "^0.0.5"
+    "angular-ui-select2": "^0.0.5",
+    "angular-ckeditor": "^1.0.3",
+    "angular-ui-calendar": "^1.0.2"
   }
 }

1	<html ng-app="acufuel">	1	<html ng-app="acufuel">
2	<head lang="en">	2	<head lang="en">
3	<meta charset="utf-8">	3	<meta charset="utf-8">
4	<meta name="viewport" content="width=device-width, initial-scale=1.0">	4	<meta name="viewport" content="width=device-width, initial-scale=1.0">
5	<meta name="description" content="">	5	<meta name="description" content="">
6	<meta name="author" content="">	6	<meta name="author" content="">
7	<title>Acufuel</title>	7	<title>Acufuel</title>
8	<!-- styles -->	8	<!-- styles -->
9	<link rel="stylesheet" href="css/ui-lightness/jquery-ui-1.10.0.custom.min.css"/>	9	<link rel="stylesheet" href="css/ui-lightness/jquery-ui-1.10.0.custom.min.css"/>
10	<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css"/>	10	<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css"/>
11	<link rel="stylesheet" href="bower_components/font-awesome/css/font-awesome.min.css"/>	11	<link rel="stylesheet" href="bower_components/font-awesome/css/font-awesome.min.css"/>
12	<link rel="stylesheet" href="bower_components/bootstrap-toggle/css/bootstrap-toggle.min.css" />	12	<link rel="stylesheet" href="bower_components/bootstrap-toggle/css/bootstrap-toggle.min.css" />
13	<!-- <link rel="stylesheet" href="bower_components/fullcalendar/dist/fullcalendar.min.css"/>	13	<!-- <link rel="stylesheet" href="bower_components/fullcalendar/dist/fullcalendar.min.css"/>
14	<link rel="stylesheet" href="bower_components/fullcalendar/dist/fullcalendar.print.min.css"/> -->	14	<link rel="stylesheet" href="bower_components/fullcalendar/dist/fullcalendar.print.min.css"/> -->
15	<link rel="stylesheet" href="bower_components/toastr/toastr.min.css"/>	15	<link rel="stylesheet" href="bower_components/toastr/toastr.min.css"/>
16	<link rel="stylesheet" href="bower_components/angular-bootstrap/ui-bootstrap-csp.css"/>	16	<link rel="stylesheet" href="bower_components/angular-bootstrap/ui-bootstrap-csp.css"/>
17	<link href="bower_components/jqGrid/css/ui.jqgrid.css" rel="stylesheet">	17	<link href="bower_components/jqGrid/css/ui.jqgrid.css" rel="stylesheet">
18	<link href="bower_components/angular-xeditable/dist/css/xeditable.css" rel="stylesheet">	18	<link href="bower_components/angular-xeditable/dist/css/xeditable.css" rel="stylesheet">
19	<link href="bower_components/angular-bootstrap-toggle/dist/angular-bootstrap-toggle.min.css"	19	<link href="bower_components/angular-bootstrap-toggle/dist/angular-bootstrap-toggle.min.css"
20	rel="stylesheet">	20	rel="stylesheet">
21		21
22		22
23	<link rel="stylesheet" href="css/main.css"/>	23	<link rel="stylesheet" href="css/main.css"/>
24	<link rel="stylesheet" href="css/base-admin-3.css"/>	24	<link rel="stylesheet" href="css/base-admin-3.css"/>
25	<link rel="stylesheet" href="css/base-admin-3-responsive.css"/>	25	<link rel="stylesheet" href="css/base-admin-3-responsive.css"/>
26	<link rel="stylesheet" href="css/custom.css"/>	26	<link rel="stylesheet" href="css/custom.css"/>
27		27
28	<link href="css/bootstrap-responsive.min.css" rel="stylesheet">	28	<link href="css/bootstrap-responsive.min.css" rel="stylesheet">
29	<link href="http://fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,400,600" rel="stylesheet">	29	<link href="http://fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,400,600" rel="stylesheet">
30	<link href="js/plugins/cirque/cirque.css" rel="stylesheet">	30	<link href="js/plugins/cirque/cirque.css" rel="stylesheet">
31		31
32	<link href="css/pages/dashboard.css" rel="stylesheet">	32	<link href="css/pages/dashboard.css" rel="stylesheet">
33	<link href="js/plugins/faq/faq.css" rel="stylesheet">	33	<link href="js/plugins/faq/faq.css" rel="stylesheet">
34	<link href="css/pages/plans.css" rel="stylesheet">	34	<link href="css/pages/plans.css" rel="stylesheet">
35		35
36	<link href="js/plugins/lightbox/themes/evolution-dark/jquery.lightbox.css" rel="stylesheet">	36	<link href="js/plugins/lightbox/themes/evolution-dark/jquery.lightbox.css" rel="stylesheet">
37	<link href="js/plugins/msgGrowl/css/msgGrowl.css" rel="stylesheet">	37	<link href="js/plugins/msgGrowl/css/msgGrowl.css" rel="stylesheet">
38	<link href="js/plugins/msgbox/jquery.msgbox.css" rel="stylesheet">	38	<link href="js/plugins/msgbox/jquery.msgbox.css" rel="stylesheet">
39	<link href="css/pages/pricing.css" rel="stylesheet">	39	<link href="css/pages/pricing.css" rel="stylesheet">
40	<link href="css/pages/reports.css" rel="stylesheet">	40	<link href="css/pages/reports.css" rel="stylesheet">