Commit 4ecd206b2008e4d5937b4293dd1b1ddd216b7e84

Authored by Kuldeep Arora
1 parent 359303f532
Exists in master

Adding company/aircraft/contact and company detail bugs (see screenshots)-#87uwt

app/partials/customers/customers.controller.js
... ... @@ -80,7 +80,6 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta
80 80  
81 81 function getAllCompanies() {
82 82 CustomersService.getAllCompanies().then(function(result) {
83   - console.log('company list', result);
84 83 $scope.companyList = result;
85 84 for (var i = 0; i < $scope.companyList.length; i++) {
86 85 if ($scope.companyList[i].companyContact != null) {
... ... @@ -214,6 +213,7 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta
214 213 }
215 214 $scope.showLoader = false;
216 215 }
  216 +
217 217 $scope.addNew = function() {
218 218 $scope.showLoader = true;
219 219 $scope.aircraftDetails.push({
... ... @@ -227,31 +227,104 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta
227 227 $scope.showLoader = false;
228 228 };
229 229  
230   - $scope.getModal = function(makeId, index) {
  230 + $scope.aircraftIdx = '';
  231 + $scope.checkTail = function(tail, idx){
  232 + var data = "tail=" + tail;
  233 + $scope.aircraftIdx = idx;
  234 + CustomersService.checkTailRegistration(data).then(function(result) {
  235 + if(result.error) {
  236 + $scope.aircraftMessage = result.error;
  237 + $scope.openAddAirCraftError();
  238 + } else if(result.warning) {
  239 + $scope.aircraftMessage = result.warning;
  240 + $scope.openAddAirCraftWarning();
  241 + }
  242 + })
  243 + }
  244 +
  245 + $scope.openAddAirCraftError = function() {
  246 + $('#addAirCraftError').css('display', 'block');
  247 + }
  248 +
  249 + $scope.openAddAirCraftWarning = function() {
  250 + $('#addAirCraftWarning').css('display', 'block');
  251 + }
  252 + $scope.acceptAirCraftError = function() {
  253 + $('#addAirCraftWarning').css('display', 'none');
  254 + }
  255 +
  256 + $scope.cancelAirCraftError = function() {
  257 + $scope.aircraftDetails[$scope.aircraftIdx].tail = '';
  258 + $('#addAirCraftWarning').css('display', 'none');
  259 + $('#addAirCraftError').css('display', 'none');
  260 + }
  261 +
  262 +
  263 + /*$scope.getModal = function(makeId, index) {
231 264 $scope.showLoader = true;
232   - //console.log(makeId)
233   - $scope.aircraft.make = makeId;
234   - //var makeId = makeId;
235 265 CustomersService.getModal($scope.aircraft.make).then(function(result) {
236 266 $scope.showLoader = false;
237 267 $scope.aircraftDetails[index].aircraftModalList = result;
238   - //$scope.aircraftDetails[index].model = $scope.aircraftModalList[0];
239 268 })
240   - }
  269 + }*/
  270 + $scope.getModal = function(makeId, index) {
  271 + $scope.showLoader = true;
  272 + $scope.aircraft.make = makeId;
  273 + CustomersService.getModal($scope.aircraft.make).then(function(result) {
  274 + $scope.showLoader = false;
  275 + $scope.aircraftDetails[index].aircraftModalList = result;
  276 + })
  277 + }
  278 +
  279 +
  280 + $scope.selectedOption = '';
  281 + $scope.getSize = function(model, index) {
  282 + $scope.showLoader = true;
  283 + $scope.aircraft.model = model;
  284 + CustomersService.getAircraftSize($scope.aircraft.make, model).then(function(result) {
  285 + $scope.showLoader = false;
  286 + $scope.aircraftDetails[index].aircraftSizeList = result;
  287 +
  288 + })
  289 + }
241 290  
242   - $scope.getSize = function(model, index) {
  291 + /*$scope.getSize = function(model, index) {
243 292 $scope.showLoader = true;
244 293 CustomersService.getAircraftSize($scope.aircraft.make, model).then(function(result) {
245 294 $scope.showLoader = false;
246 295 $scope.aircraftDetails[index].aircraftSizeList = result;
247 296 })
248   - }
  297 + }*/
  298 +
  299 + $scope.getFuelType = function(size, index) {
  300 + $scope.showLoader = true;
  301 + var data = "model="+$scope.aircraft.model+"&make="+$scope.aircraft.make+"&sizeId="+size;
  302 + ViewCompanyService.checkFuelType(data).then(function(result){
  303 + $scope.showLoader = false;
  304 + if (result.type == "JetA") {
  305 + $scope.jetShow[index] = false;
  306 + $scope.marginShow[index] = true;
  307 + } else if (result.type == "Avgas") {
  308 + $scope.jetShow[index] = true;
  309 + $scope.marginShow[index] = false;
  310 + }else {
  311 + $scope.jetShow[index] = true;
  312 + $scope.marginShow[index] = true;
  313 + }
  314 + })
  315 + }
249 316  
250 317 $scope.aircraftListData = {};
251 318 $scope.addData = [];
  319 + $scope.tailArray = [];
  320 + function check(array){
  321 + return (new Set(array)).size !== array.length;
  322 + }
252 323 $scope.saveCompanyData = function() {
253   - console.log("company data --",$scope.data)
  324 + // console.log("company data --",$scope.data)
254 325 CustomersService.addCompany($scope.data).then(function(result) {
  326 + $scope.tailArray = [];
  327 + $scope.addData =[];
255 328 $scope.accountId = result;
256 329 $scope.aircraft.accountId = $scope.accountId;
257 330  
... ... @@ -264,37 +337,45 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta
264 337 'marginId' : $scope.aircraftDetails[i].marginId,
265 338 'avgasMarginId' : $scope.aircraftDetails[i].avgasMarginId
266 339 });
  340 + $scope.tailArray.push($scope.aircraftDetails[i].tail);
267 341 }
268   - $scope.aircraftListData.aircraftList = $scope.addData;
269   - $scope.aircraftListData.accountId = $scope.aircraft.accountId;
270   -
271   - if ($scope.aircraftListData.aircraftList[0].tail == "" || $scope.aircraftListData.aircraftList[0].make == null || $scope.aircraftListData.aircraftList[0].model == null) {
272   - $scope.aircraftListData.aircraftList = [];
273   - }
274   -
275   - CustomersService.addAircraft($scope.aircraftListData).then(function(result) {
276   -
277   - if (result != null && result.success) {
278   - toastr.success('' + result.success + '', {
279   - closeButton : true
280   - })
281   - $('#demo-modal-3').css('display', 'none');
282   - $('.modal-backdrop').css('display', 'none');
283   - getAllCompanies();
284   - } else {
285   - toastr.error('' + result.statusText + '', {
286   - closeButton : true
287   - })
  342 +
  343 + if (check($scope.tailArray)) {
  344 + toastr.error('Duplicate Tail Added.', {
  345 + closeButton: true
  346 + })
  347 + }else{
  348 + $scope.aircraftListData.aircraftList = $scope.addData;
  349 + $scope.aircraftListData.accountId = $scope.aircraft.accountId;
  350 + /*if ($scope.aircraftListData.aircraftList[0].tail == "" || $scope.aircraftListData.aircraftList[0].make == null || $scope.aircraftListData.aircraftList[0].model == null) {
  351 + $scope.aircraftListData.aircraftList = [];
  352 + }*/
  353 +
  354 + CustomersService.addAircraft($scope.aircraftListData).then(function(result) {
  355 +
  356 + if (result != null && result.success) {
  357 +
  358 + toastr.success('' + result.success + '', {
  359 + closeButton : true
  360 + })
  361 + $('#demo-modal-3').css('display', 'none');
  362 + $('.modal-backdrop').css('display', 'none');
  363 + getAllCompanies();
  364 + location.reload();
  365 + } else {
  366 + toastr.error('' + result.statusText + '', {
  367 + closeButton : true
  368 + })
  369 + }
  370 + });
288 371 }
289   - });
290   -
291 372 })
292 373 }
293 374  
294 375 /*add a fuel order*/
295 376 $scope.getOrders = function() {
296 377 fuelOrdersService.getOrders().then(function(result) {
297   - console.log("==get orders===",result)
  378 + //console.log("==get orders===",result)
298 379 $scope.orderdata = result;
299 380 for (var i = 0; i < $scope.orderdata.length; i++) {
300 381 $scope.orderdata[i].upliftDateS = new Date($scope.orderdata[i].upliftDate);
... ... @@ -445,7 +526,7 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta
445 526 if ($scope.selectedCompanyId != '') {
446 527 fuelOrdersService.getAircraft($scope.selectedCompanyId).then(function(aircraft) {
447 528 $scope.aircraftList = aircraft;
448   - console.log("===tail search====",aircraft);
  529 + //console.log("===tail search====",aircraft);
449 530 })
450 531 }
451 532 if ($scope.marginId != '') {
... ... @@ -506,10 +587,9 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta
506 587 })
507 588 }
508 589  
509   - $scope.checkJetWithTail = function(tail, index) {
510   - //console.log("tail==============",tail, index)
  590 + // old api not use
  591 + /*$scope.checkJetWithTail = function(tail, index) {
511 592 ViewCompanyService.checkJetType(tail).then(function(result) {
512   - //console.log("result",result)
513 593 if (result.jetA == "true") {
514 594 $scope.jetShow[index] = false;
515 595 $scope.marginShow[index] = true;
... ... @@ -518,7 +598,7 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta
518 598 $scope.marginShow[index] = false;
519 599 }
520 600 })
521   - }
  601 + }*/
522 602  
523 603  
524 604 $scope.etaTimeList = [{time:"12:00 AM"},{time:"12:30 AM"},{time:"01:00 AM"},{time:"01:30 AM"},{time:"02:00 AM"},{time:"02:30 AM"},{time:"03:00 AM"},{time:"03:30 AM"},
... ...
app/partials/customers/customers.html
... ... @@ -368,50 +368,10 @@
368 368 </div>
369 369 <div class="widget-content" style="padding:0px;border: 0px; ">
370 370 <div class="table-responsive">
371   - <!-- <table class="table table-bordered table-hover table-striped addRow" style="margin-bottom: 0px;">
372   - <thead>
373   - <tr>
374   - <th>Tail</th>
375   - <th>Make</th>
376   - <th>Model</th>
377   - <th>Size</th>
378   - <th>Margin</th>
379   - </tr>
380   - </thead>
381   - <tbody>
382   - <tr>
383   - <td>
384   - <input type="text" style="width:100px;" ng-model="aircraft.tail" class="form-control">
385   - </td>
386   - <td style="width: 25%;">
387   - <select class="form-control" ng-model="aircraft.make" ng-change="getModal()">
388   - <option ng-repeat="make in aircraftMakeList">{{make}}</option>
389   - </select>
390   - </td>
391   - <td style="width: 20%;">
392   - <select class="form-control" ng-model="aircraft.model" ng-change="getSize()">
393   - <option ng-repeat="model in aircraftModalList">{{model}}</option>
394   - </select>
395   - </td>
396   - <td style="width: 25%;">
397   - <select class="form-control" ng-model="aircraft.size">
398   - <option ng-repeat="size in aircraftSizeList">{{size}}</option>
399   - </select>
400   - </td>
401   - <td>
402   - <select class="form-control">
403   - <option>Margin1</option>
404   - <option>Margin2</option>
405   - </select>
406   - </td>
407   - </tr>
408   - </tbody>
409   -
410   - </table> -->
411   - <table class="table table-striped table-bordered">
  371 +
  372 + <!-- <table class="table table-striped table-bordered">
412 373 <thead>
413 374 <tr>
414   - <!-- <th><input type="checkbox" ng-model="selectedAll" ng-click="checkAll()" /></th> -->
415 375 <th>Tail</th>
416 376 <th>Make</th>
417 377 <th>Model</th>
... ... @@ -422,9 +382,6 @@
422 382 </thead>
423 383 <tbody>
424 384 <tr ng-repeat="aircraftData in aircraftDetails track by $index">
425   - <!-- <td>
426   - <input type="checkbox" ng-model="aircraftData.selected"/>
427   - </td> -->
428 385 <td style="width: 15%">
429 386 <input type="text" class="form-control" ng-model="aircraftData.tail" ng-blur="checkJetWithTail(aircraftData.tail, $index)" required/>
430 387 </td>
... ... @@ -439,7 +396,7 @@
439 396 <option ng-repeat="model in aircraftData.aircraftModalList | orderBy">{{model}}</option>
440 397 <option value="" disabled>Select...</option>
441 398 </select>
442   - </td><!-- {{size.aircraftSize.id}} -->
  399 + </td>
443 400 <td style="width: 17%">
444 401 <select class="form-control" ng-model="aircraftData.sizeId">
445 402 <option value="" disabled>Select</option>
... ... @@ -453,38 +410,105 @@
453 410 <option ng-repeat="margin in jetMarginList" value="{{margin.id}}">{{margin.marginName}}</option>
454 411 </select>
455 412  
456   - <!-- <select class="form-control" ng-model="aircraftData.marginId" ng-disabled="jetShow[$index]" ng-options="margin.id as margin.marginName for margin in jetMarginList">
  413 +
  414 + </td>
  415 + <td style="width: 17%">
  416 + <select class="form-control" ng-model="aircraftData.avgasMarginId" ng-disabled="marginShow[$index]">
  417 + <option value="" disabled>Select</option>
  418 + <option ng-repeat="avgs in avgsMarginList" value="{{avgs.id}}">{{avgs.marginName}}</option>
  419 + </select>
  420 +
  421 + </td>
  422 + </tr>
  423 + </tbody>
  424 + </table>
  425 + </div>
  426 + <div class="clearfix"></div>
  427 + </div>
  428 + </div>
  429 + <div class="clearfix"></div>
  430 + <div class="col-xs-12" style="margin-bottom: 50px;margin-top: 10px;">
  431 + <button ng-click="addNew()" class="button1 turquoise pull-right"><span>+</span>Add Aircraft</button>
  432 + </div> -->
  433 +
  434 + <table class="table table-striped table-bordered">
  435 + <thead>
  436 + <tr>
  437 + <!-- <th><input type="checkbox" ng-model="selectedAll" ng-click="checkAll()" /></th> -->
  438 + <th>Tail</th>
  439 + <th>Make</th>
  440 + <th>Model</th>
  441 + <th>Size</th>
  442 + <th>JET A Margin</th>
  443 + <th>AVGS 100LL Margin</th>
  444 + </tr>
  445 + </thead>
  446 + <tbody>
  447 + <tr ng-repeat="aircraftData in aircraftDetails track by $index">
  448 + <!-- <td>
  449 + <input type="checkbox" ng-model="aircraftData.selected"/>
  450 + </td> -->
  451 + <!-- <td style="width: 15%">
  452 + <input type="tel" class="form-control" ng-model="aircraftData.tail" ng-blur="checkJetWithTail(aircraftData.tail, $index)" required/>
  453 + </td> -->
  454 + <td style="width: 15%">
  455 + <input type="tel" class="form-control" ng-model="aircraftData.tail" ng-blur="checkTail(aircraftData.tail, $index);" required/>
  456 + </td>
  457 + <td style="width: 17%">
  458 + <select class="form-control" style="width: fit-content;" ng-model="aircraftData.make" ng-change="getModal(aircraftData.make, $index) ">
  459 + <option value="" disabled>Select</option>
  460 + <option ng-repeat="make in aircraftMakeList | orderBy">{{make}}</option>
  461 + </select>
  462 + </td>
  463 + <td style="width: 17%">
  464 + <select class="form-control" ng-model="aircraftData.model" ng-change="getSize(aircraftData.model, $index)">
  465 + <option value="" disabled>Select</option>
  466 + <option ng-repeat="model in aircraftData.aircraftModalList | orderBy">{{model}}</option>
  467 + </select>
  468 + </td>
  469 + <td style="width: 17%">
  470 + <select class="form-control" ng-model="aircraftData.size" ng-change="getFuelType(aircraftData.size, $index)">
  471 + <option value="" disabled>Select</option>
  472 + <option ng-repeat="size in aircraftData.aircraftSizeList" value="{{size.aircraftSize.id}}">{{size.aircraftSize.size}}</option>
  473 + </select>
  474 +
  475 + <!-- <select class="form-control" ng-model="aircraftData.sizeId" ng-options="size.aircraftSize.id as size.aircraftSize.size for size in aircraftData.aircraftSizeList"></select> -->
  476 +
  477 + </td>
  478 + <td style="width: 17%">
  479 +
  480 + <select class="form-control" ng-model="aircraftData.marginId" ng-disabled="jetShow[$index]">
  481 + <option value="" disabled>Select</option>
  482 + <option ng-repeat="margin in jetMarginList" value="{{margin.id}}">{{margin.marginName}}</option>
  483 + </select>
  484 +
  485 + <!-- <select class="form-control" ng-model="aircraftData.marginId" ng-options="margin.id as margin.marginName for margin in jetMarginList" ng-disabled="jetShow[$index]">
  486 +
457 487 <option value="" disabled>Select...</option>
458 488 </select> -->
  489 +
459 490 </td>
460 491 <td style="width: 17%">
461 492 <select class="form-control" ng-model="aircraftData.avgasMarginId" ng-disabled="marginShow[$index]">
462 493 <option value="" disabled>Select</option>
463 494 <option ng-repeat="avgs in avgsMarginList" value="{{avgs.id}}">{{avgs.marginName}}</option>
464 495 </select>
465   - <!--
466   - <select class="form-control marginSelectBox" ng-model="aircraftData.avgasMarginId" ng-options="avgs.id as avgs.marginName for avgs in avgsMarginList">
  496 +
  497 + <!-- <select class="form-control marginSelectBox" ng-model="aircraftData.avgasMarginId" ng-options="avgs.id as avgs.marginName for avgs in avgsMarginList" ng-disabled="marginShow[$index]">
467 498 <option value="" disabled>Select...</option>
468 499 </select> -->
469 500 </td>
470   - </tr>
  501 + </tr>
471 502 </tbody>
472   - </table>
  503 + </table>
473 504 </div>
474 505 <div class="clearfix"></div>
475 506 </div>
476 507 </div>
477 508 <div class="clearfix"></div>
478 509 <div class="col-xs-12" style="margin-bottom: 50px;margin-top: 10px;">
479   - <button ng-click="addNew()" class="button1 turquoise pull-right"><span>+</span>Add Aircraft</button>
  510 + <button ng-click="addNew()" class="button1 turquoise pull-right"><span>+</span>Add Aircraft </button>
480 511 </div>
481   - <!-- <div class="col-xs-12" style="margin-bottom: 20px;">
482   - <div class="pull-right">
483   - <button type="button" class="btn btn-default" ng-click="cancelCraft()">Cancel</button>
484   - <button type="button" class="btn btn-warning" ng-click="goBack()">Go Back</button>
485   - <button type="button" class="btn btn-success" ng-click="goBack()">Save</button>
486   - </div>
487   - </div> -->
488 512 </div>
489 513 </div>
490 514 <div class="clearfix"></div>
... ... @@ -506,6 +530,43 @@
506 530 </div>
507 531 </form>
508 532  
  533 +<div class="customConfirmPopBackdrop" id="addAirCraftError">
  534 + <div class="customModalInner" style="max-width: 400px;">
  535 + <div class="customModelBody" style="border-radius: 5px 5px 0 0;">
  536 + <table>
  537 + <tr>
  538 + <td>
  539 + <p style="padding: 5px 10px; margin-bottom: 0;">{{aircraftMessage}}</p>
  540 + </td>
  541 + </tr>
  542 + </table>
  543 + </div>
  544 + <div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;">
  545 + <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelAirCraftError()">ok</button>
  546 + </div>
  547 + </div>
  548 +</div>
  549 +
  550 +<div class="customConfirmPopBackdrop" id="addAirCraftWarning">
  551 + <div class="customModalInner" style="max-width: 400px;">
  552 + <div class="customModelBody" style="border-radius: 5px 5px 0 0;">
  553 + <table>
  554 + <tr>
  555 + <td>
  556 + <p style="padding: 5px 10px; margin-bottom: 0;">{{aircraftMessage}}</p>
  557 + </td>
  558 + </tr>
  559 + </table>
  560 + </div>
  561 + <div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;">
  562 + <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="acceptAirCraftError()">Yes</button>
  563 + <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelAirCraftError()">No</button>
  564 + </div>
  565 + </div>
  566 +</div>
  567 +
  568 +
  569 +
509 570 <!-- SetUp fuel order -->
510 571 <form class="modal multi-step" id="demo-modal-4" name="fuelOrderForm">
511 572 <div class="modal-dialog modal-lg">
... ...
app/partials/customers/customers.service.js
... ... @@ -177,6 +177,22 @@
177 177 })
178 178 return deferred.promise;
179 179 }
  180 +
  181 + this.checkTailRegistration = function(data) {
  182 + var deferred = $q.defer();
  183 + $http({
  184 + method : 'POST',
  185 + url : BASE_URL.url +'/company/aircraft/tail/registered',
  186 + data : data,
  187 + headers : {'Content-Type': 'application/json'},
  188 + })
  189 + .then(function (result){
  190 + deferred.resolve(result.data);
  191 + },function (result){
  192 + deferred.resolve(result.data);
  193 + })
  194 + return deferred.promise;
  195 + }
180 196  
181 197 }
182 198  
... ...
app/partials/viewCompany/viewCompany.controller.js
... ... @@ -360,11 +360,10 @@ angular.module(&#39;acufuel&#39;)
360 360 CustomersService.getAircraftSize($scope.aircraft.make, model).then(function(result) {
361 361 $scope.showLoader = false;
362 362 $scope.aircraftDetails[index].aircraftSizeList = result;
363   - // console.log("hi", result[0].aircraftSize.id)
364   - // $scope.selectedOption = result[0].aircraftSize.id;
365   - // console.log('$scope.selectedOption', $scope.selectedOption);
366   - // $scope.aircraftData.aircraftSizeList.aircraftSize.size = result[0].aircraftSize.size;
367   - // $scope.aircraftDetails[index].size = $scope.aircraftSizeList[0];
  363 + /*if(result != null){
  364 + $scope.aircraftData.size = result[0].aircraftSize.id;
  365 + console.log("==size===",result[0].aircraftSize.id)
  366 + }*/
368 367 })
369 368 }
370 369  
... ...
app/partials/viewCompany/viewCompany.html
... ... @@ -340,7 +340,7 @@
340 340 <div class="widget" style="min-height: 350px;">
341 341 <div class="widget-header">
342 342 <i class="fa fa-plane"></i>
343   - <h3>Aircraft List kd</h3>
  343 + <h3>Aircraft List</h3>
344 344 <div class="pull-right">
345 345 <button type="submit" class="btn btn-success btn-sm" data-toggle="modal" ng-click="clearAircrafts()" data-target="#aircraft-modal-3" style="margin-top: 4px; margin-right: 9px;"><i class="fa fa-plus" aria-hidden="true"></i>&nbsp; Add Aircraft </button>
346 346 </div>
... ... @@ -783,7 +783,7 @@
783 783 <div class="col-xs-12">
784 784 <div class="widget-header">
785 785 <i class="fa fa-list"></i>
786   - <h3>Aircraft List </h3>
  786 + <h3>Aircraft List</h3>
787 787 </div>
788 788 <div class="widget-content" style="padding:0px;border: 0px; padding: 0px !important;">
789 789 <div class="table-responsive">
... ... @@ -822,7 +822,7 @@
822 822 <option ng-repeat="model in aircraftData.aircraftModalList | orderBy">{{model}}</option>
823 823 </select>
824 824 </td>
825   - <td style="width: 17%">
  825 + <td style="width: 17%">{{aircraftData.size}}
826 826 <select class="form-control" ng-model="aircraftData.size" ng-change="getFuelType(aircraftData.size, $index)">
827 827 <option value="" disabled>Select</option>
828 828 <option ng-repeat="size in aircraftData.aircraftSizeList" value="{{size.aircraftSize.id}}">{{size.aircraftSize.size}}</option>
... ... @@ -872,7 +872,7 @@
872 872 </div>
873 873 </div>
874 874 </div>
875   -
  875 +
876 876 <div class="modal-footer" style="border-top: 0;">
877 877 <button type="button" class="btn btn-default" id="reset" data-dismiss="modal">Cancel</button>
878 878 <button type="button" class="btn btn-primary step step-1" data-step="1" ng-disabled="aircraftForm.$invalid" ng-click="saveCompanyData()">Save</button>
... ...