Commit e33b4556c46cce5b8ce1afce9bfbaea261b212f6
1 parent
bd0c7fcc7f
Exists in
master
bugs resolved
Showing
4 changed files
with
453 additions
and
165 deletions
Show diff stats
app/partials/fuelOrders/fuelOrders.controller.js
1 | 'use strict'; | 1 | 'use strict'; |
2 | 2 | ||
3 | angular.module('acufuel') | 3 | angular.module('acufuel') |
4 | 4 | ||
5 | .controller('fuelOrdersController', ['$scope', '$rootScope', '$uibModal', '$filter', '$http', 'NgTableParams','fuelOrdersService', fuelOrdersController]); | 5 | .controller('fuelOrdersController', ['$scope', '$rootScope', '$uibModal', '$filter', '$http', 'NgTableParams','fuelOrdersService','CustomersService','ViewCompanyService', fuelOrdersController]); |
6 | 6 | ||
7 | function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgTableParams,fuelOrdersService) { | 7 | function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgTableParams,fuelOrdersService,CustomersService,ViewCompanyService) { |
8 | 8 | ||
9 | $scope.showFuelOrderModal = false; | 9 | $scope.showFuelOrderModal = false; |
10 | $scope.optionSelected; | 10 | $scope.optionSelected; |
11 | $scope.orderdata = {} | 11 | $scope.orderdata = {} |
12 | $scope.showLoader = false; | 12 | $scope.showLoader = false; |
13 | $scope.jetShow = []; | ||
14 | $scope.marginShow = []; | ||
15 | |||
16 | $scope.jetShow[0] = true; | ||
17 | $scope.marginShow[0] = true; | ||
13 | 18 | ||
14 | $scope.data = {}; | 19 | $scope.data = {}; |
15 | $scope.order = {}; | 20 | $scope.order = {}; |
16 | $scope.dispatchOrder = {}; | 21 | $scope.dispatchOrder = {}; |
17 | $scope.dispatchOrder.fuelOrderList = []; | 22 | $scope.dispatchOrder.fuelOrderList = []; |
18 | 23 | ||
19 | $scope.statusFilterOptions = []; | 24 | $scope.statusFilterOptions = []; |
20 | $scope.statusFilterOptions.push({ | 25 | $scope.statusFilterOptions.push({ |
21 | 'id': '', 'title': 'Show All' | 26 | 'id': '', 'title': 'Show All' |
22 | },{ | 27 | },{ |
23 | 'id': 'pending', 'title': 'Pending' | 28 | 'id': 'pending', 'title': 'Pending' |
24 | },{ | 29 | },{ |
25 | 'id': 'invoiced', 'title': 'Invoiced' | 30 | 'id': 'invoiced', 'title': 'Invoiced' |
26 | },{ | 31 | },{ |
27 | 'id': 'paid', 'title': 'Paid' | 32 | 'id': 'paid', 'title': 'Paid' |
28 | },{ | 33 | },{ |
29 | 'id': 'cancelled', 'title': 'Cancelled' | 34 | 'id': 'cancelled', 'title': 'Cancelled' |
30 | },{ | 35 | },{ |
31 | 'id': 'archived', 'title': 'Archived' | 36 | 'id': 'archived', 'title': 'Archived' |
32 | } | 37 | } |
33 | 38 | ||
34 | ); | 39 | ); |
35 | 40 | ||
41 | getAllCompanies(); | ||
42 | |||
43 | function getAllCompanies(){ | ||
44 | fuelOrdersService.getAllCompanies().then(function(result) { | ||
45 | // console.log('log', result); | ||
46 | $scope.companyList = result; | ||
47 | for (var i = 0; i < $scope.companyList.length; i++) { | ||
48 | if ($scope.companyList[i].companyContact != null) { | ||
49 | if ($scope.companyList[i].companyContact.contactNumber != null || $scope.companyList[i].companyContact.contactNumber != undefined) { | ||
50 | $scope.companyList[i].newContactNumber = $scope.companyList[i].companyContact.contactNumber; | ||
51 | } | ||
52 | } | ||
53 | if ($scope.companyList[i].primaryContact != null) { | ||
54 | if ($scope.companyList[i].primaryContact.firstName != null && $scope.companyList[i].primaryContact.lastName != null) { | ||
55 | $scope.companyList[i].primaryContactName = $scope.companyList[i].primaryContact.firstName + ' ' + $scope.companyList[i].primaryContact.lastName; | ||
56 | } | ||
57 | } | ||
58 | if ($scope.companyList[i].margin != null) { | ||
59 | if ($scope.companyList[i].margin.marginName != null) { | ||
60 | $scope.companyList[i].masterMargin = $scope.companyList[i].margin.id; | ||
61 | } | ||
62 | } | ||
63 | } | ||
64 | $scope.displayCompanyList = new NgTableParams({ | ||
65 | page: 1, | ||
66 | count: 10, | ||
67 | }, { | ||
68 | data: $scope.companyList | ||
69 | }); | ||
70 | $scope.showLoader = false; | ||
71 | }) | ||
72 | } | ||
73 | |||
74 | |||
75 | $scope.userProfileId = JSON.parse(localStorage.getItem('userProfileId')) | ||
76 | $scope.reset2 = function(){ | ||
77 | $("input").val(""); | ||
78 | $scope.removeMarginValidation(); | ||
79 | } | ||
80 | |||
36 | function colourFunction() { | 81 | function colourFunction() { |
37 | var myselect = document.getElementById('colorfulSelectbox'), | 82 | var myselect = document.getElementById('colorfulSelectbox'), |
38 | colour = myselect.options[myselect.selectedIndex].className; | 83 | colour = myselect.options[myselect.selectedIndex].className; |
39 | myselect.style.background = colour; | 84 | myselect.style.background = colour; |
40 | console.log('colour', myselect); | 85 | // console.log('colour', myselect); |
41 | myselect.blur(); | 86 | myselect.blur(); |
42 | } | 87 | } |
43 | 88 | ||
44 | //setInterval(function(){ | 89 | //setInterval(function(){ |
45 | // colourFunction(); | 90 | // colourFunction(); |
46 | //}, 1) | 91 | //}, 1) |
47 | 92 | ||
48 | 93 | ||
49 | $scope.attachmentFilterOptions = []; | 94 | $scope.attachmentFilterOptions = []; |
50 | $scope.attachmentFilterOptions.push({ | 95 | $scope.attachmentFilterOptions.push({ |
51 | 'id': '', 'title': 'Show All' | 96 | 'id': '', 'title': 'Show All' |
52 | },{ | 97 | },{ |
53 | 'id': '!null', 'title': 'Attachments' | 98 | 'id': '!null', 'title': 'Attachments' |
54 | },{ | 99 | },{ |
55 | 'id': 'null', 'title': 'No Attachments' | 100 | 'id': 'null', 'title': 'No Attachments' |
56 | } | 101 | } |
57 | ); | 102 | ); |
58 | 103 | ||
59 | // $(document).ready(function() { | 104 | // $(document).ready(function() { |
60 | // $scope.showLoader = true; | 105 | // $scope.showLoader = true; |
61 | // $('#example').DataTable(); | 106 | // $('#example').DataTable(); |
62 | // $scope.showLoader = false; | 107 | // $scope.showLoader = false; |
63 | // }); | 108 | // }); |
64 | 109 | ||
65 | $scope.getOrders = function() { | 110 | $scope.getOrders = function() { |
66 | fuelOrdersService.getOrders().then(function(result) { | 111 | fuelOrdersService.getOrders().then(function(result) { |
67 | 112 | ||
68 | $scope.orderdata = result; | 113 | $scope.orderdata = result; |
69 | for(var i=0;i<$scope.orderdata.length;i++){ | 114 | for(var i=0;i<$scope.orderdata.length;i++){ |
70 | $scope.orderdata[i].upliftDateS = new Date($scope.orderdata[i].upliftDate); | 115 | $scope.orderdata[i].upliftDateS = new Date($scope.orderdata[i].upliftDate); |
71 | 116 | ||
72 | var str = "" + $scope.orderdata[i].upliftDateS.getDate() + "/" + ($scope.orderdata[i].upliftDateS.getMonth() + 1) + "/" + $scope.orderdata[i].upliftDateS.getFullYear() | 117 | var str = "" + $scope.orderdata[i].upliftDateS.getDate() + "/" + ($scope.orderdata[i].upliftDateS.getMonth() + 1) + "/" + $scope.orderdata[i].upliftDateS.getFullYear() |
73 | // str = str.slice(4,16) | 118 | // str = str.slice(4,16) |
74 | $scope.orderdata[i].upliftDateString = str | 119 | $scope.orderdata[i].upliftDateString = str |
75 | console.log(str); | 120 | // console.log(str); |
76 | 121 | ||
77 | } | 122 | } |
78 | 123 | ||
79 | $scope.displayFuelOrderList = new NgTableParams({ | 124 | $scope.displayFuelOrderList = new NgTableParams({ |
80 | page: 1, | 125 | page: 1, |
81 | count: 10, | 126 | count: 10, |
82 | }, { | 127 | }, { |
83 | data: $scope.orderdata | 128 | data: $scope.orderdata |
84 | }); | 129 | }); |
85 | $(document).ready(function(){ | 130 | $(document).ready(function(){ |
86 | var myselect = document.getElementsByClassName('colorfulSelectbox'); | 131 | var myselect = document.getElementsByClassName('colorfulSelectbox'); |
87 | 132 | ||
88 | for (var i = 0; i < myselect.length; i++) { | 133 | for (var i = 0; i < myselect.length; i++) { |
89 | var colourIndex = $(myselect[i]).prop('selectedIndex'); | 134 | var colourIndex = $(myselect[i]).prop('selectedIndex'); |
90 | colourIndex = colourIndex + 1; | 135 | colourIndex = colourIndex + 1; |
91 | console.log(colourIndex); | 136 | // console.log(colourIndex); |
92 | var getColor = $('.colorfulSelectbox option:nth-child('+colourIndex+')').css('color'); | 137 | var getColor = $('.colorfulSelectbox option:nth-child('+colourIndex+')').css('color'); |
93 | $(myselect[i]).css('background-color', getColor); | 138 | $(myselect[i]).css('background-color', getColor); |
94 | console.log('colour', getColor); | 139 | // console.log('colour', getColor); |
95 | myselect[i].blur(); | 140 | myselect[i].blur(); |
96 | } | 141 | } |
97 | 142 | ||
98 | }) | 143 | }) |
99 | 144 | ||
100 | }) | 145 | }) |
101 | } | 146 | } |
102 | 147 | ||
103 | $scope.getOrders(); | 148 | $scope.getOrders(); |
104 | 149 | ||
105 | $scope.onFWSelect = function() { | 150 | $scope.onFWSelect = function() { |
106 | if($scope.optionSelected == 'dt'){ | 151 | if($scope.optionSelected == 'dt'){ |
107 | $('#demo-modal-4').css('display', 'block'); | 152 | $('#demo-modal-4').css('display', 'block'); |
108 | } | 153 | } |
109 | if($scope.optionSelected == 'efo'){ | 154 | if($scope.optionSelected == 'efo'){ |
110 | $scope.showLoader = true; | 155 | $scope.showLoader = true; |
111 | var fileName = "orders.csv"; | 156 | var fileName = "orders.csv"; |
112 | var a = document.createElement("a"); | 157 | var a = document.createElement("a"); |
113 | document.body.appendChild(a); | 158 | document.body.appendChild(a); |
114 | fuelOrdersService.exportCompany().then(function(result) { | 159 | fuelOrdersService.exportCompany().then(function(result) { |
115 | var file = new Blob([result], {type: 'application/csv'}); | 160 | var file = new Blob([result], {type: 'application/csv'}); |
116 | var fileURL = URL.createObjectURL(file); | 161 | var fileURL = URL.createObjectURL(file); |
117 | a.href = fileURL; | 162 | a.href = fileURL; |
118 | a.download = fileName; | 163 | a.download = fileName; |
119 | a.click(); | 164 | a.click(); |
120 | $scope.showLoader = false; | 165 | $scope.showLoader = false; |
121 | }) | 166 | }) |
122 | } | 167 | } |
123 | } | 168 | } |
124 | $scope.attachmentrowid = "" | 169 | $scope.attachmentrowid = "" |
125 | |||
126 | |||
127 | $scope.attachment = function(id, value, url) { | ||
128 | console.log(id, value) | ||
129 | $scope.attachmentrowid = id | ||
130 | // $scope.attachmentdeleteid = attachdeleteid | ||
131 | if(value == 'uploadAttachment'){ | ||
132 | $('#demo-modal-6').css('display', 'block'); | ||
133 | }else if(value == 'viewAttachment'){ | ||
134 | var win = window.open(url, '_blank'); | ||
135 | win.focus(); | ||
136 | }else if(value == 'deleteAttachment'){ | ||
137 | $('#delete1').css('display', 'block'); | ||
138 | } | ||
139 | } | ||
140 | 170 | ||
141 | $scope.cancelDeleteAttachment = function() { | 171 | |
142 | $('#delete1').css('display', ''); | 172 | $scope.attachment = function(id, value, url) { |
143 | } | 173 | // console.log(id, value) |
174 | $scope.attachmentrowid = id | ||
175 | // $scope.attachmentdeleteid = attachdeleteid | ||
176 | if(value == 'uploadAttachment'){ | ||
177 | $('#demo-modal-6').css('display', 'block'); | ||
178 | }else if(value == 'viewAttachment'){ | ||
179 | var win = window.open(url, '_blank'); | ||
180 | win.focus(); | ||
181 | }else if(value == 'deleteAttachment'){ | ||
182 | $('#delete1').css('display', 'block'); | ||
183 | } | ||
184 | } | ||
185 | |||
186 | $scope.cancelDeleteAttachment = function() { | ||
187 | $('#delete1').css('display', ''); | ||
188 | } | ||
144 | 189 | ||
145 | $scope.deleteAttachment = function() { | 190 | $scope.deleteAttachment = function() { |
146 | $scope.showLoader = true; | 191 | $scope.showLoader = true; |
147 | fuelOrdersService.deleteAttachment($scope.attachmentrowid).then(function(result) { | 192 | fuelOrdersService.deleteAttachment($scope.attachmentrowid).then(function(result) { |
148 | console.log(result, $scope.attachmentrowid) | 193 | // console.log(result, $scope.attachmentrowid) |
149 | 194 | ||
150 | if(result.success){ | 195 | if(result.success){ |
151 | toastr.success(''+result.success+'', { | 196 | toastr.success(''+result.success+'', { |
152 | closeButton: true | 197 | closeButton: true |
153 | }) | 198 | }) |
154 | } | 199 | } |
155 | }) | 200 | }) |
156 | $scope.showLoader = false; | 201 | $scope.showLoader = false; |
157 | $('#delete1').css('display', ''); | 202 | $('#delete1').css('display', ''); |
158 | } | 203 | } |
159 | 204 | ||
160 | $scope.saveUploadAttachment = function(attachmentData) { | 205 | $scope.saveUploadAttachment = function(attachmentData) { |
161 | $scope.showLoader = true; | 206 | $scope.showLoader = true; |
162 | $scope.data.media = attachmentData | 207 | $scope.data.media = attachmentData |
163 | $scope.data.id = $scope.attachmentrowid | 208 | $scope.data.id = $scope.attachmentrowid |
164 | fuelOrdersService.uploadAttachment($scope.data).then(function(result) { | 209 | fuelOrdersService.uploadAttachment($scope.data).then(function(result) { |
165 | console.log(result) | 210 | // console.log(result) |
166 | if(result){ | 211 | if(result){ |
167 | // console.log(result.success) | 212 | // console.log(result.success) |
168 | toastr.success(''+"Upload Successful"+'', { | 213 | toastr.success(''+"Upload Successful"+'', { |
169 | closeButton: true | 214 | closeButton: true |
170 | }) | 215 | }) |
171 | } | 216 | } |
172 | 217 | ||
173 | }) | 218 | }) |
174 | $scope.showLoader = false; | 219 | $scope.showLoader = false; |
175 | $('#demo-modal-6').css('display', 'none'); | 220 | $('#demo-modal-6').css('display', 'none'); |
176 | } | 221 | } |
177 | 222 | ||
178 | $scope.cancelUploadAttachment = function() { | 223 | $scope.cancelUploadAttachment = function() { |
179 | $('#demo-modal-6').css('display', 'none'); | 224 | $('#demo-modal-6').css('display', 'none'); |
180 | } | 225 | } |
181 | |||
182 | $scope.editdata = {}; | ||
183 | |||
184 | 226 | ||
185 | $scope.editTableRow = function(rowData){ | 227 | $scope.editdata = {}; |
186 | console.log('row data', rowData); | 228 | |
187 | $scope.editdata = rowData; | ||
188 | $('#demo-modal-5').css('display', 'block'); | ||
189 | } | ||
190 | 229 | ||
191 | $scope.updateTotal = function(value, valueOf){ | 230 | $scope.editTableRow = function(rowData){ |
192 | if(valueOf == 'v'){ | 231 | // console.log('row data', rowData); |
193 | $scope.editdata.total = value * $scope.editdata.invoiced | 232 | $scope.editdata = rowData; |
194 | }else if(valueOf == 'i'){ | 233 | $('#demo-modal-5').css('display', 'block'); |
195 | $scope.editdata.total = $scope.editdata.requestedVolume * value | ||
196 | } | 234 | } |
197 | } | ||
198 | 235 | ||
199 | $scope.addTotal = function(value, valueOf){ | 236 | $scope.updateTotal = function(value, valueOf){ |
200 | if(valueOf == 'v'){ | 237 | if(valueOf == 'v'){ |
201 | $scope.order.total = value * $scope.order.invoiced | 238 | $scope.editdata.total = value * $scope.editdata.invoiced |
202 | }else if(valueOf == 'i'){ | 239 | }else if(valueOf == 'i'){ |
203 | $scope.order.total = $scope.order.volume * value | 240 | $scope.editdata.total = $scope.editdata.requestedVolume * value |
241 | } | ||
204 | } | 242 | } |
205 | } | 243 | |
244 | $scope.addTotal = function(value, valueOf){ | ||
245 | if(valueOf == 'v'){ | ||
246 | $scope.order.total = value * $scope.order.invoiced | ||
247 | }else if(valueOf == 'i'){ | ||
248 | $scope.order.total = $scope.order.volume * value | ||
249 | } | ||
250 | } | ||
206 | 251 | ||
207 | $scope.addData = function() { | 252 | $scope.addData = function() { |
208 | $scope.showLoader = true; | 253 | $scope.showLoader = true; |
209 | 254 | ||
210 | if ($scope.order.upliftDate != '') { | 255 | if ($scope.order.upliftDate != '') { |
211 | $scope.order.upliftDate = new Date($scope.order.upliftDate); | 256 | $scope.order.upliftDate = new Date($scope.order.upliftDate); |
212 | $scope.order.upliftDate = $scope.order.upliftDate.getTime(); | 257 | $scope.order.upliftDate = $scope.order.upliftDate.getTime(); |
213 | } | 258 | } |
214 | if ($scope.order.departingDate != '') { | 259 | if ($scope.order.departingDate != '') { |
215 | $scope.order.departingDate = new Date($scope.order.departingDate); | 260 | $scope.order.departingDate = new Date($scope.order.departingDate); |
216 | $scope.order.departingDate = $scope.order.departingDate.getTime(); | 261 | $scope.order.departingDate = $scope.order.departingDate.getTime(); |
217 | } | 262 | } |
218 | console.log($scope.order.quotePrice); | 263 | // console.log($scope.order.quotePrice); |
219 | var obj =JSON.parse($scope.order.priceQuote); | 264 | var obj =JSON.parse($scope.order.priceQuote); |
220 | console.log('obj.papMargin',obj.papMargin); | 265 | // console.log('obj.papMargin',obj.papMargin); |
221 | $scope.order.priceQuote = obj.papMargin; | 266 | $scope.order.priceQuote = obj.papMargin; |
222 | 267 | ||
223 | $scope.fuelData = {}; | 268 | $scope.fuelData = {}; |
224 | $scope.fuelData.aircraftName = $scope.order.aircraftName | 269 | $scope.fuelData.aircraftName = $scope.order.aircraftName |
225 | $scope.fuelData.companyName = $scope.order.companyName | 270 | $scope.fuelData.companyName = $scope.order.companyName |
226 | $scope.fuelData.departingDate = $scope.order.departingDate | 271 | $scope.fuelData.departingDate = $scope.order.departingDate |
227 | $scope.fuelData.fboCost = $scope.order.fboCost | 272 | $scope.fuelData.fboCost = $scope.order.fboCost |
228 | $scope.fuelData.id = $scope.order.id | 273 | $scope.fuelData.id = $scope.order.id |
229 | $scope.fuelData.invoiced = $scope.order.invoiced | 274 | $scope.fuelData.invoiced = $scope.order.invoiced |
230 | $scope.fuelData.priceQuote = $scope.order.priceQuote | 275 | $scope.fuelData.priceQuote = $scope.order.priceQuote |
231 | $scope.fuelData.volume = $scope.order.volume | 276 | $scope.fuelData.volume = $scope.order.volume |
232 | $scope.fuelData.source = $scope.order.source | 277 | $scope.fuelData.source = $scope.order.source |
233 | $scope.fuelData.status = $scope.order.status | 278 | $scope.fuelData.status = $scope.order.status |
234 | $scope.fuelData.tierBreak = $scope.order.tierBreak | 279 | $scope.fuelData.tierBreak = $scope.order.tierBreak |
235 | $scope.fuelData.total = $scope.order.total | 280 | $scope.fuelData.total = $scope.order.total |
236 | $scope.fuelData.upliftDate = $scope.order.upliftDate | 281 | $scope.fuelData.upliftDate = $scope.order.upliftDate |
237 | $scope.fuelData.companyId = $scope.selectedCompanyId; | 282 | $scope.fuelData.companyId = $scope.selectedCompanyId; |
238 | 283 | ||
239 | 284 | ||
240 | 285 | ||
241 | $scope.dispatchOrder.fuelOrderList.push($scope.fuelData); | 286 | $scope.dispatchOrder.fuelOrderList.push($scope.fuelData); |
242 | console.log('$scope.order', $scope.dispatchOrder); | 287 | // console.log('$scope.order', $scope.dispatchOrder); |
243 | fuelOrdersService.dispathFuelOrder($scope.dispatchOrder).then(function(result) { | 288 | fuelOrdersService.dispathFuelOrder($scope.dispatchOrder).then(function(result) { |
244 | console.log('result', result); | 289 | // console.log('result', result); |
245 | $scope.showLoader = false; | 290 | $scope.showLoader = false; |
246 | $scope.order = {}; | 291 | $scope.order = {}; |
247 | $('#demo-modal-4').css('display', ''); | 292 | $('#demo-modal-4').css('display', ''); |
248 | $scope.getOrders(); | 293 | $scope.getOrders(); |
249 | toastr.success('Fuel Order Dispatched Successfully', { | 294 | toastr.success('Fuel Order Dispatched Successfully', { |
250 | closeButton: true | 295 | closeButton: true |
251 | }) | 296 | }) |
252 | }) | 297 | }) |
253 | 298 | ||
254 | } | 299 | } |
255 | $scope.updateStatus = function(row, status) { | 300 | $scope.updateStatus = function(row, status) { |
256 | $scope.showLoader = true; | 301 | $scope.showLoader = true; |
257 | $scope.fuelData = {}; | 302 | $scope.fuelData = {}; |
258 | $scope.fuelData.aircraftName = row.aircraftName | 303 | $scope.fuelData.aircraftName = row.aircraftName |
259 | $scope.fuelData.companyName = row.companyName | 304 | $scope.fuelData.companyName = row.companyName |
260 | $scope.fuelData.departingDate = row.departingDate | 305 | $scope.fuelData.departingDate = row.departingDate |
261 | $scope.fuelData.fboCost = row.fboCost | 306 | $scope.fuelData.fboCost = row.fboCost |
262 | $scope.fuelData.id = row.id | 307 | $scope.fuelData.id = row.id |
263 | $scope.fuelData.invoiced = row.invoiced | 308 | $scope.fuelData.invoiced = row.invoiced |
264 | $scope.fuelData.priceQuote = row.priceQuote | 309 | $scope.fuelData.priceQuote = row.priceQuote |
265 | $scope.fuelData.volume = row.requestedVolume | 310 | $scope.fuelData.volume = row.requestedVolume |
266 | $scope.fuelData.source = row.source | 311 | $scope.fuelData.source = row.source |
267 | $scope.fuelData.status = status | 312 | $scope.fuelData.status = status |
268 | $scope.fuelData.tierBreak = row.tierBreak | 313 | $scope.fuelData.tierBreak = row.tierBreak |
269 | $scope.fuelData.total = row.total | 314 | $scope.fuelData.total = row.total |
270 | $scope.fuelData.upliftDate = row.upliftDate | 315 | $scope.fuelData.upliftDate = row.upliftDate |
271 | 316 | ||
272 | $scope.dispatchOrder.fuelOrderList.push($scope.fuelData); | 317 | $scope.dispatchOrder.fuelOrderList.push($scope.fuelData); |
273 | fuelOrdersService.updateFuelOrder($scope.dispatchOrder).then(function(result) { | 318 | fuelOrdersService.updateFuelOrder($scope.dispatchOrder).then(function(result) { |
274 | console.log('result', result); | 319 | // console.log('result', result); |
275 | $scope.showLoader = false; | 320 | $scope.showLoader = false; |
276 | $scope.editdata = {}; | 321 | $scope.editdata = {}; |
277 | $('#demo-modal-5').css('display', ''); | 322 | $('#demo-modal-5').css('display', ''); |
278 | $scope.getOrders(); | 323 | $scope.getOrders(); |
279 | toastr.success('Fuel Order Updated Successfully', { | 324 | toastr.success('Fuel Order Updated Successfully', { |
280 | closeButton: true | 325 | closeButton: true |
281 | }); | 326 | }); |
282 | }) | 327 | }) |
283 | 328 | ||
284 | } | 329 | } |
285 | 330 | ||
286 | $scope.updateData = function() { | 331 | $scope.updateData = function() { |
287 | $scope.showLoader = true; | 332 | $scope.showLoader = true; |
288 | $scope.fuelData = {}; | 333 | $scope.fuelData = {}; |
289 | $scope.fuelData.aircraftName = $scope.editdata.aircraftName | 334 | $scope.fuelData.aircraftName = $scope.editdata.aircraftName |
290 | $scope.fuelData.companyName = $scope.editdata.companyName | 335 | $scope.fuelData.companyName = $scope.editdata.companyName |
291 | $scope.fuelData.departingDate = $scope.editdata.departingDate | 336 | $scope.fuelData.departingDate = $scope.editdata.departingDate |
292 | $scope.fuelData.fboCost = $scope.editdata.fboCost | 337 | $scope.fuelData.fboCost = $scope.editdata.fboCost |
293 | $scope.fuelData.id = $scope.editdata.id | 338 | $scope.fuelData.id = $scope.editdata.id |
294 | $scope.fuelData.invoiced = $scope.editdata.invoiced | 339 | $scope.fuelData.invoiced = $scope.editdata.invoiced |
295 | $scope.fuelData.priceQuote = $scope.editdata.priceQuote | 340 | $scope.fuelData.priceQuote = $scope.editdata.priceQuote |
296 | $scope.fuelData.volume = $scope.editdata.requestedVolume | 341 | $scope.fuelData.volume = $scope.editdata.requestedVolume |
297 | $scope.fuelData.source = $scope.editdata.source | 342 | $scope.fuelData.source = $scope.editdata.source |
298 | $scope.fuelData.status = $scope.editdata.status | 343 | $scope.fuelData.status = $scope.editdata.status |
299 | $scope.fuelData.tierBreak = $scope.editdata.tierBreak | 344 | $scope.fuelData.tierBreak = $scope.editdata.tierBreak |
300 | $scope.fuelData.total = $scope.editdata.total | 345 | $scope.fuelData.total = $scope.editdata.total |
301 | $scope.fuelData.upliftDate = $scope.editdata.upliftDate | 346 | $scope.fuelData.upliftDate = $scope.editdata.upliftDate |
302 | 347 | ||
303 | 348 | ||
304 | 349 | ||
305 | $scope.dispatchOrder.fuelOrderList.push($scope.fuelData); | 350 | $scope.dispatchOrder.fuelOrderList.push($scope.fuelData); |
306 | fuelOrdersService.updateFuelOrder($scope.dispatchOrder).then(function(result) { | 351 | fuelOrdersService.updateFuelOrder($scope.dispatchOrder).then(function(result) { |
307 | console.log('result', result); | 352 | // console.log('result', result); |
308 | $scope.showLoader = false; | 353 | $scope.showLoader = false; |
309 | $scope.editdata = {}; | 354 | $scope.editdata = {}; |
310 | $('#demo-modal-5').css('display', ''); | 355 | $('#demo-modal-5').css('display', ''); |
311 | $scope.getOrders(); | 356 | $scope.getOrders(); |
312 | toastr.success('Fuel Order Updated Successfully', { | 357 | toastr.success('Fuel Order Updated Successfully', { |
313 | closeButton: true | 358 | closeButton: true |
314 | }) | 359 | }) |
315 | }) | 360 | }) |
316 | } | 361 | } |
317 | 362 | ||
318 | $scope.getAircraft = function(company){ | 363 | $scope.getAircraft = function(company){ |
364 | |||
319 | $scope.selectedCompanyName = company; | 365 | $scope.selectedCompanyName = company; |
320 | $scope.showLoader = true; | 366 | //$scope.showLoader = true; |
367 | // console.log("id",company) | ||
321 | for (var i = 0; i < $scope.companyList.length; i++) { | 368 | for (var i = 0; i < $scope.companyList.length; i++) { |
322 | if ($scope.companyList[i].companyName == company) { | 369 | if ($scope.companyList[i].companyName == company) { |
323 | if($scope.companyList[i].margin != null && $scope.companyList[i].marginAVGAS != null){ | 370 | if($scope.companyList[i].margin != null && $scope.companyList[i].marginAVGAS != null){ |
324 | fuelOrdersService.getFuelCost($scope.companyList[i].id).then(function(margins) { | 371 | fuelOrdersService.getFuelCost($scope.companyList[i].id).then(function(margins) { |
325 | $scope.marginList = margins; | 372 | $scope.marginList = margins; |
326 | //console.log('$scope.marginList', $scope.marginList); | 373 | //console.log('$scope.marginList', $scope.marginList); |
327 | }) | 374 | }) |
328 | } else if ($scope.companyList[i].margin != null || $scope.companyList[i].marginAVGAS == null) { | 375 | } else if ($scope.companyList[i].margin != null || $scope.companyList[i].marginAVGAS == null) { |
329 | fuelOrdersService.getATypeFuelPricing($scope.companyList[i].id).then(function(margins) { | 376 | fuelOrdersService.getATypeFuelPricing($scope.companyList[i].id).then(function(margins) { |
330 | $scope.marginList = margins; | 377 | $scope.marginList = margins; |
331 | }) | 378 | }) |
332 | } else if ($scope.companyList[i].margin == null || $scope.companyList[i].marginAVGAS != null) { | 379 | } else if ($scope.companyList[i].margin == null || $scope.companyList[i].marginAVGAS != null) { |
333 | fuelOrdersService.getVTypeFuelPricing($scope.companyList[i].id).then(function(margins) { | 380 | fuelOrdersService.getVTypeFuelPricing($scope.companyList[i].id).then(function(margins) { |
334 | $scope.marginList = margins; | 381 | $scope.marginList = margins; |
335 | }) | 382 | }) |
336 | } | 383 | } |
337 | $scope.selectedCompanyId = $scope.companyList[i].id; | 384 | $scope.selectedCompanyId = $scope.companyList[i].id; |
338 | $scope.marginId = $scope.companyList[i].margin.id; | 385 | $scope.marginId = $scope.companyList[i].margin.id; |
339 | if ($scope.selectedCompanyId != '') { | 386 | if ($scope.selectedCompanyId != '') { |
340 | fuelOrdersService.getAircraft($scope.selectedCompanyId).then(function(aircraft) { | 387 | fuelOrdersService.getAircraft($scope.selectedCompanyId).then(function(aircraft) { |
341 | $scope.aircraftList = aircraft; | 388 | $scope.aircraftList = aircraft; |
342 | }) | 389 | }) |
343 | } | 390 | } |
344 | if ($scope.marginId != '') { | 391 | if ($scope.marginId != '') { |
345 | fuelOrdersService.getJetTiers($scope.marginId).then(function(tiers) { | 392 | fuelOrdersService.getJetTiers($scope.marginId).then(function(tiers) { |
346 | $scope.tierList = tiers; | 393 | $scope.tierList = tiers; |
347 | $scope.showLoader = false; | 394 | // $scope.showLoader = false; |
348 | }) | 395 | }) |
349 | }else{ | 396 | }else{ |
350 | $scope.showLoader = false; | 397 | // $scope.showLoader = false; |
351 | } | 398 | } |
352 | } | 399 | } |
353 | } | 400 | } |
354 | 401 | ||
355 | } | 402 | } |
356 | $scope.setCost = function(cost){ | 403 | $scope.setCost = function(cost){ |
357 | console.log(cost); | 404 | // console.log(cost); |
358 | if(cost != null) { | 405 | if(cost != null) { |
359 | var obj =JSON.parse(cost); | 406 | var obj =JSON.parse(cost); |
360 | $scope.order.fboCost = obj.cost; | 407 | $scope.order.fboCost = obj.cost; |
361 | } | 408 | } |
362 | 409 | ||
363 | } | 410 | } |
364 | 411 | ||
365 | 412 | ||
366 | $scope.cancelData = function() { | 413 | $scope.cancelData = function() { |
367 | $('#demo-modal-4').css('display', ''); | 414 | $('#demo-modal-4').css('display', ''); |
368 | } | 415 | } |
369 | $scope.canceleditdata = function() { | 416 | $scope.canceleditdata = function() { |
370 | $('#demo-modal-5').css('display', ''); | 417 | $('#demo-modal-5').css('display', ''); |
371 | } | 418 | } |
372 | 419 | ||
373 | 420 | ||
374 | 421 | ||
375 | $scope.companyList = {}; | 422 | $scope.companyList = {}; |
423 | |||
424 | fuelOrdersService.getAllCompanies().then(function(result) { | ||
425 | $scope.showLoader = true; | ||
426 | $scope.companyList = result; | ||
427 | $scope.showLoader = false; | ||
428 | }) | ||
429 | |||
430 | /*Add a company services API used from customersService */ | ||
431 | getCompanyName(); | ||
432 | function getCompanyName(){ | ||
433 | CustomersService.getCompanyName().then(function(result) { | ||
434 | $scope.showLoader = true; | ||
435 | $scope.compNameList = result; | ||
436 | //console.log("kd",result) | ||
437 | $scope.showLoader = false; | ||
438 | }) | ||
439 | } | ||
440 | |||
441 | $scope.marginFilterOptions = []; | ||
442 | CustomersService.getJetMargin($scope.userProfileId).then(function(result) { | ||
443 | $scope.showLoader = true; | ||
444 | $scope.jetMarginList = result; | ||
445 | //console.log("jet margin",result,$scope.userProfileId) | ||
446 | $scope.marginFilterOptions.push({ | ||
447 | 'id': '', 'title': 'Show All' | ||
448 | }); | ||
449 | for (var i = 0; i < result.length; i++) { | ||
450 | $scope.marginFilterOptions.push({ | ||
451 | 'id': result[i].id, | ||
452 | 'title': result[i].marginName | ||
453 | }) | ||
454 | } | ||
455 | $scope.showLoader = false; | ||
456 | }) | ||
457 | |||
458 | CustomersService.getAvgMargin($scope.userProfileId).then(function(result) { | ||
459 | $scope.avgsMarginList = result; | ||
460 | // console.log('avgsMarginList',result) | ||
461 | }) | ||
462 | |||
463 | $scope.showCompanyError = false; | ||
464 | $scope.showMarginError = false; | ||
465 | |||
466 | $scope.removeValidation = function(){ | ||
467 | $scope.showCompanyError = false; | ||
468 | $('.companyNameInput').removeClass('customErrorInput'); | ||
469 | if($scope.data.companyName == 'undefined' || $scope.data.companyName == '') { | ||
470 | $('.companyNameInput').addClass('customErrorInput'); | ||
471 | $scope.showCompanyError = true; | ||
472 | } | ||
473 | } | ||
376 | 474 | ||
377 | fuelOrdersService.getAllCompanies().then(function(result) { | 475 | $scope.removeMarginValidation = function(){ |
476 | $scope.showMarginError = false; | ||
477 | $('.marginSelectBox').removeClass('customErrorInput'); | ||
478 | } | ||
479 | |||
480 | getData(); | ||
481 | function getData(){ | ||
482 | $scope.showLoader = true; | ||
483 | CustomersService.getAircraftMake().then(function(result) { | ||
484 | $scope.aircraftMakeList = result; | ||
485 | $scope.showLoader = false; | ||
486 | }) | ||
487 | } | ||
488 | var companyData; | ||
489 | $scope.addFirstData = function(sel, step){ | ||
378 | $scope.showLoader = true; | 490 | $scope.showLoader = true; |
379 | $scope.companyList = result; | 491 | if($scope.data.companyName == undefined){ |
380 | console.log(result) | 492 | $scope.showCompanyError = true; |
493 | $('.companyNameInput').addClass('customErrorInput'); | ||
494 | }else if($scope.data.masterMargin == undefined){ | ||
495 | $scope.showMarginError = true; | ||
496 | $('.marginSelectBox').addClass('customErrorInput'); | ||
497 | }else{ | ||
498 | $scope.aircraftDetails = [{ | ||
499 | 'tail':'', | ||
500 | 'make': '', | ||
501 | 'model': '', | ||
502 | 'sizeId' : '', | ||
503 | 'marginId': $scope.data.masterMargin, | ||
504 | 'avgasMarginId': $scope.data.avgasMargin | ||
505 | }]; | ||
506 | |||
507 | $(sel).trigger('next.m.' + step); | ||
508 | getData(); | ||
509 | } | ||
381 | $scope.showLoader = false; | 510 | $scope.showLoader = false; |
382 | }) | 511 | } |
512 | $scope.addNew = function(){ | ||
513 | $scope.showLoader = true; | ||
514 | $scope.aircraftDetails.push({ | ||
515 | 'tail':'', | ||
516 | 'make': '', | ||
517 | 'model': '', | ||
518 | 'sizeId' : '', | ||
519 | 'marginId': $scope.data.masterMargin, | ||
520 | 'avgasMarginId': $scope.data.avgasMargin | ||
521 | }); | ||
522 | $scope.showLoader = false; | ||
523 | }; | ||
524 | |||
525 | $scope.aircraft = {}; | ||
526 | $scope.getModal = function(makeId, index){ | ||
527 | $scope.showLoader = true; | ||
528 | //console.log(makeId) | ||
529 | $scope.aircraft.make = makeId; | ||
530 | //var makeId = makeId; | ||
531 | CustomersService.getModal($scope.aircraft.make).then(function(result) { | ||
532 | $scope.showLoader = false; | ||
533 | $scope.aircraftDetails[index].aircraftModalList = result; | ||
534 | //$scope.aircraftDetails[index].model = $scope.aircraftModalList[0]; | ||
535 | }) | ||
536 | } | ||
537 | |||
538 | $scope.getSize = function(model, index){ | ||
539 | $scope.showLoader = true; | ||
540 | CustomersService.getAircraftSize($scope.aircraft.make, model).then(function(result) { | ||
541 | $scope.showLoader = false; | ||
542 | $scope.aircraftDetails[index].aircraftSizeList = result; | ||
543 | //$scope.aircraftDetails[index].size = $scope.aircraftSizeList[0]; | ||
544 | }) | ||
545 | } | ||
546 | |||
547 | $scope.aircraftListData = {}; | ||
548 | $scope.addData = []; | ||
549 | $scope.saveCompanyData = function(){ | ||
550 | CustomersService.addCompany($scope.data).then(function(result) { | ||
551 | $scope.accountId = result; | ||
552 | $scope.aircraft.accountId = $scope.accountId; | ||
553 | |||
554 | for(var i=0; i<$scope.aircraftDetails.length;i++){ | ||
555 | $scope.addData.push({ | ||
556 | 'tail': $scope.aircraftDetails[i].tail, | ||
557 | 'make': $scope.aircraftDetails[i].make, | ||
558 | 'model': $scope.aircraftDetails[i].model, | ||
559 | 'sizeId' : $scope.aircraftDetails[i].sizeId, | ||
560 | 'marginId': $scope.aircraftDetails[i].marginId, | ||
561 | 'avgasMarginId': $scope.aircraftDetails[i].avgasMarginId | ||
562 | }); | ||
563 | } | ||
564 | $scope.aircraftListData.aircraftList = $scope.addData; | ||
565 | $scope.aircraftListData.accountId = $scope.aircraft.accountId; | ||
566 | |||
567 | if($scope.aircraftListData.aircraftList[0].tail == "" || $scope.aircraftListData.aircraftList[0].make == null || $scope.aircraftListData.aircraftList[0].model == null){ | ||
568 | $scope.aircraftListData.aircraftList = []; | ||
569 | } | ||
570 | |||
571 | CustomersService.addAircraft($scope.aircraftListData).then(function(result) { | ||
572 | |||
573 | if(result != null && result.success){ | ||
574 | toastr.success(''+result.success+'', { | ||
575 | closeButton: true | ||
576 | }) | ||
577 | $('#demo-modal-3').modal('hide'); | ||
578 | getAllCompanies(); | ||
579 | }else{ | ||
580 | toastr.error(''+result.statusText+'', { | ||
581 | closeButton: true | ||
582 | }) | ||
583 | } | ||
584 | }); | ||
585 | |||
586 | }) | ||
587 | |||
588 | |||
589 | } |
app/partials/fuelOrders/fuelOrders.html
1 | <style> | 1 | <style> |
2 | .subnavbar .mainnav > li:nth-child(2) > a{ | 2 | .subnavbar .mainnav > li:nth-child(2) > a{ |
3 | color: #ff9900; | 3 | color: #ff9900; |
4 | } | 4 | } |
5 | 5 | ||
6 | .button1 { | 6 | .button1 { |
7 | display: inline-block; | 7 | display: inline-block; |
8 | height: 35px; | 8 | height: 35px; |
9 | line-height: 35px; | 9 | line-height: 35px; |
10 | padding-right: 15px; | 10 | padding-right: 15px; |
11 | padding-left: 50px; | 11 | padding-left: 50px; |
12 | position: relative; | 12 | position: relative; |
13 | background-color:rgb(41,127,184); | 13 | background-color:rgb(41,127,184); |
14 | color:rgb(255,255,255); | 14 | color:rgb(255,255,255); |
15 | text-decoration: none; | 15 | text-decoration: none; |
16 | text-transform: uppercase; | 16 | text-transform: uppercase; |
17 | letter-spacing: 1px; | 17 | letter-spacing: 1px; |
18 | margin-bottom: 15px; | 18 | margin-bottom: 15px; |
19 | border: 0; | 19 | border: 0; |
20 | 20 | ||
21 | 21 | ||
22 | border-radius: 5px; | 22 | border-radius: 5px; |
23 | -moz-border-radius: 5px; | 23 | -moz-border-radius: 5px; |
24 | -webkit-border-radius: 5px; | 24 | -webkit-border-radius: 5px; |
25 | text-shadow:0px 1px 0px rgba(0,0,0,0.5); | 25 | text-shadow:0px 1px 0px rgba(0,0,0,0.5); |
26 | -ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ff123852,Positive=true)";zoom:1; | 26 | -ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ff123852,Positive=true)";zoom:1; |
27 | filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ff123852,Positive=true); | 27 | filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ff123852,Positive=true); |
28 | 28 | ||
29 | -moz-box-shadow:0px 2px 2px rgba(0,0,0,0.2); | 29 | -moz-box-shadow:0px 2px 2px rgba(0,0,0,0.2); |
30 | -webkit-box-shadow:0px 2px 2px rgba(0,0,0,0.2); | 30 | -webkit-box-shadow:0px 2px 2px rgba(0,0,0,0.2); |
31 | box-shadow:0px 2px 2px rgba(0,0,0,0.2); | 31 | box-shadow:0px 2px 2px rgba(0,0,0,0.2); |
32 | -ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=2,Color=#33000000,Positive=true)"; | 32 | -ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=2,Color=#33000000,Positive=true)"; |
33 | filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=2,Color=#33000000,Positive=true); | 33 | filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=2,Color=#33000000,Positive=true); |
34 | } | 34 | } |
35 | 35 | ||
36 | .button1 span { | 36 | .button1 span { |
37 | position: absolute; | 37 | position: absolute; |
38 | left: 0; | 38 | left: 0; |
39 | top: 0; | 39 | top: 0; |
40 | width: 35px; | 40 | width: 35px; |
41 | background-color:rgba(0,0,0,0.5); | 41 | background-color:rgba(0,0,0,0.5); |
42 | 42 | ||
43 | -webkit-border-top-left-radius: 5px; | 43 | -webkit-border-top-left-radius: 5px; |
44 | -webkit-border-bottom-left-radius: 5px; | 44 | -webkit-border-bottom-left-radius: 5px; |
45 | -moz-border-radius-topleft: 5px; | 45 | -moz-border-radius-topleft: 5px; |
46 | -moz-border-radius-bottomleft: 5px; | 46 | -moz-border-radius-bottomleft: 5px; |
47 | border-top-left-radius: 5px; | 47 | border-top-left-radius: 5px; |
48 | border-bottom-left-radius: 5px; | 48 | border-bottom-left-radius: 5px; |
49 | border-right: 1px solid rgba(0,0,0,0.15); | 49 | border-right: 1px solid rgba(0,0,0,0.15); |
50 | } | 50 | } |
51 | 51 | ||
52 | .button1:hover span, .button1.active span { | 52 | .button1:hover span, .button1.active span { |
53 | background-color:rgb(0,102,26); | 53 | background-color:rgb(0,102,26); |
54 | border-right: 1px solid rgba(0,0,0,0.3); | 54 | border-right: 1px solid rgba(0,0,0,0.3); |
55 | } | 55 | } |
56 | 56 | ||
57 | .button1:active { | 57 | .button1:active { |
58 | margin-top: 2px; | 58 | margin-top: 2px; |
59 | margin-bottom: 13px; | 59 | margin-bottom: 13px; |
60 | 60 | ||
61 | -moz-box-shadow:0px 1px 0px rgba(255,255,255,0.5); | 61 | -moz-box-shadow:0px 1px 0px rgba(255,255,255,0.5); |
62 | -webkit-box-shadow:0px 1px 0px rgba(255,255,255,0.5); | 62 | -webkit-box-shadow:0px 1px 0px rgba(255,255,255,0.5); |
63 | box-shadow:0px 1px 0px rgba(255,255,255,0.5); | 63 | box-shadow:0px 1px 0px rgba(255,255,255,0.5); |
64 | -ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ccffffff,Positive=true)"; | 64 | -ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ccffffff,Positive=true)"; |
65 | filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ccffffff,Positive=true); | 65 | filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ccffffff,Positive=true); |
66 | } | 66 | } |
67 | 67 | ||
68 | .button1.turquoise { | 68 | .button1.turquoise { |
69 | background: #449d44; | 69 | background: #449d44; |
70 | } | 70 | } |
71 | </style> | 71 | </style> |
72 | 72 | ||
73 | <div class="myLoader" ng-show="showLoader"> | 73 | <div class="myLoader" ng-show="showLoader"> |
74 | <img src="../img/hourglass.gif" width="50px;"> | 74 | <img src="../img/hourglass.gif" width="50px;"> |
75 | </div> | 75 | </div> |
76 | 76 | ||
77 | 77 | ||
78 | <div class="main"> | 78 | <div class="main"> |
79 | <div class="container"> | 79 | <div class="container"> |
80 | <div class="row"> | 80 | <div class="row"> |
81 | <div class="col-md-12"> | 81 | <div class="col-md-12"> |
82 | <div class="widget stacked "> | 82 | <div class="widget stacked "> |
83 | <div class="widget-content"> | 83 | <div class="widget-content"> |
84 | <div class="tabbable"> | 84 | <div class="tabbable"> |
85 | <ul class="nav nav-tabs"> | 85 | <ul class="nav nav-tabs"> |
86 | <li style="margin: 0px 10px 4px 10px;"><input type="text" style="height:31px;"class="form-control" name="name" id="name" ng-model="searchText" placeholder="Search In Table"></li> | 86 | <li style="margin: 0px 10px 4px 10px;"><input type="text" style="height:31px;"class="form-control" name="name" id="name" ng-model="searchText" placeholder="Search In Table"></li> |
87 | <li><button type="button" class="btn btn-default btn-sm " ng-click="displayFuelOrderList.filter({}); searchText=null">Clear Search And Filters</button></li> | 87 | <li><button type="button" class="btn btn-default btn-sm " ng-click="displayFuelOrderList.filter({}); searchText=null">Clear Search And Filters</button></li> |
88 | <li style="float:right"><button type="submit" data-toggle="modal" data-target="#demo-modal-3" class="btn btn-success btn-sm"><i class="fa fa-plus" aria-hidden="true"></i> Add Company</button></li> | 88 | <li style="float:right"><button type="submit" data-toggle="modal" data-target="#demo-modal-3" class="btn btn-success btn-sm"><i class="fa fa-plus" aria-hidden="true"></i> Add Company</button></li> |
89 | </ul> | 89 | </ul> |
90 | <br> | 90 | <br> |
91 | <div class="tab-content customer-table" style="margin:0px"> | 91 | <div class="tab-content customer-table" style="margin:0px"> |
92 | <div class="tab-pane active" id="companyView"> | 92 | <div class="tab-pane active" id="companyView"> |
93 | <table ng-table="displayFuelOrderList" class="table table-striped table-condensed" show-filter="true"> | 93 | <table ng-table="displayFuelOrderList" class="table table-striped table-condensed" show-filter="true"> |
94 | <tr ng-repeat="row in $data | filter:searchText" style="cursor: pointer;" > | 94 | <tr ng-repeat="row in $data | filter:searchText" style="cursor: pointer;" > |
95 | <td data-title="'Company Name'" filter="{companyName: 'text'}" sortable="'companyName'" ng-click="editTableRow(row)"> | 95 | <td data-title="'Company Name'" filter="{companyName: 'text'}" sortable="'companyName'" ng-click="editTableRow(row)"> |
96 | {{row.companyName}} | 96 | {{row.companyName}} |
97 | </td> | 97 | </td> |
98 | <td data-title="'Fueling date'" filter="{departingDate: 'text'}" sortable="'departingDate'" ng-click="editTableRow(row)"> | 98 | <td data-title="'Fueling date'" filter="{departingDate: 'text'}" sortable="'departingDate'" ng-click="editTableRow(row)"> |
99 | {{row.upliftDateString}} | 99 | {{row.upliftDateString}} |
100 | </td> | 100 | </td> |
101 | <td data-title="'Tail #'" filter="{aircraftName: 'text'}" sortable="'aircraftName'" ng-click="editTableRow(row)"> | 101 | <td data-title="'Tail #'" filter="{aircraftName: 'text'}" sortable="'aircraftName'" ng-click="editTableRow(row)"> |
102 | {{row.aircraftName}} | 102 | {{row.aircraftName}} |
103 | </td> | 103 | </td> |
104 | <td data-title="'Source'" filter="{source: 'text'}" sortable="'source'" ng-click="editTableRow(row)"> | 104 | <td data-title="'Source'" filter="{source: 'text'}" sortable="'source'" ng-click="editTableRow(row)"> |
105 | {{row.source}} | 105 | {{row.source}} |
106 | </td> | 106 | </td> |
107 | <td data-title="'Volume'" filter="{requestedVolume: 'text'}" sortable="'requestedVolume'" ng-click="editTableRow(row)"> | 107 | <td data-title="'Volume'" filter="{requestedVolume: 'text'}" sortable="'requestedVolume'" ng-click="editTableRow(row)"> |
108 | {{row.requestedVolume}} | 108 | {{row.requestedVolume}} |
109 | </td> | 109 | </td> |
110 | <td data-title="'FBO Cost'" filter="{fboCost: 'text'}" sortable="'fboCost'" ng-click="editTableRow(row)"> | 110 | <td data-title="'FBO Cost'" filter="{fboCost: 'text'}" sortable="'fboCost'" ng-click="editTableRow(row)"> |
111 | {{row.fboCost}} | 111 | {{row.fboCost}} |
112 | </td> | 112 | </td> |
113 | <td data-title="'Quoted'" filter="{priceQuote: 'text'}" sortable="'priceQuote'" ng-click="editTableRow(row)"> | 113 | <td data-title="'Quoted'" filter="{priceQuote: 'text'}" sortable="'priceQuote'" ng-click="editTableRow(row)"> |
114 | {{row.priceQuote}} | 114 | {{row.priceQuote}} |
115 | </td> | 115 | </td> |
116 | <td data-title="'Invoiced'" filter="{invoiced: 'text'}" sortable="'invoiced'" ng-click="editTableRow(row)"> | 116 | <td data-title="'Invoiced'" filter="{invoiced: 'text'}" sortable="'invoiced'" ng-click="editTableRow(row)"> |
117 | {{row.invoiced}} | 117 | {{row.invoiced}} |
118 | </td> | 118 | </td> |
119 | <td data-title="'Total'" filter="{total: 'text'}" sortable="'total'" ng-click="editTableRow(row)"> | 119 | <td data-title="'Total'" filter="{total: 'text'}" sortable="'total'" ng-click="editTableRow(row)"> |
120 | {{row.total}} | 120 | {{row.total}} |
121 | </td> | 121 | </td> |
122 | <td data-title="'Status'" filter="{status: 'select'}" filter-data="statusFilterOptions" sortable="'status'"> | 122 | <td data-title="'Status'" filter="{status: 'select'}" filter-data="statusFilterOptions" sortable="'status'"> |
123 | <select class="btn btn-regular colorfulSelectbox" ng-model="row.status" ng-style="abc" ng-change="updateStatus(row, row.status)"> | 123 | <select class="btn btn-regular colorfulSelectbox" ng-model="row.status" ng-style="abc" ng-change="updateStatus(row, row.status)"> |
124 | <!-- <option value="" disabled ng-selected="row.status == null"> Select</option> --> | 124 | <!-- <option value="" disabled ng-selected="row.status == null"> Select</option> --> |
125 | <option class="blackOption" value="pending" ng-selected="row.status == pending"> Pending</option> | 125 | <option class="blackOption" value="pending" ng-selected="row.status == pending"> Pending</option> |
126 | <option class="blueOption" value="invoiced" ng-selected="row.status == invoiced" >Invoiced</option> | 126 | <option class="blueOption" value="invoiced" ng-selected="row.status == invoiced" >Invoiced</option> |
127 | <option class="greenOption" value="paid" ng-selected="row.status == paid" >Paid</option> | 127 | <option class="greenOption" value="paid" ng-selected="row.status == paid" >Paid</option> |
128 | <option class="redOption" value="cancelled" ng-selected="row.status == cancelled" >Cancelled</option> | 128 | <option class="redOption" value="cancelled" ng-selected="row.status == cancelled" >Cancelled</option> |
129 | <option class="yellowOption" value="archived" ng-selected="row.status == archived" >Archived</option> | 129 | <option class="yellowOption" value="archived" ng-selected="row.status == archived" >Archived</option> |
130 | </select> | 130 | </select> |
131 | </td> | 131 | </td> |
132 | <td data-title="'Attachments'" filter="{orderInvoice : 'select'}" filter-data="attachmentFilterOptions" sortable="'orderInvoice '"> | 132 | <td data-title="'Attachments'" filter="{orderInvoice : 'select'}" filter-data="attachmentFilterOptions" sortable="'orderInvoice '"> |
133 | <select class="btn btn-regular" ng-model="attachOptionSelected" ng-change="attachment(row.id,attachOptionSelected,row.orderInvoice.link, row)" > | 133 | <select class="btn btn-regular" ng-model="attachOptionSelected" ng-change="attachment(row.id,attachOptionSelected,row.orderInvoice.link, row)" > |
134 | <option value="" disabled selected="selected" >Invoice</option> | 134 | <option value="" disabled selected="selected" >Invoice</option> |
135 | <option value="viewAttachment" ng-if="row.orderInvoice !== null" >View</option> | 135 | <option value="viewAttachment" ng-if="row.orderInvoice !== null" >View</option> |
136 | <option value="deleteAttachment" ng-if="row.orderInvoice !== null">Delete</option> | 136 | <option value="deleteAttachment" ng-if="row.orderInvoice !== null">Delete</option> |
137 | <option value="0" disabled >_____________</option> | 137 | <option value="0" disabled >_____________</option> |
138 | <option value="uploadAttachment" >Upload</option> | 138 | <option value="uploadAttachment" >Upload</option> |
139 | </select> | 139 | </select> |
140 | <i class="fa fa-paperclip" ng-if="row.orderInvoice !== null"></i> | 140 | <i class="fa fa-paperclip" ng-if="row.orderInvoice !== null"></i> |
141 | </td> | 141 | </td> |
142 | </tr> | 142 | </tr> |
143 | </table> | 143 | </table> |
144 | 144 | ||
145 | <select class="btn btn-primary exportBtn" ng-model="optionSelected" ng-change="onFWSelect()"> | 145 | <select class="btn btn-primary exportBtn" ng-model="optionSelected" ng-change="onFWSelect()"> |
146 | <option value="" disabled selected="selected">Fuel Widget</option> | 146 | <option value="" disabled selected="selected">Fuel Widget</option> |
147 | <option value="dt" >Direct Transaction</option> | 147 | <option value="dt" >Direct Transaction</option> |
148 | <option value="efo" >Export Fuel Orders</option> | 148 | <option value="efo" >Export Fuel Orders</option> |
149 | </select> | 149 | </select> |
150 | 150 | ||
151 | </div> | 151 | </div> |
152 | </div> | 152 | </div> |
153 | </div> | 153 | </div> |
154 | </div> | 154 | </div> |
155 | <!-- /widget-content --> | 155 | <!-- /widget-content --> |
156 | </div> | 156 | </div> |
157 | <!-- /widget --> | 157 | <!-- /widget --> |
158 | </div> | 158 | </div> |
159 | <!-- /span8 --> | 159 | <!-- /span8 --> |
160 | </div> | 160 | </div> |
161 | <!-- /row --> | 161 | <!-- /row --> |
162 | </div> | 162 | </div> |
163 | <!-- /container --> | 163 | <!-- /container --> |
164 | 164 | ||
165 | 165 | ||
166 | </div> | 166 | </div> |
167 | <!-- /main --> | 167 | <!-- /main --> |
168 | 168 | ||
169 | 169 | ||
170 | <form class="modal multi-step" id="demo-modal-3" name="companyForm"> | 170 | <form class="modal multi-step" id="demo-modal-3" name="companyForm"> |
171 | <div class="modal-dialog modal-lg"> | 171 | <div class="modal-dialog modal-lg"> |
172 | <div class="modal-content"> | 172 | <div class="modal-content"> |
173 | <div class="modal-body step-1" data-step="1" style="padding: 0;"> | 173 | <div class="modal-body step-1" data-step="1" style="padding: 0;"> |
174 | <div> | 174 | <div> |
175 | <div class="row" style="margin: 0;"> | 175 | <div class="row" style="margin: 0;"> |
176 | <div> | 176 | <div> |
177 | <div class="widget" style="margin-bottom: 0;"> | 177 | <div class="widget" style="margin-bottom: 0;"> |
178 | <div class="widget-header"> | 178 | <div class="widget-header"> |
179 | <i class="icon-pencil"></i> | 179 | <i class="icon-pencil"></i> |
180 | <i class="fa fa-tasks" aria-hidden="true"></i> | 180 | <i class="fa fa-tasks" aria-hidden="true"></i> |
181 | <h3>Add a New Company</h3> | 181 | <h3>Add a New Company</h3> |
182 | <div class="pull-right my-toggle-switch" style="margin-right: 30px;"> | 182 | <div class="pull-right my-toggle-switch" style="margin-right: 30px;"> |
183 | <div style="color: #ff9a01;">Activate     | 183 | <div style="color: #ff9a01;">Activate     |
184 | <toggle ng-model="data.activate" size="customToogle"></toggle> | 184 | <toggle ng-model="data.activate" size="customToogle"></toggle> |
185 | </div> | 185 | </div> |
186 | </div> | 186 | </div> |
187 | <div class="clearfix"></div> | 187 | <div class="clearfix"></div> |
188 | </div> | 188 | </div> |
189 | <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;"> | 189 | <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;"> |
190 | <div class="col-xs-12"> | 190 | <div class="col-xs-12"> |
191 | <div class="col-md-8"> | 191 | <div class="col-md-8"> |
192 | <div class="pull-left"> | 192 | <div class="pull-left"> |
193 | <label class="new-input-label"><b>Company Name *</b></label> | 193 | <label class="new-input-label"><b>Company Name *</b></label> |
194 | </div> | 194 | </div> |
195 | <div class="pull-left" style="margin-left: 15px;"> | 195 | <div class="pull-left" style="margin-left: 15px;"> |
196 | <input type="text" ng-model="data.companyName" class="form-control companyNameInput" ng-keyup="removeValidation()" placeholder="" required> | 196 | <!-- <input type="text" ng-model="data.companyName" class="form-control companyNameInput" ng-keyup="removeValidation()" placeholder="" required> --> |
197 | <input type="text" ng-keyup="removeValidation()" ng-model="data.companyName" uib-typeahead="company.companyName for company in compNameList | filter:$viewValue | limitTo:8" class="form-control companyNameInput"> | ||
198 | |||
197 | <label class="customErrorMessage" ng-show="showCompanyError">This field is required.</label> | 199 | <label class="customErrorMessage" ng-show="showCompanyError">This field is required.</label> |
198 | </div> | 200 | </div> |
199 | <div class="clearfix"></div> | 201 | <div class="clearfix"></div> |
200 | </div> | 202 | </div> |
201 | <div class="col-md-4"> | 203 | <div class="col-md-4"> |
202 | 204 | ||
203 | <div class="pull-right"> | 205 | <div class="pull-right"> |
204 | <input type="text" ng-model="data.baseIcao" style="width: 100px;" class="form-control" placeholder=""> | 206 | <input type="text" ng-model="data.baseIcao" style="width: 100px;" class="form-control" placeholder=""> |
205 | </div> | 207 | </div> |
206 | <div class="pull-right"> | 208 | <div class="pull-right"> |
207 | <label style="margin-right: 15px;" class="new-input-label"><b>Base ICAO</b></label> | 209 | <label style="margin-right: 15px;" class="new-input-label"><b>Base ICAO</b></label> |
208 | </div> | 210 | </div> |
209 | <div class="clearfix"></div> | 211 | <div class="clearfix"></div> |
210 | </div> | 212 | </div> |
211 | </div> | 213 | </div> |
212 | <div class="clearfix"></div><br> | 214 | <div class="clearfix"></div><br> |
213 | <div class="col-xs-12"> | 215 | <div class="col-xs-12"> |
214 | <div class="col-md-7"> | 216 | <div class="col-md-7"> |
215 | <div class="pull-left"> | 217 | <div class="pull-left"> |
216 | <label class="new-input-label"><b>Relationship </b></label> | 218 | <label class="new-input-label"><b>Relationship </b></label> |
217 | </div> | 219 | </div> |
218 | <div class="pull-left" style="margin-left: 32px;"> | 220 | <div class="pull-left" style="margin-left: 32px;"> |
219 | <input type="checkbox" ng-model="data.baseTenant" name="vehicle" value="Bike"> Check here if this is a Base Tenant<br> | 221 | <input type="checkbox" ng-model="data.baseTenant" name="vehicle" value="Bike"> Check here if this is a Base Tenant<br> |
220 | <input type="checkbox" ng-model="data.fuelerlinxCustomer" name="vehicle" value="Car" checked> Check here if this is a FuelerLinx Customer<br> | 222 | <input type="checkbox" ng-model="data.fuelerlinxCustomer" name="vehicle" value="Car" checked> Check here if this is a FuelerLinx Customer<br> |
221 | <input type="checkbox" ng-model="data.contractFuelVendor" name="vehicle" value="Car" checked> Check here if this is a Contract Fuel Vendor | 223 | <input type="checkbox" ng-model="data.contractFuelVendor" name="vehicle" value="Car" checked> Check here if this is a Contract Fuel Vendor |
222 | </div> | 224 | </div> |
223 | <div class="clearfix"></div> | 225 | <div class="clearfix"></div> |
224 | </div> | 226 | </div> |
225 | <div class="col-md-2 Airport" style="text-align: right;"> | 227 | <div class="col-md-2 Airport" style="text-align: right;"> |
226 | <b>Certificate Type</b> | 228 | <b>Certificate Type</b> |
227 | </div> | 229 | </div> |
228 | <div class="col-md-3 Airport"> | 230 | <div class="col-md-3 Airport"> |
229 | <select required class="form-control" ng-model="data.certificateType"> | 231 | <select required class="form-control" ng-model="data.certificateType"> |
230 | <option value="" disabled selected hidden>Select...</option> | 232 | <option value="" disabled selected hidden>Select...</option> |
231 | <option value="corporate">Part 91 (Corporate)</option> | 233 | <option value="corporate">Part 91 (Corporate)</option> |
232 | <option value="charter">Part 135 (Charter)</option> | 234 | <option value="charter">Part 135 (Charter)</option> |
233 | <option value="scheduled">Part 121 (Scheduled)</option> | 235 | <option value="scheduled">Part 121 (Scheduled)</option> |
234 | <option value="military">Military</option> | 236 | <option value="military">Military</option> |
235 | <option value="government">Government</option> | 237 | <option value="government">Government</option> |
236 | </select> | 238 | </select> |
237 | </div> | 239 | </div> |
238 | <div class="clearfix"></div> | 240 | <div class="clearfix"></div> |
239 | </div> | 241 | </div> |
240 | <div class="clearfix"></div> | 242 | <div class="clearfix"></div> |
241 | <br/> | 243 | <br/> |
242 | <div class="col-xs-12"> | 244 | <div class="col-xs-12"> |
243 | <div class="col-md-6"> | 245 | <div class="col-md-6"> |
244 | <div class="pull-left" style="width: 110px;"> | 246 | <div class="pull-left" style="width: 110px;"> |
245 | <b>JET A Margin *</b> | 247 | <b>JET A Margin *</b> |
246 | </div> | 248 | </div> |
247 | <div class="pull-left"> | 249 | <div class="pull-left"> |
248 | <select class="form-control marginSelectBox" ng-model="data.masterMargin" ng-options="margin.id as margin.marginName for margin in jetMarginList" required ng-change="removeMarginValidation()"> | 250 | <select class="form-control marginSelectBox" ng-model="data.masterMargin" ng-options="margin.id as margin.marginName for margin in jetMarginList" required ng-change="removeMarginValidation()"> |
249 | <option value="" disabled>Select...</option> | 251 | <option value="" disabled>Select...</option> |
250 | </select> | 252 | </select> |
251 | <label ng-show="showMarginError" class="customErrorMessage">This field is required.</label> | 253 | <label ng-show="showMarginError" class="customErrorMessage">This field is required.</label> |
252 | 254 | ||
253 | <div class="clearfix"></div> | 255 | <div class="clearfix"></div> |
254 | </div> | 256 | </div> |
255 | </div> | 257 | </div> |
256 | 258 | ||
257 | <div class="col-md-3 Airport" style="text-align: right;"> | 259 | <div class="col-md-3 Airport" style="text-align: right;"> |
258 | <b>AVGAS 100LL Margin</b> | 260 | <b>AVGAS 100LL Margin</b> |
259 | </div> | 261 | </div> |
260 | <div class="col-md-3 Airport"> | 262 | <div class="col-md-3 Airport"> |
261 | <select class="form-control" ng-model="data.avgasMargin" ng-options="avgs.id as avgs.marginName for avgs in avgsMarginList"> | 263 | <select class="form-control" ng-model="data.avgasMargin" ng-options="avgs.id as avgs.marginName for avgs in avgsMarginList"> |
262 | <option value="" disabled>Select...</option> | 264 | <option value="" disabled>Select...</option> |
263 | </select> | 265 | </select> |
264 | </div> | 266 | </div> |
265 | <div class="clearfix"></div> | 267 | <div class="clearfix"></div> |
266 | </div> | 268 | </div> |
267 | <div class="clearfix"></div> | 269 | <div class="clearfix"></div> |
268 | <br/> | 270 | <br/> |
269 | <div class="col-xs-12"> | 271 | <div class="col-xs-12"> |
270 | <div class="col-md-12"> | 272 | <div class="col-md-12"> |
271 | <div class="pull-left" style="width: 110px;"> | 273 | <div class="pull-left" style="width: 110px;"> |
272 | <label class="new-input-label"><b>Address</b></label> | 274 | <label class="new-input-label"><b>Address</b></label> |
273 | </div> | 275 | </div> |
274 | <div class="pull-left" style="width: calc(100% - 110px);"> | 276 | <div class="pull-left" style="width: calc(100% - 110px);"> |
275 | <input type="text" class="form-control" ng-model="data.addressOne" placeholder=""> | 277 | <input type="text" class="form-control" ng-model="data.addressOne" placeholder=""> |
276 | </div> | 278 | </div> |
277 | <div class="clearfix"></div> | 279 | <div class="clearfix"></div> |
278 | </div> | 280 | </div> |
279 | </div> | 281 | </div> |
280 | <div class="clearfix"></div> | 282 | <div class="clearfix"></div> |
281 | <br/> | 283 | <br/> |
282 | <div class="col-xs-12"> | 284 | <div class="col-xs-12"> |
283 | <div class="col-md-12"> | 285 | <div class="col-md-12"> |
284 | <div class="pull-left" style="width: 110px;"> | 286 | <div class="pull-left" style="width: 110px;"> |
285 | <label class="new-input-label"><b>Address2</b></label> | 287 | <label class="new-input-label"><b>Address2</b></label> |
286 | </div> | 288 | </div> |
287 | <div class="pull-left" style="width: calc(100% - 110px);"> | 289 | <div class="pull-left" style="width: calc(100% - 110px);"> |
288 | <input type="text" ng-model="data.addressTwo" class="form-control" placeholder=""> | 290 | <input type="text" ng-model="data.addressTwo" class="form-control" placeholder=""> |
289 | </div> | 291 | </div> |
290 | <div class="clearfix"></div> | 292 | <div class="clearfix"></div> |
291 | </div> | 293 | </div> |
292 | </div> | 294 | </div> |
293 | <div class="clearfix"></div> | 295 | <div class="clearfix"></div> |
294 | <br/> | 296 | <br/> |
295 | <div class="col-xs-12"> | 297 | <div class="col-xs-12"> |
296 | 298 | ||
297 | <div class="col-md-6"> | 299 | <div class="col-md-6"> |
298 | <div class="pull-left" style="width: 110px;"> | 300 | <div class="pull-left" style="width: 110px;"> |
299 | <label class="new-input-label"><b>City</b></label> | 301 | <label class="new-input-label"><b>City</b></label> |
300 | </div> | 302 | </div> |
301 | <div class="pull-left" style="width: calc(100% - 110px);"> | 303 | <div class="pull-left" style="width: calc(100% - 110px);"> |
302 | <input type="text" ng-model="data.city" class="form-control" placeholder=""> | 304 | <input type="text" ng-model="data.city" class="form-control" placeholder=""> |
303 | </div> | 305 | </div> |
304 | <div class="clearfix"></div> | 306 | <div class="clearfix"></div> |
305 | </div> | 307 | </div> |
306 | <div class="col-md-3"> | 308 | <div class="col-md-3"> |
307 | <div class="pull-left" style="width: 40px;"> | 309 | <div class="pull-left" style="width: 40px;"> |
308 | <label class="new-input-label"><b>State</b></label> | 310 | <label class="new-input-label"><b>State</b></label> |
309 | </div> | 311 | </div> |
310 | <div class="pull-left" style="width: calc(100% - 110px);"> | 312 | <div class="pull-left" style="width: calc(100% - 110px);"> |
311 | <input type="text" ng-model="data.state" class="form-control" placeholder=""> | 313 | <input type="text" ng-model="data.state" class="form-control" placeholder=""> |
312 | </div> | 314 | </div> |
313 | <div class="clearfix"></div> | 315 | <div class="clearfix"></div> |
314 | </div> | 316 | </div> |
315 | <div class="col-md-3"> | 317 | <div class="col-md-3"> |
316 | <div class="pull-left"> | 318 | <div class="pull-left"> |
317 | <label class="new-input-label"><b>Zip Code</b></label> | 319 | <label class="new-input-label"><b>Zip Code</b></label> |
318 | </div> | 320 | </div> |
319 | <div class="pull-right" style="width: calc(100% - 60px);"> | 321 | <div class="pull-right" style="width: calc(100% - 60px);"> |
320 | <input type="tel" ng-model="data.zipcode" class="form-control" placeholder=""> | 322 | <input type="tel" ng-model="data.zipcode" class="form-control" placeholder=""> |
321 | </div> | 323 | </div> |
322 | <div class="clearfix"></div> | 324 | <div class="clearfix"></div> |
323 | </div> | 325 | </div> |
324 | </div> | 326 | </div> |
325 | <div class="clearfix"></div> | 327 | <div class="clearfix"></div> |
326 | <br/> | 328 | <br/> |
327 | <div class="col-xs-12"> | 329 | <div class="col-xs-12"> |
328 | 330 | ||
329 | <div class="col-md-6"> | 331 | <div class="col-md-6"> |
330 | <div class="pull-left" style="width: 110px;"> | 332 | <div class="pull-left" style="width: 110px;"> |
331 | <label class="new-input-label"><b>Country</b></label> | 333 | <label class="new-input-label"><b>Country</b></label> |
332 | </div> | 334 | </div> |
333 | <div class="pull-left" style="width: calc(100% - 110px);"> | 335 | <div class="pull-left" style="width: calc(100% - 110px);"> |
334 | <input type="text" ng-model="data.country" class="form-control" placeholder=""> | 336 | <input type="text" ng-model="data.country" class="form-control" placeholder=""> |
335 | </div> | 337 | </div> |
336 | <div class="clearfix"></div> | 338 | <div class="clearfix"></div> |
337 | </div> | 339 | </div> |
338 | <div class="col-md-6"> | 340 | <div class="col-md-6"> |
339 | <div class="pull-left" style="width: 110px;"> | 341 | <div class="pull-left" style="width: 110px;"> |
340 | <label class="new-input-label"><b>Internal Note</b></label> | 342 | <label class="new-input-label"><b>Internal Note</b></label> |
341 | </div> | 343 | </div> |
342 | <div class="pull-left" style="width: calc(100% - 110px);"> | 344 | <div class="pull-left" style="width: calc(100% - 110px);"> |
343 | <textarea name="message" ng-model="data.internalNote" rows="4" cols="34"></textarea> | 345 | <textarea name="message" ng-model="data.internalNote" rows="4" cols="34"></textarea> |
344 | </div> | 346 | </div> |
345 | <div class="clearfix"></div> | 347 | <div class="clearfix"></div> |
346 | </div> | 348 | </div> |
347 | </div> | 349 | </div> |
348 | <div class="clearfix"></div> | 350 | <div class="clearfix"></div> |
349 | <!-- <br/> | 351 | <!-- <br/> |
350 | <div class="col-xs-12"> | 352 | <div class="col-xs-12"> |
351 | <div class="col-md-2 Airport"></div> | 353 | <div class="col-md-2 Airport"></div> |
352 | <div class="col-md-10 Airport"> | 354 | <div class="col-md-10 Airport"> |
353 | <div class="pull-right"> | 355 | <div class="pull-right"> |
354 | <button type="button" class="btn btn-default" ng-click="cancel()">Cancel</button> | 356 | <button type="button" class="btn btn-default" ng-click="cancel()">Cancel</button> |
355 | <button type="button" class="btn btn-warning" ng-click="addAircraft()">Next: Add Aircraft</button> | 357 | <button type="button" class="btn btn-warning" ng-click="addAircraft()">Next: Add Aircraft</button> |
356 | </div> | 358 | </div> |
357 | </div> | 359 | </div> |
358 | </div> --> | 360 | </div> --> |
359 | </div> | 361 | </div> |
360 | </div> | 362 | </div> |
361 | <div class="clearfix"></div> | 363 | <div class="clearfix"></div> |
362 | </div> | 364 | </div> |
363 | </div> | 365 | </div> |
364 | </div> | 366 | </div> |
365 | </div> | 367 | </div> |
366 | <div class="modal-body step-2" data-step="2" style="padding: 0;"> | 368 | <div class="modal-body step-2" data-step="2" style="padding: 0;"> |
367 | <div> | 369 | <div> |
368 | <div class="row" style="margin: 0;"> | 370 | <div class="row" style="margin: 0;"> |
369 | <div> | 371 | <div> |
370 | <div class="widget" style="margin-bottom: 0;"> | 372 | <div class="widget" style="margin-bottom: 0;"> |
371 | <div class="widget-header"> | 373 | <div class="widget-header"> |
372 | <i class="icon-pencil"></i> | 374 | <i class="icon-pencil"></i> |
373 | <i class="fa fa-tasks" aria-hidden="true"></i> | 375 | <i class="fa fa-tasks" aria-hidden="true"></i> |
374 | <h3>Add a New Company</h3> | 376 | <h3>Add a New Company</h3> |
375 | <div class="clearfix"></div> | 377 | <div class="clearfix"></div> |
376 | </div> | 378 | </div> |
377 | <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;"> | 379 | <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;"> |
378 | <div class="col-xs-12"> | 380 | <div class="col-xs-12"> |
379 | <div class="widget-header"> | 381 | <div class="widget-header"> |
380 | <i class="fa fa-list"></i> | 382 | <i class="fa fa-list"></i> |
381 | <h3>Aircraft List</h3> | 383 | <h3>Aircraft List</h3> |
382 | </div> | 384 | </div> |
383 | <div class="widget-content" style="padding:0px;border: 0px; "> | 385 | <div class="widget-content" style="padding:0px;border: 0px; "> |
384 | <div class="table-responsive"> | 386 | <div class="table-responsive"> |
385 | <!-- <table class="table table-bordered table-hover table-striped addRow" style="margin-bottom: 0px;"> | 387 | <!-- <table class="table table-bordered table-hover table-striped addRow" style="margin-bottom: 0px;"> |
386 | <thead> | 388 | <thead> |
387 | <tr> | 389 | <tr> |
388 | <th>Tail</th> | 390 | <th>Tail</th> |
389 | <th>Make</th> | 391 | <th>Make</th> |
390 | <th>Model</th> | 392 | <th>Model</th> |
391 | <th>Size</th> | 393 | <th>Size</th> |
392 | <th>Margin</th> | 394 | <th>Margin</th> |
393 | </tr> | 395 | </tr> |
394 | </thead> | 396 | </thead> |
395 | <tbody> | 397 | <tbody> |
396 | <tr> | 398 | <tr> |
397 | <td> | 399 | <td> |
398 | <input type="text" style="width:100px;" ng-model="aircraft.tail" class="form-control"> | 400 | <input type="text" style="width:100px;" ng-model="aircraft.tail" class="form-control"> |
399 | </td> | 401 | </td> |
400 | <td style="width: 25%;"> | 402 | <td style="width: 25%;"> |
401 | <select class="form-control" ng-model="aircraft.make" ng-change="getModal()"> | 403 | <select class="form-control" ng-model="aircraft.make" ng-change="getModal()"> |
402 | <option ng-repeat="make in aircraftMakeList">{{make}}</option> | 404 | <option ng-repeat="make in aircraftMakeList">{{make}}</option> |
403 | </select> | 405 | </select> |
404 | </td> | 406 | </td> |
405 | <td style="width: 20%;"> | 407 | <td style="width: 20%;"> |
406 | <select class="form-control" ng-model="aircraft.model" ng-change="getSize()"> | 408 | <select class="form-control" ng-model="aircraft.model" ng-change="getSize()"> |
407 | <option ng-repeat="model in aircraftModalList">{{model}}</option> | 409 | <option ng-repeat="model in aircraftModalList">{{model}}</option> |
408 | </select> | 410 | </select> |
409 | </td> | 411 | </td> |
410 | <td style="width: 25%;"> | 412 | <td style="width: 25%;"> |
411 | <select class="form-control" ng-model="aircraft.size"> | 413 | <select class="form-control" ng-model="aircraft.size"> |
412 | <option ng-repeat="size in aircraftSizeList">{{size}}</option> | 414 | <option ng-repeat="size in aircraftSizeList">{{size}}</option> |
413 | </select> | 415 | </select> |
414 | </td> | 416 | </td> |
415 | <td> | 417 | <td> |
416 | <select class="form-control"> | 418 | <select class="form-control"> |
417 | <option>Margin1</option> | 419 | <option>Margin1</option> |
418 | <option>Margin2</option> | 420 | <option>Margin2</option> |
419 | </select> | 421 | </select> |
420 | </td> | 422 | </td> |
421 | </tr> | 423 | </tr> |
422 | </tbody> | 424 | </tbody> |
423 | 425 | ||
424 | </table> --> | 426 | </table> --> |
425 | <table class="table table-striped table-bordered"> | 427 | <table class="table table-striped table-bordered"> |
426 | <thead> | 428 | <thead> |
427 | <tr> | 429 | <tr> |
428 | <!-- <th><input type="checkbox" ng-model="selectedAll" ng-click="checkAll()" /></th> --> | 430 | <!-- <th><input type="checkbox" ng-model="selectedAll" ng-click="checkAll()" /></th> --> |
429 | <th>Tail</th> | 431 | <th>Tail</th> |
430 | <th>Make</th> | 432 | <th>Make</th> |
431 | <th>Model</th> | 433 | <th>Model</th> |
432 | <th>Size</th> | 434 | <th>Size</th> |
433 | <th>JET A Margin</th> | 435 | <th>JET A Margin</th> |
434 | <th>AVGS 100LL Margin</th> | 436 | <th>AVGS 100LL Margin</th> |
435 | </tr> | 437 | </tr> |
436 | </thead> | 438 | </thead> |
437 | <tbody> | 439 | <tbody> |
438 | <tr ng-repeat="aircraftData in aircraftDetails track by $index"> | 440 | <tr ng-repeat="aircraftData in aircraftDetails track by $index"> |
439 | <!-- <td> | 441 | <!-- <td> |
440 | <input type="checkbox" ng-model="aircraftData.selected"/> | 442 | <input type="checkbox" ng-model="aircraftData.selected"/> |
441 | </td> --> | 443 | </td> --> |
442 | <td style="width: 15%"> | 444 | <td style="width: 15%"> |
443 | <input type="text" class="form-control" ng-model="aircraftData.tail" required/> | 445 | <input type="text" class="form-control" ng-model="aircraftData.tail" ng-blur="checkJetWithTail(aircraftData.tail, $index)" required/> |
444 | </td> | 446 | </td> |
445 | <td style="width: 17%"> | 447 | <td style="width: 17%"> |
446 | <select class="form-control" ng-model="aircraftData.make" ng-change="getModal(aircraftData.make, $index)"> | 448 | <select class="form-control" ng-model="aircraftData.make" ng-change="getModal(aircraftData.make, $index)"> |
447 | <option ng-repeat="make in aircraftMakeList">{{make}}</option> | 449 | <option ng-repeat="make in aircraftMakeList | orderBy">{{make}}</option> |
448 | <option value="" disabled>Select...</option> | 450 | <option value="" disabled>Select...</option> |
449 | </select> | 451 | </select> |
450 | </td> | 452 | </td> |
451 | <td style="width: 17%"> | 453 | <td style="width: 17%"> |
452 | <select class="form-control" ng-model="aircraftData.model" ng-change="getSize(aircraftData.model, $index)"> | 454 | <select class="form-control" ng-model="aircraftData.model" ng-change="getSize(aircraftData.model, $index)"> |
453 | <option ng-repeat="model in aircraftData.aircraftModalList">{{model}}</option> | 455 | <option ng-repeat="model in aircraftData.aircraftModalList | orderBy">{{model}}</option> |
454 | <option value="" disabled>Select...</option> | 456 | <option value="" disabled>Select...</option> |
455 | </select> | 457 | </select> |
456 | </td> | 458 | </td> |
457 | <td style="width: 17%"> | 459 | <td style="width: 17%"> |
458 | <select class="form-control" ng-model="aircraftData.sizeId" ng-options="size.aircraftSize.id as size.aircraftSize.size for size in aircraftData.aircraftSizeList"> | 460 | <!-- <select class="form-control" ng-model="aircraftData.sizeId" ng-options="size.aircraftSize.id as size.aircraftSize.size for size in aircraftData.aircraftSizeList"> |
459 | <option value="" disabled>Select...</option> | 461 | <option value="" disabled>Select...</option> |
462 | </select> --> | ||
463 | <select class="form-control" ng-model="aircraftData.sizeId"> | ||
464 | <option value="" disabled>Select</option> | ||
465 | <option ng-repeat="size in aircraftData.aircraftSizeList" value="{{size.aircraftSize.id}}">{{size.aircraftSize.size}}</option> | ||
460 | </select> | 466 | </select> |
461 | <!-- <select class="form-control" ng-model="aircraftData.size"> | 467 | <!-- <select class="form-control" ng-model="aircraftData.size"> |
462 | <option ng-repeat="size in aircraftData.aircraftSizeList">{{size}}</option> | 468 | <option ng-repeat="size in aircraftData.aircraftSizeList">{{size}}</option> |
463 | </select> --> | 469 | </select> --> |
464 | </td> | 470 | </td> |
465 | <td style="width: 17%"> | 471 | <td style="width: 17%"> |
466 | <select class="form-control" ng-model="aircraftData.marginId" ng-options="margin.id as margin.marginName for margin in jetMarginList"> | 472 | <!-- <select class="form-control" ng-model="aircraftData.marginId" ng-options="margin.id as margin.marginName for margin in jetMarginList"> |
467 | <option value="" disabled>Select...</option> | 473 | <option value="" disabled>Select...</option> |
474 | </select> --> | ||
475 | <select class="form-control" ng-model="aircraftData.marginId" ng-disabled="jetShow[$index]"> | ||
476 | <option value="" disabled>Select</option> | ||
477 | <option ng-repeat="margin in jetMarginList" value="{{margin.id}}">{{margin.marginName}}</option> | ||
468 | </select> | 478 | </select> |
469 | </td> | 479 | </td> |
470 | <td style="width: 17%"> | 480 | <td style="width: 17%"> |
471 | <select class="form-control marginSelectBox" ng-model="aircraftData.avgasMarginId" ng-options="avgs.id as avgs.marginName for avgs in avgsMarginList"> | 481 | <!-- <select class="form-control marginSelectBox" ng-model="aircraftData.avgasMarginId" ng-options="avgs.id as avgs.marginName for avgs in avgsMarginList"> |
472 | <option value="" disabled>Select...</option> | 482 | <option value="" disabled>Select...</option> |
483 | </select> --> | ||
484 | <select class="form-control" ng-model="aircraftData.avgasMarginId" ng-disabled="marginShow[$index]"> | ||
485 | <option value="" disabled>Select</option> | ||
486 | <option ng-repeat="avgs in avgsMarginList" value="{{avgs.id}}">{{avgs.marginName}}</option> | ||
473 | </select> | 487 | </select> |
474 | </td> | 488 | </td> |
475 | </tr> | 489 | </tr> |
476 | </tbody> | 490 | </tbody> |
477 | </table> | 491 | </table> |
478 | </div> | 492 | </div> |
479 | <div class="clearfix"></div> | 493 | <div class="clearfix"></div> |
480 | </div> | 494 | </div> |
481 | </div> | 495 | </div> |
482 | <div class="clearfix"></div> | 496 | <div class="clearfix"></div> |
483 | <div class="col-xs-12" style="margin-bottom: 50px;margin-top: 10px;"> | 497 | <div class="col-xs-12" style="margin-bottom: 50px;margin-top: 10px;"> |
484 | <button ng-click="addNew()" class="button1 turquoise pull-right"><span>+</span>Add Aircraft</button> | 498 | <button ng-click="addNew()" class="button1 turquoise pull-right"><span>+</span>Add Aircraft</button> |
485 | </div> | 499 | </div> |
486 | <!-- <div class="col-xs-12" style="margin-bottom: 20px;"> | 500 | <!-- <div class="col-xs-12" style="margin-bottom: 20px;"> |
487 | <div class="pull-right"> | 501 | <div class="pull-right"> |
488 | <button type="button" class="btn btn-default" ng-click="cancelCraft()">Cancel</button> | 502 | <button type="button" class="btn btn-default" ng-click="cancelCraft()">Cancel</button> |
489 | <button type="button" class="btn btn-warning" ng-click="goBack()">Go Back</button> | 503 | <button type="button" class="btn btn-warning" ng-click="goBack()">Go Back</button> |
490 | <button type="button" class="btn btn-success" ng-click="goBack()">Save</button> | 504 | <button type="button" class="btn btn-success" ng-click="goBack()">Save</button> |
491 | </div> | 505 | </div> |
492 | </div> --> | 506 | </div> --> |
493 | </div> | 507 | </div> |
494 | </div> | 508 | </div> |
495 | <div class="clearfix"></div> | 509 | <div class="clearfix"></div> |
496 | </div> | 510 | </div> |
497 | </div> | 511 | </div> |
498 | </div> | 512 | </div> |
499 | </div> | 513 | </div> |
500 | <!-- <div class="modal-body step-3" data-step="3"> | 514 | <!-- <div class="modal-body step-3" data-step="3"> |
501 | This is the final step. | 515 | This is the final step. |
502 | </div> --> | 516 | </div> --> |
503 | <div class="modal-footer" style="border-top: 0;"> | 517 | <div class="modal-footer" style="border-top: 0;"> |
504 | <button type="button" class="btn btn-default" ng-click="reset2()" data-dismiss="modal">Cancel</button> | 518 | <button type="button" class="btn btn-default" ng-click="reset2()" data-dismiss="modal">Cancel</button> |
505 | <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="addFirstData('#demo-modal-3', 2)">Next: Add Aircraft</button> | 519 | <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="addFirstData('#demo-modal-3', 2)">Next: Add Aircraft</button> |
506 | <button type="button" class="btn btn-primary step step-2" data-step="2" onclick="sendEvent('#demo-modal-3', 1)">Go Back</button> | 520 | <button type="button" class="btn btn-primary step step-2" data-step="2" onclick="sendEvent('#demo-modal-3', 1)">Go Back</button> |
507 | <!-- <button type="button" class="btn btn-primary step step-2" data-step="2" onclick="sendEvent('#demo-modal-3', 3)">Continue</button> --> | 521 | <!-- <button type="button" class="btn btn-primary step step-2" data-step="2" onclick="sendEvent('#demo-modal-3', 3)">Continue</button> --> |
508 | <button type="button" class="btn btn-success step step-2" data-step="2" ng-click="saveCompanyData()">Save</button> | 522 | <button type="button" class="btn btn-success step step-2" data-step="2" ng-click="saveCompanyData()">Save</button> |
509 | </div> | 523 | </div> |
510 | </div> | 524 | </div> |
511 | </div> | 525 | </div> |
512 | </form> | 526 | </form> |
513 | 527 | ||
514 | 528 | ||
515 | 529 | ||
516 | <form class="modal multi-step" id="demo-modal-4" name="fuelOrderForm"> | 530 | <form class="modal multi-step" id="demo-modal-4" name="fuelOrderForm"> |
517 | <div class="modal-dialog modal-lg"> | 531 | <div class="modal-dialog modal-lg"> |
518 | <div class="modal-content"> | 532 | <div class="modal-content"> |
519 | <div class="modal-body step-1" data-step="1" style="padding: 0;"> | 533 | <div class="modal-body step-1" data-step="1" style="padding: 0;"> |
520 | <div> | 534 | <div> |
521 | <div class="row" style="margin: 0;"> | 535 | <div class="row" style="margin: 0;"> |
522 | <div> | 536 | <div> |
523 | <div class="widget" style="margin-bottom: 0;"> | 537 | <div class="widget" style="margin-bottom: 0;"> |
524 | <div class="widget-header"> | 538 | <div class="widget-header"> |
525 | <i class="icon-pencil"></i> | 539 | <i class="icon-pencil"></i> |
526 | <i class="fa fa-tasks" aria-hidden="true"></i> | 540 | <i class="fa fa-tasks" aria-hidden="true"></i> |
527 | <h3>Add a Fuel Order</h3> | 541 | <h3>Add a Fuel Order</h3> |
528 | <div class="clearfix"></div> | 542 | <div class="clearfix"></div> |
529 | </div> | 543 | </div> |
530 | <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;"> | 544 | <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;"> |
531 | <div class="col-xs-12"> | 545 | <div class="col-xs-12"> |
532 | <div class="col-xs-12"> | 546 | <div class="col-xs-12"> |
533 | 547 | ||
534 | <div class="col-md-6"> | 548 | <div class="col-md-6"> |
535 | <div class="pull-left" style="width: 110px;"> | 549 | <div class="pull-left" style="width: 110px;"> |
536 | <label class="new-input-label"><b>Fueling Date</b></label> | 550 | <label class="new-input-label"><b>Fueling Date</b></label> |
537 | </div> | 551 | </div> |
538 | <div class="pull-left" style="width: calc(100% - 110px);"> | 552 | <div class="pull-left" style="width: calc(100% - 110px);"> |
539 | <input type="date" ng-model="order.upliftDate" class="form-control" placeholder=""> | 553 | <input type="type" ng-model="order.upliftDate" class="form-control" placeholder="Select Date" datepicker /> |
540 | <!--<md-datepicker ng-model="myDate" md-placeholder="Enter date"></md-datepicker>--> | 554 | <!--<md-datepicker ng-model="myDate" md-placeholder="Enter date"></md-datepicker>--> |
541 | </div> | 555 | </div> |
542 | <div class="clearfix"></div> | 556 | <div class="clearfix"></div> |
543 | </div> | 557 | </div> |
544 | <div class="col-md-6"> | 558 | <div class="col-md-6"> |
545 | <div class="pull-left" style="width: 110px;"> | 559 | <div class="pull-left" style="width: 110px;"> |
546 | <label class="new-input-label"><b>Volume</b></label> | 560 | <label class="new-input-label"><b>Volume</b></label> |
547 | </div> | 561 | </div> |
548 | <div class="pull-left" style="width: calc(100% - 110px);"> | 562 | <div class="pull-left" style="width: calc(100% - 110px);"> |
549 | <input type="text" ng-model="order.volume" ng-keyup="addTotal(order.volume,'v')" class="form-control" placeholder=""> | 563 | <input type="text" ng-model="order.volume" ng-keyup="addTotal(order.volume,'v')" class="form-control" placeholder=""> |
550 | </div> | 564 | </div> |
551 | <div class="clearfix"></div> | 565 | <div class="clearfix"></div> |
552 | </div> | 566 | </div> |
553 | </div> | 567 | </div> |
554 | <div class="clearfix"></div><br> | 568 | <div class="clearfix"></div><br> |
555 | 569 | ||
556 | <div class="col-xs-12"> | 570 | <div class="col-xs-12"> |
557 | 571 | ||
558 | <div class="col-md-6"> | 572 | <div class="col-md-6"> |
559 | <div class="pull-left" style="width: 110px;"> | 573 | <div class="pull-left" style="width: 110px;"> |
560 | <label class="new-input-label"><b>Company</b></label> | 574 | <label class="new-input-label"><b>Company</b></label> |
561 | </div> | 575 | </div> |
562 | <div class="pull-left" style="width: calc(100% - 110px);"> | 576 | <div class="pull-left" style="width: calc(100% - 110px);"> |
563 | <select ui-select2 ng-model="order.companyName" ng-change="getAircraft(order.companyName)" style="width: 100%;"> | 577 | <select ui-select2 ng-model="order.companyName" ng-change="getAircraft(order.companyName)" style="width: 100%;"> |
564 | <option value="" selected disabled>Select Company</option> | 578 | <option value="" selected disabled>Select Company</option> |
565 | <option ng-repeat="list in companyList">{{list.companyName}}</option> | 579 | <option ng-repeat="list in companyList">{{list.companyName}}</option> |
566 | </select> | 580 | </select> |
567 | </div> | 581 | </div> |
568 | <div class="clearfix"></div> | 582 | <div class="clearfix"></div> |
569 | </div> | 583 | </div> |
570 | <div class="col-md-6"> | 584 | <div class="col-md-6"> |
571 | <div class="pull-left" style="width: 110px;"> | 585 | <div class="pull-left" style="width: 110px;"> |
572 | <label class="new-input-label"><b>Invoiced</b></label> | 586 | <label class="new-input-label"><b>Invoiced</b></label> |
587 | <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span> | ||
573 | </div> | 588 | </div> |
574 | <div class="pull-left" style="width: calc(100% - 110px);"> | 589 | <div class="pull-left" style="width: calc(100% - 110px);"> |
575 | <input type="text" ng-model="order.invoiced" ng-keyup="addTotal(order.invoiced,'i')" class="form-control" placeholder=""> | 590 | <input type="text" ng-model="order.invoiced" ng-keyup="addTotal(order.invoiced,'i')" class="form-control" placeholder="0.0000" valid-number /> |
576 | </div> | 591 | </div> |
577 | <div class="clearfix"></div> | 592 | <div class="clearfix"></div> |
578 | </div> | 593 | </div> |
579 | 594 | ||
580 | </div> | 595 | </div> |
581 | <div class="clearfix"></div> | 596 | <div class="clearfix"></div> |
582 | <br/> | 597 | <br/> |
583 | 598 | ||
584 | 599 | ||
585 | <div class="col-xs-12"> | 600 | <div class="col-xs-12"> |
586 | 601 | ||
587 | 602 | ||
588 | <div class="col-md-6"> | 603 | <div class="col-md-6"> |
589 | <div class="pull-left" style="width: 110px;"> | 604 | <div class="pull-left" style="width: 110px;"> |
590 | <label class="new-input-label"><b>Tail #</b></label> | 605 | <label class="new-input-label"><b>Tail #</b></label> |
591 | </div> | 606 | </div> |
592 | <div class="pull-left" style="width: calc(100% - 110px);"> | 607 | <div class="pull-left" style="width: calc(100% - 110px);"> |
593 | <select class="form-control" ng-model="order.aircraftName"> | 608 | <select class="form-control" ng-model="order.aircraftName"> |
594 | <option selected disabled value="">Select Aircraft</option> | 609 | <option selected disabled value="">Select Aircraft</option> |
595 | <option ng-repeat="list in aircraftList" value="{{list.tail}}">{{list.tail}}</option> | 610 | <option ng-repeat="list in aircraftList" value="{{list.tail}}">{{list.tail}}</option> |
596 | </select> | 611 | </select> |
597 | </div> | 612 | </div> |
598 | <div class="clearfix"></div> | 613 | <div class="clearfix"></div> |
599 | </div> | 614 | </div> |
600 | <div class="col-md-6"> | 615 | <div class="col-md-6"> |
601 | <div class="pull-left" style="width: 110px;"> | 616 | <div class="pull-left" style="width: 110px;"> |
602 | <label class="new-input-label"><b>Total</b></label> | 617 | <label class="new-input-label"><b>Total</b></label> |
618 | <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span> | ||
603 | </div> | 619 | </div> |
604 | <div class="pull-left" style="width: calc(100% - 110px);"> | 620 | <div class="pull-left" style="width: calc(100% - 110px);"> |
605 | <input type="text" disabled ng-model="order.total" class="form-control" placeholder="0.0" value="{{order.volume * order.invoiced}}"> | 621 | <input type="text" disabled ng-model="order.total" class="form-control" placeholder="0.0000" value="{{order.volume * order.invoiced}}" valid-number /> |
606 | 622 | ||
607 | </div> | 623 | </div> |
608 | <div class="clearfix"></div> | 624 | <div class="clearfix"></div> |
609 | </div> | 625 | </div> |
610 | </div> | 626 | </div> |
611 | <div class="clearfix"></div> | 627 | <div class="clearfix"></div> |
612 | <br/> | 628 | <br/> |
613 | <div class="col-xs-12"> | 629 | <div class="col-xs-12"> |
614 | 630 | ||
615 | 631 | ||
616 | <div class="col-md-6"> | 632 | <div class="col-md-6"> |
617 | <div class="pull-left" style="width: 110px;"> | 633 | <div class="pull-left" style="width: 110px;"> |
618 | <label class="new-input-label"><b>Source</b></label> | 634 | <label class="new-input-label"><b>Source</b></label> |
619 | </div> | 635 | </div> |
620 | <div class="pull-left" style="width: calc(100% - 110px);"> | 636 | <div class="pull-left" style="width: calc(100% - 110px);"> |
621 | <select ui-select2 ng-model="order.source" style="width: 100%;"> | 637 | <select ui-select2 ng-model="order.source" style="width: 100%;"> |
622 | <option value="" selected disabled>Select Source</option> | 638 | <option value="" selected disabled>Select Source</option> |
623 | <option ng-repeat="list in sourceList">{{list.source}}</option> | 639 | <option ng-repeat="list in sourceList">{{list.source}}</option> |
624 | </select> | 640 | </select> |
625 | </div> | 641 | </div> |
626 | <div class="clearfix"></div> | 642 | <div class="clearfix"></div> |
627 | </div> | 643 | </div> |
628 | <div class="col-md-6"> | 644 | <div class="col-md-6"> |
629 | <div class="pull-left" style="width: 110px;"> | 645 | <div class="pull-left" style="width: 110px;"> |
630 | <label class="new-input-label"><b>Price Quote</b></label> | 646 | <label class="new-input-label"><b>Price Quote</b></label> |
631 | </div> | 647 | </div> |
632 | <div class="pull-left" style="width: calc(100% - 110px);"> | 648 | <div class="pull-left" style="width: calc(100% - 110px);"> |
633 | <select ui-select2 style="width: 100%;" ng-model="order.priceQuote" ng-change="setCost(order.priceQuote)"> | 649 | <select ui-select2 style="width: 100%;" ng-model="order.priceQuote" ng-change="setCost(order.priceQuote)"> |
634 | <option value="" selected disabled>Select Price Quote</option> | 650 | <option value="" selected disabled>Select Price Quote</option> |
635 | <option ng-repeat="margin in marginList" value="{{margin}}">${{margin.papTotal}} {{margin.productName}}</option> | 651 | <option ng-repeat="margin in marginList" value="{{margin}}">${{margin.papTotal | number : 4}} {{margin.productName}}</option> |
636 | </select> | 652 | </select> |
637 | </div> | 653 | </div> |
638 | <div class="clearfix"></div> | 654 | <div class="clearfix"></div> |
639 | </div> | 655 | </div> |
640 | 656 | ||
641 | </div> | 657 | </div> |
642 | <div class="clearfix"></div> | 658 | <div class="clearfix"></div> |
643 | <br/> | 659 | <br/> |
644 | <div class="col-xs-12"> | 660 | <div class="col-xs-12"> |
645 | 661 | ||
646 | 662 | ||
647 | <div class="col-md-6"> | 663 | <div class="col-md-6"> |
648 | <div class="pull-left" style="width: 110px;"> | 664 | <div class="pull-left" style="width: 110px;"> |
649 | <label class="new-input-label"><b>Status</b></label> | 665 | <label class="new-input-label"><b>Status</b></label> |
650 | </div> | 666 | </div> |
651 | <div class="pull-left" style="width: calc(100% - 110px);"> | 667 | <div class="pull-left" style="width: calc(100% - 110px);"> |
652 | <select ui-select2 ng-model="order.status" style="width: 100%;"> | 668 | <select ui-select2 ng-model="order.status" style="width: 100%;"> |
653 | <option value="" selected disabled>Select Status</option> | 669 | <option value="" selected disabled>Select Status</option> |
654 | <option>Pending</option> | 670 | <option>Pending</option> |
655 | <option>Invoiced</option> | 671 | <option>Invoiced</option> |
656 | <option>Paid</option> | 672 | <option>Paid</option> |
657 | <option>Cancelled</option> | 673 | <option>Cancelled</option> |
658 | <option>Archived</option> | 674 | <option>Archived</option> |
659 | </select> | 675 | </select> |
660 | </div> | 676 | </div> |
661 | <div class="clearfix"></div> | 677 | <div class="clearfix"></div> |
662 | </div> | 678 | </div> |
663 | <div class="col-md-6"> | 679 | <div class="col-md-6"> |
664 | <div class="pull-left" style="width: 110px;"> | 680 | <div class="pull-left" style="width: 110px;"> |
665 | <label class="new-input-label"><b>FBO Cost</b></label> | 681 | <label class="new-input-label"><b>FBO Cost</b></label> |
682 | <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span> | ||
666 | </div> | 683 | </div> |
667 | <div class="pull-left" style="width: calc(100% - 110px);"> | 684 | <div class="pull-left" style="width: calc(100% - 110px);"> |
668 | <input type="text" disabled ng-model="order.fboCost" class="form-control" placeholder=""> | 685 | <input type="text" disabled ng-model="order.fboCost" class="form-control" placeholder="0.0000" valid-number /> |
669 | </div> | 686 | </div> |
670 | <div class="clearfix"></div> | 687 | <div class="clearfix"></div> |
671 | </div> | 688 | </div> |
672 | </div> | 689 | </div> |
673 | <div class="clearfix"></div> | 690 | <div class="clearfix"></div> |
674 | <br/> | 691 | <br/> |
675 | <div class="col-xs-12"> | 692 | <div class="col-xs-12"> |
676 | 693 | ||
677 | 694 | ||
678 | </div> | 695 | </div> |
679 | <div class="clearfix"></div> | 696 | <div class="clearfix"></div> |
680 | <br/> | 697 | <br/> |
681 | <div class="col-xs-12"> | 698 | <div class="col-xs-12"> |
682 | 699 | ||
683 | </div> | 700 | </div> |
684 | <div class="clearfix"></div> | 701 | <div class="clearfix"></div> |
685 | 702 | ||
686 | </div> | 703 | </div> |
687 | </div> | 704 | </div> |
688 | <div class="clearfix"></div> | 705 | <div class="clearfix"></div> |
689 | </div> | 706 | </div> |
690 | </div> | 707 | </div> |
691 | </div> | 708 | </div> |
692 | </div> | 709 | </div> |
693 | 710 | ||
694 | <div class="modal-footer" style="border-top: 0;"> | 711 | <div class="modal-footer" style="border-top: 0;"> |
695 | <button type="button" class="btn btn-default" ng-click="cancelData()" data-dismiss="modal">Cancel</button> | 712 | <button type="button" class="btn btn-default" ng-click="cancelData()" data-dismiss="modal">Cancel</button> |
696 | <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="addData()">Save</button> | 713 | <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="addData()">Save</button> |
697 | </div> | 714 | </div> |
698 | </div> | 715 | </div> |
699 | </div> | 716 | </div> |
700 | </div> | 717 | </div> |
701 | </form> | 718 | </form> |
702 | 719 | ||
703 | 720 | ||
704 | <form class="modal multi-step" id="demo-modal-5" name="fuelOrderUpdateForm"> | 721 | <form class="modal multi-step" id="demo-modal-5" name="fuelOrderUpdateForm"> |
705 | <div class="modal-dialog modal-lg"> | 722 | <div class="modal-dialog modal-lg"> |
706 | <div class="modal-content"> | 723 | <div class="modal-content"> |
707 | <div class="modal-body step-1" data-step="1" style="padding: 0;"> | 724 | <div class="modal-body step-1" data-step="1" style="padding: 0;"> |
708 | <div> | 725 | <div> |
709 | <div class="row" style="margin: 0;"> | 726 | <div class="row" style="margin: 0;"> |
710 | <div> | 727 | <div> |
711 | <div class="widget" style="margin-bottom: 0;"> | 728 | <div class="widget" style="margin-bottom: 0;"> |
712 | <div class="widget-header"> | 729 | <div class="widget-header"> |
713 | <i class="icon-pencil"></i> | 730 | <i class="icon-pencil"></i> |
714 | <i class="fa fa-tasks" aria-hidden="true"></i> | 731 | <i class="fa fa-tasks" aria-hidden="true"></i> |
715 | <h3>Update Fuel Order</h3> | 732 | <h3>Update Fuel Order</h3> |
716 | <div class="clearfix"></div> | 733 | <div class="clearfix"></div> |
717 | </div> | 734 | </div> |
718 | <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;"> | 735 | <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;"> |
719 | <div class="col-xs-12"> | 736 | <div class="col-xs-12"> |
720 | <div class="col-xs-12"> | 737 | <div class="col-xs-12"> |
721 | 738 | ||
722 | <div class="col-md-6"> | 739 | <div class="col-md-6"> |
723 | <div class="pull-left" style="width: 110px;"> | 740 | <div class="pull-left" style="width: 110px;"> |
724 | <label class="new-input-label"><b>Fueling Date</b></label> | 741 | <label class="new-input-label"><b>Fueling Date</b></label> |
725 | </div> | 742 | </div> |
726 | <div class="pull-left" style="width: calc(100% - 110px);"> | 743 | <div class="pull-left" style="width: calc(100% - 110px);"> |
727 | <!--<input type="date" ng-model="editdata.departingDate" class="form-control" placeholder="">--> | 744 | <!--<input type="date" ng-model="editdata.departingDate" class="form-control" placeholder="">--> |
728 | {{editdata.upliftDateString}} | 745 | {{editdata.upliftDateString}} |
729 | </div> | 746 | </div> |
730 | <div class="clearfix"></div> | 747 | <div class="clearfix"></div> |
731 | </div> | 748 | </div> |
732 | <div class="col-md-6"> | 749 | <div class="col-md-6"> |
733 | <div class="pull-left" style="width: 110px;"> | 750 | <div class="pull-left" style="width: 110px;"> |
734 | <label class="new-input-label"><b>Volume</b></label> | 751 | <label class="new-input-label"><b>Volume</b></label> |
735 | </div> | 752 | </div> |
736 | <div class="pull-left" style="width: calc(100% - 110px);"> | 753 | <div class="pull-left" style="width: calc(100% - 110px);"> |
737 | <input type="text" ng-model="editdata.requestedVolume" ng-keyup="updateTotal(editdata.requestedVolume,'v')" class="form-control" placeholder=""> | 754 | <input type="text" ng-model="editdata.requestedVolume" ng-keyup="updateTotal(editdata.requestedVolume,'v')" class="form-control" placeholder=""> |
738 | </div> | 755 | </div> |
739 | <div class="clearfix"></div> | 756 | <div class="clearfix"></div> |
740 | </div> | 757 | </div> |
741 | 758 | ||
742 | </div> | 759 | </div> |
743 | <div class="clearfix"></div><br> | 760 | <div class="clearfix"></div><br> |
744 | 761 | ||
745 | <div class="col-xs-12"> | 762 | <div class="col-xs-12"> |
746 | 763 | ||
747 | <div class="col-md-6"> | 764 | <div class="col-md-6"> |
748 | <div class="pull-left" style="width: 110px;"> | 765 | <div class="pull-left" style="width: 110px;"> |
749 | <label class="new-input-label"><b>Company</b></label> | 766 | <label class="new-input-label"><b>Company</b></label> |
750 | </div> | 767 | </div> |
751 | <div class="pull-left" style="width: calc(100% - 110px);"> | 768 | <div class="pull-left" style="width: calc(100% - 110px);"> |
752 | <!--<select ui-select2 ng-model="editdata.companyName" style="width: 100%;"> | 769 | <!--<select ui-select2 ng-model="editdata.companyName" style="width: 100%;"> |
753 | <option value="" selected disabled>Select Company</option> | 770 | <option value="" selected disabled>Select Company</option> |
754 | <option ng-repeat="list in companyList">{{list.companyName}}</option> | 771 | <option ng-repeat="list in companyList">{{list.companyName}}</option> |
755 | </select>--> | 772 | </select>--> |
756 | {{editdata.companyName}} | 773 | {{editdata.companyName}} |
757 | </div> | 774 | </div> |
758 | <div class="clearfix"></div> | 775 | <div class="clearfix"></div> |
759 | </div> | 776 | </div> |
760 | <div class="col-md-6"> | 777 | <div class="col-md-6"> |
761 | <div class="pull-left" style="width: 110px;"> | 778 | <div class="pull-left" style="width: 110px;"> |
762 | <label class="new-input-label"><b>Invoiced</b></label> | 779 | <label class="new-input-label"><b>Invoiced</b></label> |
763 | </div> | 780 | </div> |
764 | <div class="pull-left" style="width: calc(100% - 110px);"> | 781 | <div class="pull-left" style="width: calc(100% - 110px);"> |
765 | <input type="text" ng-model="editdata.invoiced" ng-keyup="updateTotal(editdata.invoiced,'i')" class="form-control" placeholder=""> | 782 | <input type="text" ng-model="editdata.invoiced" ng-keyup="updateTotal(editdata.invoiced,'i')" class="form-control" placeholder=""> |
766 | </div> | 783 | </div> |
767 | <div class="clearfix"></div> | 784 | <div class="clearfix"></div> |
768 | </div> | 785 | </div> |
769 | 786 | ||
770 | </div> | 787 | </div> |
771 | <div class="clearfix"></div> | 788 | <div class="clearfix"></div> |
772 | <br/> | 789 | <br/> |
773 | 790 | ||
774 | 791 | ||
775 | <div class="col-xs-12"> | 792 | <div class="col-xs-12"> |
776 | 793 | ||
777 | <div class="col-md-6"> | 794 | <div class="col-md-6"> |
778 | <div class="pull-left" style="width: 110px;"> | 795 | <div class="pull-left" style="width: 110px;"> |
779 | <label class="new-input-label"><b>Tail #</b></label> | 796 | <label class="new-input-label"><b>Tail #</b></label> |
780 | </div> | 797 | </div> |
781 | <div class="pull-left" style="width: calc(100% - 110px);"> | 798 | <div class="pull-left" style="width: calc(100% - 110px);"> |
782 | <!--<input type="text" ng-model="editdata.aircraftName" class="form-control" placeholder="">--> | 799 | <!--<input type="text" ng-model="editdata.aircraftName" class="form-control" placeholder="">--> |
783 | {{editdata.aircraftName}} | 800 | {{editdata.aircraftName}} |
784 | </div> | 801 | </div> |
785 | <div class="clearfix"></div> | 802 | <div class="clearfix"></div> |
786 | </div> | 803 | </div> |
787 | <div class="col-md-6"> | 804 | <div class="col-md-6"> |
788 | <div class="pull-left" style="width: 110px;"> | 805 | <div class="pull-left" style="width: 110px;"> |
789 | <label class="new-input-label"><b>Total</b></label> | 806 | <label class="new-input-label"><b>Total</b></label> |
790 | </div> | 807 | </div> |
791 | <div class="pull-left" style="width: calc(100% - 110px);"> | 808 | <div class="pull-left" style="width: calc(100% - 110px);"> |
792 | <input type="text" class="form-control" disabled ng-model="editdata.total" placeholder="0.0" ng-value="{{editdata.requestedVolume * editdata.invoiced}}"> | 809 | <input type="text" class="form-control" disabled ng-model="editdata.total" placeholder="0.0" ng-value="{{editdata.requestedVolume * editdata.invoiced}}"> |
793 | <!--{{editdata.total }}--> | 810 | <!--{{editdata.total }}--> |
794 | </div> | 811 | </div> |
795 | <div class="clearfix"></div> | 812 | <div class="clearfix"></div> |
796 | </div> | 813 | </div> |
797 | </div> | 814 | </div> |
798 | <div class="clearfix"></div> | 815 | <div class="clearfix"></div> |
799 | <br/> | 816 | <br/> |
800 | <div class="col-xs-12"> | 817 | <div class="col-xs-12"> |
801 | 818 | ||
802 | 819 | ||
803 | <div class="col-md-6"> | 820 | <div class="col-md-6"> |
804 | <div class="pull-left" style="width: 110px;"> | 821 | <div class="pull-left" style="width: 110px;"> |
805 | <label class="new-input-label"><b>Source</b></label> | 822 | <label class="new-input-label"><b>Source</b></label> |
806 | </div> | 823 | </div> |
807 | <div class="pull-left" style="width: calc(100% - 110px);"> | 824 | <div class="pull-left" style="width: calc(100% - 110px);"> |
808 | <!--<select ui-select2 ng-model="editdata.source" style="width: 100%;"> | 825 | <!--<select ui-select2 ng-model="editdata.source" style="width: 100%;"> |
809 | <option value="" selected disabled>Select Source</option> | 826 | <option value="" selected disabled>Select Source</option> |
810 | <option ng-repeat="list in sourceList">{{list.source}}</option> | 827 | <option ng-repeat="list in sourceList">{{list.source}}</option> |
811 | </select>--> | 828 | </select>--> |
812 | {{editdata.source}} | 829 | {{editdata.source}} |
813 | </div> | 830 | </div> |
814 | <div class="clearfix"></div> | 831 | <div class="clearfix"></div> |
815 | </div> | 832 | </div> |
816 | <div class="col-md-6"> | 833 | <div class="col-md-6"> |
817 | <div class="pull-left" style="width: 110px;"> | 834 | <div class="pull-left" style="width: 110px;"> |
818 | <label class="new-input-label"><b>FBO Cost</b></label> | 835 | <label class="new-input-label"><b>FBO Cost</b></label> |
819 | </div> | 836 | </div> |
820 | <div class="pull-left" style="width: calc(100% - 110px);"> | 837 | <div class="pull-left" style="width: calc(100% - 110px);"> |
821 | <!--<input type="text" ng-model="editdata.fboCost" class="form-control" placeholder="">--> | 838 | <!--<input type="text" ng-model="editdata.fboCost" class="form-control" placeholder="">--> |
822 | {{editdata.fboCost}} | 839 | {{editdata.fboCost}} |
823 | </div> | 840 | </div> |
824 | <div class="clearfix"></div> | 841 | <div class="clearfix"></div> |
825 | </div> | 842 | </div> |
826 | </div> | 843 | </div> |
827 | <div class="clearfix"></div> | 844 | <div class="clearfix"></div> |
828 | <br/> | 845 | <br/> |
829 | <div class="col-xs-12"> | 846 | <div class="col-xs-12"> |
830 | 847 | ||
831 | 848 | ||
832 | <div class="col-md-6"> | 849 | <div class="col-md-6"> |
833 | <div class="pull-left" style="width: 110px;"> | 850 | <div class="pull-left" style="width: 110px;"> |
834 | <label class="new-input-label"><b>Status</b></label> | 851 | <label class="new-input-label"><b>Status</b></label> |
835 | </div> | 852 | </div> |
836 | <div class="pull-left" style="width: calc(100% - 110px);"> | 853 | <div class="pull-left" style="width: calc(100% - 110px);"> |
837 | {{editdata.status}} | 854 | {{editdata.status}} |
838 | </div> | 855 | </div> |
839 | <div class="clearfix"></div> | 856 | <div class="clearfix"></div> |
840 | </div> | 857 | </div> |
841 | </div> | 858 | </div> |
842 | <div class="clearfix"></div> | 859 | <div class="clearfix"></div> |
843 | <br/> | 860 | <br/> |
844 | <div class="col-xs-12"> | 861 | <div class="col-xs-12"> |
845 | 862 | ||
846 | 863 | ||
847 | </div> | 864 | </div> |
848 | <div class="clearfix"></div> | 865 | <div class="clearfix"></div> |
849 | <br/> | 866 | <br/> |
850 | <div class="col-xs-12"> | 867 | <div class="col-xs-12"> |
851 | 868 | ||
852 | </div> | 869 | </div> |
853 | <div class="clearfix"></div> | 870 | <div class="clearfix"></div> |
854 | 871 | ||
855 | </div> | 872 | </div> |
856 | </div> | 873 | </div> |
857 | <div class="clearfix"></div> | 874 | <div class="clearfix"></div> |
858 | </div> | 875 | </div> |
859 | </div> | 876 | </div> |
860 | </div> | 877 | </div> |
861 | </div> | 878 | </div> |
862 | 879 | ||
863 | <div class="modal-footer" style="border-top: 0;"> | 880 | <div class="modal-footer" style="border-top: 0;"> |
864 | <button type="button" class="btn btn-default" ng-click="canceleditdata()" data-dismiss="modal">Cancel</button> | 881 | <button type="button" class="btn btn-default" ng-click="canceleditdata()" data-dismiss="modal">Cancel</button> |
865 | <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="updateData()">Save</button> | 882 | <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="updateData()">Save</button> |
866 | </div> | 883 | </div> |
867 | </div> | 884 | </div> |
868 | </div> | 885 | </div> |
869 | </div> | 886 | </div> |
870 | </form> | 887 | </form> |
871 | 888 | ||
872 | <form class="modal multi-step" id="demo-modal-6" name="uploadAttachmentForm"> | 889 | <form class="modal multi-step" id="demo-modal-6" name="uploadAttachmentForm"> |
873 | <div class="modal-dialog modal-xs"> | 890 | <div class="modal-dialog modal-xs"> |
874 | <div class="modal-content"> | 891 | <div class="modal-content"> |
875 | <div class="modal-body step-1" data-step="1" style="padding: 0;"> | 892 | <div class="modal-body step-1" data-step="1" style="padding: 0;"> |
876 | <div> | 893 | <div> |
877 | <div class="row" style="margin: 0;"> | 894 | <div class="row" style="margin: 0;"> |
878 | <div> | 895 | <div> |
879 | <div class="widget" style="margin-bottom: 0;"> | 896 | <div class="widget" style="margin-bottom: 0;"> |
880 | <div class="widget-header"> | 897 | <div class="widget-header"> |
881 | <i class="icon-pencil"></i> | 898 | <i class="icon-pencil"></i> |
882 | <i class="fa fa-tasks" aria-hidden="true"></i> | 899 | <i class="fa fa-tasks" aria-hidden="true"></i> |
883 | <h3>Upload Attachment</h3> | 900 | <h3>Upload Attachment</h3> |
884 | <div class="clearfix"></div> | 901 | <div class="clearfix"></div> |
885 | </div> | 902 | </div> |
886 | <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;"> | 903 | <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;"> |
887 | <div class="col-xs-6"> | 904 | <div class="col-xs-6"> |
888 | <div class="col-xs-6"> | 905 | <div class="col-xs-6"> |
889 | 906 | ||
890 | <div class="col-md-6"> | 907 | <div class="col-md-6"> |
891 | <div class="pull-left" style="width: 110px;"> | 908 | <div class="pull-left" style="width: 110px;"> |
892 | <label class="new-input-label"><b>Upload</b></label> | 909 | <label class="new-input-label"><b>Upload</b></label> |
893 | <br> | 910 | <br> |
894 | <br> | 911 | <br> |
895 | </div> | 912 | </div> |
896 | <div class="pull-left" style="width: calc(100% - 110px);"> | 913 | <div class="pull-left" style="width: calc(100% - 110px);"> |
897 | <input type="file" accept=".pdf" file-model = "uploadFile.attachment"> | 914 | <input type="file" accept=".pdf" file-model = "uploadFile.attachment"> |
898 | <!--<md-datepicker ng-model="myDate" md-placeholder="Enter date"></md-datepicker>--> | 915 | <!--<md-datepicker ng-model="myDate" md-placeholder="Enter date"></md-datepicker>--> |
899 | </div> | 916 | </div> |
900 | <div class="clearfix"></div> | 917 | <div class="clearfix"></div> |
901 | </div> | 918 | </div> |
902 | </div> | 919 | </div> |
903 | <div class="clearfix"></div><br> | 920 | <div class="clearfix"></div><br> |
904 | 921 | ||
905 | </div> | 922 | </div> |
906 | </div> | 923 | </div> |
907 | <div class="clearfix"></div> | 924 | <div class="clearfix"></div> |
908 | </div> | 925 | </div> |
909 | </div> | 926 | </div> |
910 | </div> | 927 | </div> |
911 | </div> | 928 | </div> |
912 | 929 | ||
913 | <div class="modal-footer" style="border-top: 0;"> | 930 | <div class="modal-footer" style="border-top: 0;"> |
914 | <button type="button" class="btn btn-default" ng-click="cancelUploadAttachment()" data-dismiss="modal">Cancel</button> | 931 | <button type="button" class="btn btn-default" ng-click="cancelUploadAttachment()" data-dismiss="modal">Cancel</button> |
915 | <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="saveUploadAttachment(uploadFile.attachment)">Upload</button> | 932 | <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="saveUploadAttachment(uploadFile.attachment)">Upload</button> |
916 | </div> | 933 | </div> |
917 | </div> | 934 | </div> |
918 | </div> | 935 | </div> |
919 | </div> | 936 | </div> |
920 | </form> | 937 | </form> |
921 | 938 | ||
922 | <div class="customConfirmPopBackdrop" id="delete1"> | 939 | <div class="customConfirmPopBackdrop" id="delete1"> |
923 | <div class="customModalInner" style="max-width: 400px;"> | 940 | <div class="customModalInner" style="max-width: 400px;"> |
924 | <div class="customModelBody" style="border-radius: 5px 5px 0 0;"> | 941 | <div class="customModelBody" style="border-radius: 5px 5px 0 0;"> |
925 | <table> | 942 | <table> |
926 | <tr> | 943 | <tr> |
927 | <td> | 944 | <td> |
928 | <img src="img/info.png" style="width: 50px;"> | 945 | <img src="img/info.png" style="width: 50px;"> |
929 | </td> | 946 | </td> |
930 | <td> | 947 | <td> |
931 | <p style="padding: 5px 10px; margin-bottom: 0;">Are you sure you want to delete the attachment?</p> | 948 | <p style="padding: 5px 10px; margin-bottom: 0;">Are you sure you want to delete the attachment?</p> |
932 | </td> | 949 | </td> |
933 | </tr> | 950 | </tr> |
934 | </table> | 951 | </table> |
935 | </div> | 952 | </div> |
936 | <div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;"> | 953 | <div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;"> |
937 | <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="deleteAttachment()">Yes</button> | 954 | <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="deleteAttachment()">Yes</button> |
938 | <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelDeleteAttachment()">No</button> | 955 | <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelDeleteAttachment()">No</button> |
939 | </div> | 956 | </div> |
940 | </div> | 957 | </div> |
941 | </div> | 958 | </div> |
942 | 959 | ||
943 | 960 | ||
944 | 961 | ||
945 | <div class="myLoader" ng-show="showLoader"> | 962 | <div class="myLoader" ng-show="showLoader"> |
946 | <img src="../img/hourglass.gif" width="50px;"> | 963 | <img src="../img/hourglass.gif" width="50px;"> |
947 | </div> | 964 | </div> |
948 | <script src="js/multi-step-modal.js"></script> | 965 | <script src="js/multi-step-modal.js"></script> |
949 | <script> | 966 | <script> |
950 | sendEvent = function(sel, step) { | 967 | sendEvent = function(sel, step) { |
951 | $(sel).trigger('next.m.' + step); | 968 | $(sel).trigger('next.m.' + step); |
952 | } | 969 | } |
953 | </script> | 970 | </script> |
954 | 971 |
app/partials/main/main.controller.js
1 | 1 | ||
2 | (function() { | 2 | (function() { |
3 | 'use strict' | 3 | 'use strict' |
4 | 4 | ||
5 | angular.module('acufuel') | 5 | angular.module('acufuel') |
6 | .controller('MainController', [ '$scope', '$filter','$rootScope','$state', '$window', MainController]); | 6 | .controller('MainController', [ '$scope', '$filter','$rootScope','$state', '$window', '$interval', MainController]); |
7 | 7 | ||
8 | function MainController($scope, $filter, $rootScope,$state, $window) { | 8 | function MainController($scope, $filter, $rootScope,$state, $window, $interval) { |
9 | 9 | ||
10 | $scope.currentUserName = JSON.parse(localStorage.getItem('currentUserName')); | 10 | $scope.currentUserName = JSON.parse(localStorage.getItem('currentUserName')); |
11 | 11 | ||
12 | |||
12 | $scope.testFunction = function(){ | 13 | $scope.testFunction = function(){ |
13 | $scope.currentUserName = JSON.parse(localStorage.getItem('currentUserName')); | 14 | $scope.currentUserName = JSON.parse(localStorage.getItem('currentUserName')); |
14 | } | 15 | } |
16 | |||
17 | /** | ||
18 | Automatic logout session | ||
19 | **/ | ||
20 | |||
21 | var resetTime; | ||
22 | /*function warning(){ | ||
23 | //setTimeout(function(){ | ||
24 | $('.warning-message').delay(5000).css('display', 'block'); | ||
25 | //}, 5000); | ||
26 | }*/ | ||
27 | |||
28 | resetTime = setInterval(function(){ | ||
29 | // $('.warning-message').delay(5000).css('display', 'block'); | ||
30 | //console.log('out'); | ||
31 | localStorage.clear(); | ||
32 | $state.go('login'); | ||
33 | }, 600000); | ||
34 | |||
35 | |||
36 | $(document).mousemove(function(event){ | ||
37 | clearInterval(resetTime); | ||
38 | //$('.warning-message').delay(5000).css('display', 'none'); | ||
39 | // warning(); | ||
40 | //console.log('restart'); | ||
41 | resetTime = setInterval(function(){ | ||
42 | //console.log('out'); | ||
43 | //warning(); | ||
44 | localStorage.clear(); | ||
45 | $state.go('login'); | ||
46 | }, 600000); | ||
47 | }) | ||
48 | |||
49 | |||
50 | |||
15 | 51 | ||
16 | // Flight Tracking page code | 52 | // Flight Tracking page code |
17 | 53 | ||
18 | /*$scope.reloadPage = function(){ | 54 | /*$scope.reloadPage = function(){ |
19 | console.log("if",$state) | 55 | console.log("if",$state) |
20 | console.log("=========state name",$state.current.name); | 56 | console.log("=========state name",$state.current.name); |
21 | // $state.go('app.flightTracking', {}, {reload: 'app.flightTracking'}) | 57 | // $state.go('app.flightTracking', {}, {reload: 'app.flightTracking'}) |
22 | //$state.go($state.current, {}, {reload: true}); | 58 | //$state.go($state.current, {}, {reload: true}); |
23 | 59 | ||
24 | if($state.current.name != "app.flightTracking"){ | 60 | if($state.current.name != "app.flightTracking"){ |
25 | $window.location.href = '/#!/flightTracking'; | 61 | $window.location.href = '/#!/flightTracking'; |
26 | setInterval(function(){ | 62 | setInterval(function(){ |
27 | console.log("come") | 63 | console.log("come") |
28 | $window.location.reload() | 64 | $window.location.reload() |
29 | },10); | 65 | },10); |
30 | }else{ | 66 | }else{ |
31 | console.log("flight tracking state found====="); | 67 | console.log("flight tracking state found====="); |
32 | $window.location.reload(); | 68 | $window.location.reload(); |
33 | } | 69 | } |
34 | }*/ | 70 | }*/ |
35 | 71 | ||
72 | // Set timeout variables. | ||
36 | 73 | ||
37 | } | 74 | } |
75 | //var timoutWarning = 840000; // Display warning in 14 Mins. | ||
76 | //var timoutNow = 900000; // Timeout in 15 mins. | ||
77 | |||
78 | |||
79 | |||
38 | 80 | ||
39 | })(); | 81 | })(); |
40 | 82 | ||
41 | 83 |
app/partials/main/main.html
1 | |||
1 | <nav class="navbar navbar-inverse" role="navigation"> | 2 | <nav class="navbar navbar-inverse" role="navigation"> |
2 | <div class="container"> | 3 | <div class="container"> |
3 | <!-- Brand and toggle get grouped for better mobile display --> | 4 | <!-- Brand and toggle get grouped for better mobile display --> |
4 | <div class="navbar-header"> | 5 | <div class="navbar-header"> |
5 | <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse"> | 6 | <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse"> |
6 | <span class="sr-only">Toggle navigation</span> | 7 | <span class="sr-only">Toggle navigation</span> |
7 | <i class="icon-cog"></i> | 8 | <i class="icon-cog"></i> |
8 | </button> | 9 | </button> |
9 | <a class="navbar-brand" ui-sref="app.dashboard"> | 10 | <a class="navbar-brand" ui-sref="app.dashboard"> |
10 | <img src="./img/acufuelLOGOwhite.png" class="img-logo"> | 11 | <img src="./img/acufuelLOGOwhite.png" class="img-logo"> |
11 | </a> | 12 | </a> |
12 | </div> | 13 | </div> |
13 | <!-- Collect the nav links, forms, and other content for toggling --> | 14 | <!-- Collect the nav links, forms, and other content for toggling --> |
14 | <div class="collapse navbar-collapse navbar-ex1-collapse"> | 15 | <div class="collapse navbar-collapse navbar-ex1-collapse"> |
15 | <ul class="nav navbar-nav navbar-right"> | 16 | <ul class="nav navbar-nav navbar-right"> |
16 | <li class="dropdown"> | 17 | <li class="dropdown"> |
17 | <a href="javscript:;" class="dropdown-toggle" data-toggle="dropdown"> | 18 | <a href="javscript:;" class="dropdown-toggle" data-toggle="dropdown"> |
18 | <i class="icon-plane"></i> | 19 | <i class="icon-plane"></i> |
19 | {{currentUserName}} | 20 | {{currentUserName}} |
20 | <b class="caret"></b> | 21 | <b class="caret"></b> |
21 | </a> | 22 | </a> |
22 | <ul class="dropdown-menu"> | 23 | <ul class="dropdown-menu"> |
23 | <li ng-if="!isAuthenticated"><a href="javascript:;">My Profile</a></li> | 24 | <li ng-if="!isAuthenticated"><a href="javascript:;">My Profile</a></li> |
24 | <li ng-if="isAuthenticated"><a ui-sref="app.accountSetting">Account Settings</a></li> | 25 | <li ng-if="isAuthenticated"><a ui-sref="app.accountSetting">Account Settings</a></li> |
25 | <li class="divider"></li> | 26 | <li class="divider"></li> |
26 | <li><a href="#" ng-click="logout();">Logout</a></li> | 27 | <li><a href="#" ng-click="logout();">Logout</a></li> |
27 | </ul> | 28 | </ul> |
28 | </li> | 29 | </li> |
29 | </ul> | 30 | </ul> |
30 | </div> | 31 | </div> |
31 | <!-- /.navbar-collapse --> | 32 | <!-- /.navbar-collapse --> |
32 | </div> | 33 | </div> |
33 | <!-- /.container --> | 34 | <!-- /.container --> |
34 | </nav> | 35 | </nav> |
35 | <div class="subnavbar"> | 36 | <div class="subnavbar"> |
36 | <div class="subnavbar-inner"> | 37 | <div class="subnavbar-inner"> |
37 | <div class="container"> | 38 | <div class="container"> |
38 | <a href="javascript:;" class="subnav-toggle" data-toggle="collapse" data-target=".subnav-collapse"> | 39 | <a href="javascript:;" class="subnav-toggle" data-toggle="collapse" data-target=".subnav-collapse"> |
39 | <span class="sr-only">Toggle navigation</span> | 40 | <span class="sr-only">Toggle navigation</span> |
40 | <i class="icon-reorder"></i> | 41 | <i class="icon-reorder"></i> |
41 | </a> | 42 | </a> |
42 | <div class="collapse subnav-collapse"> | 43 | <div class="collapse subnav-collapse"> |
43 | <ul class="mainnav"> | 44 | <ul class="mainnav"> |
44 | <li ng-if="isAuthenticated"> | 45 | <li ng-if="isAuthenticated"> |
45 | <a ui-sref="app.dashboard"> | 46 | <a ui-sref="app.dashboard"> |
46 | <i class="fa fa-home"></i> | 47 | <i class="fa fa-home"></i> |
47 | <span>Home</span> | 48 | <span>Home</span> |
48 | </a> | 49 | </a> |
49 | </li> | 50 | </li> |
50 | <li class="dropdown" ng-if="isAuthenticated"> | 51 | <li class="dropdown" ng-if="isAuthenticated"> |
51 | <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown"> | 52 | <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown"> |
52 | <i class="fa fa-tint"></i> | 53 | <i class="fa fa-tint"></i> |
53 | <span>Fuel Manager</span> | 54 | <span>Fuel Manager</span> |
54 | <b class="caret"></b> | 55 | <b class="caret"></b> |
55 | </a> | 56 | </a> |
56 | <ul class="dropdown-menu"> | 57 | <ul class="dropdown-menu"> |
57 | <li><a ui-sref="app.updateFuelManager" href="#/updateFuelManager">Update Fuel Manager</a></li> | 58 | <li><a ui-sref="app.updateFuelManager" href="#/updateFuelManager">Update Fuel Manager</a></li> |
58 | <li> | 59 | <li> |
59 | <a ui-sref="app.enterFuelOrder">Enter Fuel Order</a> | 60 | <a ui-sref="app.enterFuelOrder">Enter Fuel Order</a> |
60 | </li> | 61 | </li> |
61 | <li><a ui-sref="app.fuelManager" href="#/fuelManager">Ramp Fee Manager</a></li> | 62 | <li><a ui-sref="app.fuelManager" href="#/fuelManager">Ramp Fee Manager</a></li> |
62 | <li class="dropdown-submenu"> | 63 | <li class="dropdown-submenu"> |
63 | <a tabindex="-1" >Tax Manager</a> | 64 | <a tabindex="-1" >Tax Manager</a> |
64 | <ul class="dropdown-menu"> | 65 | <ul class="dropdown-menu"> |
65 | <li><a tabindex="-1" ui-sref="app.taxes" href="#/taxes">Federal Taxes</a></li> | 66 | <li><a tabindex="-1" ui-sref="app.taxes" href="#/taxes">Federal Taxes</a></li> |
66 | <li><a ui-sref="app.taxes" href="#/taxes">State & Country Taxes</a></li> | 67 | <li><a ui-sref="app.taxes" href="#/taxes">State & Country Taxes</a></li> |
67 | <li><a ui-sref="app.taxes" href="#/taxes">Airport Taxes</a></li> | 68 | <li><a ui-sref="app.taxes" href="#/taxes">Airport Taxes</a></li> |
68 | </ul> | 69 | </ul> |
69 | </li> | 70 | </li> |
70 | <li ng-if="isAuthenticated"> | 71 | <li ng-if="isAuthenticated"> |
71 | <a ui-sref="app.fuelOrders" href="#/fuelOrders"> | 72 | <a ui-sref="app.fuelOrders" href="#/fuelOrders"> |
72 | Fuel Orders | 73 | Fuel Orders |
73 | </a> | 74 | </a> |
74 | </li> | 75 | </li> |
75 | </ul> | 76 | </ul> |
76 | </li> | 77 | </li> |
77 | <li class="dropdown" ng-if="isAuthenticated"> | 78 | <li class="dropdown" ng-if="isAuthenticated"> |
78 | <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown"> | 79 | <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown"> |
79 | <i class="fa fa-user"></i> | 80 | <i class="fa fa-user"></i> |
80 | <span>Accounts</span> | 81 | <span>Accounts</span> |
81 | <b class="caret"></b> | 82 | <b class="caret"></b> |
82 | </a> | 83 | </a> |
83 | <ul class="dropdown-menu"> | 84 | <ul class="dropdown-menu"> |
84 | <!-- <li><a ui-sref="app.viewCompany">View Companies</a></li> --> | 85 | <!-- <li><a ui-sref="app.viewCompany">View Companies</a></li> --> |
85 | <li><a ui-sref="app.customers">View Customers</a></li> | 86 | <li><a ui-sref="app.customers">View Customers</a></li> |
86 | <li><a ui-sref="app.account">View Fuel Vendors</a></li> | 87 | <li><a ui-sref="app.account">View Fuel Vendors</a></li> |
87 | <li><a ui-sref="app.analytics">Lookup Flight Dept</a></li> | 88 | <li><a ui-sref="app.analytics">Lookup Flight Dept</a></li> |
88 | </ul> | 89 | </ul> |
89 | </li> | 90 | </li> |
90 | <li ng-if="isAuthenticated"> | 91 | <li ng-if="isAuthenticated"> |
91 | <a ui-sref="app.scheduler"> | 92 | <a ui-sref="app.scheduler"> |
92 | <i class="fa fa-calendar"></i> | 93 | <i class="fa fa-calendar"></i> |
93 | <span>Scheduler</span> | 94 | <span>Scheduler</span> |
94 | </a> | 95 | </a> |
95 | </li> | 96 | </li> |
96 | <li class="dropdown" ng-if="isAuthenticated"> | 97 | <li class="dropdown" ng-if="isAuthenticated"> |
97 | <a href="app.analytics:;" class="dropdown-toggle" data-toggle="dropdown"> | 98 | <a href="app.analytics:;" class="dropdown-toggle" data-toggle="dropdown"> |
98 | <i class="fa fa-signal"></i> | 99 | <i class="fa fa-signal"></i> |
99 | <span>Analytics</span> | 100 | <span>Analytics</span> |
100 | <b class="caret"></b> | 101 | <b class="caret"></b> |
101 | </a> | 102 | </a> |
102 | <ul class="dropdown-menu"> | 103 | <ul class="dropdown-menu"> |
103 | <!-- <li><a href="#">Live Flight tracking</a></li> --> | 104 | <!-- <li><a href="#">Live Flight tracking</a></li> --> |
104 | <li><a href="#">Historical Fuel Prices</a></li> | 105 | <li><a href="#">Historical Fuel Prices</a></li> |
105 | <li><a href="#">Regional Pricing</a></li> | 106 | <li><a href="#">Regional Pricing</a></li> |
106 | <li><a href="#">Actual vs. Canceled Fuelings</a></li> | 107 | <li><a href="#">Actual vs. Canceled Fuelings</a></li> |
107 | <li><a href="#">Customer Lead Sources</a></li> | 108 | <li><a href="#">Customer Lead Sources</a></li> |
108 | </ul> | 109 | </ul> |
109 | </li> | 110 | </li> |
110 | <li ng-if="isAuthenticated"> | 111 | <li ng-if="isAuthenticated"> |
111 | <!-- <a ui-sref="app.flightTracking()" ng-click="reloadPage()" data-ui-sref-opts="{reload:false}"> --> | 112 | <!-- <a ui-sref="app.flightTracking()" ng-click="reloadPage()" data-ui-sref-opts="{reload:false}"> --> |
112 | <a ui-sref="app.flightTracking"> | 113 | <a ui-sref="app.flightTracking"> |
113 | <i class="fa fa-plane"></i> | 114 | <i class="fa fa-plane"></i> |
114 | <span>Flight Tracking</span> | 115 | <span>Flight Tracking</span> |
115 | </a> | 116 | </a> |
116 | </li> | 117 | </li> |
117 | <li ng-if="!isAuthenticated"> | 118 | <li ng-if="!isAuthenticated"> |
118 | <a ui-sref="app.flightDepDashboard"> | 119 | <a ui-sref="app.flightDepDashboard"> |
119 | <i class="fa fa-search"></i> | 120 | <i class="fa fa-search"></i> |
120 | <span>Search Fuel</span> | 121 | <span>Search Fuel</span> |
121 | </a> | 122 | </a> |
122 | </li> | 123 | </li> |
123 | <li class="dropdown" ng-if="!isAuthenticated"> | 124 | <li class="dropdown" ng-if="!isAuthenticated"> |
124 | <a ui-sref="app.flightDepOrders" class="dropdown-toggle" data-toggle="dropdown"> | 125 | <a ui-sref="app.flightDepOrders" class="dropdown-toggle" data-toggle="dropdown"> |
125 | <i class="fa fa-tint"></i> | 126 | <i class="fa fa-tint"></i> |
126 | <span>Fuel Orders</span> | 127 | <span>Fuel Orders</span> |
127 | </a> | 128 | </a> |
128 | </li> | 129 | </li> |
129 | </ul> | 130 | </ul> |
130 | </div> | 131 | </div> |
131 | <!-- /.subnav-collapse --> | 132 | <!-- /.subnav-collapse --> |
132 | </div> | 133 | </div> |
133 | <!-- /container --> | 134 | <!-- /container --> |
134 | </div> | 135 | </div> |
135 | <!-- /subnavbar-inner --> | 136 | <!-- /subnavbar-inner --> |
136 | </div> | 137 | </div> |
137 | <!-- /subnavbar --> | 138 | <!-- /subnavbar --> |
138 | <div ui-view></div> | 139 | <div ui-view></div> |
139 | <!-- </body> --> | 140 | <!-- </body> --> |
140 | <!-- footer --> | 141 | <!-- footer --> |
141 | <div class="extra"> | 142 | <div class="extra"> |
142 | <div class="container"> | 143 | <div class="container"> |
143 | <div class="row"> | 144 | <div class="row"> |
144 | <div class="col-md-3"> | 145 | <div class="col-md-3"> |
145 | <h4>About</h4> | 146 | <h4>About</h4> |
146 | <ul> | 147 | <ul> |
147 | <li><a href="javascript:;">About Us</a></li> | 148 | <li><a href="javascript:;">About Us</a></li> |
148 | <li><a href="javascript:;">Twitter</a></li> | 149 | <li><a href="javascript:;">Twitter</a></li> |
149 | <li><a href="javascript:;">Facebook</a></li> | 150 | <li><a href="javascript:;">Facebook</a></li> |
150 | <li><a href="javascript:;">Google+</a></li> | 151 | <li><a href="javascript:;">Google+</a></li> |
151 | </ul> | 152 | </ul> |
152 | </div> | 153 | </div> |
153 | <!-- /span3 --> | 154 | <!-- /span3 --> |
154 | <div class="col-md-3"> | 155 | <div class="col-md-3"> |
155 | <h4>Support</h4> | 156 | <h4>Support</h4> |
156 | <ul> | 157 | <ul> |
157 | <li><a href="javascript:;">Frequently Asked Questions</a></li> | 158 | <li><a href="javascript:;">Frequently Asked Questions</a></li> |
158 | <li><a href="javascript:;">Ask a Question</a></li> | 159 | <li><a href="javascript:;">Ask a Question</a></li> |
159 | <li><a href="javascript:;">Video Tutorial</a></li> | 160 | <li><a href="javascript:;">Video Tutorial</a></li> |
160 | <li><a href="javascript:;">Feedback</a></li> | 161 | <li><a href="javascript:;">Feedback</a></li> |
161 | </ul> | 162 | </ul> |
162 | </div> | 163 | </div> |
163 | <!-- /span3 --> | 164 | <!-- /span3 --> |
164 | <div class="col-md-3"> | 165 | <div class="col-md-3"> |
165 | <h4>Legal</h4> | 166 | <h4>Legal</h4> |
166 | <ul> | 167 | <ul> |
167 | <li><a href="javascript:;">License</a></li> | 168 | <li><a href="javascript:;">License</a></li> |
168 | <li><a href="javascript:;">Terms of Use</a></li> | 169 | <li><a href="javascript:;">Terms of Use</a></li> |
169 | <li><a href="javascript:;">Privacy Policy</a></li> | 170 | <li><a href="javascript:;">Privacy Policy</a></li> |
170 | <li><a href="javascript:;">Security</a></li> | 171 | <li><a href="javascript:;">Security</a></li> |
171 | </ul> | 172 | </ul> |
172 | </div> | 173 | </div> |
173 | <!-- /span3 --> | 174 | <!-- /span3 --> |
174 | <div class="col-md-3"> | 175 | <div class="col-md-3"> |
175 | <h4>Settings</h4> | 176 | <h4>Settings</h4> |
176 | <ul> | 177 | <ul> |
177 | <li><a href="javascript:;">Consectetur adipisicing</a></li> | 178 | <li><a href="javascript:;">Consectetur adipisicing</a></li> |
178 | <li><a href="javascript:;">Eiusmod tempor </a></li> | 179 | <li><a href="javascript:;">Eiusmod tempor </a></li> |
179 | <li><a href="javascript:;">Fugiat nulla pariatur</a></li> | 180 | <li><a href="javascript:;">Fugiat nulla pariatur</a></li> |
180 | <li><a href="javascript:;">Officia deserunt</a></li> | 181 | <li><a href="javascript:;">Officia deserunt</a></li> |
181 | </ul> | 182 | </ul> |
182 | </div> | 183 | </div> |
183 | <!-- /span3 --> | 184 | <!-- /span3 --> |
184 | </div> | 185 | </div> |
185 | <!-- /row --> | 186 | <!-- /row --> |
186 | </div> | 187 | </div> |
187 | <!-- /container --> | 188 | <!-- /container --> |
188 | </div> | 189 | </div> |
189 | <!-- /extra --> | 190 | <!-- /extra --> |
190 | <div class="footer"> | 191 | <div class="footer"> |
191 | <div class="container"> | 192 | <div class="container"> |
192 | <div class="row"> | 193 | <div class="row"> |
193 | <div id="footer-copyright" class="col-md-6"> | 194 | <div id="footer-copyright" class="col-md-6"> |
194 | © 2012-13 Jumpstart UI. | 195 | © 2012-13 Jumpstart UI. |
195 | </div> | 196 | </div> |
196 | <!-- /span6 --> | 197 | <!-- /span6 --> |
197 | <div id="footer-terms" class="col-md-6"> | 198 | <div id="footer-terms" class="col-md-6"> |
198 | Theme by <a href="http://jumpstartui.com" target="_blank">Jumpstart UI</a> | 199 | Theme by <a href="http://jumpstartui.com" target="_blank">Jumpstart UI</a> |
199 | </div> | 200 | </div> |
200 | <!-- /.span6 --> | 201 | <!-- /.span6 --> |
201 | </div> | 202 | </div> |
202 | <!-- /row --> | 203 | <!-- /row --> |
203 | </div> | 204 | </div> |
204 | <!-- /container --> | 205 | <!-- /container --> |
205 | </div> | 206 | </div> |
207 | |||
208 | |||
209 | <!--automatic logout session--> | ||
210 | <!-- <div class="alert alert-warning warning-message" style="display: none; z-index: 99999; position: fixed; top: 50px; right: 50px;"> | ||
211 | <strong>Warning!</strong> Indicates a warning that might need attention. | ||
212 | </div> --> |