Commit 60b62c053d275b6c194a0a684b4fb6ededa20309

Authored by Kuldeep Arora
1 parent 2075411ed7
Exists in master

redesign of direct transaction

app/partials/enterFuelOrder/enterFuelOrder.html
1 <style type="text/css"> 1 <style type="text/css">
2 .subnavbar .mainnav > li:nth-child(4) > a{ 2 .subnavbar .mainnav > li:nth-child(4) > a{
3 color: #c44646; 3 color: #c44646;
4 } 4 }
5 .customInputWrap{ 5 .customInputWrap{
6 margin-top: 15px; 6 margin-top: 15px;
7 } 7 }
8 .customInputWrap label{ 8 .customInputWrap label{
9 font-weight: normal; 9 font-weight: normal;
10 margin-bottom: 0; 10 margin-bottom: 0;
11 } 11 }
12 </style> 12 </style>
13 <div class="myLoader" ng-show="showLoader"> 13 <div class="myLoader" ng-show="showLoader">
14 <img src="../img/hourglass.gif" width="50px;"> 14 <img src="../img/hourglass.gif" width="50px;">
15 </div> 15 </div>
16 16
17 <div class="container"> 17 <div class="container">
18 <div class="row"> 18 <div class="row">
19 <div class="col-xs-8"> 19 <div class="col-xs-8">
20 <div class="widget stacked"> 20 <div class="widget stacked">
21 <div class="widget-header"> 21 <div class="widget-header">
22 <i class="fa fa-tasks" aria-hidden="true"></i> 22 <i class="fa fa-tasks" aria-hidden="true"></i>
23 <h3>Create Fuel Order</h3> 23 <h3>Create Fuel Order</h3>
24 </div> 24 </div>
25 <div class="widget-content new-widget-content"> 25 <div class="widget-content new-widget-content">
26 <form name="orderform" novalidate> 26 <form name="orderform" novalidate>
27 27
28 <div class="customInputWrap"> 28 <div class="customInputWrap">
29 <!-- <div class="col-md-3 text-right">
30 <label>Company</label>
31 </div>
32 <div class="col-md-9">
33 <select ui-select2 ng-model="order.companyName" ng-change="getAircraft(order.companyName)" style="width: 100%;" required>
34 <option value="" selected disabled>Select Company</option>
35 <option ng-repeat="list in companyList">{{list.companyName}}</option>
36 </select>
37 </div>
38 <div class="clearfix"></div>
39 </div>
40 <div class="customInputWrap">
41 <div class="col-xs-10">
42 <label>Aircraft</label>
43 </div>
44 <div class="col-md-3">
45 <select class="form-control" ng-model="order.aircraftName" required>
46 <option selected disabled value="">Select Aircraft</option>
47 <option ng-repeat="list in aircraftList" value="{{list}}">{{list.tail}}</option>
48 </select>
49 </div>
50 <div class="col-md-3 text-right">
51 <label>Requested Volume</label>
52 </div>
53 <div class="col-md-3">
54 <input type="text" ng-model="order.volume" class="form-control" required>
55 </div>
56 <div class="clearfix"></div>
57 </div>
58
59 <div class="customInputWrap">
60 <div class="col-md-3 text-right">
61 <label>Product</label>
62 </div>
63 <div class="col-md-8 col-md-offset-1">
64 <select class="form-control" ng-model="order.priceQuote" required>
65 <option value="" selected disabled>Select Product</option>
66 <option ng-repeat="margin in marginList" value="{{margin}}">${{margin.papTotal | number : 2}} {{margin.productName}}</option>
67 </select>
68 </div>
69 <div class="clearfix"></div>
70 </div>
71
72 <div class="customInputWrap">
73 <div class="col-md-3 text-right">
74 <label>Tier Break</label>
75 </div>
76 <div class="col-md-8 col-md-offset-1">
77 <select class="form-control" ng-model="order.tierBreak">
78 <option value="" selected disabled>Select Tier Break</option>
79 <option ng-repeat="list in tierList" value="{{list.minTierBreak}}-{{list.maxTierBreak}}">
80 {{list.minTierBreak}}-{{list.maxTierBreak}} = ${{list.marginTotal | number: 2}} {{list.marginTemplate.marginName}}
81 </option>
82 </select>
83 </div>
84 <div class="clearfix"></div>
85 </div>
86
87 <div class="customInputWrap">
88 <div class="col-md-3 text-right">
89 <label>Uplift Date</label>
90 </div>
91 <div class="col-md-3">
92 <input type="text" ng-model="order.upliftDate" datepicker class="form-control" style="width: 100px" required>
93 </div>
94 <div class="col-md-3 text-right">
95 <label>Departing FBO</label>
96 </div>
97 <div class="col-md-3">
98 <input type="text" ng-model="order.departingDate" datepicker class="form-control">
99 </div>
100 <div class="clearfix"></div>
101 </div> -->
102
103 <div class="col-xs-12"> 29 <div class="col-xs-12">
104 30
105 <div class="col-md-6"> 31 <div class="col-md-6">
106 <div class="pull-left" style="width: 110px;"> 32 <div class="pull-left" style="width: 110px;">
107 <label class="new-input-label"><b>Company</b></label> 33 <label class="new-input-label"><b>Company</b></label>
108 </div> 34 </div>
109 <div class="pull-left" style="width: calc(100% - 110px);"> 35 <div class="pull-left" style="width: calc(100% - 110px);">
110 <select ui-select2 ng-model="order.companyName" ng-change="getAircraft(order.companyName)" style="width: 100%;" required> 36 <select ui-select2 ng-model="order.companyName" ng-change="getAircraft(order.companyName)" style="width: 100%;" required>
111 <option value="" selected disabled>Select Company</option> 37 <option value="" selected disabled>Select Company</option>
112 <option ng-repeat="list in companyList">{{list.companyName}}</option> 38 <option ng-repeat="list in companyList">{{list.companyName}}</option>
113 </select> 39 </select>
114 </div> 40 </div>
115 <div class="clearfix"></div> 41 <div class="clearfix"></div>
116 </div> 42 </div>
117 <div class="col-md-6"> 43 <div class="col-md-6">
118 <div class="pull-left" style="width: 110px;"> 44 <div class="pull-left" style="width: 110px;">
119 <label class="new-input-label"><b>Product</b></label> 45 <label class="new-input-label"><b>Product</b></label>
120 </div> 46 </div>
121 <div class="pull-left" style="width: calc(100% - 110px);"> 47 <div class="pull-left" style="width: calc(100% - 110px);">
122 <select class="form-control" ng-model="order.priceQuote" ng-change="setCost(order.priceQuote)" required> 48 <select class="form-control" ng-model="order.priceQuote" ng-change="setCost(order.priceQuote)" required>
123 <option value="" selected disabled>Select Product</option> 49 <option value="" selected disabled>Select Product</option>
124 <option ng-repeat="margin in marginList" value="{{margin}}">${{margin.papTotal | number : 4}} {{margin.productName}}</option> 50 <option ng-repeat="margin in marginList" value="{{margin}}">${{margin.papTotal | number : 4}} {{margin.productName}}</option>
125 </select> 51 </select>
126 </div> 52 </div>
127 <div class="clearfix"></div> 53 <div class="clearfix"></div>
128 </div> 54 </div>
129 55
130 </div> 56 </div>
131 <div class="clearfix"></div> 57 <div class="clearfix"></div>
132 <br/> 58 <br/>
133 59
134 60
135 <div class="col-xs-12"> 61 <div class="col-xs-12">
136 62
137 <div class="col-md-6"> 63 <div class="col-md-6">
138 <div class="pull-left" style="width: 110px;"> 64 <div class="pull-left" style="width: 110px;">
139 <label class="new-input-label"><b>Aircraft</b></label> 65 <label class="new-input-label"><b>Aircraft</b></label>
140 </div> 66 </div>
141 <div class="pull-left" style="width: calc(100% - 110px);"> 67 <div class="pull-left" style="width: calc(100% - 110px);">
142 <select class="form-control" ng-model="order.aircraftName" required> 68 <select class="form-control" ng-model="order.aircraftName" required>
143 <option selected disabled value="">Select Aircraft</option> 69 <option selected disabled value="">Select Aircraft</option>
144 <option ng-repeat="list in aircraftList" value="{{list}}">{{list.tail}}</option> 70 <option ng-repeat="list in aircraftList" value="{{list}}">{{list.tail}}</option>
145 </select> 71 </select>
146 </div> 72 </div>
147 <div class="clearfix"></div> 73 <div class="clearfix"></div>
148 </div> 74 </div>
149 <div class="col-md-6"> 75 <div class="col-md-6">
150 <div class="pull-left" style="width: 110px;"> 76 <div class="pull-left" style="width: 110px;">
151 <label class="new-input-label"><b>Volume</b></label> 77 <label class="new-input-label"><b>Volume</b></label>
152 </div> 78 </div>
153 <div class="pull-left" style="width: calc(100% - 110px);"> 79 <div class="pull-left" style="width: calc(100% - 110px);">
154 <!-- <input type="text" ng-model="order.volume" class="form-control" required> -->
155 <input type="text" ng-model="order.volume" ng-keyup="addTotal(order.volume,'v')" class="form-control" placeholder=""> 80 <input type="text" ng-model="order.volume" ng-keyup="addTotal(order.volume,'v')" class="form-control" placeholder="">
156 </div> 81 </div>
157 <div class="clearfix"></div> 82 <div class="clearfix"></div>
158 </div> 83 </div>
159 84
160 </div> 85 </div>
161 <div class="clearfix"></div> 86 <div class="clearfix"></div>
162 <br/> 87 <br/>
163 88
164 <div class="col-xs-12"> 89 <div class="col-xs-12">
165 90
166 <div class="col-md-6"> 91 <div class="col-md-6">
167 <div class="pull-left" style="width: 110px;"> 92 <div class="pull-left" style="width: 110px;">
168 <label class="new-input-label" style="margin-top: 25px;"><b>ETA</b></label> 93 <label class="new-input-label" style="margin-top: 25px;"><b>ETA</b></label>
169 </div> 94 </div>
170 <div class="pull-left" style="width: calc(100% - 110px);"> 95 <div class="pull-left" style="width: calc(100% - 110px);">
171 <div style="width: 50%; float: left;"> 96 <div style="width: 50%; float: left;">
172 Date 97 Date
173 <input type="text" style="width: 90%;" ng-model="order.upliftDate" class="form-control" placeholder="" datepicker/> 98 <input type="text" style="width: 90%;" ng-model="order.upliftDate" class="form-control" placeholder="" datepicker/>
174 </div> 99 </div>
175 <div style="width: 50%; float: left;"> 100 <div style="width: 50%; float: left;">
176 Time 101 Time
177 <select class="form-control" ng-model="order.etaTime" style="width: 100%;"> 102 <select class="form-control" ng-model="order.etaTime" style="width: 100%;">
178 <option ng-repeat="li in etaTimeList">{{li.time}}</option> 103 <option ng-repeat="li in etaTimeList">{{li.time}}</option>
179 </select> 104 </select>
180 105
181 </div> 106 </div>
182 </div> 107 </div>
183 <div class="clearfix"></div> 108 <div class="clearfix"></div>
184 </div> 109 </div>
185 110
186 <div class="col-md-6" style="margin-top: 22px;"> 111 <div class="col-md-6" style="margin-top: 22px;">
187 <div class="pull-left" style="width: 110px;"> 112 <div class="pull-left" style="width: 110px;">
188 <label class="new-input-label"><b>Invoiced</b></label> 113 <label class="new-input-label"><b>Invoiced</b></label>
189 <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span> 114 <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span>
190 </div> 115 </div>
191 <div class="pull-left" style="width: calc(100% - 110px);"> 116 <div class="pull-left" style="width: calc(100% - 110px);">
192 <input type="text" ng-model="order.invoiced" ng-keyup="addTotal(order.invoiced,'i')" class="form-control" placeholder=""> 117 <input type="text" ng-model="order.invoiced" ng-keyup="addTotal(order.invoiced,'i')" class="form-control" placeholder="">
193 </div> 118 </div>
194 <div class="clearfix"></div> 119 <div class="clearfix"></div>
195 </div> 120 </div>
196 </div> 121 </div>
197 <div class="clearfix"></div><br> 122 <div class="clearfix"></div><br>
198 123
199 124
200 <div class="col-xs-12"> 125 <div class="col-xs-12">
201 126
202 <div class="col-md-6"> 127 <div class="col-md-6">
203 <div class="pull-left" style="width: 110px;"> 128 <div class="pull-left" style="width: 110px;">
204 <label class="new-input-label" style="margin-top: 25px;"><b>ETD</b></label> 129 <label class="new-input-label" style="margin-top: 25px;"><b>ETD</b></label>
205 </div> 130 </div>
206 <div class="pull-left" style="width: calc(100% - 110px);"> 131 <div class="pull-left" style="width: calc(100% - 110px);">
207 <div style="width: 50%; float: left;"> 132 <div style="width: 50%; float: left;">
208 Date 133 Date
209 <input type="text" style="width: 90%;" ng-model="order.departingDate" class="form-control" placeholder="" datepicker/> 134 <input type="text" style="width: 90%;" ng-model="order.departingDate" class="form-control" placeholder="" datepicker/>
210 </div> 135 </div>
211 <!-- {{editdata.upliftDateString}} -->
212 <div style="width: 50%; float: left;"> 136 <div style="width: 50%; float: left;">
213 Time 137 Time
214 <select class="form-control" ng-model="order.etdTime" style="width: 100%;"> 138 <select class="form-control" ng-model="order.etdTime" style="width: 100%;">
215 <option ng-repeat="list in etdTimeList">{{list.time}}</option> 139 <option ng-repeat="list in etdTimeList">{{list.time}}</option>
216 </select> 140 </select>
217 <!-- <input type="time" ng-model="editdata.etaTime" step="60" value="12:00" style="width: 90%"> -->
218
219 </div> 141 </div>
220 </div> 142 </div>
221 <div class="clearfix"></div> 143 <div class="clearfix"></div>
222 </div> 144 </div>
223 145
224 <div class="col-md-6" style="margin-top: 22px;"> 146 <div class="col-md-6" style="margin-top: 22px;">
225 <div class="pull-left" style="width: 110px;"> 147 <div class="pull-left" style="width: 110px;">
226 <label class="new-input-label"><b>Total</b></label> 148 <label class="new-input-label"><b>Total</b></label>
227 <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span> 149 <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span>
228 </div> 150 </div>
229 <div class="pull-left" style="width: calc(100% - 110px);"> 151 <div class="pull-left" style="width: calc(100% - 110px);">
230 <input type="text" class="form-control" disabled ng-model="order.total | number : 4" placeholder="" ng-value="{{order.volume * order.invoiced}}"> 152 <input type="text" class="form-control" disabled ng-model="order.total | number : 4" placeholder="" ng-value="{{order.volume * order.invoiced}}">
231 <!--{{editdata.total }}-->
232 </div> 153 </div>
233 </div> 154 </div>
234 </div> 155 </div>
235 <div class="clearfix"></div><br> 156 <div class="clearfix"></div><br>
236 157
237 158
238 <div class="col-xs-12"> 159 <div class="col-xs-12">
239 160
240 <div class="col-md-6"> 161 <div class="col-md-6">
241 <div class="pull-left" style="width: 110px;"> 162 <div class="pull-left" style="width: 110px;">
242 <label class="new-input-label"><b>Fuel on</b></label> 163 <label class="new-input-label"><b>Fuel on</b></label>
243 </div> 164 </div>
244 <div class="pull-left" style="width: calc(100% - 110px);"> 165 <div class="pull-left" style="width: calc(100% - 110px);">
245 <select class="form-control" ng-model="order.fuelOn" style="width: 100%;"> 166 <select class="form-control" ng-model="order.fuelOn" style="width: 100%;">
246 <option value="" disabled selected hidden>Select...</option> 167 <option value="" disabled selected hidden>Select...</option>
247 <option value="Arrival">Arrival</option> 168 <option value="Arrival">Arrival</option>
248 <option value="Departure">Departure</option> 169 <option value="Departure">Departure</option>
249 </select> 170 </select>
250 </div> 171 </div>
251 <div class="clearfix"></div> 172 <div class="clearfix"></div>
252 </div> 173 </div>
253 174
254 <div class="col-md-6"> 175 <div class="col-md-6">
255 <div class="pull-left" style="width: 110px;"> 176 <div class="pull-left" style="width: 110px;">
256 <label class="new-input-label"><b>FBO Cost</b></label> 177 <label class="new-input-label"><b>FBO Cost</b></label>
257 <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span> 178 <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span>
258 </div> 179 </div>
259 <div class="pull-left" style="width: calc(100% - 110px);"> 180 <div class="pull-left" style="width: calc(100% - 110px);">
260 <input type="text" disabled ng-model="order.fboCost" class="form-control" placeholder="0.0000" valid-number /> 181 <input type="text" disabled ng-model="order.fboCost" class="form-control" placeholder="0.0000" valid-number />
261 </div> 182 </div>
262 <div class="clearfix"></div> 183 <div class="clearfix"></div>
263 </div> 184 </div>
264 </div> 185 </div>
265 <div class="clearfix"></div><br> 186 <div class="clearfix"></div><br>
266 187
267 <div class="col-xs-12"> 188 <div class="col-xs-12">
268 <div class="col-md-6"> 189 <div class="col-md-6">
269 <div class="pull-left" style="width: 110px;"> 190 <div class="pull-left" style="width: 110px;">
270 <label class="new-input-label"><b>Source</b></label> 191 <label class="new-input-label"><b>Source</b></label>
271 </div> 192 </div>
272 <div class="pull-left" style="width: calc(100% - 110px);"> 193 <div class="pull-left" style="width: calc(100% - 110px);">
273 <select class="form-control" ng-model="order.source" style="width: 100%;"> 194 <select class="form-control" ng-model="order.source" style="width: 100%;">
274 <option value="" disabled selected hidden>Select Source</option> 195 <option value="" disabled selected hidden>Select Source</option>
275 <option value="Tenant">Tenant</option> 196 <option value="Tenant">Tenant</option>
276 <option value="CAA">CAA</option> 197 <option value="CAA">CAA</option>
277 <option value="Tenant/CAA">Tenant/CAA</option> 198 <option value="Tenant/CAA">Tenant/CAA</option>
278 </select> 199 </select>
279 </div> 200 </div>
280 <div class="clearfix"></div> 201 <div class="clearfix"></div>
281 </div> 202 </div>
282 </div> 203 </div>
283 <div class="clearfix"></div> 204 <div class="clearfix"></div>
284 <br/> 205 <br/>
285 <div class="col-xs-12"> 206 <div class="col-xs-12">
286 207
287 208
288 <div class="col-md-6"> 209 <div class="col-md-6">
289 <div class="pull-left" style="width: 110px;"> 210 <div class="pull-left" style="width: 110px;">
290 <label class="new-input-label"><b>Certificate Type</b></label> 211 <label class="new-input-label"><b>Certificate Type</b></label>
291 </div> 212 </div>
292 <div class="pull-left" style="width: calc(100% - 110px);"> 213 <div class="pull-left" style="width: calc(100% - 110px);">
293 <select class="form-control" ng-model="order.certificateType" style="width: 100%;" required> 214 <select class="form-control" ng-model="order.certificateType" style="width: 100%;" required>
294 <option value="" disabled selected hidden>Select...</option> 215 <option value="" disabled selected hidden>Select...</option>
295 <option value="corporate">Part 91 (Corporate)</option> 216 <option value="corporate">Part 91 (Corporate)</option>
296 <option value="charter">Part 135 (Charter)</option> 217 <option value="charter">Part 135 (Charter)</option>
297 <option value="scheduled">Part 121 (Scheduled)</option> 218 <option value="scheduled">Part 121 (Scheduled)</option>
298 <option value="military">Military</option> 219 <option value="military">Military</option>
299 <option value="government">Government</option> 220 <option value="government">Government</option>
300 </select> 221 </select>
301 </div> 222 </div>
302 <div class="clearfix"></div> 223 <div class="clearfix"></div>
303 </div> 224 </div>
304 <div class="col-md-6"> 225 <div class="col-md-6">
305 <div class="pull-left" style="width: 110px;"> 226 <div class="pull-left" style="width: 110px;">
306 <label class="new-input-label"><b>Status</b></label> 227 <label class="new-input-label"><b>Status</b></label>
307 </div> 228 </div>
308 <div class="pull-left" style="width: calc(100% - 110px);"> 229 <div class="pull-left" style="width: calc(100% - 110px);">
309 <select class="form-control" ng-model="order.status" style="width: 100%;"> 230 <select class="form-control" ng-model="order.status" style="width: 100%;">
310 <option value="" disabled selected hidden>Select Status</option> 231 <option value="" disabled selected hidden>Select Status</option>
311 <option value="pending">pending</option> 232 <option value="pending">pending</option>
312 <option value="invoiced">invoiced</option> 233 <option value="invoiced">invoiced</option>
313 <option value="paid">paid</option> 234 <option value="paid">paid</option>
314 <option value="cancelled">cancelled</option> 235 <option value="cancelled">cancelled</option>
315 <option value="archived">archived</option> 236 <option value="archived">archived</option>
316 </select> 237 </select>
317 </div> 238 </div>
318 <div class="clearfix"></div> 239 <div class="clearfix"></div>
319 </div> 240 </div>
320 </div> 241 </div>
321 <div class="clearfix"></div><br> 242 <div class="clearfix"></div><br>
322 243
323 <div class="customInputWrap text-right"> 244 <div class="customInputWrap text-right">
324 <div class="col-xs-12"> 245 <div class="col-xs-12">
325 <input type="cancel" value="Cancel" ng-click="cancelOrder()" class="btn btn-default" style="margin-right: 15px; width: 100px;"> 246 <input type="cancel" value="Cancel" ng-click="cancelOrder()" class="btn btn-default" style="margin-right: 15px; width: 100px;">
326 <input type="submit" value="save" ng-click="dispatchFuel()" class="btn btn-primary" ng-disabled="orderform.$invalid"> 247 <input type="submit" value="save" ng-click="dispatchFuel()" class="btn btn-primary" ng-disabled="orderform.$invalid">
327 </div> 248 </div>
328 <div class="clearfix"></div> 249 <div class="clearfix"></div>
329 </div> 250 </div>
330 251
331 </form> 252 </form>
332 </div> 253 </div>
333 </div> 254 </div>
334 </div> 255 </div>
335 </div> 256 </div>
336 </div> 257 </div>
337 258
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','CustomersService','ViewCompanyService', 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,CustomersService,ViewCompanyService) { 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 = []; 13 $scope.jetShow = [];
14 $scope.marginShow = []; 14 $scope.marginShow = [];
15 15
16 $scope.jetShow[0] = true; 16 $scope.jetShow[0] = true;
17 $scope.marginShow[0] = true; 17 $scope.marginShow[0] = true;
18 18
19 $scope.data = {}; 19 $scope.data = {};
20 $scope.order = {}; 20 $scope.order = {};
21 $scope.dispatchOrder = {}; 21 $scope.dispatchOrder = {};
22 $scope.dispatchOrder.fuelOrderList = []; 22 $scope.dispatchOrder.fuelOrderList = [];
23 23
24 $scope.statusFilterOptions = []; 24 $scope.statusFilterOptions = [];
25 $scope.statusFilterOptions.push({ 25 $scope.statusFilterOptions.push({
26 'id': '', 'title': 'Show All' 26 'id': '', 'title': 'Show All'
27 },{ 27 },{
28 'id': 'pending', 'title': 'Pending' 28 'id': 'pending', 'title': 'Pending'
29 },{ 29 },{
30 'id': 'invoiced', 'title': 'Invoiced' 30 'id': 'invoiced', 'title': 'Invoiced'
31 },{ 31 },{
32 'id': 'paid', 'title': 'Paid' 32 'id': 'paid', 'title': 'Paid'
33 },{ 33 },{
34 'id': 'cancelled', 'title': 'Cancelled' 34 'id': 'cancelled', 'title': 'Cancelled'
35 },{ 35 },{
36 'id': 'archived', 'title': 'Archived' 36 'id': 'archived', 'title': 'Archived'
37 } 37 }
38 38
39 ); 39 );
40 40
41 getAllCompanies(); 41 getAllCompanies();
42 42
43 function getAllCompanies(){ 43 function getAllCompanies(){
44 fuelOrdersService.getAllCompanies().then(function(result) { 44 fuelOrdersService.getAllCompanies().then(function(result) {
45 $scope.companyList = result; 45 $scope.companyList = result;
46 for (var i = 0; i < $scope.companyList.length; i++) { 46 for (var i = 0; i < $scope.companyList.length; i++) {
47 if ($scope.companyList[i].companyContact != null) { 47 if ($scope.companyList[i].companyContact != null) {
48 if ($scope.companyList[i].companyContact.contactNumber != null || $scope.companyList[i].companyContact.contactNumber != undefined) { 48 if ($scope.companyList[i].companyContact.contactNumber != null || $scope.companyList[i].companyContact.contactNumber != undefined) {
49 $scope.companyList[i].newContactNumber = $scope.companyList[i].companyContact.contactNumber; 49 $scope.companyList[i].newContactNumber = $scope.companyList[i].companyContact.contactNumber;
50 } 50 }
51 } 51 }
52 if ($scope.companyList[i].primaryContact != null) { 52 if ($scope.companyList[i].primaryContact != null) {
53 if ($scope.companyList[i].primaryContact.firstName != null && $scope.companyList[i].primaryContact.lastName != null) { 53 if ($scope.companyList[i].primaryContact.firstName != null && $scope.companyList[i].primaryContact.lastName != null) {
54 $scope.companyList[i].primaryContactName = $scope.companyList[i].primaryContact.firstName + ' ' + $scope.companyList[i].primaryContact.lastName; 54 $scope.companyList[i].primaryContactName = $scope.companyList[i].primaryContact.firstName + ' ' + $scope.companyList[i].primaryContact.lastName;
55 } 55 }
56 } 56 }
57 if ($scope.companyList[i].margin != null) { 57 if ($scope.companyList[i].margin != null) {
58 if ($scope.companyList[i].margin.marginName != null) { 58 if ($scope.companyList[i].margin.marginName != null) {
59 $scope.companyList[i].masterMargin = $scope.companyList[i].margin.id; 59 $scope.companyList[i].masterMargin = $scope.companyList[i].margin.id;
60 } 60 }
61 } 61 }
62 } 62 }
63 $scope.displayCompanyList = new NgTableParams({ 63 $scope.displayCompanyList = new NgTableParams({
64 page: 1, 64 page: 1,
65 count: 10, 65 count: 10,
66 }, { 66 }, {
67 data: $scope.companyList 67 data: $scope.companyList
68 }); 68 });
69 $scope.showLoader = false; 69 $scope.showLoader = false;
70 }) 70 })
71 } 71 }
72 72
73 73
74 $scope.userProfileId = JSON.parse(localStorage.getItem('userProfileId')) 74 $scope.userProfileId = JSON.parse(localStorage.getItem('userProfileId'))
75 $scope.reset2 = function(){ 75 $scope.reset2 = function(){
76 $("input").val(""); 76 $("input").val("");
77 $scope.removeMarginValidation(); 77 $scope.removeMarginValidation();
78 } 78 }
79 79
80 function colourFunction() { 80 function colourFunction() {
81 var myselect = document.getElementById('colorfulSelectbox'), 81 var myselect = document.getElementById('colorfulSelectbox'),
82 colour = myselect.options[myselect.selectedIndex].className; 82 colour = myselect.options[myselect.selectedIndex].className;
83 myselect.style.background = colour; 83 myselect.style.background = colour;
84 myselect.blur(); 84 myselect.blur();
85 } 85 }
86 86
87 87
88 /*setInterval(function(){ 88 /*setInterval(function(){
89 colourFunction(); 89 colourFunction();
90 }, 1)*/ 90 }, 1)*/
91 91
92 92
93 $scope.attachmentFilterOptions = []; 93 $scope.attachmentFilterOptions = [];
94 $scope.attachmentFilterOptions.push({ 94 $scope.attachmentFilterOptions.push({
95 'id': '', 'title': 'Show All' 95 'id': '', 'title': 'Show All'
96 },{ 96 },{
97 'id': '!null', 'title': 'Attachments' 97 'id': '!null', 'title': 'Attachments'
98 },{ 98 },{
99 'id': 'null', 'title': 'No Attachments' 99 'id': 'null', 'title': 'No Attachments'
100 } 100 }
101 ); 101 );
102 102
103 // $(document).ready(function() { 103 // $(document).ready(function() {
104 // $scope.showLoader = true; 104 // $scope.showLoader = true;
105 // $('#example').DataTable(); 105 // $('#example').DataTable();
106 // $scope.showLoader = false; 106 // $scope.showLoader = false;
107 // }); 107 // });
108 108
109 $scope.getOrders = function() { 109 $scope.getOrders = function() {
110 fuelOrdersService.getOrders().then(function(result) { 110 fuelOrdersService.getOrders().then(function(result) {
111 $scope.orderdata = result; 111 $scope.orderdata = result;
112 for(var i=0 ; i < $scope.orderdata.length ; i++){ 112 for(var i=0 ; i < $scope.orderdata.length ; i++){
113 $scope.orderdata[i].upliftDateS = new Date($scope.orderdata[i].upliftDate); 113 $scope.orderdata[i].upliftDateS = new Date($scope.orderdata[i].upliftDate);
114 $scope.orderdata[i].departingDateS = new Date($scope.orderdata[i].departingDate); 114 $scope.orderdata[i].departingDateS = new Date($scope.orderdata[i].departingDate);
115 115
116 var str = "" + ($scope.orderdata[i].upliftDateS.getMonth() + 1) + "/" + $scope.orderdata[i].upliftDateS.getDate() + "/" + $scope.orderdata[i].upliftDateS.getFullYear(); 116 var str = "" + ($scope.orderdata[i].upliftDateS.getMonth() + 1) + "/" + $scope.orderdata[i].upliftDateS.getDate() + "/" + $scope.orderdata[i].upliftDateS.getFullYear();
117 var departingStr = "" + ($scope.orderdata[i].departingDateS.getMonth() + 1) + "/" + $scope.orderdata[i].departingDateS.getDate() + "/" + $scope.orderdata[i].departingDateS.getFullYear(); 117 var departingStr = "" + ($scope.orderdata[i].departingDateS.getMonth() + 1) + "/" + $scope.orderdata[i].departingDateS.getDate() + "/" + $scope.orderdata[i].departingDateS.getFullYear();
118 $scope.orderdata[i].upliftDateString = str; 118 $scope.orderdata[i].upliftDateString = str;
119 $scope.orderdata[i].departingDateString = departingStr; 119 $scope.orderdata[i].departingDateString = departingStr;
120 //not working in input type Time 120 //not working in input type Time
121 /*if ($scope.orderdata[i].etaTime != null) { 121 /*if ($scope.orderdata[i].etaTime != null) {
122 var now = new Date(); 122 var now = new Date();
123 123
124 var hr = $scope.orderdata[i].etaTime.slice(0, 2); 124 var hr = $scope.orderdata[i].etaTime.slice(0, 2);
125 var mm = $scope.orderdata[i].etaTime.slice(3, 5); 125 var mm = $scope.orderdata[i].etaTime.slice(3, 5);
126 now.setHours(hr); 126 now.setHours(hr);
127 now.setMinutes(mm); 127 now.setMinutes(mm);
128 $scope.orderdata[i].etaTime = now; 128 $scope.orderdata[i].etaTime = now;
129 console.log("===eta====", now, hr, mm); 129 console.log("===eta====", now, hr, mm);
130 }*/ 130 }*/
131 131
132 } 132 }
133 133
134 $scope.displayFuelOrderList = new NgTableParams({ 134 $scope.displayFuelOrderList = new NgTableParams({
135 page: 1, 135 page: 1,
136 count: 10, 136 count: 10,
137 }, { 137 }, {
138 data: $scope.orderdata 138 data: $scope.orderdata
139 }); 139 });
140 $(document).ready(function(){ 140 $(document).ready(function(){
141 function changeSelectboxBg(){ 141 function changeSelectboxBg(){
142 setInterval(function(){ 142 setInterval(function(){
143 if ($('.table select').is(':focus')) { 143 if ($('.table select').is(':focus')) {
144 144
145 }else{ 145 }else{
146 var myselect = document.getElementsByClassName('colorfulSelectbox'); 146 var myselect = document.getElementsByClassName('colorfulSelectbox');
147 147
148 for (var i = 0; i < myselect.length; i++) { 148 for (var i = 0; i < myselect.length; i++) {
149 var colourIndex = $(myselect[i]).prop('selectedIndex'); 149 var colourIndex = $(myselect[i]).prop('selectedIndex');
150 colourIndex = colourIndex + 1; 150 colourIndex = colourIndex + 1;
151 var getColor = $('.colorfulSelectbox option:nth-child('+colourIndex+')').css('color'); 151 var getColor = $('.colorfulSelectbox option:nth-child('+colourIndex+')').css('color');
152 $(myselect[i]).css('background-color', getColor); 152 $(myselect[i]).css('background-color', getColor);
153 myselect[i].blur(); 153 myselect[i].blur();
154 } 154 }
155 } 155 }
156 }, 1000) 156 }, 1000)
157 } 157 }
158 changeSelectboxBg(); 158 changeSelectboxBg();
159 159
160 /*$('.pagination , .recordCountSelect').click(function(){ 160 /*$('.pagination , .recordCountSelect').click(function(){
161 changeSelectboxBg(); 161 changeSelectboxBg();
162 }) 162 })
163 $('.input-filter').keydown(function(){ 163 $('.input-filter').keydown(function(){
164 console.log('function..........'); 164 console.log('function..........');
165 changeSelectboxBg(); 165 changeSelectboxBg();
166 })*/ 166 })*/
167 }) 167 })
168 }) 168 })
169 } 169 }
170 170
171 $scope.getOrders(); 171 $scope.getOrders();
172 $scope.optionSelected=''; 172 $scope.optionSelected='';
173 $scope.onFWSelect = function() { 173 $scope.onFWSelect = function() {
174 if($scope.optionSelected == 'dt'){ 174 if($scope.optionSelected == 'dt'){
175 $('#demo-modal-4').css('display', 'block'); 175 $('#demo-modal-4').css('display', 'block');
176 $scope.optionSelected=''; 176 $scope.optionSelected='';
177 177
178 } 178 }
179 if($scope.optionSelected == 'efo'){ 179 if($scope.optionSelected == 'efo'){
180 $scope.showLoader = true; 180 $scope.showLoader = true;
181 var fileName = "orders.csv"; 181 var fileName = "orders.csv";
182 var a = document.createElement("a"); 182 var a = document.createElement("a");
183 document.body.appendChild(a); 183 document.body.appendChild(a);
184 fuelOrdersService.exportCompany().then(function(result) { 184 fuelOrdersService.exportCompany().then(function(result) {
185 var file = new Blob([result], {type: 'application/csv'}); 185 var file = new Blob([result], {type: 'application/csv'});
186 var fileURL = URL.createObjectURL(file); 186 var fileURL = URL.createObjectURL(file);
187 a.href = fileURL; 187 a.href = fileURL;
188 a.download = fileName; 188 a.download = fileName;
189 a.click(); 189 a.click();
190 $scope.showLoader = false; 190 $scope.showLoader = false;
191 $scope.optionSelected=''; 191 $scope.optionSelected='';
192 }) 192 })
193 } 193 }
194 } 194 }
195 $scope.attachmentrowid = "" 195 $scope.attachmentrowid = ""
196 196
197 197
198 $scope.attachment = function(id, value, url) { 198 $scope.attachment = function(id, value, url) {
199 $scope.attachmentrowid = id 199 $scope.attachmentrowid = id
200 if(value == 'uploadAttachment'){ 200 if(value == 'uploadAttachment'){
201 $('#demo-modal-6').css('display', 'block'); 201 $('#demo-modal-6').css('display', 'block');
202 }else if(value == 'viewAttachment'){ 202 }else if(value == 'viewAttachment'){
203 var win = window.open(url, '_blank'); 203 var win = window.open(url, '_blank');
204 win.focus(); 204 win.focus();
205 }else if(value == 'deleteAttachment'){ 205 }else if(value == 'deleteAttachment'){
206 $('#delete1').css('display', 'block'); 206 $('#delete1').css('display', 'block');
207 } 207 }
208 } 208 }
209 209
210 $scope.cancelDeleteAttachment = function() { 210 $scope.cancelDeleteAttachment = function() {
211 $('#delete1').css('display', ''); 211 $('#delete1').css('display', '');
212 } 212 }
213 213
214 $scope.deleteAttachment = function() { 214 $scope.deleteAttachment = function() {
215 $scope.showLoader = true; 215 $scope.showLoader = true;
216 fuelOrdersService.deleteAttachment($scope.attachmentrowid).then(function(result) { 216 fuelOrdersService.deleteAttachment($scope.attachmentrowid).then(function(result) {
217 217
218 if(result.success){ 218 if(result.success){
219 toastr.success(''+result.success+'', { 219 toastr.success(''+result.success+'', {
220 closeButton: true 220 closeButton: true
221 }) 221 })
222 } 222 }
223 }) 223 })
224 $scope.showLoader = false; 224 $scope.showLoader = false;
225 $('#delete1').css('display', ''); 225 $('#delete1').css('display', '');
226 } 226 }
227 227
228 $scope.saveUploadAttachment = function(attachmentData) { 228 $scope.saveUploadAttachment = function(attachmentData) {
229 $scope.showLoader = true; 229 $scope.showLoader = true;
230 $scope.data.media = attachmentData 230 $scope.data.media = attachmentData
231 $scope.data.id = $scope.attachmentrowid 231 $scope.data.id = $scope.attachmentrowid
232 fuelOrdersService.uploadAttachment($scope.data).then(function(result) { 232 fuelOrdersService.uploadAttachment($scope.data).then(function(result) {
233 if(result){ 233 if(result){
234 toastr.success(''+"Upload Successful"+'', { 234 toastr.success(''+"Upload Successful"+'', {
235 closeButton: true 235 closeButton: true
236 }) 236 })
237 } 237 }
238 238
239 }) 239 })
240 $scope.showLoader = false; 240 $scope.showLoader = false;
241 $('#demo-modal-6').css('display', 'none'); 241 $('#demo-modal-6').css('display', 'none');
242 } 242 }
243 243
244 $scope.cancelUploadAttachment = function() { 244 $scope.cancelUploadAttachment = function() {
245 $('#demo-modal-6').css('display', 'none'); 245 $('#demo-modal-6').css('display', 'none');
246 } 246 }
247 247
248 $scope.editdata = {}; 248 $scope.editdata = {};
249 249
250 250
251 $scope.editTableRow = function(rowData){ 251 $scope.editTableRow = function(rowData){
252 //console.log('row data', rowData); 252 //console.log('row data', rowData);
253 $scope.editdata = rowData; 253 $scope.editdata = rowData;
254 $('#demo-modal-5').css('display', 'block'); 254 $('#demo-modal-5').css('display', 'block');
255 } 255 }
256 256
257 $scope.updateTotal = function(value, valueOf){ 257 $scope.updateTotal = function(value, valueOf){
258 if(valueOf == 'v'){ 258 if(valueOf == 'v'){
259 $scope.editdata.total = value * $scope.editdata.invoiced 259 $scope.editdata.total = value * $scope.editdata.invoiced
260 }else if(valueOf == 'i'){ 260 }else if(valueOf == 'i'){
261 $scope.editdata.total = $scope.editdata.requestedVolume * value 261 $scope.editdata.total = $scope.editdata.requestedVolume * value
262 } 262 }
263 } 263 }
264 264
265 $scope.setCost = function(cost){
266 if(cost != null) {
267 var obj =JSON.parse(cost);
268 $scope.order.fboCost = obj.cost;
269 }
270
271 }
272
265 $scope.addTotal = function(value, valueOf){ 273 $scope.addTotal = function(value, valueOf){
266 if(valueOf == 'v'){ 274 if(valueOf == 'v'){
267 $scope.order.total = value * $scope.order.invoiced 275 $scope.order.total = value * $scope.order.invoiced
268 }else if(valueOf == 'i'){ 276 }else if(valueOf == 'i'){
269 $scope.order.total = $scope.order.volume * value 277 $scope.order.total = $scope.order.volume * value
270 } 278 }
271 } 279 }
272 280
273 $scope.addFuelData = function() { 281 $scope.addFuelData = function() {
274 $scope.showLoader = true; 282 $scope.showLoader = true;
275 283 $scope.fuelData = {};
276 if ($scope.order.priceQuote === null || $scope.order.priceQuote == '') { 284 $scope.fuelData.companyId = $scope.selectedCompanyId;
277 $scope.showLoader = false; 285
278 toastr.error('Please select Company and Price Quote.', { 286 $scope.fuelData.companyName = $scope.order.companyName;
279 closeButton: true 287 var aircraftObj =JSON.parse($scope.order.aircraftName);
280 }) 288 $scope.fuelData.aircraftName = aircraftObj.tail;
281 }else{ 289 $scope.fuelData.make = aircraftObj.make;
290 $scope.fuelData.model = aircraftObj.model;
291 $scope.fuelData.fuelOn = $scope.order.fuelOn;
292 $scope.fuelData.invoiced = $scope.order.invoiced;
293 $scope.fuelData.volume = $scope.order.volume;
294 $scope.fuelData.source = $scope.order.source;
295 $scope.fuelData.status = $scope.order.status;
296 $scope.fuelData.total = $scope.order.total;
297 //tier no use
298 $scope.fuelData.tierBreak = $scope.order.tierBreak;
299
300 var obj =JSON.parse($scope.order.priceQuote);
301 $scope.fuelData.priceQuote = obj.papTotal;
302 $scope.fuelData.fboCost = obj.cost;
303 $scope.fuelData.productName = obj.productName;
304
305 $scope.fuelData.etaTime = $scope.order.etaTime;
306 $scope.fuelData.etdTime = $scope.order.etdTime;
307 $scope.fuelData.certificateType = $scope.order.certificateType;
308 var currentDate = new Date();
309 var hours = currentDate.getHours();
310 var min = currentDate.getMinutes();
311 var sec = currentDate.getSeconds();
312 if ($scope.order.upliftDate != '') {
313 $scope.order.upliftDate = $scope.order.upliftDate + ' ' + hours + ':' + min + ':' + sec;
314 $scope.order.upliftDate = new Date($scope.order.upliftDate);
315 $scope.fuelData.upliftDate = $scope.order.upliftDate.getTime();
316 }
282 317
283 if ($scope.order.upliftDate != '') { 318
284 $scope.order.upliftDate = new Date($scope.order.upliftDate); 319 if ($scope.order.departingDate != '') {
285 $scope.order.upliftDate = $scope.order.upliftDate.getTime(); 320 $scope.order.departingDate = $scope.order.departingDate + ' ' + hours + ':' + min + ':' + sec;
286 } 321 $scope.order.departingDate = new Date($scope.order.departingDate);
287 if ($scope.order.departingDate != '') { 322 $scope.fuelData.departingDate = $scope.order.departingDate.getTime();
288 $scope.order.departingDate = new Date($scope.order.departingDate); 323 }
289 $scope.order.departingDate = $scope.order.departingDate.getTime(); 324
290 }
291 var obj =JSON.parse($scope.order.priceQuote);
292 //$scope.order.priceQuote = obj.papMargin;
293 $scope.order.priceQuote = obj.papTotal;
294 $scope.fuelData = {};
295 $scope.fuelData.aircraftName = $scope.order.aircraftName;
296 $scope.fuelData.companyName = $scope.order.companyName;
297 $scope.fuelData.departingDate = $scope.order.departingDate;
298 $scope.fuelData.fboCost = $scope.order.fboCost;
299 $scope.fuelData.id = $scope.order.id;
300 $scope.fuelData.invoiced = $scope.order.invoiced;
301 $scope.fuelData.priceQuote = $scope.order.priceQuote;
302 $scope.fuelData.productName = obj.productName;
303 $scope.fuelData.volume = $scope.order.volume;
304 $scope.fuelData.source = $scope.order.source;
305 $scope.fuelData.status = $scope.order.status;
306 $scope.fuelData.tierBreak = $scope.order.tierBreak;
307 $scope.fuelData.total = $scope.order.total;
308 $scope.fuelData.upliftDate = $scope.order.upliftDate;
309 $scope.fuelData.companyId = $scope.selectedCompanyId;
310 325
311 326
312 327 $scope.dispatchOrder.fuelOrderList.push($scope.fuelData);
313 $scope.dispatchOrder.fuelOrderList.push($scope.fuelData); 328 //console.log("=====$scope.fueldata======",$scope.fuelData)
314 //console.log("=====$scope.fueldata======",$scope.fuelData) 329 fuelOrdersService.dispathFuelOrder($scope.dispatchOrder).then(function(result) {
315 fuelOrdersService.dispathFuelOrder($scope.dispatchOrder).then(function(result) { 330 $scope.showLoader = false;
316 $scope.showLoader = false; 331 $scope.order = {};
317 $scope.order = {}; 332 $scope.dispatchOrder.fuelOrderList = [];
318 $scope.dispatchOrder.fuelOrderList = []; 333 $('#demo-modal-4').css('display', '');
319 $('#demo-modal-4').css('display', ''); 334 $scope.getOrders();
320 $scope.getOrders(); 335 toastr.success('Fuel Order Dispatched Successfully', {
321 toastr.success('Fuel Order Dispatched Successfully', { 336 closeButton: true
322 closeButton: true 337 })
323 }) 338 })
324 })
325
326 }
327 339
328 340
329 } 341 }
342
330 $scope.updateStatus = function(row, status) { 343 $scope.updateStatus = function(row, status) {
331 $scope.showLoader = true; 344 $scope.showLoader = true;
332 $scope.fuelData = {}; 345 $scope.fuelData = {};
333 $scope.fuelData.aircraftName = row.aircraftName 346 $scope.fuelData.aircraftName = row.aircraftName
334 $scope.fuelData.companyName = row.companyName 347 $scope.fuelData.companyName = row.companyName
335 $scope.fuelData.departingDate = row.departingDate 348 $scope.fuelData.departingDate = row.departingDate
336 $scope.fuelData.fboCost = row.fboCost 349 $scope.fuelData.fboCost = row.fboCost
337 $scope.fuelData.id = row.id 350 $scope.fuelData.id = row.id
338 $scope.fuelData.invoiced = row.invoiced 351 $scope.fuelData.invoiced = row.invoiced
339 $scope.fuelData.priceQuote = row.priceQuote 352 $scope.fuelData.priceQuote = row.priceQuote
340 $scope.fuelData.volume = row.requestedVolume 353 $scope.fuelData.volume = row.requestedVolume
341 $scope.fuelData.source = row.source 354 $scope.fuelData.source = row.source
342 $scope.fuelData.status = status 355 $scope.fuelData.status = status
343 $scope.fuelData.tierBreak = row.tierBreak 356 $scope.fuelData.tierBreak = row.tierBreak
344 $scope.fuelData.total = row.total 357 $scope.fuelData.total = row.total
345 $scope.fuelData.upliftDate = row.upliftDate 358 $scope.fuelData.upliftDate = row.upliftDate
346 359
347 $scope.dispatchOrder.fuelOrderList.push($scope.fuelData); 360 $scope.dispatchOrder.fuelOrderList.push($scope.fuelData);
348 fuelOrdersService.updateFuelOrder($scope.dispatchOrder).then(function(result) { 361 fuelOrdersService.updateFuelOrder($scope.dispatchOrder).then(function(result) {
349 $scope.showLoader = false; 362 $scope.showLoader = false;
350 $scope.editdata = {}; 363 $scope.editdata = {};
351 $scope.fuelData = {}; 364 $scope.fuelData = {};
352 $scope.dispatchOrder.fuelOrderList = []; 365 $scope.dispatchOrder.fuelOrderList = [];
353 $('#demo-modal-5').css('display', ''); 366 $('#demo-modal-5').css('display', '');
354 $scope.getOrders(); 367 $scope.getOrders();
355 toastr.success('Fuel Order Updated Successfully', { 368 toastr.success('Fuel Order Updated Successfully', {
356 closeButton: true 369 closeButton: true
357 }); 370 });
358 }) 371 })
359 372
360 } 373 }
361 $scope.fuelData = {}; 374 $scope.fuelData = {};
362 $scope.updateData = function() { 375 $scope.updateData = function() {
363 if($scope.editdata.etaTime != null && $scope.editdata.etdTime != null){ 376 if($scope.editdata.etaTime != null && $scope.editdata.etdTime != null){
364 if($scope.editdata.fuelOn != null || $scope.editdata.fuelOn != undefined) { 377 if($scope.editdata.fuelOn != null || $scope.editdata.fuelOn != undefined) {
365 $scope.showLoader = true; 378 $scope.showLoader = true;
366 $scope.fuelData.aircraftName = $scope.editdata.aircraftName; 379 $scope.fuelData.aircraftName = $scope.editdata.aircraftName;
367 $scope.fuelData.companyName = $scope.editdata.companyName; 380 $scope.fuelData.companyName = $scope.editdata.companyName;
368 $scope.fuelData.fboCost = $scope.editdata.fboCost; 381 $scope.fuelData.fboCost = $scope.editdata.fboCost;
369 $scope.fuelData.id = $scope.editdata.id; 382 $scope.fuelData.id = $scope.editdata.id;
370 $scope.fuelData.invoiced = $scope.editdata.invoiced; 383 $scope.fuelData.invoiced = $scope.editdata.invoiced;
371 $scope.fuelData.priceQuote = $scope.editdata.priceQuote; 384 $scope.fuelData.priceQuote = $scope.editdata.priceQuote;
372 $scope.fuelData.volume = $scope.editdata.requestedVolume; 385 $scope.fuelData.volume = $scope.editdata.requestedVolume;
373 $scope.fuelData.source = $scope.editdata.source; 386 $scope.fuelData.source = $scope.editdata.source;
374 $scope.fuelData.status = $scope.editdata.status; 387 $scope.fuelData.status = $scope.editdata.status;
375 $scope.fuelData.tierBreak = $scope.editdata.tierBreak; 388 $scope.fuelData.tierBreak = $scope.editdata.tierBreak;
376 $scope.fuelData.total = $scope.editdata.total; 389 $scope.fuelData.total = $scope.editdata.total;
377 390
378 $scope.editdata.upliftDateString = new Date($scope.editdata.upliftDateString); 391 $scope.editdata.upliftDateString = new Date($scope.editdata.upliftDateString);
379 $scope.editdata.upliftDateString = $scope.editdata.upliftDateString.getTime(); 392 $scope.editdata.upliftDateString = $scope.editdata.upliftDateString.getTime();
380 393
381 $scope.editdata.departingDateString = new Date($scope.editdata.departingDateString); 394 $scope.editdata.departingDateString = new Date($scope.editdata.departingDateString);
382 $scope.editdata.departingDateString = $scope.editdata.departingDateString.getTime(); 395 $scope.editdata.departingDateString = $scope.editdata.departingDateString.getTime();
383 396
384 $scope.fuelData.upliftDate = $scope.editdata.upliftDateString; 397 $scope.fuelData.upliftDate = $scope.editdata.upliftDateString;
385 $scope.fuelData.departingDate = $scope.editdata.departingDateString; 398 $scope.fuelData.departingDate = $scope.editdata.departingDateString;
386 $scope.fuelData.productName = $scope.editdata.productName; 399 $scope.fuelData.productName = $scope.editdata.productName;
387 /*$scope.fuelData.etaTime = $scope.editdata.etaTime.toLocaleTimeString(); 400 /*$scope.fuelData.etaTime = $scope.editdata.etaTime.toLocaleTimeString();
388 $scope.fuelData.etdTime = $scope.editdata.etdTime.toLocaleTimeString();*/ 401 $scope.fuelData.etdTime = $scope.editdata.etdTime.toLocaleTimeString();*/
389 $scope.fuelData.etaTime = $scope.editdata.etaTime; 402 $scope.fuelData.etaTime = $scope.editdata.etaTime;
390 $scope.fuelData.etdTime = $scope.editdata.etdTime; 403 $scope.fuelData.etdTime = $scope.editdata.etdTime;
391 $scope.fuelData.certificateType = $scope.editdata.certificateType; 404 $scope.fuelData.certificateType = $scope.editdata.certificateType;
392 $scope.fuelData.fuelOn = $scope.editdata.fuelOn; 405 $scope.fuelData.fuelOn = $scope.editdata.fuelOn;
393 406
394 $scope.dispatchOrder.fuelOrderList.push($scope.fuelData); 407 $scope.dispatchOrder.fuelOrderList.push($scope.fuelData);
395 // console.log("====fueldata===",$scope.dispatchOrder); 408 // console.log("====fueldata===",$scope.dispatchOrder);
396 fuelOrdersService.updateFuelOrder($scope.dispatchOrder).then(function(result) { 409 fuelOrdersService.updateFuelOrder($scope.dispatchOrder).then(function(result) {
397 // console.log('result', result); 410 // console.log('result', result);
398 $scope.showLoader = false; 411 $scope.showLoader = false;
399 $scope.editdata = {}; 412 $scope.editdata = {};
400 $('#demo-modal-5').css('display', ''); 413 $('#demo-modal-5').css('display', '');
401 $scope.getOrders(); 414 $scope.getOrders();
402 toastr.success('Fuel Order Updated Successfully', { 415 toastr.success('Fuel Order Updated Successfully', {
403 closeButton: true 416 closeButton: true
404 }) 417 })
405 }) 418 })
406 419
407 420
408 } else{ 421 } else{
409 { 422 {
410 toastr.error('Please select fuelOn.', { 423 toastr.error('Please select fuelOn.', {
411 closeButton: true 424 closeButton: true
412 }) 425 })
413 } 426 }
414 } 427 }
415 428
416 }else 429 }else
417 { 430 {
418 toastr.error('Please select Arrival Time and Departure time both.', { 431 toastr.error('Please select Arrival Time and Departure time both.', {
419 closeButton: true 432 closeButton: true
420 }) 433 })
421 } 434 }
422 435
423 } 436 }
424 437
425 $scope.getAircraft = function(company){ 438 $scope.getAircraft = function(company){
426 439
427 $scope.selectedCompanyName = company; 440 $scope.selectedCompanyName = company;
428 //$scope.showLoader = true; 441 //$scope.showLoader = true;
429 for (var i = 0; i < $scope.companyList.length; i++) { 442 for (var i = 0; i < $scope.companyList.length; i++) {
430 if ($scope.companyList[i].companyName == company) { 443 if ($scope.companyList[i].companyName == company) {
431 if($scope.companyList[i].margin != null && $scope.companyList[i].marginAVGAS != null){ 444 if($scope.companyList[i].margin != null && $scope.companyList[i].marginAVGAS != null){
432 fuelOrdersService.getFuelCost($scope.companyList[i].id).then(function(margins) { 445 fuelOrdersService.getFuelCost($scope.companyList[i].id).then(function(margins) {
433 $scope.marginList = margins; 446 $scope.marginList = margins;
434 }) 447 })
435 } else if ($scope.companyList[i].margin != null || $scope.companyList[i].marginAVGAS == null) { 448 } else if ($scope.companyList[i].margin != null || $scope.companyList[i].marginAVGAS == null) {
436 fuelOrdersService.getATypeFuelPricing($scope.companyList[i].id).then(function(margins) { 449 fuelOrdersService.getATypeFuelPricing($scope.companyList[i].id).then(function(margins) {
437 $scope.marginList = margins; 450 $scope.marginList = margins;
438 }) 451 })
439 } else if ($scope.companyList[i].margin == null || $scope.companyList[i].marginAVGAS != null) { 452 } else if ($scope.companyList[i].margin == null || $scope.companyList[i].marginAVGAS != null) {
440 fuelOrdersService.getVTypeFuelPricing($scope.companyList[i].id).then(function(margins) { 453 fuelOrdersService.getVTypeFuelPricing($scope.companyList[i].id).then(function(margins) {
441 $scope.marginList = margins; 454 $scope.marginList = margins;
442 }) 455 })
443 } 456 }
444 $scope.selectedCompanyId = $scope.companyList[i].id; 457 $scope.selectedCompanyId = $scope.companyList[i].id;
445 $scope.marginId = $scope.companyList[i].margin.id; 458 $scope.marginId = $scope.companyList[i].margin.id;
446 if ($scope.selectedCompanyId != '') { 459 if ($scope.selectedCompanyId != '') {
447 fuelOrdersService.getAircraft($scope.selectedCompanyId).then(function(aircraft) { 460 fuelOrdersService.getAircraft($scope.selectedCompanyId).then(function(aircraft) {
448 $scope.aircraftList = aircraft; 461 $scope.aircraftList = aircraft;
449 }) 462 })
450 } 463 }
451 if ($scope.marginId != '') { 464 if ($scope.marginId != '') {
452 fuelOrdersService.getJetTiers($scope.marginId).then(function(tiers) { 465 fuelOrdersService.getJetTiers($scope.marginId).then(function(tiers) {
453 $scope.tierList = tiers; 466 $scope.tierList = tiers;
454 // $scope.showLoader = false; 467 // $scope.showLoader = false;
455 }) 468 })
456 }else{ 469 }else{
457 // $scope.showLoader = false; 470 // $scope.showLoader = false;
458 } 471 }
459 } 472 }
460 } 473 }
461 474
462 } 475 }
463 $scope.setCost = function(cost){ 476
464 if(cost != null) {
465 var obj =JSON.parse(cost);
466 $scope.order.fboCost = obj.cost;
467 }
468
469 }
470 477
471 478
472 $scope.cancelData = function() { 479 $scope.cancelData = function() {
473 $('#demo-modal-4').css('display', ''); 480 $('#demo-modal-4').css('display', '');
474 } 481 }
475 $scope.canceleditdata = function() { 482 $scope.canceleditdata = function() {
476 $('#demo-modal-5').css('display', ''); 483 $('#demo-modal-5').css('display', '');
477 } 484 }
478 485
479 486
480 487
481 $scope.companyList = {}; 488 $scope.companyList = {};
482 489
483 fuelOrdersService.getAllCompanies().then(function(result) { 490 fuelOrdersService.getAllCompanies().then(function(result) {
484 $scope.showLoader = true; 491 $scope.showLoader = true;
485 $scope.companyList = result; 492 $scope.companyList = result;
486 $scope.showLoader = false; 493 $scope.showLoader = false;
487 }) 494 })
488 495
489 /*Add a company services API used from customersService */ 496 /*Add a company services API used from customersService */
490 getCompanyName(); 497 getCompanyName();
491 function getCompanyName(){ 498 function getCompanyName(){
492 CustomersService.getCompanyName().then(function(result) { 499 CustomersService.getCompanyName().then(function(result) {
493 $scope.showLoader = true; 500 $scope.showLoader = true;
494 $scope.compNameList = result; 501 $scope.compNameList = result;
495 $scope.showLoader = false; 502 $scope.showLoader = false;
496 }) 503 })
497 } 504 }
498 505
499 $scope.marginFilterOptions = []; 506 $scope.marginFilterOptions = [];
500 CustomersService.getJetMargin($scope.userProfileId).then(function(result) { 507 CustomersService.getJetMargin($scope.userProfileId).then(function(result) {
501 $scope.showLoader = true; 508 $scope.showLoader = true;
502 $scope.jetMarginList = result; 509 $scope.jetMarginList = result;
503 $scope.marginFilterOptions.push({ 510 $scope.marginFilterOptions.push({
504 'id': '', 'title': 'Show All' 511 'id': '', 'title': 'Show All'
505 }); 512 });
506 for (var i = 0; i < result.length; i++) { 513 for (var i = 0; i < result.length; i++) {
507 $scope.marginFilterOptions.push({ 514 $scope.marginFilterOptions.push({
508 'id': result[i].id, 515 'id': result[i].id,
509 'title': result[i].marginName 516 'title': result[i].marginName
510 }) 517 })
511 } 518 }
512 $scope.showLoader = false; 519 $scope.showLoader = false;
513 }) 520 })
514 521
515 CustomersService.getAvgMargin($scope.userProfileId).then(function(result) { 522 CustomersService.getAvgMargin($scope.userProfileId).then(function(result) {
516 $scope.avgsMarginList = result; 523 $scope.avgsMarginList = result;
517 }) 524 })
518 525
519 $scope.showCompanyError = false; 526 $scope.showCompanyError = false;
520 $scope.showMarginError = false; 527 $scope.showMarginError = false;
521 528
522 $scope.removeValidation = function(){ 529 $scope.removeValidation = function(){
523 $scope.showCompanyError = false; 530 $scope.showCompanyError = false;
524 $('.companyNameInput').removeClass('customErrorInput'); 531 $('.companyNameInput').removeClass('customErrorInput');
525 if($scope.data.companyName == 'undefined' || $scope.data.companyName == '') { 532 if($scope.data.companyName == 'undefined' || $scope.data.companyName == '') {
526 $('.companyNameInput').addClass('customErrorInput'); 533 $('.companyNameInput').addClass('customErrorInput');
527 $scope.showCompanyError = true; 534 $scope.showCompanyError = true;
528 } 535 }
529 } 536 }
530 537
531 $scope.removeMarginValidation = function(){ 538 $scope.removeMarginValidation = function(){
532 $scope.showMarginError = false; 539 $scope.showMarginError = false;
533 $('.marginSelectBox').removeClass('customErrorInput'); 540 $('.marginSelectBox').removeClass('customErrorInput');
534 } 541 }
535 542
536 getData(); 543 getData();
537 function getData(){ 544 function getData(){
538 $scope.showLoader = true; 545 $scope.showLoader = true;
539 CustomersService.getAircraftMake().then(function(result) { 546 CustomersService.getAircraftMake().then(function(result) {
540 $scope.aircraftMakeList = result; 547 $scope.aircraftMakeList = result;
541 $scope.showLoader = false; 548 $scope.showLoader = false;
542 }) 549 })
543 } 550 }
544 var companyData; 551 var companyData;
545 $scope.addFirstData = function(sel, step){ 552 $scope.addFirstData = function(sel, step){
546 $scope.showLoader = true; 553 $scope.showLoader = true;
547 if($scope.data.companyName == undefined){ 554 if($scope.data.companyName == undefined){
548 $scope.showCompanyError = true; 555 $scope.showCompanyError = true;
549 $('.companyNameInput').addClass('customErrorInput'); 556 $('.companyNameInput').addClass('customErrorInput');
550 }else if($scope.data.masterMargin == undefined){ 557 }else if($scope.data.masterMargin == undefined){
551 $scope.showMarginError = true; 558 $scope.showMarginError = true;
552 $('.marginSelectBox').addClass('customErrorInput'); 559 $('.marginSelectBox').addClass('customErrorInput');
553 }else{ 560 }else{
554 $scope.aircraftDetails = [{ 561 $scope.aircraftDetails = [{
555 'tail':'', 562 'tail':'',
556 'make': '', 563 'make': '',
557 'model': '', 564 'model': '',
558 'sizeId' : '', 565 'sizeId' : '',
559 'marginId': $scope.data.masterMargin, 566 'marginId': $scope.data.masterMargin,
560 'avgasMarginId': $scope.data.avgasMargin 567 'avgasMarginId': $scope.data.avgasMargin
561 }]; 568 }];
562 569
563 $(sel).trigger('next.m.' + step); 570 $(sel).trigger('next.m.' + step);
564 getData(); 571 getData();
565 } 572 }
566 $scope.showLoader = false; 573 $scope.showLoader = false;
567 } 574 }
568 $scope.addNew = function(){ 575 $scope.addNew = function(){
569 $scope.showLoader = true; 576 $scope.showLoader = true;
570 $scope.aircraftDetails.push({ 577 $scope.aircraftDetails.push({
571 'tail':'', 578 'tail':'',
572 'make': '', 579 'make': '',
573 'model': '', 580 'model': '',
574 'sizeId' : '', 581 'sizeId' : '',
575 'marginId': $scope.data.masterMargin, 582 'marginId': $scope.data.masterMargin,
576 'avgasMarginId': $scope.data.avgasMargin 583 'avgasMarginId': $scope.data.avgasMargin
577 }); 584 });
578 $scope.showLoader = false; 585 $scope.showLoader = false;
579 }; 586 };
580 587
581 $scope.aircraft = {}; 588 $scope.aircraft = {};
582 $scope.getModal = function(makeId, index){ 589 $scope.getModal = function(makeId, index){
583 $scope.showLoader = true; 590 $scope.showLoader = true;
584 $scope.aircraft.make = makeId; 591 $scope.aircraft.make = makeId;
585 CustomersService.getModal($scope.aircraft.make).then(function(result) { 592 CustomersService.getModal($scope.aircraft.make).then(function(result) {
586 $scope.showLoader = false; 593 $scope.showLoader = false;
587 $scope.aircraftDetails[index].aircraftModalList = result; 594 $scope.aircraftDetails[index].aircraftModalList = result;
588 //$scope.aircraftDetails[index].model = $scope.aircraftModalList[0]; 595 //$scope.aircraftDetails[index].model = $scope.aircraftModalList[0];
589 }) 596 })
590 } 597 }
591 598
592 $scope.getSize = function(model, index){ 599 $scope.getSize = function(model, index){
593 $scope.showLoader = true; 600 $scope.showLoader = true;
594 CustomersService.getAircraftSize($scope.aircraft.make, model).then(function(result) { 601 CustomersService.getAircraftSize($scope.aircraft.make, model).then(function(result) {
595 $scope.showLoader = false; 602 $scope.showLoader = false;
596 $scope.aircraftDetails[index].aircraftSizeList = result; 603 $scope.aircraftDetails[index].aircraftSizeList = result;
597 //$scope.aircraftDetails[index].size = $scope.aircraftSizeList[0]; 604 //$scope.aircraftDetails[index].size = $scope.aircraftSizeList[0];
598 }) 605 })
599 } 606 }
600 607
601 $scope.aircraftListData = {}; 608 $scope.aircraftListData = {};
602 $scope.addData = []; 609 $scope.addData = [];
610
603 $scope.saveCompanyData = function(){ 611 $scope.saveCompanyData = function(){
604 CustomersService.addCompany($scope.data).then(function(result) { 612 CustomersService.addCompany($scope.data).then(function(result) {
605 $scope.accountId = result; 613 $scope.accountId = result;
606 $scope.aircraft.accountId = $scope.accountId; 614 $scope.aircraft.accountId = $scope.accountId;
607 615
608 for(var i=0; i<$scope.aircraftDetails.length;i++){ 616 for(var i=0; i<$scope.aircraftDetails.length;i++){
609 $scope.addData.push({ 617 $scope.addData.push({
610 'tail': $scope.aircraftDetails[i].tail, 618 'tail': $scope.aircraftDetails[i].tail,
611 'make': $scope.aircraftDetails[i].make, 619 'make': $scope.aircraftDetails[i].make,
612 'model': $scope.aircraftDetails[i].model, 620 'model': $scope.aircraftDetails[i].model,
613 'sizeId' : $scope.aircraftDetails[i].sizeId, 621 'sizeId' : $scope.aircraftDetails[i].sizeId,
614 'marginId': $scope.aircraftDetails[i].marginId, 622 'marginId': $scope.aircraftDetails[i].marginId,
615 'avgasMarginId': $scope.aircraftDetails[i].avgasMarginId 623 'avgasMarginId': $scope.aircraftDetails[i].avgasMarginId
616 }); 624 });
617 } 625 }
618 $scope.aircraftListData.aircraftList = $scope.addData; 626 $scope.aircraftListData.aircraftList = $scope.addData;
619 $scope.aircraftListData.accountId = $scope.aircraft.accountId; 627 $scope.aircraftListData.accountId = $scope.aircraft.accountId;
620 628
621 if($scope.aircraftListData.aircraftList[0].tail == "" || $scope.aircraftListData.aircraftList[0].make == null || $scope.aircraftListData.aircraftList[0].model == null){ 629 if($scope.aircraftListData.aircraftList[0].tail == "" || $scope.aircraftListData.aircraftList[0].make == null || $scope.aircraftListData.aircraftList[0].model == null){
622 $scope.aircraftListData.aircraftList = []; 630 $scope.aircraftListData.aircraftList = [];
623 } 631 }
624 632
625 CustomersService.addAircraft($scope.aircraftListData).then(function(result) { 633 CustomersService.addAircraft($scope.aircraftListData).then(function(result) {
626 634
627 if(result != null && result.success){ 635 if(result != null && result.success){
628 toastr.success(''+result.success+'', { 636 toastr.success(''+result.success+'', {
629 closeButton: true 637 closeButton: true
630 }) 638 })
631 $('#demo-modal-3').modal('hide'); 639 $('#demo-modal-3').modal('hide');
632 getAllCompanies(); 640 getAllCompanies();
633 }else{ 641 }else{
634 toastr.error(''+result.statusText+'', { 642 toastr.error(''+result.statusText+'', {
635 closeButton: true 643 closeButton: true
636 }) 644 })
637 } 645 }
638 }); 646 });
639 647
640 }) 648 })
641 649
642 650
643 } 651 }
644 652
645 $scope.checkJetWithTail = function(tail, index){ 653 $scope.checkJetWithTail = function(tail, index){
646 654
647 ViewCompanyService.checkJetType(tail).then(function(result) { 655 ViewCompanyService.checkJetType(tail).then(function(result) {
648 if(result.jetA == "true"){ 656 if(result.jetA == "true"){
649 $scope.jetShow[index] = false; 657 $scope.jetShow[index] = false;
650 $scope.marginShow[index] = true; 658 $scope.marginShow[index] = true;
651 }else{ 659 }else{
app/partials/fuelOrders/fuelOrders.html
1 <style> 1 <style>
2 .subnavbar .mainnav > li:nth-child(4) > a{ 2 .subnavbar .mainnav > li:nth-child(4) > a{
3 color: #c44646; 3 color: #c44646;
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 | number : 4}} 111 {{row.fboCost | number : 4}}
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 | number : 4}} 114 {{row.priceQuote | number : 4}}
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 | number : 4}} 117 {{row.invoiced | number : 4}}
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 | number : 4}} 120 {{row.total | number : 4}}
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 class="blackOption" value="pending" ng-selected="row.status == pending"> Pending</option> 124 <option class="blackOption" value="pending" ng-selected="row.status == pending"> Pending</option>
125 <option class="blueOption" value="invoiced" ng-selected="row.status == invoiced" >Invoiced</option> 125 <option class="blueOption" value="invoiced" ng-selected="row.status == invoiced" >Invoiced</option>
126 <option class="greenOption" value="paid" ng-selected="row.status == paid" >Paid</option> 126 <option class="greenOption" value="paid" ng-selected="row.status == paid" >Paid</option>
127 <option class="redOption" value="cancelled" ng-selected="row.status == cancelled" >Cancelled</option> 127 <option class="redOption" value="cancelled" ng-selected="row.status == cancelled" >Cancelled</option>
128 <option class="yellowOption" value="archived" ng-selected="row.status == archived" >Archived</option> 128 <option class="yellowOption" value="archived" ng-selected="row.status == archived" >Archived</option>
129 </select> 129 </select>
130 </td> 130 </td>
131 <td data-title="'Attachments'" filter="{orderInvoice : 'select'}" filter-data="attachmentFilterOptions" sortable="'orderInvoice '"> 131 <td data-title="'Attachments'" filter="{orderInvoice : 'select'}" filter-data="attachmentFilterOptions" sortable="'orderInvoice '">
132 <select class="btn btn-regular" ng-model="attachOptionSelected" ng-change="attachment(row.id,attachOptionSelected,row.orderInvoice.link, row)" > 132 <select class="btn btn-regular" ng-model="attachOptionSelected" ng-change="attachment(row.id,attachOptionSelected,row.orderInvoice.link, row)" >
133 <option value="" disabled selected="selected" >Invoice</option> 133 <option value="" disabled selected="selected" >Invoice</option>
134 <option value="viewAttachment" ng-if="row.orderInvoice !== null" >View</option> 134 <option value="viewAttachment" ng-if="row.orderInvoice !== null" >View</option>
135 <option value="deleteAttachment" ng-if="row.orderInvoice !== null">Delete</option> 135 <option value="deleteAttachment" ng-if="row.orderInvoice !== null">Delete</option>
136 <option value="0" disabled >_____________</option> 136 <option value="0" disabled >_____________</option>
137 <option value="uploadAttachment" >Upload</option> 137 <option value="uploadAttachment" >Upload</option>
138 </select> 138 </select>
139 <i class="fa fa-paperclip" ng-if="row.orderInvoice !== null"></i> 139 <i class="fa fa-paperclip" ng-if="row.orderInvoice !== null"></i>
140 </td> 140 </td>
141 </tr> 141 </tr>
142 </table> 142 </table>
143 143
144 <select class="btn btn-primary exportBtn" ng-model="optionSelected" ng-change="onFWSelect()"> 144 <select class="btn btn-primary exportBtn" ng-model="optionSelected" ng-change="onFWSelect()">
145 <option value="" disabled selected="selected">Fuel Widget</option> 145 <option value="" disabled selected="selected">Fuel Widget</option>
146 <option value="dt" >Direct Transaction</option> 146 <option value="dt" >Direct Transaction</option>
147 <option value="efo" >Export Fuel Orders</option> 147 <option value="efo" >Export Fuel Orders</option>
148 </select> 148 </select>
149 149
150 </div> 150 </div>
151 </div> 151 </div>
152 </div> 152 </div>
153 </div> 153 </div>
154 <!-- /widget-content --> 154 <!-- /widget-content -->
155 </div> 155 </div>
156 <!-- /widget --> 156 <!-- /widget -->
157 </div> 157 </div>
158 <!-- /span8 --> 158 <!-- /span8 -->
159 </div> 159 </div>
160 <!-- /row --> 160 <!-- /row -->
161 </div> 161 </div>
162 <!-- /container --> 162 <!-- /container -->
163 163
164 164
165 </div> 165 </div>
166 <!-- /main --> 166 <!-- /main -->
167 167
168 168
169 <form class="modal multi-step" id="demo-modal-3" name="companyForm"> 169 <form class="modal multi-step" id="demo-modal-3" name="companyForm">
170 <div class="modal-dialog modal-lg"> 170 <div class="modal-dialog modal-lg">
171 <div class="modal-content"> 171 <div class="modal-content">
172 <div class="modal-body step-1" data-step="1" style="padding: 0;"> 172 <div class="modal-body step-1" data-step="1" style="padding: 0;">
173 <div> 173 <div>
174 <div class="row" style="margin: 0;"> 174 <div class="row" style="margin: 0;">
175 <div> 175 <div>
176 <div class="widget" style="margin-bottom: 0;"> 176 <div class="widget" style="margin-bottom: 0;">
177 <div class="widget-header"> 177 <div class="widget-header">
178 <i class="icon-pencil"></i> 178 <i class="icon-pencil"></i>
179 <i class="fa fa-tasks" aria-hidden="true"></i> 179 <i class="fa fa-tasks" aria-hidden="true"></i>
180 <h3>Add a New Company</h3> 180 <h3>Add a New Company</h3>
181 <div class="pull-right my-toggle-switch" style="margin-right: 30px;"> 181 <div class="pull-right my-toggle-switch" style="margin-right: 30px;">
182 <div style="color: #ff9a01;">Activate &nbsp &nbsp 182 <div style="color: #ff9a01;">Activate &nbsp &nbsp
183 <toggle ng-model="data.activate" size="customToogle"></toggle> 183 <toggle ng-model="data.activate" size="customToogle"></toggle>
184 </div> 184 </div>
185 </div> 185 </div>
186 <div class="clearfix"></div> 186 <div class="clearfix"></div>
187 </div> 187 </div>
188 <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;"> 188 <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">
189 <div class="col-xs-12"> 189 <div class="col-xs-12">
190 <div class="col-md-8"> 190 <div class="col-md-8">
191 <div class="pull-left"> 191 <div class="pull-left">
192 <label class="new-input-label"><b>Company Name *</b></label> 192 <label class="new-input-label"><b>Company Name *</b></label>
193 </div> 193 </div>
194 <div class="pull-left" style="margin-left: 15px;"> 194 <div class="pull-left" style="margin-left: 15px;">
195 <!-- <input type="text" ng-model="data.companyName" class="form-control companyNameInput" ng-keyup="removeValidation()" placeholder="" required> --> 195 <!-- <input type="text" ng-model="data.companyName" class="form-control companyNameInput" ng-keyup="removeValidation()" placeholder="" required> -->
196 <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"> 196 <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">
197 197
198 <label class="customErrorMessage" ng-show="showCompanyError">This field is required.</label> 198 <label class="customErrorMessage" ng-show="showCompanyError">This field is required.</label>
199 </div> 199 </div>
200 <div class="clearfix"></div> 200 <div class="clearfix"></div>
201 </div> 201 </div>
202 <div class="col-md-4"> 202 <div class="col-md-4">
203 203
204 <div class="pull-right"> 204 <div class="pull-right">
205 <input type="text" ng-model="data.baseIcao" style="width: 100px;" class="form-control" placeholder=""> 205 <input type="text" ng-model="data.baseIcao" style="width: 100px;" class="form-control" placeholder="">
206 </div> 206 </div>
207 <div class="pull-right"> 207 <div class="pull-right">
208 <label style="margin-right: 15px;" class="new-input-label"><b>Base ICAO</b></label> 208 <label style="margin-right: 15px;" class="new-input-label"><b>Base ICAO</b></label>
209 </div> 209 </div>
210 <div class="clearfix"></div> 210 <div class="clearfix"></div>
211 </div> 211 </div>
212 </div> 212 </div>
213 <div class="clearfix"></div><br> 213 <div class="clearfix"></div><br>
214 <div class="col-xs-12"> 214 <div class="col-xs-12">
215 <div class="col-md-7"> 215 <div class="col-md-7">
216 <div class="pull-left"> 216 <div class="pull-left">
217 <label class="new-input-label"><b>Relationship&nbsp;</b></label> 217 <label class="new-input-label"><b>Relationship&nbsp;</b></label>
218 </div> 218 </div>
219 <div class="pull-left" style="margin-left: 32px;"> 219 <div class="pull-left" style="margin-left: 32px;">
220 <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.baseTenant" name="vehicle" value="Bike"> Check here if this is a Base Tenant<br>
221 <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.fuelerlinxCustomer" name="vehicle" value="Car" checked> Check here if this is a FuelerLinx Customer<br>
222 <input type="checkbox" ng-model="data.contractFuelVendor" name="vehicle" value="Car" checked> Check here if this is a Contract Fuel Vendor 222 <input type="checkbox" ng-model="data.contractFuelVendor" name="vehicle" value="Car" checked> Check here if this is a Contract Fuel Vendor
223 </div> 223 </div>
224 <div class="clearfix"></div> 224 <div class="clearfix"></div>
225 </div> 225 </div>
226 <div class="col-md-2 Airport" style="text-align: right;"> 226 <div class="col-md-2 Airport" style="text-align: right;">
227 <b>Certificate Type</b> 227 <b>Certificate Type</b>
228 </div> 228 </div>
229 <div class="col-md-3 Airport"> 229 <div class="col-md-3 Airport">
230 <select required class="form-control" ng-model="data.certificateType"> 230 <select required class="form-control" ng-model="data.certificateType">
231 <option value="" disabled selected hidden>Select...</option> 231 <option value="" disabled selected hidden>Select...</option>
232 <option value="corporate">Part 91 (Corporate)</option> 232 <option value="corporate">Part 91 (Corporate)</option>
233 <option value="charter">Part 135 (Charter)</option> 233 <option value="charter">Part 135 (Charter)</option>
234 <option value="scheduled">Part 121 (Scheduled)</option> 234 <option value="scheduled">Part 121 (Scheduled)</option>
235 <option value="military">Military</option> 235 <option value="military">Military</option>
236 <option value="government">Government</option> 236 <option value="government">Government</option>
237 </select> 237 </select>
238 </div> 238 </div>
239 <div class="clearfix"></div> 239 <div class="clearfix"></div>
240 </div> 240 </div>
241 <div class="clearfix"></div> 241 <div class="clearfix"></div>
242 <br/> 242 <br/>
243 <div class="col-xs-12"> 243 <div class="col-xs-12">
244 <div class="col-md-6"> 244 <div class="col-md-6">
245 <div class="pull-left" style="width: 110px;"> 245 <div class="pull-left" style="width: 110px;">
246 <b>JET A Margin *</b> 246 <b>JET A Margin *</b>
247 </div> 247 </div>
248 <div class="pull-left"> 248 <div class="pull-left">
249 <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 <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 <option value="" disabled>Select...</option> 250 <option value="" disabled>Select...</option>
251 </select> 251 </select>
252 <label ng-show="showMarginError" class="customErrorMessage">This field is required.</label> 252 <label ng-show="showMarginError" class="customErrorMessage">This field is required.</label>
253 253
254 <div class="clearfix"></div> 254 <div class="clearfix"></div>
255 </div> 255 </div>
256 </div> 256 </div>
257 257
258 <div class="col-md-3 Airport" style="text-align: right;"> 258 <div class="col-md-3 Airport" style="text-align: right;">
259 <b>AVGAS 100LL Margin</b> 259 <b>AVGAS 100LL Margin</b>
260 </div> 260 </div>
261 <div class="col-md-3 Airport"> 261 <div class="col-md-3 Airport">
262 <select class="form-control" ng-model="data.avgasMargin" ng-options="avgs.id as avgs.marginName for avgs in avgsMarginList"> 262 <select class="form-control" ng-model="data.avgasMargin" ng-options="avgs.id as avgs.marginName for avgs in avgsMarginList">
263 <option value="" disabled>Select...</option> 263 <option value="" disabled>Select...</option>
264 </select> 264 </select>
265 </div> 265 </div>
266 <div class="clearfix"></div> 266 <div class="clearfix"></div>
267 </div> 267 </div>
268 <div class="clearfix"></div> 268 <div class="clearfix"></div>
269 <br/> 269 <br/>
270 <div class="col-xs-12"> 270 <div class="col-xs-12">
271 <div class="col-md-12"> 271 <div class="col-md-12">
272 <div class="pull-left" style="width: 110px;"> 272 <div class="pull-left" style="width: 110px;">
273 <label class="new-input-label"><b>Address</b></label> 273 <label class="new-input-label"><b>Address</b></label>
274 </div> 274 </div>
275 <div class="pull-left" style="width: calc(100% - 110px);"> 275 <div class="pull-left" style="width: calc(100% - 110px);">
276 <input type="text" class="form-control" ng-model="data.addressOne" placeholder=""> 276 <input type="text" class="form-control" ng-model="data.addressOne" placeholder="">
277 </div> 277 </div>
278 <div class="clearfix"></div> 278 <div class="clearfix"></div>
279 </div> 279 </div>
280 </div> 280 </div>
281 <div class="clearfix"></div> 281 <div class="clearfix"></div>
282 <br/> 282 <br/>
283 <div class="col-xs-12"> 283 <div class="col-xs-12">
284 <div class="col-md-12"> 284 <div class="col-md-12">
285 <div class="pull-left" style="width: 110px;"> 285 <div class="pull-left" style="width: 110px;">
286 <label class="new-input-label"><b>Address2</b></label> 286 <label class="new-input-label"><b>Address2</b></label>
287 </div> 287 </div>
288 <div class="pull-left" style="width: calc(100% - 110px);"> 288 <div class="pull-left" style="width: calc(100% - 110px);">
289 <input type="text" ng-model="data.addressTwo" class="form-control" placeholder=""> 289 <input type="text" ng-model="data.addressTwo" class="form-control" placeholder="">
290 </div> 290 </div>
291 <div class="clearfix"></div> 291 <div class="clearfix"></div>
292 </div> 292 </div>
293 </div> 293 </div>
294 <div class="clearfix"></div> 294 <div class="clearfix"></div>
295 <br/> 295 <br/>
296 <div class="col-xs-12"> 296 <div class="col-xs-12">
297 297
298 <div class="col-md-6"> 298 <div class="col-md-6">
299 <div class="pull-left" style="width: 110px;"> 299 <div class="pull-left" style="width: 110px;">
300 <label class="new-input-label"><b>City</b></label> 300 <label class="new-input-label"><b>City</b></label>
301 </div> 301 </div>
302 <div class="pull-left" style="width: calc(100% - 110px);"> 302 <div class="pull-left" style="width: calc(100% - 110px);">
303 <input type="text" ng-model="data.city" class="form-control" placeholder=""> 303 <input type="text" ng-model="data.city" class="form-control" placeholder="">
304 </div> 304 </div>
305 <div class="clearfix"></div> 305 <div class="clearfix"></div>
306 </div> 306 </div>
307 <div class="col-md-3"> 307 <div class="col-md-3">
308 <div class="pull-left" style="width: 40px;"> 308 <div class="pull-left" style="width: 40px;">
309 <label class="new-input-label"><b>State</b></label> 309 <label class="new-input-label"><b>State</b></label>
310 </div> 310 </div>
311 <div class="pull-left" style="width: calc(100% - 110px);"> 311 <div class="pull-left" style="width: calc(100% - 110px);">
312 <input type="text" ng-model="data.state" class="form-control" placeholder=""> 312 <input type="text" ng-model="data.state" class="form-control" placeholder="">
313 </div> 313 </div>
314 <div class="clearfix"></div> 314 <div class="clearfix"></div>
315 </div> 315 </div>
316 <div class="col-md-3"> 316 <div class="col-md-3">
317 <div class="pull-left"> 317 <div class="pull-left">
318 <label class="new-input-label"><b>Zip Code</b></label> 318 <label class="new-input-label"><b>Zip Code</b></label>
319 </div> 319 </div>
320 <div class="pull-right" style="width: calc(100% - 60px);"> 320 <div class="pull-right" style="width: calc(100% - 60px);">
321 <input type="tel" ng-model="data.zipcode" class="form-control" placeholder=""> 321 <input type="tel" ng-model="data.zipcode" class="form-control" placeholder="">
322 </div> 322 </div>
323 <div class="clearfix"></div> 323 <div class="clearfix"></div>
324 </div> 324 </div>
325 </div> 325 </div>
326 <div class="clearfix"></div> 326 <div class="clearfix"></div>
327 <br/> 327 <br/>
328 <div class="col-xs-12"> 328 <div class="col-xs-12">
329 329
330 <div class="col-md-6"> 330 <div class="col-md-6">
331 <div class="pull-left" style="width: 110px;"> 331 <div class="pull-left" style="width: 110px;">
332 <label class="new-input-label"><b>Country</b></label> 332 <label class="new-input-label"><b>Country</b></label>
333 </div> 333 </div>
334 <div class="pull-left" style="width: calc(100% - 110px);"> 334 <div class="pull-left" style="width: calc(100% - 110px);">
335 <input type="text" ng-model="data.country" class="form-control" placeholder=""> 335 <input type="text" ng-model="data.country" class="form-control" placeholder="">
336 </div> 336 </div>
337 <div class="clearfix"></div> 337 <div class="clearfix"></div>
338 </div> 338 </div>
339 <div class="col-md-6"> 339 <div class="col-md-6">
340 <div class="pull-left" style="width: 110px;"> 340 <div class="pull-left" style="width: 110px;">
341 <label class="new-input-label"><b>Internal Note</b></label> 341 <label class="new-input-label"><b>Internal Note</b></label>
342 </div> 342 </div>
343 <div class="pull-left" style="width: calc(100% - 110px);"> 343 <div class="pull-left" style="width: calc(100% - 110px);">
344 <textarea name="message" ng-model="data.internalNote" rows="4" cols="34"></textarea> 344 <textarea name="message" ng-model="data.internalNote" rows="4" cols="34"></textarea>
345 </div> 345 </div>
346 <div class="clearfix"></div> 346 <div class="clearfix"></div>
347 </div> 347 </div>
348 </div> 348 </div>
349 <div class="clearfix"></div> 349 <div class="clearfix"></div>
350 <!-- <br/> 350 <!-- <br/>
351 <div class="col-xs-12"> 351 <div class="col-xs-12">
352 <div class="col-md-2 Airport"></div> 352 <div class="col-md-2 Airport"></div>
353 <div class="col-md-10 Airport"> 353 <div class="col-md-10 Airport">
354 <div class="pull-right"> 354 <div class="pull-right">
355 <button type="button" class="btn btn-default" ng-click="cancel()">Cancel</button> 355 <button type="button" class="btn btn-default" ng-click="cancel()">Cancel</button>
356 <button type="button" class="btn btn-warning" ng-click="addAircraft()">Next: Add Aircraft</button> 356 <button type="button" class="btn btn-warning" ng-click="addAircraft()">Next: Add Aircraft</button>
357 </div> 357 </div>
358 </div> 358 </div>
359 </div> --> 359 </div> -->
360 </div> 360 </div>
361 </div> 361 </div>
362 <div class="clearfix"></div> 362 <div class="clearfix"></div>
363 </div> 363 </div>
364 </div> 364 </div>
365 </div> 365 </div>
366 </div> 366 </div>
367 <div class="modal-body step-2" data-step="2" style="padding: 0;"> 367 <div class="modal-body step-2" data-step="2" style="padding: 0;">
368 <div> 368 <div>
369 <div class="row" style="margin: 0;"> 369 <div class="row" style="margin: 0;">
370 <div> 370 <div>
371 <div class="widget" style="margin-bottom: 0;"> 371 <div class="widget" style="margin-bottom: 0;">
372 <div class="widget-header"> 372 <div class="widget-header">
373 <i class="icon-pencil"></i> 373 <i class="icon-pencil"></i>
374 <i class="fa fa-tasks" aria-hidden="true"></i> 374 <i class="fa fa-tasks" aria-hidden="true"></i>
375 <h3>Add a New Company</h3> 375 <h3>Add a New Company</h3>
376 <div class="clearfix"></div> 376 <div class="clearfix"></div>
377 </div> 377 </div>
378 <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;"> 378 <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">
379 <div class="col-xs-12"> 379 <div class="col-xs-12">
380 <div class="widget-header"> 380 <div class="widget-header">
381 <i class="fa fa-list"></i> 381 <i class="fa fa-list"></i>
382 <h3>Aircraft List</h3> 382 <h3>Aircraft List</h3>
383 </div> 383 </div>
384 <div class="widget-content" style="padding:0px;border: 0px; "> 384 <div class="widget-content" style="padding:0px;border: 0px; ">
385 <div class="table-responsive"> 385 <div class="table-responsive">
386 <!-- <table class="table table-bordered table-hover table-striped addRow" style="margin-bottom: 0px;"> 386 <!-- <table class="table table-bordered table-hover table-striped addRow" style="margin-bottom: 0px;">
387 <thead> 387 <thead>
388 <tr> 388 <tr>
389 <th>Tail</th> 389 <th>Tail</th>
390 <th>Make</th> 390 <th>Make</th>
391 <th>Model</th> 391 <th>Model</th>
392 <th>Size</th> 392 <th>Size</th>
393 <th>Margin</th> 393 <th>Margin</th>
394 </tr> 394 </tr>
395 </thead> 395 </thead>
396 <tbody> 396 <tbody>
397 <tr> 397 <tr>
398 <td> 398 <td>
399 <input type="text" style="width:100px;" ng-model="aircraft.tail" class="form-control"> 399 <input type="text" style="width:100px;" ng-model="aircraft.tail" class="form-control">
400 </td> 400 </td>
401 <td style="width: 25%;"> 401 <td style="width: 25%;">
402 <select class="form-control" ng-model="aircraft.make" ng-change="getModal()"> 402 <select class="form-control" ng-model="aircraft.make" ng-change="getModal()">
403 <option ng-repeat="make in aircraftMakeList">{{make}}</option> 403 <option ng-repeat="make in aircraftMakeList">{{make}}</option>
404 </select> 404 </select>
405 </td> 405 </td>
406 <td style="width: 20%;"> 406 <td style="width: 20%;">
407 <select class="form-control" ng-model="aircraft.model" ng-change="getSize()"> 407 <select class="form-control" ng-model="aircraft.model" ng-change="getSize()">
408 <option ng-repeat="model in aircraftModalList">{{model}}</option> 408 <option ng-repeat="model in aircraftModalList">{{model}}</option>
409 </select> 409 </select>
410 </td> 410 </td>
411 <td style="width: 25%;"> 411 <td style="width: 25%;">
412 <select class="form-control" ng-model="aircraft.size"> 412 <select class="form-control" ng-model="aircraft.size">
413 <option ng-repeat="size in aircraftSizeList">{{size}}</option> 413 <option ng-repeat="size in aircraftSizeList">{{size}}</option>
414 </select> 414 </select>
415 </td> 415 </td>
416 <td> 416 <td>
417 <select class="form-control"> 417 <select class="form-control">
418 <option>Margin1</option> 418 <option>Margin1</option>
419 <option>Margin2</option> 419 <option>Margin2</option>
420 </select> 420 </select>
421 </td> 421 </td>
422 </tr> 422 </tr>
423 </tbody> 423 </tbody>
424 424
425 </table> --> 425 </table> -->
426 <table class="table table-striped table-bordered"> 426 <table class="table table-striped table-bordered">
427 <thead> 427 <thead>
428 <tr> 428 <tr>
429 <!-- <th><input type="checkbox" ng-model="selectedAll" ng-click="checkAll()" /></th> --> 429 <!-- <th><input type="checkbox" ng-model="selectedAll" ng-click="checkAll()" /></th> -->
430 <th>Tail</th> 430 <th>Tail</th>
431 <th>Make</th> 431 <th>Make</th>
432 <th>Model</th> 432 <th>Model</th>
433 <th>Size</th> 433 <th>Size</th>
434 <th>JET A Margin</th> 434 <th>JET A Margin</th>
435 <th>AVGS 100LL Margin</th> 435 <th>AVGS 100LL Margin</th>
436 </tr> 436 </tr>
437 </thead> 437 </thead>
438 <tbody> 438 <tbody>
439 <tr ng-repeat="aircraftData in aircraftDetails track by $index"> 439 <tr ng-repeat="aircraftData in aircraftDetails track by $index">
440 <!-- <td> 440 <!-- <td>
441 <input type="checkbox" ng-model="aircraftData.selected"/> 441 <input type="checkbox" ng-model="aircraftData.selected"/>
442 </td> --> 442 </td> -->
443 <td style="width: 15%"> 443 <td style="width: 15%">
444 <input type="text" class="form-control" ng-model="aircraftData.tail" ng-blur="checkJetWithTail(aircraftData.tail, $index)" required/> 444 <input type="text" class="form-control" ng-model="aircraftData.tail" ng-blur="checkJetWithTail(aircraftData.tail, $index)" required/>
445 </td> 445 </td>
446 <td style="width: 17%"> 446 <td style="width: 17%">
447 <select class="form-control" ng-model="aircraftData.make" ng-change="getModal(aircraftData.make, $index)"> 447 <select class="form-control" ng-model="aircraftData.make" ng-change="getModal(aircraftData.make, $index)">
448 <option ng-repeat="make in aircraftMakeList | orderBy">{{make}}</option> 448 <option ng-repeat="make in aircraftMakeList | orderBy">{{make}}</option>
449 <option value="" disabled>Select...</option> 449 <option value="" disabled>Select...</option>
450 </select> 450 </select>
451 </td> 451 </td>
452 <td style="width: 17%"> 452 <td style="width: 17%">
453 <select class="form-control" ng-model="aircraftData.model" ng-change="getSize(aircraftData.model, $index)"> 453 <select class="form-control" ng-model="aircraftData.model" ng-change="getSize(aircraftData.model, $index)">
454 <option ng-repeat="model in aircraftData.aircraftModalList | orderBy">{{model}}</option> 454 <option ng-repeat="model in aircraftData.aircraftModalList | orderBy">{{model}}</option>
455 <option value="" disabled>Select...</option> 455 <option value="" disabled>Select...</option>
456 </select> 456 </select>
457 </td> 457 </td>
458 <td style="width: 17%"> 458 <td style="width: 17%">
459 <!-- <select class="form-control" ng-model="aircraftData.sizeId" ng-options="size.aircraftSize.id as size.aircraftSize.size for size in aircraftData.aircraftSizeList"> 459 <!-- <select class="form-control" ng-model="aircraftData.sizeId" ng-options="size.aircraftSize.id as size.aircraftSize.size for size in aircraftData.aircraftSizeList">
460 <option value="" disabled>Select...</option> 460 <option value="" disabled>Select...</option>
461 </select> --> 461 </select> -->
462 <select class="form-control" ng-model="aircraftData.sizeId"> 462 <select class="form-control" ng-model="aircraftData.sizeId">
463 <option value="" disabled>Select</option> 463 <option value="" disabled>Select</option>
464 <option ng-repeat="size in aircraftData.aircraftSizeList" value="{{size.aircraftSize.id}}">{{size.aircraftSize.size}}</option> 464 <option ng-repeat="size in aircraftData.aircraftSizeList" value="{{size.aircraftSize.id}}">{{size.aircraftSize.size}}</option>
465 </select> 465 </select>
466 <!-- <select class="form-control" ng-model="aircraftData.size"> 466 <!-- <select class="form-control" ng-model="aircraftData.size">
467 <option ng-repeat="size in aircraftData.aircraftSizeList">{{size}}</option> 467 <option ng-repeat="size in aircraftData.aircraftSizeList">{{size}}</option>
468 </select> --> 468 </select> -->
469 </td> 469 </td>
470 <td style="width: 17%"> 470 <td style="width: 17%">
471 <!-- <select class="form-control" ng-model="aircraftData.marginId" ng-options="margin.id as margin.marginName for margin in jetMarginList"> 471 <!-- <select class="form-control" ng-model="aircraftData.marginId" ng-options="margin.id as margin.marginName for margin in jetMarginList">
472 <option value="" disabled>Select...</option> 472 <option value="" disabled>Select...</option>
473 </select> --> 473 </select> -->
474 <select class="form-control" ng-model="aircraftData.marginId" ng-disabled="jetShow[$index]"> 474 <select class="form-control" ng-model="aircraftData.marginId" ng-disabled="jetShow[$index]">
475 <option value="" disabled>Select</option> 475 <option value="" disabled>Select</option>
476 <option ng-repeat="margin in jetMarginList" value="{{margin.id}}">{{margin.marginName}}</option> 476 <option ng-repeat="margin in jetMarginList" value="{{margin.id}}">{{margin.marginName}}</option>
477 </select> 477 </select>
478 </td> 478 </td>
479 <td style="width: 17%"> 479 <td style="width: 17%">
480 <!-- <select class="form-control marginSelectBox" ng-model="aircraftData.avgasMarginId" ng-options="avgs.id as avgs.marginName for avgs in avgsMarginList"> 480 <!-- <select class="form-control marginSelectBox" ng-model="aircraftData.avgasMarginId" ng-options="avgs.id as avgs.marginName for avgs in avgsMarginList">
481 <option value="" disabled>Select...</option> 481 <option value="" disabled>Select...</option>
482 </select> --> 482 </select> -->
483 <select class="form-control" ng-model="aircraftData.avgasMarginId" ng-disabled="marginShow[$index]"> 483 <select class="form-control" ng-model="aircraftData.avgasMarginId" ng-disabled="marginShow[$index]">
484 <option value="" disabled>Select</option> 484 <option value="" disabled>Select</option>
485 <option ng-repeat="avgs in avgsMarginList" value="{{avgs.id}}">{{avgs.marginName}}</option> 485 <option ng-repeat="avgs in avgsMarginList" value="{{avgs.id}}">{{avgs.marginName}}</option>
486 </select> 486 </select>
487 </td> 487 </td>
488 </tr> 488 </tr>
489 </tbody> 489 </tbody>
490 </table> 490 </table>
491 </div> 491 </div>
492 <div class="clearfix"></div> 492 <div class="clearfix"></div>
493 </div> 493 </div>
494 </div> 494 </div>
495 <div class="clearfix"></div> 495 <div class="clearfix"></div>
496 <div class="col-xs-12" style="margin-bottom: 50px;margin-top: 10px;"> 496 <div class="col-xs-12" style="margin-bottom: 50px;margin-top: 10px;">
497 <button ng-click="addNew()" class="button1 turquoise pull-right"><span>+</span>Add Aircraft</button> 497 <button ng-click="addNew()" class="button1 turquoise pull-right"><span>+</span>Add Aircraft</button>
498 </div> 498 </div>
499 <!-- <div class="col-xs-12" style="margin-bottom: 20px;"> 499 <!-- <div class="col-xs-12" style="margin-bottom: 20px;">
500 <div class="pull-right"> 500 <div class="pull-right">
501 <button type="button" class="btn btn-default" ng-click="cancelCraft()">Cancel</button> 501 <button type="button" class="btn btn-default" ng-click="cancelCraft()">Cancel</button>
502 <button type="button" class="btn btn-warning" ng-click="goBack()">Go Back</button> 502 <button type="button" class="btn btn-warning" ng-click="goBack()">Go Back</button>
503 <button type="button" class="btn btn-success" ng-click="goBack()">Save</button> 503 <button type="button" class="btn btn-success" ng-click="goBack()">Save</button>
504 </div> 504 </div>
505 </div> --> 505 </div> -->
506 </div> 506 </div>
507 </div> 507 </div>
508 <div class="clearfix"></div> 508 <div class="clearfix"></div>
509 </div> 509 </div>
510 </div> 510 </div>
511 </div> 511 </div>
512 </div> 512 </div>
513 <!-- <div class="modal-body step-3" data-step="3"> 513 <!-- <div class="modal-body step-3" data-step="3">
514 This is the final step. 514 This is the final step.
515 </div> --> 515 </div> -->
516 <div class="modal-footer" style="border-top: 0;"> 516 <div class="modal-footer" style="border-top: 0;">
517 <button type="button" class="btn btn-default" ng-click="reset2()" data-dismiss="modal">Cancel</button> 517 <button type="button" class="btn btn-default" ng-click="reset2()" data-dismiss="modal">Cancel</button>
518 <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="addFirstData('#demo-modal-3', 2)">Next: Add Aircraft</button> 518 <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-2" data-step="2" onclick="sendEvent('#demo-modal-3', 1)">Go Back</button> 519 <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', 3)">Continue</button> --> 520 <!-- <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-success step step-2" data-step="2" ng-click="saveCompanyData()">Save</button> 521 <button type="button" class="btn btn-success step step-2" data-step="2" ng-click="saveCompanyData()">Save</button>
522 </div> 522 </div>
523 </div> 523 </div>
524 </div> 524 </div>
525 </form> 525 </form>
526 526
527 527
528 528
529 <form class="modal multi-step" id="demo-modal-4" name="fuelOrderForm"> 529 <form class="modal multi-step" id="demo-modal-4" name="fuelOrderForm">
530 <div class="modal-dialog modal-lg"> 530 <div class="modal-dialog modal-lg">
531 <div class="modal-content"> 531 <div class="modal-content">
532 <div class="modal-body step-1" data-step="1" style="padding: 0;"> 532 <div class="modal-body step-1" data-step="1" style="padding: 0;">
533 <div> 533 <div>
534 <div class="row" style="margin: 0;"> 534 <div class="row" style="margin: 0;">
535 <div> 535 <div>
536 <div class="widget" style="margin-bottom: 0;"> 536 <div class="widget" style="margin-bottom: 0;">
537 <div class="widget-header"> 537 <div class="widget-header">
538 <i class="icon-pencil"></i> 538 <i class="icon-pencil"></i>
539 <i class="fa fa-tasks" aria-hidden="true"></i> 539 <i class="fa fa-tasks" aria-hidden="true"></i>
540 <h3>Add a Fuel Order</h3> 540 <h3>Add a Fuel Order</h3>
541 <div class="clearfix"></div> 541 <div class="clearfix"></div>
542 </div> 542 </div>
543 <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;"> 543 <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">
544 <div class="col-xs-12"> 544 <div class="col-xs-12">
545 <div class="col-xs-12"> 545 <div class="col-xs-12">
546 546
547 <div class="col-md-6"> 547 <div class="col-md-6">
548 <div class="pull-left" style="width: 110px;"> 548 <div class="pull-left" style="width: 110px;">
549 <label class="new-input-label"><b>Fueling Date</b></label> 549 <label class="new-input-label"><b>Company</b></label>
550 </div> 550 </div>
551 <div class="pull-left" style="width: calc(100% - 110px);"> 551 <div class="pull-left" style="width: calc(100% - 110px);">
552 <input type="type" ng-model="order.upliftDate" class="form-control" placeholder="Select Date" datepicker /> 552 <select ui-select2 ng-model="order.companyName" ng-change="getAircraft(order.companyName)" style="width: 100%;" required>
553 <!--<md-datepicker ng-model="myDate" md-placeholder="Enter date"></md-datepicker>--> 553 <option value="" selected disabled>Select Company</option>
554 <option ng-repeat="list in companyList">{{list.companyName}}</option>
555 </select>
554 </div> 556 </div>
555 <div class="clearfix"></div> 557 <div class="clearfix"></div>
556 </div> 558 </div>
557 <div class="col-md-6"> 559 <div class="col-md-6">
558 <div class="pull-left" style="width: 110px;"> 560 <div class="pull-left" style="width: 110px;">
559 <label class="new-input-label"><b>Volume</b></label> 561 <label class="new-input-label"><b>Product</b></label>
560 </div> 562 </div>
561 <div class="pull-left" style="width: calc(100% - 110px);"> 563 <div class="pull-left" style="width: calc(100% - 110px);">
562 <input type="text" ng-model="order.volume" ng-keyup="addTotal(order.volume,'v')" class="form-control" placeholder=""> 564 <select class="form-control" ng-model="order.priceQuote" ng-change="setCost(order.priceQuote)" required>
565 <option value="" selected disabled>Select Product</option>
566 <option ng-repeat="margin in marginList" value="{{margin}}">${{margin.papTotal | number : 4}} {{margin.productName}}</option>
567 </select>
563 </div> 568 </div>
564 <div class="clearfix"></div> 569 <div class="clearfix"></div>
565 </div> 570 </div>
566 </div> 571
567 <div class="clearfix"></div><br> 572 </div>
573 <div class="clearfix"></div>
574 <br/>
568 575
569 <div class="col-xs-12"> 576
577 <div class="col-xs-12">
570 578
571 <div class="col-md-6"> 579 <div class="col-md-6">
572 <div class="pull-left" style="width: 110px;"> 580 <div class="pull-left" style="width: 110px;">
573 <label class="new-input-label"><b>Company</b></label> 581 <label class="new-input-label"><b>Aircraft</b></label>
574 </div> 582 </div>
575 <div class="pull-left" style="width: calc(100% - 110px);"> 583 <div class="pull-left" style="width: calc(100% - 110px);">
576 <select ui-select2 ng-model="order.companyName" ng-change="getAircraft(order.companyName)" style="width: 100%;"> 584 <select class="form-control" ng-model="order.aircraftName" required>
577 <option value="" selected disabled>Select Company</option> 585 <option selected disabled value="">Select Aircraft</option>
578 <option ng-repeat="list in companyList">{{list.companyName}}</option> 586 <option ng-repeat="list in aircraftList" value="{{list}}">{{list.tail}}</option>
579 </select> 587 </select>
580 </div> 588 </div>
581 <div class="clearfix"></div> 589 <div class="clearfix"></div>
582 </div> 590 </div>
583 <div class="col-md-6"> 591 <div class="col-md-6">
584 <div class="pull-left" style="width: 110px;"> 592 <div class="pull-left" style="width: 110px;">
585 <label class="new-input-label"><b>Invoiced</b></label> 593 <label class="new-input-label"><b>Volume</b></label>
586 <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span>
587 </div> 594 </div>
588 <div class="pull-left" style="width: calc(100% - 110px);"> 595 <div class="pull-left" style="width: calc(100% - 110px);">
589 <input type="text" ng-model="order.invoiced" ng-keyup="addTotal(order.invoiced,'i')" class="form-control" placeholder="0.0000" valid-number /> 596 <input type="text" ng-model="order.volume" ng-keyup="addTotal(order.volume,'v')" class="form-control" placeholder="">
590 </div> 597 </div>
591 <div class="clearfix"></div> 598 <div class="clearfix"></div>
592 </div> 599 </div>
593 600
594 </div> 601 </div>
595 <div class="clearfix"></div> 602 <div class="clearfix"></div>
596 <br/> 603 <br/>
597
598
599 <div class="col-xs-12">
600 604
601 605 <div class="col-xs-12">
602 <div class="col-md-6"> 606
607 <div class="col-md-6">
603 <div class="pull-left" style="width: 110px;"> 608 <div class="pull-left" style="width: 110px;">
604 <label class="new-input-label"><b>Tail #</b></label> 609 <label class="new-input-label" style="margin-top: 25px;"><b>ETA</b></label>
605 </div> 610 </div>
606 <div class="pull-left" style="width: calc(100% - 110px);"> 611 <div class="pull-left" style="width: calc(100% - 110px);">
607 <select class="form-control" ng-model="order.aircraftName"> 612 <div style="width: 50%; float: left;">
608 <option selected disabled value="">Select Aircraft</option> 613 Date
609 <option ng-repeat="list in aircraftList" value="{{list.tail}}">{{list.tail}}</option> 614 <input type="text" style="width: 90%;" ng-model="order.upliftDate" class="form-control" placeholder="" datepicker/>
610 </select> 615 </div>
616 <div style="width: 50%; float: left;">
617 Time
618 <select class="form-control" ng-model="order.etaTime" style="width: 100%;">
619 <option ng-repeat="li in etaTimeList">{{li.time}}</option>
620 </select>
621
622 </div>
611 </div> 623 </div>
612 <div class="clearfix"></div> 624 <div class="clearfix"></div>
613 </div> 625 </div>
614 <div class="col-md-6"> 626
627 <div class="col-md-6" style="margin-top: 22px;">
615 <div class="pull-left" style="width: 110px;"> 628 <div class="pull-left" style="width: 110px;">
616 <label class="new-input-label"><b>Total</b></label> 629 <label class="new-input-label"><b>Invoiced</b></label>
617 <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span> 630 <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span>
618 </div> 631 </div>
619 <div class="pull-left" style="width: calc(100% - 110px);"> 632 <div class="pull-left" style="width: calc(100% - 110px);">
620 <input type="text" disabled ng-model="order.total" class="form-control" placeholder="0.0000" value="{{order.volume * order.invoiced}}" valid-number /> 633 <input type="text" ng-model="order.invoiced" ng-keyup="addTotal(order.invoiced,'i')" class="form-control" placeholder="">
621
622 </div> 634 </div>
623 <div class="clearfix"></div> 635 <div class="clearfix"></div>
624 </div> 636 </div>
625 </div> 637 </div>
626 <div class="clearfix"></div> 638 <div class="clearfix"></div><br>
627 <br/>
628 <div class="col-xs-12">
629 639
630 640
631 <div class="col-md-6"> 641 <div class="col-xs-12">
642
643 <div class="col-md-6">
632 <div class="pull-left" style="width: 110px;"> 644 <div class="pull-left" style="width: 110px;">
633 <label class="new-input-label"><b>Source</b></label> 645 <label class="new-input-label" style="margin-top: 25px;"><b>ETD</b></label>
634 </div> 646 </div>
635 <div class="pull-left" style="width: calc(100% - 110px);"> 647 <div class="pull-left" style="width: calc(100% - 110px);">
636 <!-- <select ui-select2 ng-model="order.source" style="width: 100%;"> 648 <div style="width: 50%; float: left;">
637 <option value="" selected disabled>Select Source</option> 649 Date
638 <option ng-repeat="list in sourceList">{{list.source}}</option> 650 <input type="text" style="width: 90%;" ng-model="order.departingDate" class="form-control" placeholder="" datepicker/>
639 </select> --> 651 </div>
640 <select class="form-control" ng-model="order.source" style="width: 100%;"> 652 <div style="width: 50%; float: left;">
641 <option value="" disabled selected hidden>Select Source</option> 653 Time
642 <option value="Tenant">Tenant</option> 654 <select class="form-control" ng-model="order.etdTime" style="width: 100%;">
643 <option value="CAA">CAA</option> 655 <option ng-repeat="list in etdTimeList">{{list.time}}</option>
644 <option value="Tenant/CAA">Tenant/CAA</option> 656 </select>
645 </select> 657
658 </div>
646 </div> 659 </div>
647 <div class="clearfix"></div> 660 <div class="clearfix"></div>
648 </div> 661 </div>
649 <div class="col-md-6"> 662
663 <div class="col-md-6" style="margin-top: 22px;">
650 <div class="pull-left" style="width: 110px;"> 664 <div class="pull-left" style="width: 110px;">
651 <label class="new-input-label"><b>Product</b></label> 665 <label class="new-input-label"><b>Total</b></label>
666 <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span>
652 </div> 667 </div>
653 <div class="pull-left" style="width: calc(100% - 110px);"> 668 <div class="pull-left" style="width: calc(100% - 110px);">
654 <select ui-select2 style="width: 100%;" ng-model="order.priceQuote" ng-change="setCost(order.priceQuote)" class="price-quote-select"> 669 <input type="text" class="form-control" disabled ng-model="order.total | number : 4" placeholder="" ng-value="{{order.volume * order.invoiced}}">
655 <option value="" selected disabled>Select Product</option>
656 <option ng-repeat="margin in marginList" value="{{margin}}">${{margin.papTotal | number : 4}} {{margin.productName}}</option>
657 </select>
658 </div>
659 <div class="clearfix"></div>
660 </div> 670 </div>
661 671 </div>
662 </div> 672 </div>
663 <div class="clearfix"></div> 673 <div class="clearfix"></div><br>
664 <br/>
665 <div class="col-xs-12">
666 674
667 675
668 <div class="col-md-6"> 676 <div class="col-xs-12">
677
678 <div class="col-md-6">
669 <div class="pull-left" style="width: 110px;"> 679 <div class="pull-left" style="width: 110px;">
670 <label class="new-input-label"><b>Status</b></label> 680 <label class="new-input-label"><b>Fuel on</b></label>
671 </div> 681 </div>
672 <div class="pull-left" style="width: calc(100% - 110px);"> 682 <div class="pull-left" style="width: calc(100% - 110px);">
673 <select ui-select2 ng-model="order.status" style="width: 100%;"> 683 <select class="form-control" ng-model="order.fuelOn" style="width: 100%;">
674 <option value="" selected disabled>Select Status</option> 684 <option value="" disabled selected hidden>Select...</option>
675 <option value="pending">pending</option> 685 <option value="Arrival">Arrival</option>
676 <option value="invoiced">invoiced</option> 686 <option value="Departure">Departure</option>
677 <option value="paid">paid</option> 687 </select>
678 <option value="cancelled">cancelled</option>
679 <option value="archived">archived</option>
680 </select>
681 </div> 688 </div>
682 <div class="clearfix"></div> 689 <div class="clearfix"></div>
683 </div> 690 </div>
691
684 <div class="col-md-6"> 692 <div class="col-md-6">
685 <div class="pull-left" style="width: 110px;"> 693 <div class="pull-left" style="width: 110px;">
686 <label class="new-input-label"><b>FBO Cost</b></label> 694 <label class="new-input-label"><b>FBO Cost</b></label>
687 <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span> 695 <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span>
688 </div> 696 </div>
689 <div class="pull-left" style="width: calc(100% - 110px);"> 697 <div class="pull-left" style="width: calc(100% - 110px);">
690 <input type="text" disabled ng-model="order.fboCost" class="form-control" placeholder="0.0000" valid-number /> 698 <input type="text" disabled ng-model="order.fboCost" class="form-control" placeholder="0.0000" valid-number />
691 </div> 699 </div>
692 <div class="clearfix"></div> 700 <div class="clearfix"></div>
693 </div> 701 </div>
694 </div> 702 </div>
695 <div class="clearfix"></div> 703 <div class="clearfix"></div><br>
696 <br/>
697 <div class="col-xs-12">
698 704
699 705 <div class="col-xs-12">
706 <div class="col-md-6">
707 <div class="pull-left" style="width: 110px;">
708 <label class="new-input-label"><b>Source</b></label>
709 </div>
710 <div class="pull-left" style="width: calc(100% - 110px);">
711 <select class="form-control" ng-model="order.source" style="width: 100%;">
712 <option value="" disabled selected hidden>Select Source</option>
713 <option value="Tenant">Tenant</option>
714 <option value="CAA">CAA</option>
715 <option value="Tenant/CAA">Tenant/CAA</option>
716 </select>
717 </div>
718 <div class="clearfix"></div>
700 </div> 719 </div>
701 <div class="clearfix"></div> 720 </div>
702 <br/> 721 <div class="clearfix"></div>
703 <div class="col-xs-12"> 722 <br/>
723 <div class="col-xs-12">
724
725
726 <div class="col-md-6">
727 <div class="pull-left" style="width: 110px;">
728 <label class="new-input-label"><b>Certificate Type</b></label>
729 </div>
730 <div class="pull-left" style="width: calc(100% - 110px);">
731 <select class="form-control" ng-model="order.certificateType" style="width: 100%;" required>
732 <option value="" disabled selected hidden>Select...</option>
733 <option value="corporate">Part 91 (Corporate)</option>
734 <option value="charter">Part 135 (Charter)</option>
735 <option value="scheduled">Part 121 (Scheduled)</option>
736 <option value="military">Military</option>
737 <option value="government">Government</option>
738 </select>
739 </div>
740 <div class="clearfix"></div>
741 </div>
742 <div class="col-md-6">
743 <div class="pull-left" style="width: 110px;">
744 <label class="new-input-label"><b>Status</b></label>
745 </div>
746 <div class="pull-left" style="width: calc(100% - 110px);">
747 <select class="form-control" ng-model="order.status" style="width: 100%;">
748 <option value="" disabled selected hidden>Select Status</option>
749 <option value="pending">pending</option>
750 <option value="invoiced">invoiced</option>
751 <option value="paid">paid</option>
752 <option value="cancelled">cancelled</option>
753 <option value="archived">archived</option>
754 </select>
755 </div>
756 <div class="clearfix"></div>
757 </div>
758 </div>
759 <div class="clearfix"></div><br>
704 760
705 </div>
706 <div class="clearfix"></div>
707
708 </div> 761 </div>
709 </div> 762 </div>
710 <div class="clearfix"></div>
711 </div> 763 </div>
712 </div> 764 </div>
713 </div> 765 </div>
714 </div> 766 </div>
715
716 <div class="modal-footer" style="border-top: 0;"> 767 <div class="modal-footer" style="border-top: 0;">
717 <button type="button" class="btn btn-default" ng-click="cancelData()" data-dismiss="modal">Cancel</button> 768 <button type="button" class="btn btn-default" ng-click="cancelData()" data-dismiss="modal">Cancel</button>
718 <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="addFuelData()">Save</button> 769 <button type="button" class="btn btn-primary step step-1" data-step="1" ng-disabled="fuelOrderForm.$invalid" ng-click="addFuelData()">Save</button>
719 </div> 770 </div>
720 </div> 771 </div>
721 </div> 772 </div>
722 </div> 773 </div>
723 </form> 774 </form>
724 775
725 776
726 <form class="modal multi-step" id="demo-modal-5" name="fuelOrderUpdateForm"> 777 <form class="modal multi-step" id="demo-modal-5" name="fuelOrderUpdateForm">
727 <div class="modal-dialog modal-lg"> 778 <div class="modal-dialog modal-lg">
728 <div class="modal-content"> 779 <div class="modal-content">
729 <div class="modal-body step-1" data-step="1" style="padding: 0;"> 780 <div class="modal-body step-1" data-step="1" style="padding: 0;">
730 <div> 781 <div>
731 <div class="row" style="margin: 0;"> 782 <div class="row" style="margin: 0;">
732 <div> 783 <div>
733 <div class="widget" style="margin-bottom: 0;"> 784 <div class="widget" style="margin-bottom: 0;">
734 <div class="widget-header"> 785 <div class="widget-header">
735 <i class="icon-pencil"></i> 786 <i class="icon-pencil"></i>
736 <i class="fa fa-tasks" aria-hidden="true"></i> 787 <i class="fa fa-tasks" aria-hidden="true"></i>
737 <h3>Update Fuel Order</h3> 788 <h3>Update Fuel Order</h3>
738 <div class="clearfix"></div> 789 <div class="clearfix"></div>
739 </div> 790 </div>
740 <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;"> 791 <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">
741 <div class="col-xs-12"> 792 <div class="col-xs-12">
742 <div class="col-xs-12"> 793 <div class="col-xs-12">
743 794
744 <div class="col-md-6"> 795 <div class="col-md-6">
745 <div class="pull-left" style="width: 110px;"> 796 <div class="pull-left" style="width: 110px;">
746 <label class="new-input-label" style="margin-top: 25px;"><b>ETA</b></label> 797 <label class="new-input-label" style="margin-top: 25px;"><b>ETA</b></label>
747 </div> 798 </div>
748 <div class="pull-left" style="width: calc(100% - 110px);"> 799 <div class="pull-left" style="width: calc(100% - 110px);">
749 <div style="width: 50%; float: left;"> 800 <div style="width: 50%; float: left;">
750 Date 801 Date
751 <input type="text" style="width: 90%;" ng-model="editdata.upliftDateString" class="form-control" placeholder="" datepicker/> 802 <input type="text" style="width: 90%;" ng-model="editdata.upliftDateString" class="form-control" placeholder="" datepicker/>
752 </div> 803 </div>
753 <!-- {{editdata.upliftDateString}} -->
754 <div style="width: 50%; float: left;"> 804 <div style="width: 50%; float: left;">
755 Time 805 Time
756 <select class="form-control" ng-model="editdata.etaTime" style="width: 90%;"> 806 <select class="form-control" ng-model="editdata.etaTime" style="width: 90%;">
757 <option ng-repeat="li in etaTimeList">{{li.time}}</option> 807 <option ng-repeat="li in etaTimeList">{{li.time}}</option>
758 </select> 808 </select>
759 <!-- <input type="time" ng-model="editdata.etaTime" step="60" value="12:00" style="width: 90%"> -->
760 809
761 </div> 810 </div>
762 </div> 811 </div>
763 <div class="clearfix"></div> 812 <div class="clearfix"></div>
764 </div> 813 </div>
765 <div class="col-md-6" style="margin-top: 25px;"> 814 <div class="col-md-6" style="margin-top: 25px;">
766 <div class="pull-left" style="width: 110px;"> 815 <div class="pull-left" style="width: 110px;">
767 <label class="new-input-label"><b>Volume</b></label> 816 <label class="new-input-label"><b>Volume</b></label>
768 </div> 817 </div>
769 <div class="pull-left" style="width: calc(100% - 110px);"> 818 <div class="pull-left" style="width: calc(100% - 110px);">
770 <input type="text" ng-model="editdata.requestedVolume" ng-keyup="updateTotal(editdata.requestedVolume,'v')" class="form-control" placeholder=""> 819 <input type="text" ng-model="editdata.requestedVolume" ng-keyup="updateTotal(editdata.requestedVolume,'v')" class="form-control" placeholder="">
771 </div> 820 </div>
772 <div class="clearfix"></div> 821 <div class="clearfix"></div>
773 </div> 822 </div>
774 </div> 823 </div>
775 <div class="clearfix"></div><br> 824 <div class="clearfix"></div><br>
776 825
777 <div class="col-xs-12"> 826 <div class="col-xs-12">
778 827
779 <div class="col-md-6"> 828 <div class="col-md-6">
780 <div class="pull-left" style="width: 110px;"> 829 <div class="pull-left" style="width: 110px;">
781 <label class="new-input-label"><b>ETD</b></label> 830 <label class="new-input-label"><b>ETD</b></label>
782 </div> 831 </div>
783 <div class="pull-left" style="width: calc(100% - 110px);"> 832 <div class="pull-left" style="width: calc(100% - 110px);">
784 <div style="width: 50%; float: left;"> 833 <div style="width: 50%; float: left;">
785 <input type="text" style="width: 90%" ng-model="editdata.departingDateString" class="form-control" placeholder="" datepicker/> 834 <input type="text" style="width: 90%" ng-model="editdata.departingDateString" class="form-control" placeholder="" datepicker/>
786 </div> 835 </div>
787 <div style="width: 50%; float: left;"> 836 <div style="width: 50%; float: left;">
788 <select class="form-control" ng-model="editdata.etdTime" style="width: 90%;"> 837 <select class="form-control" ng-model="editdata.etdTime" style="width: 90%;">
789 <option ng-repeat="list in etdTimeList">{{list.time}}</option> 838 <option ng-repeat="list in etdTimeList">{{list.time}}</option>
790 </select> 839 </select>
791 <!-- <input type="time" ng-model="editdata.etdTime" step="60" value="12:00" style="width: 90%"> -->
792 </div> 840 </div>
793 </div> 841 </div>
794 <div class="clearfix"></div> 842 <div class="clearfix"></div>
795 </div> 843 </div>
796 <div class="col-md-6"> 844 <div class="col-md-6">
797 <div class="pull-left" style="width: 110px;"> 845 <div class="pull-left" style="width: 110px;">
798 <label class="new-input-label"><b>Fuel on</b></label> 846 <label class="new-input-label"><b>Fuel on</b></label>
799 </div> 847 </div>
800 <div class="pull-left" style="width: calc(100% - 110px);"> 848 <div class="pull-left" style="width: calc(100% - 110px);">
801 <select class="form-control" ng-model="editdata.fuelOn" style="width: 100%;"> 849 <select class="form-control" ng-model="editdata.fuelOn" style="width: 100%;">
802 <option value="" disabled selected hidden>Select...</option> 850 <option value="" disabled selected hidden>Select...</option>
803 <option value="Arrival">Arrival</option> 851 <option value="Arrival">Arrival</option>
804 <option value="Departure">Departure</option> 852 <option value="Departure">Departure</option>
805 <!-- <option ng-repeat="list in sourceList">{{list.source}}</option> -->
806 </select> 853 </select>
807 <!-- <input type="text" ng-model="editdata.requestedVolume" ng-keyup="updateTotal(editdata.requestedVolume,'v')" class="form-control" placeholder=""> -->
808 </div> 854 </div>
809 <div class="clearfix"></div> 855 <div class="clearfix"></div>
810 </div> 856 </div>
811 </div> 857 </div>
812 <div class="clearfix"></div><br> 858 <div class="clearfix"></div><br>
813 859
814 <div class="col-xs-12"> 860 <div class="col-xs-12">
815 861
816 <div class="col-md-6"> 862 <div class="col-md-6">
817 <div class="pull-left" style="width: 110px;"> 863 <div class="pull-left" style="width: 110px;">
818 <label class="new-input-label"><b>Company</b></label> 864 <label class="new-input-label"><b>Company</b></label>
819 </div> 865 </div>
820 <div class="pull-left" style="width: calc(100% - 110px);"> 866 <div class="pull-left" style="width: calc(100% - 110px);">
821 <!--<select ui-select2 ng-model="editdata.companyName" style="width: 100%;">
822 <option value="" selected disabled>Select Company</option>
823 <option ng-repeat="list in companyList">{{list.companyName}}</option>
824 </select>-->
825 {{editdata.companyName}} 867 {{editdata.companyName}}
826 </div> 868 </div>
827 <div class="clearfix"></div> 869 <div class="clearfix"></div>
828 </div> 870 </div>
829 <div class="col-md-6"> 871 <div class="col-md-6">
830 <div class="pull-left" style="width: 110px;"> 872 <div class="pull-left" style="width: 110px;">
831 <label class="new-input-label"><b>Invoiced</b></label> 873 <label class="new-input-label"><b>Invoiced</b></label>
832 <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span> 874 <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span>
833 </div> 875 </div>
834 <div class="pull-left" style="width: calc(100% - 110px);"> 876 <div class="pull-left" style="width: calc(100% - 110px);">
835 <input type="text" ng-model="editdata.invoiced" ng-keyup="updateTotal(editdata.invoiced,'i')" class="form-control" placeholder=""> 877 <input type="text" ng-model="editdata.invoiced" ng-keyup="updateTotal(editdata.invoiced,'i')" class="form-control" placeholder="">
836 </div> 878 </div>
837 <div class="clearfix"></div> 879 <div class="clearfix"></div>
838 </div> 880 </div>
839 881
840 </div> 882 </div>
841 <div class="clearfix"></div> 883 <div class="clearfix"></div>
842 <br/> 884 <br/>
843 885
844 886
845 <div class="col-xs-12"> 887 <div class="col-xs-12">
846 888
847 <div class="col-md-6"> 889 <div class="col-md-6">
848 <div class="pull-left" style="width: 110px;"> 890 <div class="pull-left" style="width: 110px;">
849 <label class="new-input-label"><b>Tail #</b></label> 891 <label class="new-input-label"><b>Tail #</b></label>
850 </div> 892 </div>
851 <div class="pull-left" style="width: calc(100% - 110px);"> 893 <div class="pull-left" style="width: calc(100% - 110px);">
852 <!--<input type="text" ng-model="editdata.aircraftName" class="form-control" placeholder="">-->
853 {{editdata.aircraftName}} 894 {{editdata.aircraftName}}
854 </div> 895 </div>
855 <div class="clearfix"></div> 896 <div class="clearfix"></div>
856 </div> 897 </div>
857 <div class="col-md-6"> 898 <div class="col-md-6">
858 <div class="pull-left" style="width: 110px;"> 899 <div class="pull-left" style="width: 110px;">
859 <label class="new-input-label"><b>Total</b></label> 900 <label class="new-input-label"><b>Total</b></label>
860 <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span> 901 <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span>
861 </div> 902 </div>
862 <div class="pull-left" style="width: calc(100% - 110px);"> 903 <div class="pull-left" style="width: calc(100% - 110px);">
863 <input type="text" class="form-control" disabled ng-model="editdata.total | number : 4" placeholder="" ng-value="{{editdata.requestedVolume * editdata.invoiced}}"> 904 <input type="text" class="form-control" disabled ng-model="editdata.total | number : 4" placeholder="" ng-value="{{editdata.requestedVolume * editdata.invoiced}}">
864 <!--{{editdata.total }}-->
865 </div> 905 </div>
866 <div class="clearfix"></div> 906 <div class="clearfix"></div>
867 </div> 907 </div>
868 </div> 908 </div>
869 <div class="clearfix"></div> 909 <div class="clearfix"></div>
870 <br/> 910 <br/>
871 <div class="col-xs-12"> 911 <div class="col-xs-12">
872 912
873 913
874 <div class="col-md-6"> 914 <div class="col-md-6">
875 <div class="pull-left" style="width: 110px;"> 915 <div class="pull-left" style="width: 110px;">
876 <label class="new-input-label"><b>Source</b></label> 916 <label class="new-input-label"><b>Source</b></label>
877 </div> 917 </div>
878 <div class="pull-left" style="width: calc(100% - 110px);"> 918 <div class="pull-left" style="width: calc(100% - 110px);">
879 <select class="form-control" ng-model="editdata.source" style="width: 100%;"> 919 <select class="form-control" ng-model="editdata.source" style="width: 100%;">
880 <option value="" disabled selected hidden>Select Source</option> 920 <option value="" disabled selected hidden>Select Source</option>
881 <option value="Tenant">Tenant</option> 921 <option value="Tenant">Tenant</option>
882 <option value="CAA">CAA</option> 922 <option value="CAA">CAA</option>
883 <option value="Tenant/CAA">Tenant/CAA</option> 923 <option value="Tenant/CAA">Tenant/CAA</option>
884 <!-- <option ng-repeat="list in sourceList">{{list.source}}</option> -->
885 </select> 924 </select>
886 <!-- {{editdata.source}} -->
887 </div> 925 </div>
888 <div class="clearfix"></div> 926 <div class="clearfix"></div>
889 </div> 927 </div>
890 <div class="col-md-6"> 928 <div class="col-md-6">
891 <div class="pull-left" style="width: 110px;"> 929 <div class="pull-left" style="width: 110px;">
892 <label class="new-input-label"><b>Product</b></label> 930 <label class="new-input-label"><b>Product</b></label>
893 </div> 931 </div>
894 <div class="pull-left" style="width: calc(100% - 110px);"> 932 <div class="pull-left" style="width: calc(100% - 110px);">
895 <!--<input type="text" ng-model="editdata.fboCost" class="form-control" placeholder="">-->
896 {{editdata.productName}} 933 {{editdata.productName}}
897 </div> 934 </div>
898 <div class="clearfix"></div> 935 <div class="clearfix"></div>
899 </div> 936 </div>
900 </div> 937 </div>
901 <div class="clearfix"></div> 938 <div class="clearfix"></div>
902 <br/> 939 <br/>
903 940
904 <div class="col-xs-12"> 941 <div class="col-xs-12">
905 942
906 <div class="col-md-6"> 943 <div class="col-md-6">
907 <div class="pull-left" style="width: 110px;"> 944 <div class="pull-left" style="width: 110px;">
908 <label class="new-input-label"><b>Status</b></label> 945 <label class="new-input-label"><b>Status</b></label>
909 </div> 946 </div>
910 <div class="pull-left" style="width: calc(100% - 110px);"> 947 <div class="pull-left" style="width: calc(100% - 110px);">
911 <select class="form-control" ng-model="editdata.status" style="width: 100%;"> 948 <select class="form-control" ng-model="editdata.status" style="width: 100%;">
912 <option value="" disabled selected hidden>Select Status</option> 949 <option value="" disabled selected hidden>Select Status</option>
913 <option value="pending">pending</option> 950 <option value="pending">pending</option>
914 <option value="invoiced">invoiced</option> 951 <option value="invoiced">invoiced</option>
915 <option value="paid">paid</option> 952 <option value="paid">paid</option>
916 <option value="cancelled">cancelled</option> 953 <option value="cancelled">cancelled</option>
917 <option value="archived">archived</option> 954 <option value="archived">archived</option>
918 </select> 955 </select>
919 <!-- {{editdata.status}} -->
920 </div> 956 </div>
921 <div class="clearfix"></div> 957 <div class="clearfix"></div>
922 </div> 958 </div>
923 <div class="col-md-6"> 959 <div class="col-md-6">
924 <div class="pull-left" style="width: 110px;"> 960 <div class="pull-left" style="width: 110px;">
925 <label class="new-input-label"><b>Certificate Type</b></label> 961 <label class="new-input-label"><b>Certificate Type</b></label>
926 </div> 962 </div>
927 <div class="pull-left" style="width: calc(100% - 110px);"> 963 <div class="pull-left" style="width: calc(100% - 110px);">
928 <select class="form-control" ng-model="editdata.certificateType" style="width: 100%;" required> 964 <select class="form-control" ng-model="editdata.certificateType" style="width: 100%;" required>
929 <option value="" disabled selected hidden>Select...</option> 965 <option value="" disabled selected hidden>Select...</option>
930 <option value="corporate">Part 91 (Corporate)</option> 966 <option value="corporate">Part 91 (Corporate)</option>
931 <option value="charter">Part 135 (Charter)</option> 967 <option value="charter">Part 135 (Charter)</option>
932 <option value="scheduled">Part 121 (Scheduled)</option> 968 <option value="scheduled">Part 121 (Scheduled)</option>
933 <option value="military">Military</option> 969 <option value="military">Military</option>
934 <option value="government">Government</option> 970 <option value="government">Government</option>
935 </select> 971 </select>
936 </div> 972 </div>
937 973
938 </div> 974 </div>
939 <div class="clearfix"></div> 975 <div class="clearfix"></div>
940 <br/> 976 <br/>
941 <div class="col-xs-12"> 977 <div class="col-xs-12">
942 </div> 978 </div>
943 <div class="clearfix"></div> 979 <div class="clearfix"></div>
944 <br/> 980 <br/>
945 <div class="col-xs-12"> 981 <div class="col-xs-12">
946 982
947 </div> 983 </div>
948 <div class="clearfix"></div> 984 <div class="clearfix"></div>
949 985
950 </div> 986 </div>
951 </div> 987 </div>
952 <div class="clearfix"></div> 988 <div class="clearfix"></div>
953 </div> 989 </div>
954 </div> 990 </div>
955 </div> 991 </div>
956 </div> 992 </div>
957 993
958 <div class="modal-footer" style="border-top: 0;"> 994 <div class="modal-footer" style="border-top: 0;">
959 <button type="button" class="btn btn-default" ng-click="canceleditdata()" data-dismiss="modal">Cancel</button> 995 <button type="button" class="btn btn-default" ng-click="canceleditdata()" data-dismiss="modal">Cancel</button>
960 <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="updateData()">Save</button> 996 <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="updateData()">Save</button>
961 </div> 997 </div>
962 </div> 998 </div>
963 </div> 999 </div>
964 </div> 1000 </div>
965 </form> 1001 </form>
966 1002
967 <form class="modal multi-step" id="demo-modal-6" name="uploadAttachmentForm"> 1003 <form class="modal multi-step" id="demo-modal-6" name="uploadAttachmentForm">
968 <div class="modal-dialog modal-xs"> 1004 <div class="modal-dialog modal-xs">
969 <div class="modal-content"> 1005 <div class="modal-content">
970 <div class="modal-body step-1" data-step="1" style="padding: 0;"> 1006 <div class="modal-body step-1" data-step="1" style="padding: 0;">
971 <div> 1007 <div>
972 <div class="row" style="margin: 0;"> 1008 <div class="row" style="margin: 0;">
973 <div> 1009 <div>
974 <div class="widget" style="margin-bottom: 0;"> 1010 <div class="widget" style="margin-bottom: 0;">
975 <div class="widget-header"> 1011 <div class="widget-header">
976 <i class="icon-pencil"></i> 1012 <i class="icon-pencil"></i>
977 <i class="fa fa-tasks" aria-hidden="true"></i> 1013 <i class="fa fa-tasks" aria-hidden="true"></i>
978 <h3>Upload Attachment</h3> 1014 <h3>Upload Attachment</h3>
979 <div class="clearfix"></div> 1015 <div class="clearfix"></div>
980 </div> 1016 </div>
981 <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;"> 1017 <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">
982 <div class="col-xs-6"> 1018 <div class="col-xs-6">
983 <div class="col-xs-6"> 1019 <div class="col-xs-6">
984 1020
985 <div class="col-md-6"> 1021 <div class="col-md-6">
986 <div class="pull-left" style="width: 110px;"> 1022 <div class="pull-left" style="width: 110px;">
987 <label class="new-input-label"><b>Upload</b></label> 1023 <label class="new-input-label"><b>Upload</b></label>
988 <br> 1024 <br>
989 <br> 1025 <br>
990 </div> 1026 </div>
991 <div class="pull-left" style="width: calc(100% - 110px);"> 1027 <div class="pull-left" style="width: calc(100% - 110px);">
992 <input type="file" accept=".pdf" file-model = "uploadFile.attachment"> 1028 <input type="file" accept=".pdf" file-model = "uploadFile.attachment">
993 <!--<md-datepicker ng-model="myDate" md-placeholder="Enter date"></md-datepicker>--> 1029 <!--<md-datepicker ng-model="myDate" md-placeholder="Enter date"></md-datepicker>-->
994 </div> 1030 </div>
995 <div class="clearfix"></div> 1031 <div class="clearfix"></div>
996 </div> 1032 </div>
997 </div> 1033 </div>
998 <div class="clearfix"></div><br> 1034 <div class="clearfix"></div><br>
999 1035
1000 </div> 1036 </div>
1001 </div> 1037 </div>
1002 <div class="clearfix"></div> 1038 <div class="clearfix"></div>
1003 </div> 1039 </div>
1004 </div> 1040 </div>
1005 </div> 1041 </div>
1006 </div> 1042 </div>
1007 1043
1008 <div class="modal-footer" style="border-top: 0;"> 1044 <div class="modal-footer" style="border-top: 0;">
1009 <button type="button" class="btn btn-default" ng-click="cancelUploadAttachment()" data-dismiss="modal">Cancel</button> 1045 <button type="button" class="btn btn-default" ng-click="cancelUploadAttachment()" data-dismiss="modal">Cancel</button>
1010 <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="saveUploadAttachment(uploadFile.attachment)">Upload</button> 1046 <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="saveUploadAttachment(uploadFile.attachment)">Upload</button>
1011 </div> 1047 </div>
1012 </div> 1048 </div>
1013 </div> 1049 </div>
1014 </div> 1050 </div>
1015 </form> 1051 </form>
1016 1052
1017 <div class="customConfirmPopBackdrop" id="delete1"> 1053 <div class="customConfirmPopBackdrop" id="delete1">
1018 <div class="customModalInner" style="max-width: 400px;"> 1054 <div class="customModalInner" style="max-width: 400px;">
1019 <div class="customModelBody" style="border-radius: 5px 5px 0 0;"> 1055 <div class="customModelBody" style="border-radius: 5px 5px 0 0;">
1020 <table> 1056 <table>
1021 <tr> 1057 <tr>