Commit a858eca3e7f096fa998f513922f2e97dcdfe0306
1 parent
20b4aefe7f
Exists in
master
css
Showing
2 changed files
with
4 additions
and
1 deletions
Show diff stats
app/css/main.css
... | ... | @@ -334,7 +334,7 @@ right: 120px; |
334 | 334 | } |
335 | 335 | |
336 | 336 | |
337 | -/* login page css */ | |
337 | +/* login page css */ | |
338 | 338 | |
339 | 339 | .table.vertical-center > thead > tr > th, .table.vertical-center > tbody > tr > th, .table.vertical-center > tfoot > tr > th, .table.vertical-center > thead > tr > td, .table.vertical-center > tbody > tr > td, .table.vertical-center > tfoot > tr > td{ |
340 | 340 | vertical-align: middle !important; | ... | ... |
app/partials/viewCompany/viewCompany.controller.js
... | ... | @@ -258,8 +258,11 @@ angular.module('acufuel') |
258 | 258 | |
259 | 259 | }else{ |
260 | 260 | $scope.contactAircraftList[i].fuelType = "100LL"; |
261 | + if (result[i].aircraftsAVGASMargin != null) { | |
261 | 262 | $scope.contactAircraftList[i].marginValue = result[i].aircraftsAVGASMargin.marginValue; |
262 | 263 | $scope.xyz = true; |
264 | + | |
265 | + } | |
263 | 266 | } |
264 | 267 | |
265 | 268 | } | ... | ... |