viithiisys / Acufuel

Download as
Browse Code ยป

Commit 68c767613f27b6c9e0160fc1a133599bf076fbda

Authored by Swarn Singh
1 parent 4441858d80
Exists in master

fixed ramp fee and fuel manager bugs

Showing 4 changed files with 399 additions and 480 deletions   Show diff stats
app/partials/fuelManager/fuelManager.controller.js
Diff comments   View file @68c7676
... ... @@ -63,15 +63,30 @@
63 63 $scope.avoidanceList.rampFeesAndAvoidanceList = $scope.addData;
64 64 $scope.avoidanceList.fboUserId = $scope.currentUserData;
65 65  
66   - /*fuelManagerService.updateFullList($scope.avoidanceList).then(function(result) {
  66 + fuelManagerService.updateFullList($scope.avoidanceList).then(function(result) {
67 67 toastr.success(''+result.success+'', {
68 68 closeButton: true
69 69 })
70 70 fuelManagerService.getFullList().then(function(result) {
71   - $scope.fullJetList = result;
72   - $scope.showLoader = false;
73   - })
74   - })*/
  71 + $scope.fullJetList = result;
  72 + console.log('$scope.fullJetList', $scope.fullJetList);
  73 + for (var i = 0; i<$scope.fullJetList.length; i++) {
  74 + for (var j = 0; j<$scope.fullJetList[i].aircraftsSize.length; j++) {
  75 + if ($scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance != null) {
  76 + if ($scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate != null && $scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate != '') {
  77 + var newTime = new Date($scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate);
  78 + var dmonth = newTime.getUTCMonth() + 1; //months from 1-12
  79 + var dday = newTime.getUTCDate();
  80 + var dyear = newTime.getUTCFullYear();
  81 + $scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate = dmonth+'/'+dday+'/'+dyear;
  82 + console.log('$scope.fullJetList.aircraftsSize.rampFeesAndAvoidance.expirationDate', $scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate);
  83 + }
  84 + }
  85 + }
  86 + }
  87 + $scope.showLoader = false;
  88 + })
  89 + })
75 90  
76 91 }
77 92  
... ... @@ -88,126 +103,166 @@
88 103 $scope.aircrafts = result;
89 104 })
90 105  
  106 + $scope.customRampData = {};
  107 + $scope.customRampDataCraft = {};
  108 + $scope.customRampDataCraft.aircraftType = '';
  109 + $scope.customRampDataCraft.aircraftSizeId = '';
  110 +
91 111 $scope.openRampFeeModal = false;
  112 + $scope.showWeightForm = false;
  113 + $scope.showMakeModelForm = false;
  114 + $scope.showWingspanForm = false;
  115 + $scope.showTailForm = false;
  116 +
92 117 $scope.customRampData = {};
93   - $scope.customRampData.rampFeesAndAvoidanceList = {};
94   - $scope.customRampData.rampFeesAndAvoidanceList.aircraftType = null;
95   -
96   - $scope.customRampData.rampFeesAndAvoidanceList.aircraftMake = '';
97   - $scope.customRampData.rampFeesAndAvoidanceList.aircraftSizeId = '';
98   - $scope.customRampData.rampFeesAndAvoidanceList.tailNumber = '';
99   - $scope.customRampData.rampFeesAndAvoidanceList.wingspanMin = '';
100   - $scope.customRampData.rampFeesAndAvoidanceList.wingspanMax = '';
101   - $scope.customRampData.rampFeesAndAvoidanceList.weightRangeMin = '';
102   - $scope.customRampData.rampFeesAndAvoidanceList.weightRangeMax = '';
103   - $scope.customRampData.rampFeesAndAvoidanceList.weightRangeMax = '';
104   - $scope.customRampData.rampFeesAndAvoidanceList.rampFees = '';
105   - $scope.customRampData.rampFeesAndAvoidanceList.avoidance = '';
106   - //$scope.customRampData.fboUserId = '';
107   -
108   - //$scope.rampFeeType = '';
  118 + $scope.customMakeData = {};
  119 + $scope.customWingspanData = {};
  120 + $scope.customTailData = {};
109 121  
110 122 $scope.openRampModal = function(){
111   - //console.log('$scope.dropOptions', $scope.dropOptions)
112   - if ($scope.customRampData.rampFeesAndAvoidanceList.aircraftType === 'WEIGHT') {
113   - $scope.openRampFeeModal = true;
114   - $scope.showWeight = true;
115   - $scope.showWingspan = false;
116   - $scope.showTail = false;
117   - $scope.showAircraft = false;
118   - $scope.customRampData.rampFeesAndAvoidanceList.aircraftMake = '';
119   - $scope.customRampData.rampFeesAndAvoidanceList.tailNumber = '';
120   - $scope.customRampData.rampFeesAndAvoidanceList.wingspanMin = '';
121   - $scope.customRampData.rampFeesAndAvoidanceList.wingspanMax = '';
122   - $scope.customRampData.rampFeesAndAvoidanceList.rampFees = '';
123   - $scope.customRampData.rampFeesAndAvoidanceList.avoidance = '';
124   - }else if ($scope.customRampData.rampFeesAndAvoidanceList.aircraftType === 'MAKE_AND_MODEL') {
125   - $scope.openRampFeeModal = true;
126   - $scope.showWeight = false;
127   - $scope.showWingspan = false;
128   - $scope.showTail = false;
129   - $scope.showAircraft = true;
130   - $scope.customRampData.rampFeesAndAvoidanceList.tailNumber = '';
131   - $scope.customRampData.rampFeesAndAvoidanceList.wingspanMin = '';
132   - $scope.customRampData.rampFeesAndAvoidanceList.wingspanMax = '';
133   - $scope.customRampData.rampFeesAndAvoidanceList.weightRangeMin = '';
134   - $scope.customRampData.rampFeesAndAvoidanceList.weightRangeMax = '';
135   - $scope.customRampData.rampFeesAndAvoidanceList.rampFees = '';
136   - $scope.customRampData.rampFeesAndAvoidanceList.avoidance = '';
137   - }else if ($scope.customRampData.rampFeesAndAvoidanceList.aircraftType === 'WINGSPAN') {
138   - $scope.openRampFeeModal = true;
139   - $scope.showWeight = false;
140   - $scope.showWingspan = true;
141   - $scope.showTail = false;
142   - $scope.showAircraft = false;
143   - $scope.customRampData.rampFeesAndAvoidanceList.aircraftMake = '';
144   - $scope.customRampData.rampFeesAndAvoidanceList.tailNumber = '';
145   - $scope.customRampData.rampFeesAndAvoidanceList.weightRangeMin = '';
146   - $scope.customRampData.rampFeesAndAvoidanceList.weightRangeMax = '';
147   - $scope.customRampData.rampFeesAndAvoidanceList.rampFees = '';
148   - $scope.customRampData.rampFeesAndAvoidanceList.avoidance = '';
149   - }else if ($scope.customRampData.rampFeesAndAvoidanceList.aircraftType === 'TAIL') {
150   - $scope.openRampFeeModal = true;
151   - $scope.showWeight = false;
152   - $scope.showWingspan = false;
153   - $scope.showTail = true;
154   - $scope.showAircraft = false;
155   - $scope.customRampData.rampFeesAndAvoidanceList.aircraftMake = '';
156   - $scope.customRampData.rampFeesAndAvoidanceList.wingspanMin = '';
157   - $scope.customRampData.rampFeesAndAvoidanceList.wingspanMax = '';
158   - $scope.customRampData.rampFeesAndAvoidanceList.weightRangeMin = '';
159   - $scope.customRampData.rampFeesAndAvoidanceList.weightRangeMax = '';
160   - $scope.customRampData.rampFeesAndAvoidanceList.rampFees = '';
161   - $scope.customRampData.rampFeesAndAvoidanceList.avoidance = '';
162   - }else if ($scope.customRampData.rampFeesAndAvoidanceList.aircraftType = null){
163   - $scope.openRampFeeModal = false;
164   - $scope.showWeight = false;
165   - $scope.showWingspan = false;
166   - $scope.showTail = false;
167   - $scope.showAircraft = false;
  123 + $scope.showLoader = true;
  124 + $scope.openRampFeeModal = true;
  125 + if ($scope.customRampDataCraft.aircraftType != null) {
  126 + for (var i = 0; i < $scope.dropOptions.length; i++) {
  127 + if ($scope.customRampDataCraft.aircraftType === $scope.dropOptions[i].size) {
  128 + $scope.customRampDataCraft.aircraftSizeId = $scope.dropOptions[i].id;
  129 + }
  130 + }
  131 + $scope.OldRampData = {};
  132 + fuelManagerService.getRampFeeDetail($scope.customRampDataCraft.aircraftSizeId).then(function(result) {
  133 + $scope.OldRampData = result;
  134 + if ($scope.customRampDataCraft.aircraftType === 'WEIGHT') {
  135 + $scope.showWeightForm = true;
  136 + $scope.showMakeModelForm = false;
  137 + $scope.showWingspanForm = false;
  138 + $scope.showTailForm = false;
  139 + $scope.customRampData = $scope.OldRampData;
  140 + }else if ($scope.customRampDataCraft.aircraftType === 'MAKE_AND_MODEL') {
  141 + $scope.showWeightForm = false;
  142 + $scope.showMakeModelForm = true;
  143 + $scope.showWingspanForm = false;
  144 + $scope.showTailForm = false;
  145 + $scope.customMakeData = $scope.OldRampData;
  146 + console.log('$scope.customMakeData', $scope.customMakeData);
  147 + }else if ($scope.customRampDataCraft.aircraftType === 'WINGSPAN') {
  148 + $scope.showWeightForm = false;
  149 + $scope.showMakeModelForm = false;
  150 + $scope.showWingspanForm = true;
  151 + $scope.showTailForm = false;
  152 + $scope.customWingspanData = $scope.OldRampData;
  153 + }else if ($scope.customRampDataCraft.aircraftType === 'TAIL') {
  154 + $scope.showWeightForm = false;
  155 + $scope.showMakeModelForm = false;
  156 + $scope.showWingspanForm = false;
  157 + $scope.showTailForm = true;
  158 + $scope.customTailData = $scope.OldRampData;
  159 + }else{
  160 + $scope.openRampFeeModal = false;
  161 + $scope.showWeightForm = false;
  162 + $scope.showMakeModelForm = false;
  163 + $scope.showWingspanForm = false;
  164 + $scope.showTailForm = false;
  165 + }
  166 + $scope.showLoader = false;
  167 + })
168 168 }else{
169 169 $scope.openRampFeeModal = false;
170   - $scope.showWeight = false;
171   - $scope.showWingspan = false;
172   - $scope.showTail = false;
173   - $scope.showAircraft = false;
174   - }
175   - console.log('$scope.dropOptions', $scope.dropOptions);
176   - /*fuelManagerService.getRampFeeDetail().then(function(result) {
177   - console.log('result', result)
178   - })*/
179   - for (var i = 0; $scope.dropOptions.length; i++) {
180   - if ($scope.customRampData.rampFeesAndAvoidanceList.aircraftType === $scope.dropOptions[i].size) {
181   - $scope.customRampData.rampFeesAndAvoidanceList.aircraftSizeId = $scope.dropOptions[i].id;
182   - }
183 170 }
184   -
185 171 }
186 172  
187   -
188   -
189   - $scope.addCustomRamp = function(){
  173 + $scope.addCustomRampNew = function(data){
  174 + $scope.showLoader = true;
  175 + $scope.newCustomRampData = data;
  176 + $scope.newRampData = [];
  177 + if ($scope.newCustomRampData != null) {
  178 + if ($scope.newCustomRampData.id != null) {
  179 + $scope.newRampData.push({'id': $scope.newCustomRampData.id});
  180 + }
  181 + $scope.newRampData.push({
  182 + 'aircraftSizeId': $scope.customRampDataCraft.aircraftSizeId,
  183 + 'rampFees': $scope.newCustomRampData.rampFees,
  184 + 'avoidance': $scope.newCustomRampData.avoidance,
  185 + 'applicable': $scope.newCustomRampData.applicable,
  186 + 'expirationDate': $scope.newCustomRampData.expirationDate,
  187 + 'notes': $scope.newCustomRampData.notes,
  188 + 'aircraftMake': $scope.newCustomRampData.aircraftMake,
  189 + 'wingspanMin': $scope.newCustomRampData.wingspanMin,
  190 + 'wingspanMax': $scope.newCustomRampData.wingspanMax,
  191 + 'weightRangeMin': $scope.newCustomRampData.weightRangeMin,
  192 + 'weightRangeMax': $scope.newCustomRampData.weightRangeMax,
  193 + 'tailNumber': $scope.newCustomRampData.tailNumber,
  194 + });
  195 + }
190 196  
191   - $scope.newData = {};
192   - $scope.newData.rampFeesAndAvoidanceList = [];
193   - $scope.newData.rampFeesAndAvoidanceList.push($scope.customRampData.rampFeesAndAvoidanceList);
194   - $scope.newData.fboUserId = $scope.currentUserData;
195   - console.log('$scope.customRampData', $scope.newData)
196   - fuelManagerService.updateFullList($scope.newData).then(function(result) {
  197 + $scope.avoidanceList.rampFeesAndAvoidanceList = $scope.newRampData;
  198 + $scope.avoidanceList.fboUserId = $scope.currentUserData;
  199 + //console.log('$scope.newRampData', $scope.avoidanceList);
  200 + fuelManagerService.updateFullList($scope.avoidanceList).then(function(result) {
197 201 toastr.success(''+result.success+'', {
198 202 closeButton: true
199   - });
  203 + })
200 204 $scope.openRampFeeModal = false;
201   - $scope.customRampData.rampFeesAndAvoidanceList = {};
202   - $scope.customRampData.rampFeesAndAvoidanceList.aircraftType = null;
203   - $scope.newData = {};
204   - $scope.newData.rampFeesAndAvoidanceList = [];
  205 + fuelManagerService.getFullList().then(function(result) {
  206 + $scope.fullJetList = result;
  207 + console.log('$scope.fullJetList', $scope.fullJetList);
  208 + for (var i = 0; i<$scope.fullJetList.length; i++) {
  209 + for (var j = 0; j<$scope.fullJetList[i].aircraftsSize.length; j++) {
  210 + if ($scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance != null) {
  211 + if ($scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate != null && $scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate != '') {
  212 + var newTime = new Date($scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate);
  213 + var dmonth = newTime.getUTCMonth() + 1; //months from 1-12
  214 + var dday = newTime.getUTCDate();
  215 + var dyear = newTime.getUTCFullYear();
  216 + $scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate = dmonth+'/'+dday+'/'+dyear;
  217 + console.log('$scope.fullJetList.aircraftsSize.rampFeesAndAvoidance.expirationDate', $scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate);
  218 + }
  219 + }
  220 + }
  221 + }
  222 + $scope.showLoader = false;
  223 + })
  224 + })
  225 + }
  226 +
  227 + $scope.deleteTemplateId = '';
  228 +
  229 + $scope.deleteCustomJet = function(id){
  230 + $('#confirm1').css('display', 'block');
  231 + $scope.deleteTemplateId = id;
  232 + console.log('$scope.deleteTemplateId', id);
  233 + }
  234 +
  235 + $scope.saveAndCloseConfirm = function(){
  236 + $scope.showLoader = true;
  237 + $('#confirm1').css('display', 'none');
  238 + fuelManagerService.deleteCustomRamp($scope.deleteTemplateId).then(function(result) {
205 239 fuelManagerService.getFullList().then(function(result) {
206 240 $scope.fullJetList = result;
  241 + console.log('$scope.fullJetList', $scope.fullJetList);
  242 + for (var i = 0; i<$scope.fullJetList.length; i++) {
  243 + for (var j = 0; j<$scope.fullJetList[i].aircraftsSize.length; j++) {
  244 + if ($scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance != null) {
  245 + if ($scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate != null && $scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate != '') {
  246 + var newTime = new Date($scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate);
  247 + var dmonth = newTime.getUTCMonth() + 1; //months from 1-12
  248 + var dday = newTime.getUTCDate();
  249 + var dyear = newTime.getUTCFullYear();
  250 + $scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate = dmonth+'/'+dday+'/'+dyear;
  251 + console.log('$scope.fullJetList.aircraftsSize.rampFeesAndAvoidance.expirationDate', $scope.fullJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate);
  252 + }
  253 + }
  254 + }
  255 + }
  256 + $scope.showLoader = false;
207 257 })
208 258 })
209 259 }
210 260  
  261 + $scope.cancelAndCloseConfirm = function(){
  262 + $('#confirm1').css('display', 'none');
  263 + $scope.deleteTemplateId = '';
  264 + }
  265 +
211 266 $scope.closeRampFeeModel = function(){
212 267 $scope.openRampFeeModal = false;
213 268 $scope.showWeight = false;
... ... @@ -215,7 +270,7 @@
215 270 $scope.showTail = false;
216 271 $scope.showAircraft = false;
217 272 $scope.customRampData.rampFeesAndAvoidanceList = {};
218   - $scope.customRampData.rampFeesAndAvoidanceList.aircraftType = null;
  273 + $scope.customRampDataCraft.aircraftType = null;
219 274 }
220 275  
221 276 $scope.parentOpen = function(index){
... ...
app/partials/fuelManager/fuelManager.html
Diff comments   View file @68c7676
... ... @@ -2,6 +2,12 @@
2 2 .subnavbar .mainnav > li:nth-child(2) > a{
3 3 color: #ff9900;
4 4 }
  5 + button > i{
  6 + cursor: pointer !important;
  7 + }
  8 + button[disabled] > i{
  9 + cursor: not-allowed !important;
  10 + }
5 11 </style>
6 12 <div class="myLoader" ng-show="showLoader">
7 13 <img src="../img/hourglass.gif" width="50px;">
... ... @@ -17,7 +23,7 @@
17 23 <div class="widget-header">
18 24 <i class="fa fa-pencil"></i>
19 25 <h3>Ramp Fee Manager</h3>
20   - <select style="float: right; margin: 8px 10px;" ng-model="customRampData.rampFeesAndAvoidanceList.aircraftType" ng-change="openRampModal()">
  26 + <select style="float: right; margin: 8px 10px;" ng-model="customRampDataCraft.aircraftType" ng-change="openRampModal()">
21 27 <option disabled selected value="">Ramp Fee By Category</option>
22 28 <option ng-repeat="modals in dropOptions" value="{{modals.size}}">{{modals.size}}</option>
23 29 </select>
... ... @@ -97,7 +103,9 @@
97 103 </div>
98 104 </div>
99 105 <div class="col-md-1" ng-if="list.type == 'CUSTOM'">
100   - <i class="fa fa-trash-o deleteTierIcon" ng-click="deleteCustomJet()" aria-hidden="true"></i>
  106 + <button type="button" ng-disabled="jets.rampFeesAndAvoidance == null" ng-click="deleteCustomJet(jets.rampFeesAndAvoidance.id)" style="border: none; background-color: transparent; padding: 0;">
  107 + <i class="fa fa-trash-o deleteTierIcon" style="cursor: default;" aria-hidden="true"></i>
  108 + </button>
101 109 </div>
102 110 <div class="clearfix"></div>
103 111 </div>
... ... @@ -183,430 +191,271 @@
183 191 <div class="clearfix"></div>
184 192 </div>
185 193 <div class="customModelBody">
186   -
187   - <div class="col-xs-12 col-sm-4">
188   - Type:
189   - </div>
190   - <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
191   - <select class="form-control" style="border-radius: 0; height: 26px; padding: 0;" ng-model="customRampData.rampFeesAndAvoidanceList.aircraftType" ng-change="openRampModal()">
192   - <option ng-repeat="modalsNew in dropOptions" value="{{modalsNew.size}}">{{modalsNew.size}}</option>
193   - </select>
194   - </div>
195   - <div class="clearfix"></div>
196   - <br/>
197 194  
198   - <div ng-show="showAircraft">
  195 + <div ng-show="showWeightForm">
  196 +
199 197 <div class="col-xs-12 col-sm-4">
200   - Aircraft Make:
  198 + Type:
201 199 </div>
202 200 <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
203   - <select class="form-control" style="border-radius: 0; height: 26px; padding: 0;" ng-model="customRampData.rampFeesAndAvoidanceList.aircraftMake">
204   - <option ng-repeat="crafts in aircrafts" value="{{crafts}}">{{crafts}}</option>
  201 + <select class="form-control" style="border-radius: 0; height: 26px; padding: 0;" ng-model="customRampDataCraft.aircraftType" ng-change="openRampModal()">
  202 + <option ng-repeat="modalsNew in dropOptions" value="{{modalsNew.size}}">{{modalsNew.size}}</option>
205 203 </select>
206 204 </div>
207 205 <div class="clearfix"></div>
208 206 <br/>
209   - </div>
210 207  
211   - <div ng-show="showTail">
212   - <div class="col-xs-12 col-sm-4">
213   - Tail Numbers:
  208 + <div>
  209 + <div class="col-xs-12 col-sm-4">
  210 + Weight Range Min:
  211 + </div>
  212 + <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
  213 + <input type="number" value="0.00" ng-model="customRampData.weightRangeMin" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
  214 + </div>
  215 + <div class="col-xs-12 col-sm-4" style="padding-left: 5px;">
  216 + lbs.
  217 + </div>
  218 + <div class="clearfix"></div>
  219 + <br/>
  220 + <div class="col-xs-12 col-sm-4">
  221 + Weight Range Max:
  222 + </div>
  223 + <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
  224 + <input type="number" value="0.00" ng-model="customRampData.weightRangeMax" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
  225 + </div>
  226 + <div class="col-xs-12 col-sm-4" style="padding-left: 5px;">
  227 + lbs.
  228 + </div>
  229 + <div class="clearfix"></div>
  230 + <br/>
214 231 </div>
215   - <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
216   - <select class="form-control" style="border-radius: 0; height: 26px; padding: 0;" ng-model="customRampData.rampFeesAndAvoidanceList.tailNumber">
217   - <!-- <option ng-repeat="crafts in aircrafts" value="{{crafts}}">{{crafts}}</option> -->
218   - </select>
  232 +
  233 + <div>
  234 + <div class="col-xs-12 col-sm-4">
  235 + Ramp/Facil. Fee($):
  236 + </div>
  237 + <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
  238 + <input type="number" value="0" ng-model="customRampData.rampFees" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
  239 + </div>
  240 + <div class="clearfix"></div>
  241 + <br/>
219 242 </div>
220   - <div class="clearfix"></div>
221   - <br/>
  243 + <div>
  244 + <div class="col-xs-12 col-sm-4">
  245 + Avoidance:
  246 + </div>
  247 + <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
  248 + <input type="number" value="0" ng-model="customRampData.avoidance" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
  249 + </div>
  250 + <div class="col-xs-12 col-sm-4" style="padding-left: 5px;">
  251 + gal.
  252 + </div>
  253 + <div class="clearfix"></div>
  254 + </div>
  255 +
222 256 </div>
223 257  
224   - <div ng-show="showWingspan">
  258 + <div ng-show="showMakeModelForm">
  259 +
225 260 <div class="col-xs-12 col-sm-4">
226   - Wingspan Min:
  261 + Type:
227 262 </div>
228 263 <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
229   - <input type="number" value="0.00" ng-model="customRampData.rampFeesAndAvoidanceList.wingspanMin" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
230   - </div>
231   - <div class="col-xs-12 col-sm-4" style="padding-left: 5px;">
232   - ft.
  264 + <select class="form-control" style="border-radius: 0; height: 26px; padding: 0;" ng-model="customRampDataCraft.aircraftType" ng-change="openRampModal()">
  265 + <option ng-repeat="modalsNew in dropOptions" value="{{modalsNew.size}}">{{modalsNew.size}}</option>
  266 + </select>
233 267 </div>
234 268 <div class="clearfix"></div>
235 269 <br/>
236   - <div class="col-xs-12 col-sm-4">
237   - Wingspan Max:
  270 +
  271 + <div>
  272 + <div class="col-xs-12 col-sm-4">
  273 + Aircraft Make:
  274 + </div>
  275 + <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
  276 + <select class="form-control" style="border-radius: 0; height: 26px; padding: 0;" ng-model="customMakeData.aircraftMake">
  277 + <option ng-repeat="crafts in aircrafts" value="{{crafts}}">{{crafts}}</option>
  278 + </select>
  279 + </div>
  280 + <div class="clearfix"></div>
  281 + <br/>
238 282 </div>
239   - <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
240   - <input type="number" value="0.00" ng-model="customRampData.rampFeesAndAvoidanceList.wingspanMax" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
  283 +
  284 + <div>
  285 + <div class="col-xs-12 col-sm-4">
  286 + Ramp/Facil. Fee($):
  287 + </div>
  288 + <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
  289 + <input type="number" value="0" ng-model="customMakeData.rampFees" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
  290 + </div>
  291 + <div class="clearfix"></div>
  292 + <br/>
241 293 </div>
242   - <div class="col-xs-12 col-sm-4" style="padding-left: 5px;">
243   - ft.
  294 + <div>
  295 + <div class="col-xs-12 col-sm-4">
  296 + Avoidance:
  297 + </div>
  298 + <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
  299 + <input type="number" value="0" ng-model="customMakeData.avoidance" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
  300 + </div>
  301 + <div class="col-xs-12 col-sm-4" style="padding-left: 5px;">
  302 + gal.
  303 + </div>
  304 + <div class="clearfix"></div>
244 305 </div>
245   - <div class="clearfix"></div>
246   - <br/>
  306 +
247 307 </div>
248 308  
249   - <div ng-show="showWeight">
  309 + <div ng-show="showWingspanForm">
  310 +
250 311 <div class="col-xs-12 col-sm-4">
251   - Weight Range Min:
  312 + Type:
252 313 </div>
253 314 <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
254   - <input type="number" value="0.00" ng-model="customRampData.rampFeesAndAvoidanceList.weightRangeMin" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
255   - </div>
256   - <div class="col-xs-12 col-sm-4" style="padding-left: 5px;">
257   - lbs.
  315 + <select class="form-control" style="border-radius: 0; height: 26px; padding: 0;" ng-model="customRampDataCraft.aircraftType" ng-change="openRampModal()">
  316 + <option ng-repeat="modalsNew in dropOptions" value="{{modalsNew.size}}">{{modalsNew.size}}</option>
  317 + </select>
258 318 </div>
259 319 <div class="clearfix"></div>
260 320 <br/>
261   - <div class="col-xs-12 col-sm-4">
262   - Weight Range Max:
  321 +
  322 + <div>
  323 + <div class="col-xs-12 col-sm-4">
  324 + Wingspan Min:
  325 + </div>
  326 + <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
  327 + <input type="number" value="0.00" ng-model="customWingspanData.wingspanMin" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
  328 + </div>
  329 + <div class="col-xs-12 col-sm-4" style="padding-left: 5px;">
  330 + ft.
  331 + </div>
  332 + <div class="clearfix"></div>
  333 + <br/>
  334 + <div class="col-xs-12 col-sm-4">
  335 + Wingspan Max:
  336 + </div>
  337 + <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
  338 + <input type="number" value="0.00" ng-model="customWingspanData.wingspanMax" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
  339 + </div>
  340 + <div class="col-xs-12 col-sm-4" style="padding-left: 5px;">
  341 + ft.
  342 + </div>
  343 + <div class="clearfix"></div>
  344 + <br/>
263 345 </div>
264   - <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
265   - <input type="number" value="0.00" ng-model="customRampData.rampFeesAndAvoidanceList.weightRangeMax" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
  346 +
  347 + <div>
  348 + <div class="col-xs-12 col-sm-4">
  349 + Ramp/Facil. Fee($):
  350 + </div>
  351 + <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
  352 + <input type="number" value="0" ng-model="customWingspanData.rampFees" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
  353 + </div>
  354 + <div class="clearfix"></div>
  355 + <br/>
266 356 </div>
267   - <div class="col-xs-12 col-sm-4" style="padding-left: 5px;">
268   - lbs.
  357 + <div>
  358 + <div class="col-xs-12 col-sm-4">
  359 + Avoidance:
  360 + </div>
  361 + <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
  362 + <input type="number" value="0" ng-model="customWingspanData.avoidance" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
  363 + </div>
  364 + <div class="col-xs-12 col-sm-4" style="padding-left: 5px;">
  365 + gal.
  366 + </div>
  367 + <div class="clearfix"></div>
269 368 </div>
270   - <div class="clearfix"></div>
271   - <br/>
  369 +
272 370 </div>
273 371  
274   - <div>
  372 + <div ng-show="showTailForm">
  373 +
275 374 <div class="col-xs-12 col-sm-4">
276   - Ramp/Facil. Fee($):
  375 + Type:
277 376 </div>
278 377 <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
279   - <input type="number" value="0" ng-model="customRampData.rampFeesAndAvoidanceList.rampFees" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
  378 + <select class="form-control" style="border-radius: 0; height: 26px; padding: 0;" ng-model="customRampDataCraft.aircraftType" ng-change="openRampModal()">
  379 + <option ng-repeat="modalsNew in dropOptions" value="{{modalsNew.size}}">{{modalsNew.size}}</option>
  380 + </select>
280 381 </div>
281 382 <div class="clearfix"></div>
282 383 <br/>
283   - </div>
284   - <div>
285   - <div class="col-xs-12 col-sm-4">
286   - Avoidance:
  384 +
  385 + <div>
  386 + <div class="col-xs-12 col-sm-4">
  387 + Tail Numbers:
  388 + </div>
  389 + <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
  390 + <select class="form-control" style="border-radius: 0; height: 26px; padding: 0;" ng-model="customTailData.tailNumber">
  391 + <!-- <option ng-repeat="crafts in aircrafts" value="{{crafts}}">{{crafts}}</option> -->
  392 + </select>
  393 + </div>
  394 + <div class="clearfix"></div>
  395 + <br/>
287 396 </div>
288   - <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
289   - <input type="number" value="0" ng-model="customRampData.rampFeesAndAvoidanceList.avoidance" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
  397 +
  398 + <div>
  399 + <div class="col-xs-12 col-sm-4">
  400 + Ramp/Facil. Fee($):
  401 + </div>
  402 + <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
  403 + <input type="number" value="0" ng-model="customTailData.rampFees" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
  404 + </div>
  405 + <div class="clearfix"></div>
  406 + <br/>
290 407 </div>
291   - <div class="col-xs-12 col-sm-4" style="padding-left: 5px;">
292   - gal.
  408 + <div>
  409 + <div class="col-xs-12 col-sm-4">
  410 + Avoidance:
  411 + </div>
  412 + <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
  413 + <input type="number" value="0" ng-model="customTailData.avoidance" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
  414 + </div>
  415 + <div class="col-xs-12 col-sm-4" style="padding-left: 5px;">
  416 + gal.
  417 + </div>
  418 + <div class="clearfix"></div>
293 419 </div>
294   - <div class="clearfix"></div>
  420 +
295 421 </div>
296 422  
297 423 </div>
298 424 <div class="customModelFooter text-center">
299   - <input type="submit" value="Save" class="btn" ng-click="addCustomRamp(customRampData)">
  425 + <input type="submit" value="Save" class="btn" ng-show="showWeightForm" ng-click="addCustomRampNew(customRampData)">
  426 + <input type="submit" value="Save" class="btn" ng-show="showMakeModelForm" ng-click="addCustomRampNew(customMakeData)">
  427 + <input type="submit" value="Save" class="btn" ng-show="showWingspanForm" ng-click="addCustomRampNew(customWingspanData)">
  428 + <input type="submit" value="Save" class="btn" ng-show="showTailForm" ng-click="addCustomRampNew(customTailData)">
300 429 <button class="btn" ng-click="closeRampFeeModel()">Cancel</button>
301 430 </div>
302 431 </div>
303 432 </div>
304 433 </div>
305 434  
  435 +<div class="customConfirmPopBackdrop" id="confirm1">
  436 + <div class="customModalInner">
  437 + <div class="customModelBody" style="border-radius: 5px 5px 0 0;">
  438 + <table>
  439 + <tr>
  440 + <td>
  441 + <img src="img/info.png" style="width: 50px;">
  442 + </td>
  443 + <td>
  444 + <p style="padding: 5px 10px; margin-bottom: 0;">Are you sure that you want to delete this Ramp Fee Template ?</p>
  445 + </td>
  446 + </tr>
  447 + </table>
  448 + </div>
  449 + <div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;">
  450 + <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="saveAndCloseConfirm()">Yes</button>
  451 + <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelAndCloseConfirm()">Cancel</button>
  452 + </div>
  453 + </div>
  454 +</div>
306 455  
307 456  
308 457  
309 458  
310   -
311   -
312   -
313   -
314   -
315   -
316   -
317   -
318   -<div class="container" style="display: none;">
319   - <div class="row">
320   - <div class="col-md-10">
321   - <div class="widget stacked">
322   - <div class="widget-header">
323   - <i class="fa fa-pencil"></i>
324   - <h3>Ramp Fee Manager</h3>
325   - <select>
326   - <option>Ramp Fee By Category</option>
327   - <option>Make And Model</option>
328   - <option>Weight</option>
329   - <option>Wingspan</option>
330   - </select>
331   - </div>
332   - <!-- /widget-header -->
333   - <div class="widget-content">
334   - <h3>Ramp Fees & Avoidance</h3>
335   - <section id="accordions">
336   - <div class="newCustomAccordian">
337   - <!-- tab 1 -->
338   - <div class="customAccordianHeader customActive" id="customTabs1">
339   - <span>Jet Aircraft</span>
340   - <select class="form-control">
341   - <option>Pricing Structure</option>
342   - <option>Retail-(minus)</option>
343   - <option>Cost+(plus)</option>
344   - <option>Direct=(equals)</option>
345   - </select>
346   - <input type="text" name="" class="form-control" value="$1.7500">
347   - <div class="pull-right">
348   - <button class="btn btn-success">Save</button>
349   - <button class="btn btn-danger">Delete</button>
350   - <button class="btn btn-default" id="customTabToggle1" style="display: none;">Edit</button>
351   - </div>
352   - <div class="clearfix"></div>
353   - </div>
354   - <div class="customAccordianTabBody" id="customTabsBody1">
355   - <table class="customTableWithFilter">
356   - <thead>
357   - <tr>
358   - <th>
359   - <span class="pull-left">1-250 gal.</span>
360   - <i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>
361   - </th>
362   - <th>
363   - <span class="pull-left">1-250 gal.</span>
364   - <i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>
365   - </th>
366   - <th>
367   - <input type="text" placeholder="min" name=""> -
368   - <input type="text" placeholder="max" name="">
369   - <span>gal.</span>
370   - </th>
371   - <th> &nbsp; </th>
372   - </tr>
373   - </thead>
374   - <tbody>
375   - <tr>
376   - <td>
377   - <span class="pull-left">-$0.0000</span> &nbsp;
378   - <span class="pull-right">($1.7500)</span>
379   - </td>
380   - <td>
381   - <span class="pull-left">-$0.0000</span> &nbsp;
382   - <span class="pull-right">($1.7500)</span>
383   - </td>
384   - <td>
385   - <span>$</span>
386   - <input type="text" placeholder="margin" class="tierTextBox" name="">
387   - <button class="addTierButton">Add Tier</button>
388   - </td>
389   - <td>
390   - <i class="fa fa-trash-o" aria-hidden="true"></i>
391   - </td>
392   - </tr>
393   - </tbody>
394   - </table>
395   - <textarea class="form-control resizeTextarea" placeholder="Message..."></textarea>
396   - </div>
397   -
398   - <!-- tab 2 -->
399   -
400   - <div class="customAccordianHeader" id="customTabs2">
401   - <span>Jet Aircraft</span>
402   - <select class="form-control" disabled="true">
403   - <option>Pricing Structure</option>
404   - <option>Retail-(minus)</option>
405   - <option>Cost+(plus)</option>
406   - <option>Direct=(equals)</option>
407   - </select>
408   - <input type="text" name="" disabled="true" class="form-control" value="$1.7500">
409   - <div class="pull-right">
410   - <button class="btn btn-success" style="display: none;">Save</button>
411   - <button class="btn btn-danger" style="display: none;">Delete</button>
412   - <button class="btn btn-default" id="customTabToggle2">Edit</button>
413   - </div>
414   - <div class="clearfix"></div>
415   - </div>
416   - <div class="customAccordianTabBody" id="customTabsBody2" style="display: none;">
417   - <table class="customTableWithFilter">
418   - <thead>
419   - <tr>
420   - <th>
421   - <span class="pull-left">1-250 gal.</span>
422   - <i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>
423   - </th>
424   - <th>
425   - <span class="pull-left">1-250 gal.</span>
426   - <i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>
427   - </th>
428   - <th>
429   - <input type="text" placeholder="min" name=""> -
430   - <input type="text" placeholder="max" name="">
431   - <span>gal.</span>
432   - </th>
433   - <th> &nbsp; </th>
434   - </tr>
435   - </thead>
436   - <tbody>
437   - <tr>
438   - <td>
439   - <span class="pull-left">-$0.0000</span> &nbsp;
440   - <span class="pull-right">($1.7500)</span>
441   - </td>
442   - <td>
443   - <span class="pull-left">-$0.0000</span> &nbsp;
444   - <span class="pull-right">($1.7500)</span>
445   - </td>
446   - <td>
447   - <span>$</span>
448   - <input type="text" placeholder="margin" class="tierTextBox" name="">
449   - <button class="addTierButton">Add Tier</button>
450   - </td>
451   - <td>
452   - <i class="fa fa-trash-o" aria-hidden="true"></i>
453   - </td>
454   - </tr>
455   - </tbody>
456   - </table>
457   - <textarea class="form-control resizeTextarea" placeholder="Message..."></textarea>
458   - </div>
459   -
460   - <!-- tab 3 -->
461   -
462   - <div class="customAccordianHeader" id="customTabs3">
463   - <span>Jet Aircraft</span>
464   - <select class="form-control" disabled="true">
465   - <option>Pricing Structure</option>
466   - <option>Retail-(minus)</option>
467   - <option>Cost+(plus)</option>
468   - <option>Direct=(equals)</option>
469   - </select>
470   - <input type="text" name="" disabled="true" class="form-control" value="$1.7500">
471   - <div class="pull-right">
472   - <button class="btn btn-success" style="display: none;">Save</button>
473   - <button class="btn btn-danger" style="display: none;">Delete</button>
474   - <button class="btn btn-default" id="customTabToggle3">Edit</button>
475   - </div>
476   - <div class="clearfix"></div>
477   - </div>
478   - <div class="customAccordianTabBody" id="customTabsBody3" style="display: none;">
479   - <table class="customTableWithFilter">
480   - <thead>
481   - <tr>
482   - <th>
483   - <span class="pull-left">1-250 gal.</span>
484   - <i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>
485   - </th>
486   - <th>
487   - <span class="pull-left">1-250 gal.</span>
488   - <i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>
489   - </th>
490   - <th>
491   - <input type="text" placeholder="min" name=""> -
492   - <input type="text" placeholder="max" name="">
493   - <span>gal.</span>
494   - </th>
495   - <th> &nbsp; </th>
496   - </tr>
497   - </thead>
498   - <tbody>
499   - <tr>
500   - <td>
501   - <span class="pull-left">-$0.0000</span> &nbsp;
502   - <span class="pull-right">($1.7500)</span>
503   - </td>
504   - <td>
505   - <span class="pull-left">-$0.0000</span> &nbsp;
506   - <span class="pull-right">($1.7500)</span>
507   - </td>
508   - <td>
509   - <span>$</span>
510   - <input type="text" placeholder="margin" class="tierTextBox" name="">
511   - <button class="addTierButton">Add Tier</button>
512   - </td>
513   - <td>
514   - <i class="fa fa-trash-o" aria-hidden="true"></i>
515   - </td>
516   - </tr>
517   - </tbody>
518   - </table>
519   - <textarea class="form-control resizeTextarea" placeholder="Message..."></textarea>
520   - </div>
521   -
522   - <!-- tab 4 -->
523   -
524   - <div class="customAccordianHeader" id="customTabs4">
525   - <span>Jet Aircraft</span>
526   - <select class="form-control" disabled="true">
527   - <option>Pricing Structure</option>
528   - <option>Retail-(minus)</option>
529   - <option>Cost+(plus)</option>
530   - <option>Direct=(equals)</option>
531   - </select>
532   - <input type="text" name="" disabled="true" class="form-control" value="$1.7500">
533   - <div class="pull-right">
534   - <button class="btn btn-success" style="display: none;">Save</button>
535   - <button class="btn btn-danger" style="display: none;">Delete</button>
536   - <button class="btn btn-default" id="customTabToggle4">Edit</button>
537   - </div>
538   - <div class="clearfix"></div>
539   - </div>
540   - <div class="customAccordianTabBody" id="customTabsBody4" style="display: none;">
541   - <table class="customTableWithFilter">
542   - <thead>
543   - <tr>
544   - <th>
545   - <span class="pull-left">1-250 gal.</span>
546   - <i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>
547   - </th>
548   - <th>
549   - <span class="pull-left">1-250 gal.</span>
550   - <i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>
551   - </th>
552   - <th>
553   - <input type="text" placeholder="min" name=""> -
554   - <input type="text" placeholder="max" name="">
555   - <span>gal.</span>
556   - </th>
557   - <th> &nbsp; </th>
558   - </tr>
559   - </thead>
560   - <tbody>
561   - <tr>
562   - <td>
563   - <span class="pull-left">-$0.0000</span> &nbsp;
564   - <span class="pull-right">($1.7500)</span>
565   - </td>
566   - <td>
567   - <span class="pull-left">-$0.0000</span> &nbsp;
568   - <span class="pull-right">($1.7500)</span>
569   - </td>
570   - <td>
571   - <span>$</span>
572   - <input type="text" placeholder="margin" class="tierTextBox" name="">
573   - <button class="addTierButton">Add Tier</button>
574   - </td>
575   - <td>
576   - <i class="fa fa-trash-o" aria-hidden="true"></i>
577   - </td>
578   - </tr>
579   - </tbody>
580   - </table>
581   - <textarea class="form-control resizeTextarea" placeholder="Message..."></textarea>
582   - </div>
583   -
584   -
585   - </div>
586   - </section>
587   - <div class="row">&nbsp;</div>
588   - <div class="row">
589   - <div class="col-md-7">
590   - </div>
591   - <div class="col-md-5">
592   - <div class="form-group">
593   - <div class="col-lg-4"></div>
594   - <div class="col-lg-8">
595   - <button type="submit" class="btn btn-success"><i class="icon-ok"></i> Save Form</button>&nbsp;&nbsp;
596   - <button type="reset" class="btn btn-default">Cancel</button>
597   - </div>
598   - </div>
599   - </div>
600   - </div>
601   - </div>
602   - <!-- /widget-content -->
603   - </div>
604   - <!-- /widget -->
605   - </div>
606   - <!-- /span6 -->
607   - </div>
608   - <!-- /span12 -->
609   -</div> <!-- /container 1 -->
610 459 <!-- Le javascript
611 460 ================================================== -->
612 461 <!-- Placed at the end of the document so the pages load faster -->
... ...
app/partials/fuelManager/fuelManager.service.js
Diff comments   View file @68c7676
... ... @@ -75,7 +75,7 @@
75 75 var deferred = $q.defer();
76 76 $http({
77 77 method : 'GET',
78   - url : BASE_URL.url +'/getRampFeeBySize/CUSTOM',
  78 + url : BASE_URL.url +'/rampFeesAndAvoidance/getRampFeeBySize/'+id,
79 79 headers : {'Content-Type': 'application/json'},
80 80 })
81 81 .then(function (result){
... ... @@ -86,6 +86,21 @@
86 86 return deferred.promise;
87 87  
88 88 }
  89 +
  90 + this.deleteCustomRamp = function(id){
  91 + var deferred = $q.defer();
  92 + $http({
  93 + method : 'DELETE',
  94 + url : BASE_URL.url +'/rampFeesAndAvoidance/'+id,
  95 + headers : {'Content-Type': 'application/json'},
  96 + })
  97 + .then(function (result){
  98 + deferred.resolve(result.data);
  99 + },function (result){
  100 + deferred.resolve(result.data);
  101 + })
  102 + return deferred.promise;
  103 + }
89 104  
90 105 }
91 106  
... ...
app/partials/updateFuelManager/updateFuelManager.html
Diff comments   View file @68c7676
... ... @@ -47,7 +47,7 @@
47 47 <input type="text" class="form-control" ng-model="fuelPricing.fuelPricing.papMargin" style="height:31px; width: 50px; padding: 6px 6px;">
48 48 </td>
49 49 <td>
50   - <span style="line-height: 31px; color: #1ab394;">$ {{fuelPricing.fuelPricing.cost -- fuelPricing.fuelPricing.papMargin}}</span>
  50 + <span style="line-height: 31px; color: #1ab394;">$ {{fuelPricing.fuelPricing.cost -- fuelPricing.fuelPricing.papMargin | number : 2 }}</span>
51 51 </td>
52 52 <td>
53 53 <input type="text" class="form-control" datepicker ng-model="fuelPricing.fuelPricing.expirationDate" style="height:31px; width: 100px; padding: 6px 6px;">
... ... @@ -115,7 +115,7 @@
115 115  
116 116 <input type="text" placeholder="max" style="width: 36px;" ng-model="tier.margin" ng-show="showEditTier"> &nbsp;
117 117  
118   - <span class="pull-right maxTierSpan" ng-hide="showEditTier">(${{tier.marginTotal}})</span>
  118 + <span class="pull-right maxTierSpan" ng-hide="showEditTier">(${{tier.marginTotal | number : 2}})</span>
119 119  
120 120 <button class="addTierBtn" ng-click="editTier(tier, $parent.$index)" ng-show="showEditTier">Save</button>
121 121  
... ... @@ -201,7 +201,7 @@
201 201 <input type="text" class="form-control" ng-model="fuelPricing.futureFuelPricing.cost" style="height:31px; width: 50px; padding: 6px 6px;">
202 202 </td>
203 203 <td>
204   - <span style="line-height: 31px; color: #1ab394;">$ {{fuelPricing.futureFuelPricing.cost -- fuelPricing.fuelPricing.papMargin}}</span>
  204 + <span style="line-height: 31px; color: #1ab394;">$ {{fuelPricing.futureFuelPricing.cost -- fuelPricing.fuelPricing.papMargin | number : 2}}</span>
205 205 </td>
206 206 <td>
207 207 <input type="text" class="form-control" ng-disabled="fuelPricing.futureFuelPricing.cost == undefined || fuelPricing.futureFuelPricing.cost == null || fuelPricing.futureFuelPricing.cost == ''" datepicker ng-model="fuelPricing.futureFuelPricing.deployDate" style="height:31px; width: 100px; padding: 6px 6px;">
... ... @@ -271,7 +271,7 @@
271 271  
272 272 <input type="text" placeholder="max" style="width: 36px;" ng-model="tier.margin" ng-show="showEditTier"> &nbsp;
273 273  
274   - <span class="pull-right maxTierSpan" ng-hide="showEditTier">(${{tier.marginTotal}})</span>
  274 + <span class="pull-right maxTierSpan" ng-hide="showEditTier">(${{tier.marginTotal | number : 2}})</span>
275 275  
276 276 <button class="addTierBtn" ng-click="editVtypeTier(tier, $parent.$index)" ng-show="showEditTier">Save</button>
277 277  
... ...