Commit 169fc146e9143f76fb1e5b4720f7642e76a98eb8
1 parent
1b4bc24a75
Exists in
master
final omit ui
Showing
2 changed files
with
4 additions
and
4 deletions
Show diff stats
app/partials/viewCompany/viewCompany.controller.js
... | ... | @@ -683,16 +683,16 @@ angular.module('acufuel') |
683 | 683 | /* omit strike out*/ |
684 | 684 | updateFuelManagerService.getFuelPricingNew().then(function(result) { |
685 | 685 | $scope.fuelPricing = result; |
686 | - console.log("==fuel pricing==",result) | |
686 | + //console.log("==fuel pricing==",result) | |
687 | 687 | $scope.omitData; |
688 | 688 | ViewCompanyService.getOmitCompany($scope.compId).then(function(result){ |
689 | 689 | $scope.omitData = result; |
690 | - console.log("omit data===", $scope.omitData); | |
690 | + // console.log("omit data===", $scope.omitData); | |
691 | 691 | for(var i = 0 ; i< $scope.fuelPricing.length; i++){ |
692 | 692 | for(var j = 0; j<$scope.omitData.length; j++){ |
693 | 693 | if($scope.omitData[j].marginId == $scope.fuelPricing[i].fuelPricing.id){ |
694 | 694 | $scope.fuelPricing[i].fuelPricing.omit = $scope.omitData[j].omit; |
695 | - console.log("fuel.pricing.omit",$scope.fuelPricing[i].fuelPricing.omit) | |
695 | + // console.log("fuel.pricing.omit",$scope.fuelPricing[i].fuelPricing.omit) | |
696 | 696 | } |
697 | 697 | } |
698 | 698 | } | ... | ... |
app/partials/viewCompany/viewCompany.html
... | ... | @@ -526,7 +526,7 @@ |
526 | 526 | <tbody> |
527 | 527 | <tr ng-repeat="fuel in fuelPricing | orderBy:'name' : 'reverse' | filter:{ status: true }" ng-class="fuel.fuelPricing.omit ? 'strikeout' : ''"> |
528 | 528 | <!-- <tr ng-repeat="fuel in fuelPricing | orderBy:'name' : 'reverse' | filter:{ status: true }"> --> |
529 | - <td><input type="checkbox" ng-model="fuel.fuelPricing.omit" ng-change="updateOmit(fuel.fuelPricing, fuel.status)">{{fuel.fuelPricing.omit}}</td> | |
529 | + <td><input type="checkbox" ng-model="fuel.fuelPricing.omit" ng-change="updateOmit(fuel.fuelPricing, fuel.status)"></td> | |
530 | 530 | <td>{{fuel.name}}</td> |
531 | 531 | <td>${{fuel.fuelPricing.cost | number :4}}</td> |
532 | 532 | <td>${{fuel.fuelPricing.papMargin | number :4}}</td> | ... | ... |