viithiisys / Acufuel

Download as
Browse Code ยป

Commit dadb4611735d07b8c997fe8a0ccc3463e5503bea

Authored by Kuldeep Arora
1 parent c537ab7ad7
Exists in master

color code for value (margins)

Showing 2 changed files with 12 additions and 4 deletions   Show diff stats
app/partials/viewCompany/viewCompany.controller.js
Diff comments   View file @dadb461
... ... @@ -252,12 +252,12 @@ angular.module('acufuel')
252 252 })
253 253 $scope.contactAircraftList[i].fuelType = "Jet-A";
254 254 $scope.contactAircraftList[i].marginValue = result[i].aircraftsMargin.marginValue;
255   - $scope.abc = true;
  255 + $scope.abc = true;
256 256  
257 257 }else{
258 258 $scope.contactAircraftList[i].fuelType = "100LL";
259 259 $scope.contactAircraftList[i].marginValue = result[i].aircraftsAVGASMargin.marginValue;
260   - $scope.xyz = true;
  260 + $scope.xyz = true;
261 261 }
262 262  
263 263 }
... ... @@ -680,7 +680,7 @@ angular.module('acufuel')
680 680 // console.log("$scope.fuelPricing",$scope.fuelPricing)
681 681 for (var i = 0; i < $scope.fuelPricing.length; i++) {
682 682 // console.log('$scope.fuelPricing[i].fuelPricing', $scope.fuelPricing[i].fuelPricing);
683   - //console.log("fuelid",$scope.fuelPricing[i].fuelPricing.id,"getid",$scope.omitData[j].id)
  683 + //console.log("fuelid",$scope.fuelPricing[i].fuelPricing.id,"getid",$scope.omitData[j].id)
684 684 if ($scope.fuelPricing[i].fuelPricing.expirationDate != null) {
685 685 $scope.fuelPricing[i].fuelPricing.expirationDate = new Date($scope.fuelPricing[i].fuelPricing.expirationDate);
686 686 var newTime = new Date($scope.fuelPricing[i].fuelPricing.expirationDate);
... ...
app/partials/viewCompany/viewCompany.html
Diff comments   View file @dadb461
... ... @@ -379,7 +379,15 @@
379 379 <option ng-repeat="margin in avgsMarginList" value="{{margin.id}}">{{margin.marginName}}</option>
380 380 </select>
381 381 </td>
382   - <td ng-style="aircraft.global && {color:'#9e9696'}">${{aircraft.marginValue}}</td>
  382 + <td ng-style="aircraft.global">
  383 + <span ng-if="aircraft.aircraftsMargin.pricingStructure === 'equal' || aircraft.aircraftsAVGASMargin.pricingStructure === 'equal' ">
  384 + =${{aircraft.marginValue}}
  385 + </span>
  386 + <span ng-if="aircraft.aircraftsMargin.pricingStructure === 'minus' || aircraft.aircraftsAVGASMargin.pricingStructure === 'minus'" style="color: #ff0000;">-${{aircraft.marginValue}}
  387 + </span>
  388 + <span ng-if="aircraft.aircraftsMargin.pricingStructure === 'plus' || aircraft.aircraftsAVGASMargin.pricingStructure === 'plus' " style="color: green;">+${{aircraft.marginValue}}
  389 + </span>
  390 + </td>
383 391 <td>
384 392 <!-- <td ng-show="abc && aircraft.fuelType=='Jet-A'" style="color:#55AF8B;">${{aircraft.marginAllIn | number : 4}}</td>
385 393 <td ng-show="xyz && aircraft.fuelType=='100LL'" style="color:#55AF8B;">${{aircraft.marginAvgasAllIn | number : 4}}</td> -->
... ...