viithiisys / Acufuel

Download as
Browse Code ยป

Commit d8cc21c7ada134a3bf04b1d911fde40aa2585e0a

Authored by Swarn Singh
1 parent a9e3a73659
Exists in master

fixed fuel vendor, undefined issue on view vendor

Showing 3 changed files with 58 additions and 49 deletions   Show diff stats
app/partials/updateFuelManager/updateFuelManager.controller.js
Diff comments   View file @d8cc21c
... ... @@ -413,22 +413,24 @@
413 413 console.log('$scope.newFuelPricing[i].fuelPricing.expirationDate', $scope.newFuelPricing[i].fuelPricing.expirationDate);
414 414 $scope.newFuelPricing[i].fuelPricing.expirationDate = $scope.newFuelPricing[i].fuelPricing.expirationDate.getTime();
415 415 }
  416 +
  417 + $scope.newFuelPricing[i].fuelPricing.papTotal = parseFloat($scope.newFuelPricing[i].fuelPricing.cost) + parseFloat($scope.newFuelPricing[i].fuelPricing.papMargin);
  418 + $scope.updateFuelPricing.fuelPricingList.push({
  419 + 'cost': $scope.newFuelPricing[i].fuelPricing.cost,
  420 + 'papMargin': $scope.newFuelPricing[i].fuelPricing.papMargin,
  421 + 'papTotal': $scope.newFuelPricing[i].fuelPricing.papTotal,
  422 + 'expirationDate': $scope.newFuelPricing[i].fuelPricing.expirationDate,
  423 + 'productId': $scope.newFuelPricing[i].id,
  424 + 'id': $scope.newFuelPricing[i].fuelPricing.id,
  425 + })
416 426  
417 427 }else{
418   - $scope.newFuelPricing[i].fuelPricing.cost = '';
  428 + /*$scope.newFuelPricing[i].fuelPricing.cost = '';
419 429 $scope.newFuelPricing[i].fuelPricing.papMargin = '';
420 430 $scope.newFuelPricing[i].fuelPricing.papTotal = '';
421   - $scope.newFuelPricing[i].fuelPricing.expirationDate = '';
  431 + $scope.newFuelPricing[i].fuelPricing.expirationDate = '';*/
422 432 }
423 433  
424   - $scope.updateFuelPricing.fuelPricingList.push({
425   - 'cost': $scope.newFuelPricing[i].fuelPricing.cost,
426   - 'papMargin': $scope.newFuelPricing[i].fuelPricing.papMargin,
427   - 'papTotal': $scope.newFuelPricing[i].fuelPricing.papTotal,
428   - 'expirationDate': $scope.newFuelPricing[i].fuelPricing.expirationDate,
429   - 'productId': $scope.newFuelPricing[i].id,
430   - 'id': $scope.newFuelPricing[i].fuelPricing.id,
431   - })
432 434 }
433 435 updateFuelManagerService.updateFuelPricing($scope.updateFuelPricing).then(function(result) {
434 436 toastr.success('Successfully Updated', {
... ... @@ -479,41 +481,45 @@
479 481 $scope.updateFutureFuelPricingClick = function(){
480 482 $scope.showLoader = true;
481 483 for (var i = 0; i<$scope.newFuelPricing.length; i++) {
  484 + //console.log(parseFloat($scope.newFuelPricing[i].futureFuelPricing.cost) + parseFloat($scope.newFuelPricing[i].fuelPricing.papMargin));
482 485 if ($scope.newFuelPricing[i].futureFuelPricing != null) {
483   - $scope.newFuelPricing[i].futureFuelPricing.papTotal = parseFloat($scope.newFuelPricing[i].futureFuelPricing.cost) + parseFloat($scope.newFuelPricing[i].fuelPricing.papMargin);
484   - if ($scope.newFuelPricing[i].futureFuelPricing.cost == null) {
485   - $scope.newFuelPricing[i].futureFuelPricing.cost = '';
486   - }
487   - if ($scope.newFuelPricing[i].futureFuelPricing.papMargin == null) {
488   - $scope.newFuelPricing[i].futureFuelPricing.papMargin = '';
489   - }
490   - if ($scope.newFuelPricing[i].futureFuelPricing.papTotal == null) {
491   - $scope.newFuelPricing[i].futureFuelPricing.papTotal = '';
492   - }
493   - if ($scope.newFuelPricing[i].futureFuelPricing.expirationDate == null) {
494   - $scope.newFuelPricing[i].futureFuelPricing.expirationDate = '';
495   - }else{
496   - $scope.newFuelPricing[i].futureFuelPricing.expirationDate = new Date($scope.newFuelPricing[i].futureFuelPricing.expirationDate);
497   - console.log('$scope.newFuelPricing[i].futureFuelPricing.expirationDate', $scope.newFuelPricing[i].futureFuelPricing.expirationDate);
498   - $scope.newFuelPricing[i].futureFuelPricing.expirationDate = $scope.newFuelPricing[i].futureFuelPricing.expirationDate.getTime();
499   - }
500   - if ($scope.newFuelPricing[i].futureFuelPricing.deployDate == null) {
501   - $scope.newFuelPricing[i].futureFuelPricing.deployDate = '';
502   - }else{
503   - $scope.newFuelPricing[i].futureFuelPricing.deployDate = new Date($scope.newFuelPricing[i].futureFuelPricing.deployDate);
504   - console.log('$scope.newFuelPricing[i].futureFuelPricing.deployDate', $scope.newFuelPricing[i].futureFuelPricing.deployDate);
505   - $scope.newFuelPricing[i].futureFuelPricing.deployDate = $scope.newFuelPricing[i].futureFuelPricing.deployDate.getTime();
  486 + if ($scope.newFuelPricing[i].futureFuelPricing.cost != null || $scope.newFuelPricing[i].futureFuelPricing.cost != '' || $scope.newFuelPricing[i].futureFuelPricing.cost != undefined) {
  487 + $scope.newFuelPricing[i].futureFuelPricing.papTotal = parseFloat($scope.newFuelPricing[i].futureFuelPricing.cost) + parseFloat($scope.newFuelPricing[i].fuelPricing.papMargin);
  488 + if ($scope.newFuelPricing[i].futureFuelPricing.cost == null) {
  489 + $scope.newFuelPricing[i].futureFuelPricing.cost = '';
  490 + }
  491 + if ($scope.newFuelPricing[i].futureFuelPricing.papMargin == null) {
  492 + $scope.newFuelPricing[i].futureFuelPricing.papMargin = '';
  493 + }
  494 + if ($scope.newFuelPricing[i].futureFuelPricing.papTotal == null) {
  495 + $scope.newFuelPricing[i].futureFuelPricing.papTotal = '';
  496 + }
  497 + if ($scope.newFuelPricing[i].futureFuelPricing.nextExpiration == null) {
  498 + $scope.newFuelPricing[i].futureFuelPricing.nextExpiration = '';
  499 + }else{
  500 + $scope.newFuelPricing[i].futureFuelPricing.nextExpiration = new Date($scope.newFuelPricing[i].futureFuelPricing.nextExpiration);
  501 + console.log('$scope.newFuelPricing[i].futureFuelPricing.nextExpiration', $scope.newFuelPricing[i].futureFuelPricing.nextExpiration);
  502 + $scope.newFuelPricing[i].futureFuelPricing.nextExpiration = $scope.newFuelPricing[i].futureFuelPricing.nextExpiration.getTime();
  503 + }
  504 + if ($scope.newFuelPricing[i].futureFuelPricing.deployDate == null) {
  505 + $scope.newFuelPricing[i].futureFuelPricing.deployDate = '';
  506 + }else{
  507 + $scope.newFuelPricing[i].futureFuelPricing.deployDate = new Date($scope.newFuelPricing[i].futureFuelPricing.deployDate);
  508 + $scope.newFuelPricing[i].futureFuelPricing.deployDate = $scope.newFuelPricing[i].futureFuelPricing.deployDate.getTime();
  509 + }
  510 +
  511 + $scope.newFuelPricing[i].futureFuelPricing.papTotal = parseFloat($scope.newFuelPricing[i].futureFuelPricing.cost) + parseFloat($scope.newFuelPricing[i].fuelPricing.papMargin);
  512 + $scope.updateFutureFuelPricing.futureFuelPricingList.push({
  513 + 'cost': $scope.newFuelPricing[i].futureFuelPricing.cost,
  514 + 'papMargin': $scope.newFuelPricing[i].fuelPricing.papMargin,
  515 + //'papTotal': $scope.newFuelPricing[i].futureFuelPricing.papTotal,
  516 + 'papTotal': $scope.newFuelPricing[i].futureFuelPricing.papTotal,
  517 + 'expirationDate': $scope.newFuelPricing[i].futureFuelPricing.nextExpiration,
  518 + 'deployDate': $scope.newFuelPricing[i].futureFuelPricing.deployDate,
  519 + 'productId': $scope.newFuelPricing[i].id,
  520 + 'id': $scope.newFuelPricing[i].futureFuelPricing.id,
  521 + })
506 522 }
507   - $scope.updateFutureFuelPricing.futureFuelPricingList.push({
508   - 'cost': $scope.newFuelPricing[i].futureFuelPricing.cost,
509   - 'papMargin': $scope.newFuelPricing[i].futureFuelPricing.papMargin,
510   - //'papTotal': $scope.newFuelPricing[i].futureFuelPricing.papTotal,
511   - 'papTotal': '1',
512   - 'expirationDate': $scope.newFuelPricing[i].futureFuelPricing.nextExpiration,
513   - 'deployDate': $scope.newFuelPricing[i].futureFuelPricing.deployDate,
514   - 'productId': $scope.newFuelPricing[i].id,
515   - 'id': $scope.newFuelPricing[i].futureFuelPricing.id,
516   - })
517 523 }else{
518 524 /*$scope.newFuelPricing[i].futureFuelPricing.cost = '';
519 525 $scope.newFuelPricing[i].futureFuelPricing.papMargin = '';
... ...
app/partials/updateFuelManager/updateFuelManager.html
Diff comments   View file @d8cc21c
... ... @@ -201,13 +201,13 @@
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.papMargin}}</span>
  204 + <span style="line-height: 31px; color: #1ab394;">$ {{fuelPricing.futureFuelPricing.cost -- fuelPricing.fuelPricing.papMargin}}</span>
205 205 </td>
206 206 <td>
207   - <input type="text" class="form-control" datepicker ng-model="fuelPricing.futureFuelPricing.deployDate" style="height:31px; width: 100px; padding: 6px 6px;">
  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;">
208 208 </td>
209 209 <td>
210   - <input type="text" class="form-control" datepicker ng-model="fuelPricing.futureFuelPricing.nextExpiration" style="height:31px; width: 100px; padding: 6px 6px;">
  210 + <input type="text" class="form-control" datepicker ng-disabled="fuelPricing.futureFuelPricing.cost == undefined || fuelPricing.futureFuelPricing.cost == null || fuelPricing.futureFuelPricing.cost == ''" ng-model="fuelPricing.futureFuelPricing.nextExpiration" style="height:31px; width: 100px; padding: 6px 6px;">
211 211 </td>
212 212 </tr>
213 213 </tbody>
... ...
app/partials/viewFuelVendor/viewFuelVendor.html
Diff comments   View file @d8cc21c
... ... @@ -144,7 +144,7 @@
144 144 <div class="widget-content">
145 145 <div class="row" style="margin-left:0px;">
146 146 <div class="col-md-7" style="padding-left: 0;">
147   - <h4 ng-show="showCompanyName">
  147 + <h4 ng-show="showCompanyName" ng-if="vendorData.vendorName != 'undefined'">
148 148 <b style="color:#F90;">{{vendorData.vendorName}}</b> &nbsp;<i class="fa fa-pencil-square-o" ng-click="company()" style="font-size: 14px;" aria-hidden="true"></i>
149 149 </h4>
150 150 <input type="tel" ng-hide="showCompanyName" ng-model="vendorData.vendorName" class="form-control" ng-blur="editData('showCompanyName')"/>
... ... @@ -186,7 +186,10 @@
186 186 </div>
187 187 </br>
188 188 <div class="new-address">
189   - <p ng-show="showAddress"><i class="fa fa-map-marker"></i> {{vendorData.addressOne}} {{vendorData.addressTwo}} &nbsp;<i class="fa fa-pencil-square-o" ng-click="addressChange()" aria-hidden="true"></i> </p>
  189 + <p ng-show="showAddress"><i class="fa fa-map-marker"></i>
  190 + <span ng-if="vendorData.addressOne != 'undefined'">{{vendorData.addressOne}} </span>
  191 + <span ng-if="vendorData.addressTwo != 'undefined'">{{vendorData.addressTwo}} </span>
  192 + &nbsp;<i class="fa fa-pencil-square-o" ng-click="addressChange()" aria-hidden="true"></i> </p>
190 193  
191 194 <div ng-hide="showAddress">
192 195 <label>Address1</label>
... ... @@ -207,7 +210,7 @@
207 210 </div>
208 211 <div>
209 212 <p style="margin-bottom: 0;"><b>Company Notes</b> &nbsp;<i class="fa fa-pencil-square-o" ng-click="showNote()" aria-hidden="true"></i></p>
210   - <p ng-show="showNoteData">{{vendorData.internalNote}}</p>
  213 + <p ng-show="showNoteData" ng-if="vendorData.internalNote != 'undefined'">{{vendorData.internalNote}}</p>
211 214 <textarea name="message" ng-hide="showNoteData" style="margin-bottom: 6px;" class="form-control" ng-model="vendorData.internalNote" ng-blur="editData('showNoteData')" rows="4" cols="34"></textarea>
212 215 </div>
213 216 <div class="dis">
... ...