Blame view
app/partials/customers/customers.html
46.9 KB
feacde5ff
setup acuefuel in...
|
1 |
<style> |
8fc0ea8f4
update menu items
|
2 |
.subnavbar .mainnav > li:nth-child(2) > a{
|
|
6f19fff16
Rebranding-FBOins...
|
3 |
color: #ca5c6a; |
|
feacde5ff
setup acuefuel in...
|
4 |
} |
|
3a9f4472b
Implement contact...
|
5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 |
.button1 {
display: inline-block;
height: 35px;
line-height: 35px;
padding-right: 15px;
padding-left: 50px;
position: relative;
background-color:rgb(41,127,184);
color:rgb(255,255,255);
text-decoration: none;
text-transform: uppercase;
letter-spacing: 1px;
margin-bottom: 15px;
border: 0;
border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
text-shadow:0px 1px 0px rgba(0,0,0,0.5);
-ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ff123852,Positive=true)";zoom:1;
filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ff123852,Positive=true);
-moz-box-shadow:0px 2px 2px rgba(0,0,0,0.2);
-webkit-box-shadow:0px 2px 2px rgba(0,0,0,0.2);
box-shadow:0px 2px 2px rgba(0,0,0,0.2);
-ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=2,Color=#33000000,Positive=true)";
filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=2,Color=#33000000,Positive=true);
}
.button1 span {
position: absolute;
left: 0;
top: 0;
width: 35px;
background-color:rgba(0,0,0,0.5);
|
|
3a9f4472b
Implement contact...
|
42 |
-webkit-border-top-left-radius: 5px; |
|
91d8ce8f4
customer grid bug...
|
43 44 45 46 47 48 |
-webkit-border-bottom-left-radius: 5px;
-moz-border-radius-topleft: 5px;
-moz-border-radius-bottomleft: 5px;
border-top-left-radius: 5px;
border-bottom-left-radius: 5px;
border-right: 1px solid rgba(0,0,0,0.15);
|
|
3a9f4472b
Implement contact...
|
49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 |
}
.button1:hover span, .button1.active span {
background-color:rgb(0,102,26);
border-right: 1px solid rgba(0,0,0,0.3);
}
.button1:active {
margin-top: 2px;
margin-bottom: 13px;
-moz-box-shadow:0px 1px 0px rgba(255,255,255,0.5);
-webkit-box-shadow:0px 1px 0px rgba(255,255,255,0.5);
box-shadow:0px 1px 0px rgba(255,255,255,0.5);
-ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ccffffff,Positive=true)";
filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ccffffff,Positive=true);
}
.button1.turquoise {
background: #449d44;
}
|
|
feacde5ff
setup acuefuel in...
|
70 |
</style> |
05bfa28a2
remove save butto...
|
71 72 73 |
<div class="myLoader" ng-show="showLoader">
<img src="../img/hourglass.gif" width="50px;">
</div>
|
|
3a9f4472b
Implement contact...
|
74 |
|
|
feacde5ff
setup acuefuel in...
|
75 76 77 78 79 80 81 82 83 |
<div class="main">
<div class="container">
<div class="row">
<div class="col-md-12">
<div class="widget stacked ">
<div class="widget-content">
<div class="tabbable">
<ul class="nav nav-tabs">
<li class="active">
|
e196b9b74
new changes added
|
84 |
<a ui-sref="app.customers">Customer View |
|
4bb02bb84
new integration w...
|
85 86 87 88 89 90 91 92 93 94 95 96 |
<i class="fa fa-caret-down" aria-hidden="true"></i>
</a>
</li>
<li>
<a ui-sref="app.ContactView">Contact View
<i class="fa fa-caret-down" aria-hidden="true"></i>
</a>
</li>
<li>
<a ui-sref="app.FuelVendors">Fuel Vendors
<i class="fa fa-caret-down" aria-hidden="true"></i>
</a>
|
|
feacde5ff
setup acuefuel in...
|
97 |
</li> |
|
52fea957f
csv and search co...
|
98 99 |
<li style="margin: 0px 10px 4px 40px;"><input type="text" style="height:31px;"class="form-control" ng-model="searchText" placeholder="Search In Table"></li>
<li><button type="button" class="btn btn-default btn-sm" ng-click="displayCompanyList.filter({}); searchText=null">Clear Search And Filters</button></li>
|
|
4bb02bb84
new integration w...
|
100 |
<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> |
|
feacde5ff
setup acuefuel in...
|
101 |
</ul> |
|
4bb02bb84
new integration w...
|
102 103 |
<br>
<div class="tab-content customer-table" style="margin:0px">
|
|
feacde5ff
setup acuefuel in...
|
104 |
<div class="tab-pane active" id="companyView"> |
eefc1c74d
minor updates
|
105 |
<table ng-table="displayCompanyList" class="table table-striped table-condensed" show-filter="true"> |
|
00400ff35
alignment
|
106 107 |
<tr style="text-align: center;" ng-repeat="row in $data | filter:searchText:strict"" style="cursor: pointer;">
<td style="text-align: left;" data-title="'Company Name'" filter="{companyName: 'text'}" sortable="'companyName'" ui-sref="app.viewCompany({id : row.id})">
|
|
0f34b8798
desing and implem...
|
108 |
<i class="fa fa-search-plus" style="color:red" ng-if="row.fboPreferred == true"></i> {{row.companyName}}
|
|
eefc1c74d
minor updates
|
109 |
</td> |
|
52fea957f
csv and search co...
|
110 |
<td data-title="'Fleet'" filter="{companyAircraftSize: 'text'}" sortable="'companyAircraftSize'" ui-sref="app.viewCompany({id : row.id})">
|
|
eefc1c74d
minor updates
|
111 112 |
{{row.companyAircraftSize}}
</td>
|
|
52fea957f
csv and search co...
|
113 |
<td data-title="'Main Phone'" filter="{newContactNumber: 'text'}" sortable="'newContactNumber'" ui-sref="app.viewCompany({id : row.id})">
|
|
b97bc56e0
table search and ...
|
114 |
{{row.newContactNumber}}
|
|
eefc1c74d
minor updates
|
115 |
</td> |
|
52fea957f
csv and search co...
|
116 |
<td data-title="'Primary Contact'" filter="{primaryContactName: 'text'}" sortable="'primaryContactName'" ui-sref="app.viewCompany({id : row.id})">
|
|
b97bc56e0
table search and ...
|
117 |
{{row.primaryContactName}}
|
|
eefc1c74d
minor updates
|
118 |
</td> |
|
52fea957f
csv and search co...
|
119 |
<td data-title="'Base'" filter="{baseIcao: 'text'}" sortable="'baseIcao'" ui-sref="app.viewCompany({id : row.id})">
|
|
eefc1c74d
minor updates
|
120 121 |
{{row.baseIcao}}
</td>
|
|
52fea957f
csv and search co...
|
122 |
<td data-title="'Status'" filter="{activate: 'select'}" filter-data="statusFilter" sortable="'activate'" ui-sref="app.viewCompany({id : row.id})">
|
|
eefc1c74d
minor updates
|
123 124 125 |
<button type="button" ng-if="row.activate == true" class="btn btn-success btn-xs">Active</button>
<button type="button" ng-if="row.activate == false" class="btn btn-warning btn-xs">InActive</button>
</td>
|
|
d1e8d9afb
fuel order & home...
|
126 |
<td style="width: 130px;" class="margin-media" data-title="'Margin Setting'" filter="{masterMargin: 'select'}" filter-data="marginFilterOptions" sortable="'masterMargin'">
|
a7a7cfeca
fuel vendor page ...
|
127 |
<select class="form-control" ng-change="editMargin(row)" style="height:31px;" ng-model="row.masterMargin" ng-selected="" ng-options="margin.id as margin.marginName for margin in jetMarginList" required></select> |
|
eefc1c74d
minor updates
|
128 |
</td> |
|
52fea957f
csv and search co...
|
129 |
<td data-title="'All In'" filter="{marginAllIn: 'text'}" sortable="'marginAllIn'" ui-sref="app.viewCompany({id : row.id})">
|
|
84416fa2a
updates
|
130 |
{{row.marginAllIn | number : 4}}
|
|
eefc1c74d
minor updates
|
131 132 |
</td>
<td data-title="''">
|
|
0173d74ad
source autopopula...
|
133 |
<button type="button" class="btn btn-info btn-xs" ng-click="setFuel(row.companyName,row.baseTenant,row.contractFuelVendor,row.fuelerlinxCustomer,row.certificateType)">Setup Fuel</button> |
|
eefc1c74d
minor updates
|
134 135 136 |
</td>
</tr>
</table>
|
|
52fea957f
csv and search co...
|
137 |
<button type="button" ng-click="exportCompany()" class="btn btn-warning exportBtn">Export CSV</button> |
|
8f7dbe97c
fuel order comple...
|
138 |
|
|
956e0d9ed
contact view effe...
|
139 |
</div> |
|
feacde5ff
setup acuefuel in...
|
140 141 142 143 144 145 146 147 148 149 150 151 152 |
</div>
</div>
</div>
<!-- /widget-content -->
</div>
<!-- /widget -->
</div>
<!-- /span8 -->
</div>
<!-- /row -->
</div>
<!-- /container -->
</div>
|
|
4bb02bb84
new integration w...
|
153 |
<!-- /main --> |
|
55e075d7e
add contact, add ...
|
154 |
<form class="modal multi-step" id="demo-modal-3" name="companyForm"> |
|
4bb02bb84
new integration w...
|
155 156 157 158 159 160 161 162 163 164 165 166 167 |
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-body step-1" data-step="1" style="padding: 0;">
<div>
<div class="row" style="margin: 0;">
<div>
<div class="widget" style="margin-bottom: 0;">
<div class="widget-header">
<i class="icon-pencil"></i>
<i class="fa fa-tasks" aria-hidden="true"></i>
<h3>Add a New Company</h3>
<div class="pull-right my-toggle-switch" style="margin-right: 30px;">
<div style="color: #ff9a01;">Activate    
|
|
74c8ae4bb
remove old toogle...
|
168 |
<toggle ng-model="data.activate" size="customToogle"></toggle> |
|
4bb02bb84
new integration w...
|
169 170 171 172 173 174 175 176 |
</div>
</div>
<div class="clearfix"></div>
</div>
<div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">
<div class="col-xs-12">
<div class="col-md-8">
<div class="pull-left">
|
|
49676befb
new changes applied
|
177 |
<label class="new-input-label"><b>Company Name *</b></label> |
|
4bb02bb84
new integration w...
|
178 179 |
</div>
<div class="pull-left" style="margin-left: 15px;">
|
|
5e7aae2d2
new changes
|
180 181 |
<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">
|
|
32286a73a
tier issue resolved
|
182 |
<label class="customErrorMessage" ng-show="showCompanyError">This field is required.</label> |
|
4bb02bb84
new integration w...
|
183 184 185 186 187 188 |
</div>
<div class="clearfix"></div>
</div>
<div class="col-md-4">
<div class="pull-right">
|
|
32286a73a
tier issue resolved
|
189 |
<input type="text" ng-model="data.baseIcao" style="width: 100px;" class="form-control" placeholder=""> |
|
4bb02bb84
new integration w...
|
190 191 192 193 194 195 196 197 198 |
</div>
<div class="pull-right">
<label style="margin-right: 15px;" class="new-input-label"><b>Base ICAO</b></label>
</div>
<div class="clearfix"></div>
</div>
</div>
<div class="clearfix"></div><br>
<div class="col-xs-12">
|
|
a7a7cfeca
fuel vendor page ...
|
199 |
<div class="col-md-7"> |
|
4bb02bb84
new integration w...
|
200 201 202 203 204 205 206 207 208 209 |
<div class="pull-left">
<label class="new-input-label"><b>Relationship </b></label>
</div>
<div class="pull-left" style="margin-left: 32px;">
<input type="checkbox" ng-model="data.baseTenant" name="vehicle" value="Bike"> Check here if this is a Base Tenant<br>
<input type="checkbox" ng-model="data.fuelerlinxCustomer" name="vehicle" value="Car" checked> Check here if this is a FuelerLinx Customer<br>
<input type="checkbox" ng-model="data.contractFuelVendor" name="vehicle" value="Car" checked> Check here if this is a Contract Fuel Vendor
</div>
<div class="clearfix"></div>
</div>
|
|
a7a7cfeca
fuel vendor page ...
|
210 211 212 213 214 215 216 217 218 219 220 221 222 223 |
<div class="col-md-2 Airport" style="text-align: right;">
<b>Certificate Type</b>
</div>
<div class="col-md-3 Airport">
<select required class="form-control" ng-model="data.certificateType">
<option value="" disabled selected hidden>Select...</option>
<option value="corporate">Part 91 (Corporate)</option>
<option value="charter">Part 135 (Charter)</option>
<option value="scheduled">Part 121 (Scheduled)</option>
<option value="military">Military</option>
<option value="government">Government</option>
</select>
</div>
<div class="clearfix"></div>
|
|
4bb02bb84
new integration w...
|
224 225 226 227 228 229 |
</div>
<div class="clearfix"></div>
<br/>
<div class="col-xs-12">
<div class="col-md-6">
<div class="pull-left" style="width: 110px;">
|
|
49676befb
new changes applied
|
230 |
<b>JET A Margin *</b> |
|
4bb02bb84
new integration w...
|
231 232 |
</div>
<div class="pull-left">
|
|
a7a7cfeca
fuel vendor page ...
|
233 234 235 236 |
<select class="form-control marginSelectBox" ng-model="data.masterMargin" ng-options="margin.id as margin.marginName for margin in jetMarginList" required ng-change="removeMarginValidation()">
<option value="" disabled>Select...</option>
</select>
<label ng-show="showMarginError" class="customErrorMessage">This field is required.</label>
|
|
3a9f4472b
Implement contact...
|
237 |
|
|
a7a7cfeca
fuel vendor page ...
|
238 |
<div class="clearfix"></div> |
|
4bb02bb84
new integration w...
|
239 |
</div> |
|
a7a7cfeca
fuel vendor page ...
|
240 |
</div> |
|
4bb02bb84
new integration w...
|
241 242 |
<div class="col-md-3 Airport" style="text-align: right;">
|
|
a7a7cfeca
fuel vendor page ...
|
243 |
<b>AVGAS 100LL Margin</b> |
|
4bb02bb84
new integration w...
|
244 245 |
</div>
<div class="col-md-3 Airport">
|
|
49676befb
new changes applied
|
246 |
<select class="form-control" ng-model="data.avgasMargin" ng-options="avgs.id as avgs.marginName for avgs in avgsMarginList"> |
|
a7a7cfeca
fuel vendor page ...
|
247 |
<option value="" disabled>Select...</option> |
|
4bb02bb84
new integration w...
|
248 249 |
</select>
</div>
|
|
a7a7cfeca
fuel vendor page ...
|
250 |
<div class="clearfix"></div> |
|
4bb02bb84
new integration w...
|
251 252 253 254 255 256 257 258 259 |
</div>
<div class="clearfix"></div>
<br/>
<div class="col-xs-12">
<div class="col-md-12">
<div class="pull-left" style="width: 110px;">
<label class="new-input-label"><b>Address</b></label>
</div>
<div class="pull-left" style="width: calc(100% - 110px);">
|
|
32286a73a
tier issue resolved
|
260 |
<input type="text" class="form-control" ng-model="data.addressOne" placeholder=""> |
|
4bb02bb84
new integration w...
|
261 262 263 264 265 266 267 268 269 270 271 272 |
</div>
<div class="clearfix"></div>
</div>
</div>
<div class="clearfix"></div>
<br/>
<div class="col-xs-12">
<div class="col-md-12">
<div class="pull-left" style="width: 110px;">
<label class="new-input-label"><b>Address2</b></label>
</div>
<div class="pull-left" style="width: calc(100% - 110px);">
|
|
32286a73a
tier issue resolved
|
273 |
<input type="text" ng-model="data.addressTwo" class="form-control" placeholder=""> |
|
4bb02bb84
new integration w...
|
274 275 276 277 278 279 280 281 282 283 284 285 286 |
</div>
<div class="clearfix"></div>
</div>
</div>
<div class="clearfix"></div>
<br/>
<div class="col-xs-12">
<div class="col-md-6">
<div class="pull-left" style="width: 110px;">
<label class="new-input-label"><b>City</b></label>
</div>
<div class="pull-left" style="width: calc(100% - 110px);">
|
|
32286a73a
tier issue resolved
|
287 |
<input type="text" ng-model="data.city" class="form-control" placeholder=""> |
|
4bb02bb84
new integration w...
|
288 289 290 291 292 293 294 295 |
</div>
<div class="clearfix"></div>
</div>
<div class="col-md-3">
<div class="pull-left" style="width: 40px;">
<label class="new-input-label"><b>State</b></label>
</div>
<div class="pull-left" style="width: calc(100% - 110px);">
|
|
32286a73a
tier issue resolved
|
296 |
<input type="text" ng-model="data.state" class="form-control" placeholder=""> |
|
4bb02bb84
new integration w...
|
297 298 299 300 301 302 303 304 |
</div>
<div class="clearfix"></div>
</div>
<div class="col-md-3">
<div class="pull-left">
<label class="new-input-label"><b>Zip Code</b></label>
</div>
<div class="pull-right" style="width: calc(100% - 60px);">
|
|
32286a73a
tier issue resolved
|
305 |
<input type="tel" ng-model="data.zipcode" class="form-control" placeholder=""> |
|
4bb02bb84
new integration w...
|
306 307 308 309 310 311 312 313 314 315 316 317 318 |
</div>
<div class="clearfix"></div>
</div>
</div>
<div class="clearfix"></div>
<br/>
<div class="col-xs-12">
<div class="col-md-6">
<div class="pull-left" style="width: 110px;">
<label class="new-input-label"><b>Country</b></label>
</div>
<div class="pull-left" style="width: calc(100% - 110px);">
|
|
32286a73a
tier issue resolved
|
319 |
<input type="text" ng-model="data.country" class="form-control" placeholder=""> |
|
4bb02bb84
new integration w...
|
320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 |
</div>
<div class="clearfix"></div>
</div>
<div class="col-md-6">
<div class="pull-left" style="width: 110px;">
<label class="new-input-label"><b>Internal Note</b></label>
</div>
<div class="pull-left" style="width: calc(100% - 110px);">
<textarea name="message" ng-model="data.internalNote" rows="4" cols="34"></textarea>
</div>
<div class="clearfix"></div>
</div>
</div>
<div class="clearfix"></div>
<!-- <br/>
<div class="col-xs-12">
<div class="col-md-2 Airport"></div>
<div class="col-md-10 Airport">
<div class="pull-right">
<button type="button" class="btn btn-default" ng-click="cancel()">Cancel</button>
<button type="button" class="btn btn-warning" ng-click="addAircraft()">Next: Add Aircraft</button>
</div>
</div>
</div> -->
</div>
</div>
<div class="clearfix"></div>
</div>
</div>
</div>
</div>
<div class="modal-body step-2" data-step="2" style="padding: 0;">
<div>
<div class="row" style="margin: 0;">
<div>
<div class="widget" style="margin-bottom: 0;">
<div class="widget-header">
<i class="icon-pencil"></i>
<i class="fa fa-tasks" aria-hidden="true"></i>
<h3>Add a New Company</h3>
<div class="clearfix"></div>
</div>
<div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">
<div class="col-xs-12">
<div class="widget-header">
<i class="fa fa-list"></i>
<h3>Aircraft List</h3>
</div>
<div class="widget-content" style="padding:0px;border: 0px; ">
<div class="table-responsive">
|
|
4ecd206b2
Adding company/ai...
|
370 371 372 373 |
<table class="table table-striped table-bordered">
<thead>
<tr>
|
|
4ecd206b2
Adding company/ai...
|
374 375 376 377 378 379 380 381 382 383 |
<th>Tail</th>
<th>Make</th>
<th>Model</th>
<th>Size</th>
<th>JET A Margin</th>
<th>AVGS 100LL Margin</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="aircraftData in aircraftDetails track by $index">
|
|
7f6e3b1df
final code
|
384 |
|
|
4ecd206b2
Adding company/ai...
|
385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 |
<td style="width: 15%">
<input type="tel" class="form-control" ng-model="aircraftData.tail" ng-blur="checkTail(aircraftData.tail, $index);" required/>
</td>
<td style="width: 17%">
<select class="form-control" style="width: fit-content;" ng-model="aircraftData.make" ng-change="getModal(aircraftData.make, $index) ">
<option value="" disabled>Select</option>
<option ng-repeat="make in aircraftMakeList | orderBy">{{make}}</option>
</select>
</td>
<td style="width: 17%">
<select class="form-control" ng-model="aircraftData.model" ng-change="getSize(aircraftData.model, $index)">
<option value="" disabled>Select</option>
<option ng-repeat="model in aircraftData.aircraftModalList | orderBy">{{model}}</option>
</select>
</td>
<td style="width: 17%">
<select class="form-control" ng-model="aircraftData.size" ng-change="getFuelType(aircraftData.size, $index)">
<option value="" disabled>Select</option>
|
|
633bbda7a
aircraft size aut...
|
403 |
<option ng-repeat="size in aircraftData.aircraftSizeList" value="{{size.aircraftSize.id}}" ng-selected="aircraftData.size = aircraftData.aircraftSizeList[0].aircraftSize.id">{{size.aircraftSize.size}}</option>
|
|
4ecd206b2
Adding company/ai...
|
404 |
</select> |
|
4ecd206b2
Adding company/ai...
|
405 406 407 408 409 410 411 |
</td>
<td style="width: 17%">
<select class="form-control" ng-model="aircraftData.marginId" ng-disabled="jetShow[$index]">
<option value="" disabled>Select</option>
<option ng-repeat="margin in jetMarginList" value="{{margin.id}}">{{margin.marginName}}</option>
</select>
|
|
a7a7cfeca
fuel vendor page ...
|
412 413 |
</td>
<td style="width: 17%">
|
|
c2f3d77be
check with tail i...
|
414 415 416 417 |
<select class="form-control" ng-model="aircraftData.avgasMarginId" ng-disabled="marginShow[$index]">
<option value="" disabled>Select</option>
<option ng-repeat="avgs in avgsMarginList" value="{{avgs.id}}">{{avgs.marginName}}</option>
</select>
|
|
3a9f4472b
Implement contact...
|
418 |
</td> |
|
4ecd206b2
Adding company/ai...
|
419 |
</tr> |
|
55e075d7e
add contact, add ...
|
420 |
</tbody> |
|
4ecd206b2
Adding company/ai...
|
421 |
</table> |
|
4bb02bb84
new integration w...
|
422 423 424 425 426 427 |
</div>
<div class="clearfix"></div>
</div>
</div>
<div class="clearfix"></div>
<div class="col-xs-12" style="margin-bottom: 50px;margin-top: 10px;">
|
|
4ecd206b2
Adding company/ai...
|
428 |
<button ng-click="addNew()" class="button1 turquoise pull-right"><span>+</span>Add Aircraft </button> |
|
4bb02bb84
new integration w...
|
429 |
</div> |
|
4bb02bb84
new integration w...
|
430 431 432 433 434 435 436 437 438 439 440 |
</div>
</div>
<div class="clearfix"></div>
</div>
</div>
</div>
</div>
<!-- <div class="modal-body step-3" data-step="3">
This is the final step.
</div> -->
<div class="modal-footer" style="border-top: 0;">
|
|
7152ff131
model handle
|
441 |
<button type="button" class="btn btn-default" ng-click="reset2()" data-dismiss="modal">Cancel</button> |
|
4bb02bb84
new integration w...
|
442 443 444 445 446 447 448 449 |
<button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="addFirstData('#demo-modal-3', 2)">Next: Add Aircraft</button>
<button type="button" class="btn btn-primary step step-2" data-step="2" onclick="sendEvent('#demo-modal-3', 1)">Go Back</button>
<!-- <button type="button" class="btn btn-primary step step-2" data-step="2" onclick="sendEvent('#demo-modal-3', 3)">Continue</button> -->
<button type="button" class="btn btn-success step step-2" data-step="2" ng-click="saveCompanyData()">Save</button>
</div>
</div>
</div>
</form>
|
|
676250262
enhancement fuel ...
|
450 |
|
|
4ecd206b2
Adding company/ai...
|
451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 |
<div class="customConfirmPopBackdrop" id="addAirCraftError">
<div class="customModalInner" style="max-width: 400px;">
<div class="customModelBody" style="border-radius: 5px 5px 0 0;">
<table>
<tr>
<td>
<p style="padding: 5px 10px; margin-bottom: 0;">{{aircraftMessage}}</p>
</td>
</tr>
</table>
</div>
<div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;">
<button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelAirCraftError()">ok</button>
</div>
</div>
</div>
<div class="customConfirmPopBackdrop" id="addAirCraftWarning">
<div class="customModalInner" style="max-width: 400px;">
<div class="customModelBody" style="border-radius: 5px 5px 0 0;">
<table>
<tr>
<td>
<p style="padding: 5px 10px; margin-bottom: 0;">{{aircraftMessage}}</p>
</td>
</tr>
</table>
</div>
<div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;">
<button class="btn" style="padding: 4px 0; width: 80px;" ng-click="acceptAirCraftError()">Yes</button>
<button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelAirCraftError()">No</button>
</div>
</div>
</div>
|
|
676250262
enhancement fuel ...
|
485 |
<!-- SetUp fuel order --> |
|
91d8ce8f4
customer grid bug...
|
486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 |
<form class="modal multi-step" id="demo-modal-4" name="fuelOrderForm">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-body step-1" data-step="1" style="padding: 0;">
<div>
<div class="row" style="margin: 0;">
<div>
<div class="widget" style="margin-bottom: 0;">
<div class="widget-header">
<i class="icon-pencil"></i>
<i class="fa fa-tasks" aria-hidden="true"></i>
<h3>Add a Fuel Order</h3>
<div class="clearfix"></div>
</div>
<div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">
<div class="col-xs-12">
<div class="col-xs-12">
<div class="col-md-6">
<div class="pull-left" style="width: 110px;">
<label class="new-input-label"><b>Company</b></label>
</div>
<div class="pull-left" style="width: calc(100% - 110px);">
<!-- <select ui-select2 ng-model="order.companyName" ng-change="getAircraft(order.companyName)" style="width: 100%;" required>
<option value="" selected disabled>Select Company</option>
<option ng-repeat="list in companyList">{{list.companyName}}</option>
</select> -->
<input type="text" disabled ng-model="order.defaultCompanyName" class="form-control"/>
</div>
|
|
676250262
enhancement fuel ...
|
515 |
<div class="clearfix"></div> |
|
91d8ce8f4
customer grid bug...
|
516 517 518 519 |
</div>
<div class="col-md-6">
<div class="pull-left" style="width: 110px;">
<label class="new-input-label"><b>Product</b></label>
|
|
676250262
enhancement fuel ...
|
520 |
</div> |
|
91d8ce8f4
customer grid bug...
|
521 |
<div class="pull-left" style="width: calc(100% - 110px);"> |
|
87660da6c
testing
|
522 |
<select class="form-control" ng-model="order.priceQuote" ng-change="setCost(order.priceQuote); addTotal(order.priceQuote, order.volume)" required> |
|
91d8ce8f4
customer grid bug...
|
523 524 525 526 527 528 529 530 531 532 |
<option value="" selected disabled>Select Product</option>
<option ng-repeat="margin in marginList" value="{{margin}}">${{margin.papTotal | number : 4}} {{margin.productName}}</option>
</select>
</div>
<div class="clearfix"></div>
</div>
</div>
<div class="clearfix"></div>
<br/>
|
|
4f1de64cd
final phase task
|
533 |
<div class="col-xs-12"> |
|
91d8ce8f4
customer grid bug...
|
534 535 536 537 538 539 |
<div class="col-md-6">
<div class="pull-left" style="width: 110px;">
<label class="new-input-label"><b>Aircraft</b></label>
</div>
<div class="pull-left" style="width: calc(100% - 110px);">
|
|
4f1de64cd
final phase task
|
540 |
<select class="form-control" ng-model="order.aircraftName" ng-change="getAircraftMakeAndModel(order.aircraftName)" required> |
|
91d8ce8f4
customer grid bug...
|
541 |
<option selected disabled value="">Select Aircraft</option> |
|
4f1de64cd
final phase task
|
542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 |
<option ng-repeat="list in aircraftList">{{list.tail}}</option>
</select>
</div>
<div class="clearfix"></div>
</div>
<div class="col-md-6">
<div class="pull-left" style="width: 110px;">
<label class="new-input-label"><b>Make</b></label>
</div>
<div class="pull-left" style="width: calc(100% - 110px);">
<select class="form-control" ng-model="order.aircraftMake" disabled required>
<option selected disabled value="">Select Make</option>
<!-- <option ng-repeat="list in aircraftList" value="{{list}}">{{list.make}}</option> -->
<option ng-repeat="list in aircraftList">{{list.make}}</option>
</select>
</div>
<div class="clearfix"></div>
</div>
</div>
<div class="clearfix"></div>
<br/>
<div class="col-xs-12">
<div class="col-md-6">
<div class="pull-left" style="width: 110px;">
<label class="new-input-label"><b>Model</b></label>
</div>
<div class="pull-left" style="width: calc(100% - 110px);">
<select class="form-control" ng-model="order.aircraftModel" disabled required>
<option selected disabled value="">Select Model</option>
<!-- <option ng-repeat="list in aircraftList" value="{{list}}">{{list.model}}</option> -->
<option ng-repeat="list in aircraftList">{{list.model}}</option>
|
|
91d8ce8f4
customer grid bug...
|
576 577 578 579 580 581 582 583 584 |
</select>
</div>
<div class="clearfix"></div>
</div>
<div class="col-md-6">
<div class="pull-left" style="width: 110px;">
<label class="new-input-label"><b>Volume</b></label>
</div>
<div class="pull-left" style="width: calc(100% - 110px);">
|
|
87660da6c
testing
|
585 |
<input type="text" ng-model="order.volume" ng-keyup="addTotal(order.priceQuote, order.volume)" class="form-control" placeholder="" required> |
|
91d8ce8f4
customer grid bug...
|
586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 |
</div>
<div class="clearfix"></div>
</div>
</div>
<div class="clearfix"></div>
<br/>
<div class="col-xs-12">
<div class="col-md-6">
<div class="pull-left" style="width: 110px;">
<label class="new-input-label" style="margin-top: 25px;"><b>ETA</b></label>
</div>
<div class="pull-left" style="width: calc(100% - 110px);">
<div style="width: 50%; float: left;">
Date
<input type="text" style="width: 90%;" ng-model="order.upliftDate" class="form-control" placeholder="" datepicker required/>
</div>
<div style="width: 50%; float: left;">
Time
<select class="form-control" ng-model="order.etaTime" style="width: 100%;" required>
<option ng-repeat="li in etaTimeList">{{li.time}}</option>
</select>
</div>
</div>
<div class="clearfix"></div>
</div>
|
|
87660da6c
testing
|
616 |
<div class="col-md-6" style="margin-top: 22px;" ng-if ="order.status === 'invoiced'"> |
|
91d8ce8f4
customer grid bug...
|
617 618 619 620 621 |
<div class="pull-left" style="width: 110px;">
<label class="new-input-label"><b>Invoiced</b></label>
<span style="margin-top: 6px; margin-right: 3px; float: right;">$</span>
</div>
<div class="pull-left" style="width: calc(100% - 110px);">
|
|
87660da6c
testing
|
622 |
<input type="text" ng-model="order.invoiced" class="form-control" placeholder=""> |
|
91d8ce8f4
customer grid bug...
|
623 624 625 |
</div>
<div class="clearfix"></div>
</div>
|
|
9d840540f
fixed bugs and ne...
|
626 |
</div> |
|
91d8ce8f4
customer grid bug...
|
627 |
<div class="clearfix"></div><br> |
|
9d840540f
fixed bugs and ne...
|
628 |
|
|
91d8ce8f4
customer grid bug...
|
629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 |
<div class="col-xs-12">
<div class="col-md-6">
<div class="pull-left" style="width: 110px;">
<label class="new-input-label" style="margin-top: 25px;"><b>ETD</b></label>
</div>
<div class="pull-left" style="width: calc(100% - 110px);">
<div style="width: 50%; float: left;">
Date
<input type="text" style="width: 90%;" ng-model="order.departingDate" class="form-control" placeholder="" datepicker/>
</div>
<div style="width: 50%; float: left;">
Time
<select class="form-control" ng-model="order.etdTime" style="width: 100%;">
<option ng-repeat="list in etdTimeList">{{list.time}}</option>
</select>
</div>
</div>
<div class="clearfix"></div>
</div>
<div class="col-md-6" style="margin-top: 22px;">
<div class="pull-left" style="width: 110px;">
<label class="new-input-label"><b>Total</b></label>
<span style="margin-top: 6px; margin-right: 3px; float: right;">$</span>
</div>
<div class="pull-left" style="width: calc(100% - 110px);">
<input type="text" class="form-control" disabled ng-model="order.total | number : 4" placeholder="" ng-value="{{order.volume * order.invoiced}}">
</div>
</div>
</div>
<div class="clearfix"></div><br>
|
|
91d8ce8f4
customer grid bug...
|
662 663 664 665 666 667 668 669 |
<div class="col-xs-12">
<div class="col-md-6">
<div class="pull-left" style="width: 110px;">
<label class="new-input-label"><b>Fuel on</b></label>
</div>
<div class="pull-left" style="width: calc(100% - 110px);">
<select class="form-control" ng-model="order.fuelOn" style="width: 100%;">
|
|
20f645d6f
fuelorder
|
670 |
<option value="" disabled selected hidden>Arrival</option> |
|
91d8ce8f4
customer grid bug...
|
671 672 673 674 675 676 677 678 679 680 681 682 683 |
<option value="Arrival">Arrival</option>
<option value="Departure">Departure</option>
</select>
</div>
<div class="clearfix"></div>
</div>
<div class="col-md-6">
<div class="pull-left" style="width: 110px;">
<label class="new-input-label"><b>FBO Cost</b></label>
<span style="margin-top: 6px; margin-right: 3px; float: right;">$</span>
</div>
<div class="pull-left" style="width: calc(100% - 110px);">
|
|
87660da6c
testing
|
684 |
<input type="text" disabled ng-model="order.fboCost | number : 4" class="form-control" placeholder="0.0000" /> |
|
91d8ce8f4
customer grid bug...
|
685 686 687 688 689 690 691 692 693 694 695 696 |
</div>
<div class="clearfix"></div>
</div>
</div>
<div class="clearfix"></div><br>
<div class="col-xs-12">
<div class="col-md-6">
<div class="pull-left" style="width: 110px;">
<label class="new-input-label"><b>Source</b></label>
</div>
<div class="pull-left" style="width: calc(100% - 110px);">
|
|
6c795a9f9
tenant/caa status...
|
697 698 |
<div style="font-weight: normal;" ng-if="baseTenant && !contractFuelVendor">Tenant/Base Customer</br></div>
<div style="font-weight: normal;" ng-if="contractFuelVendor && !baseTenant">CAA Member</div>
|
|
9b150f816
minor
|
699 |
<div style="font-weight: normal;" ng-if="contractFuelVendor && baseTenant">Tenant/CAA</div> |
|
7f6e3b1df
final code
|
700 |
|
|
91d8ce8f4
customer grid bug...
|
701 702 703 704 705 706 707 708 709 710 711 712 713 714 |
</div>
<div class="clearfix"></div>
</div>
</div>
<div class="clearfix"></div>
<br/>
<div class="col-xs-12">
<div class="col-md-6">
<div class="pull-left" style="width: 110px;">
<label class="new-input-label"><b>Certificate Type</b></label>
</div>
<div class="pull-left" style="width: calc(100% - 110px);">
|
|
87660da6c
testing
|
715 |
<select class="form-control" disabled ng-model="order.certificateType" style="width: 100%;"> |
|
91d8ce8f4
customer grid bug...
|
716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 |
<option value="" disabled selected hidden>Select...</option>
<option value="corporate">Part 91 (Corporate)</option>
<option value="charter">Part 135 (Charter)</option>
<option value="scheduled">Part 121 (Scheduled)</option>
<option value="military">Military</option>
<option value="government">Government</option>
</select>
</div>
<div class="clearfix"></div>
</div>
<div class="col-md-6">
<div class="pull-left" style="width: 110px;">
<label class="new-input-label"><b>Status</b></label>
</div>
<div class="pull-left" style="width: calc(100% - 110px);">
<select class="form-control" ng-model="order.status" style="width: 100%;">
<option value="" disabled selected hidden>pending</option>
|
|
87660da6c
testing
|
733 |
<option value="pending">pending</option> |
|
91d8ce8f4
customer grid bug...
|
734 735 |
<option value="invoiced">invoiced</option>
<option value="paid">paid</option>
|
|
87660da6c
testing
|
736 737 |
<!-- <option value="cancelled">cancelled</option>
<option value="archived">archived</option> -->
|
|
91d8ce8f4
customer grid bug...
|
738 739 740 741 742 743 744 745 746 747 748 749 |
</select>
</div>
<div class="clearfix"></div>
</div>
</div>
<div class="clearfix"></div><br>
</div>
</div>
</div>
</div>
</div>
|
|
676250262
enhancement fuel ...
|
750 |
</div> |
|
91d8ce8f4
customer grid bug...
|
751 752 753 754 755 756 757 |
<div class="modal-footer" style="border-top: 0;">
<button type="button" class="btn btn-default" ng-click="cancelData()" data-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-primary step step-1" data-step="1" ng-disabled="fuelOrderForm.$invalid" ng-click="dispatchFuel()">Save</button>
</div>
</div>
</div>
</div>
|
|
676250262
enhancement fuel ...
|
758 |
</form> |
|
d24318592
changes and new i...
|
759 760 761 |
<div class="myLoader" ng-show="showLoader">
<img src="../img/hourglass.gif" width="50px;">
</div>
|
|
4bb02bb84
new integration w...
|
762 763 764 765 766 |
<script src="js/multi-step-modal.js"></script>
<script>
sendEvent = function(sel, step) {
$(sel).trigger('next.m.' + step);
}
|
|
79e5208c9
fixed some minor ...
|
767 |
</script> |