viithiisys / Acufuel

Download as
Browse Code ยป

Commit 20f645d6f34fbfbcbae544599291659b330b3685

Authored by Kuldeep Arora
1 parent 618caf10c8
Exists in master

fuelorder

Showing 6 changed files with 42 additions and 33 deletions   Show diff stats
app/partials/customers/customers.controller.js
Diff comments   View file @20f645d
... ... @@ -79,6 +79,7 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta
79 79 function getAllCompanies() {
80 80 CustomersService.getAllCompanies().then(function(result) {
81 81 $scope.companyList = result;
  82 + console.log("result",result)
82 83 for (var i = 0; i < $scope.companyList.length; i++) {
83 84 if ($scope.companyList[i].companyContact != null) {
84 85 if ($scope.companyList[i].companyContact.contactNumber != null || $scope.companyList[i].companyContact.contactNumber != undefined) {
... ... @@ -376,7 +377,6 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta
376 377 /*add a fuel order*/
377 378 $scope.getOrders = function() {
378 379 fuelOrdersService.getOrders().then(function(result) {
379   - //console.log("==get orders===",result)
380 380 $scope.orderdata = result;
381 381 for (var i = 0; i < $scope.orderdata.length; i++) {
382 382 $scope.orderdata[i].upliftDateS = new Date($scope.orderdata[i].upliftDate);
... ... @@ -438,7 +438,7 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta
438 438 $scope.fuelData.aircraftName = aircraftObj.tail;
439 439 $scope.fuelData.make = aircraftObj.make;
440 440 $scope.fuelData.model = aircraftObj.model;
441   - $scope.fuelData.fuelOn = $scope.order.fuelOn;
  441 + //$scope.fuelData.fuelOn = $scope.order.fuelOn;
442 442 $scope.fuelData.invoiced = $scope.order.invoiced;
443 443 $scope.fuelData.volume = $scope.order.volume;
444 444 // $scope.fuelData.source = $scope.order.source;
... ... @@ -480,7 +480,11 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta
480 480  
481 481 $scope.fuelData.status = $scope.order.status;
482 482 }
483   -
  483 + if($scope.fuelData.fuelOn === null || $scope.fuelData.fuelOn ===undefined){
  484 + $scope.fuelData.fuelOn = "Arrival"; //default fuelon
  485 + }else {
  486 + $scope.fuelData.fuelOn = $scope.order.fuelOn ;
  487 + }
484 488 if($scope.baseTenant && $scope.contractFuelVendor ){
485 489 $scope.fuelData.source = "Tenant/CAA" ;
486 490 }else if($scope.baseTenant)
... ...
app/partials/customers/customers.html
Diff comments   View file @20f645d
... ... @@ -113,6 +113,9 @@
113 113 <td data-title="'Main Phone'" filter="{newContactNumber: 'text'}" sortable="'newContactNumber'" ui-sref="app.viewCompany({id : row.id})">
114 114 {{row.newContactNumber}}
115 115 </td>
  116 + <td data-title="'Tail'" filter="{aircraftName: 'text'}" sortable="'aircraftName'" ui-sref="app.viewCompany({id : row.id})">
  117 + {{row.aircraftName}}
  118 + </td>
116 119 <td data-title="'Primary Contact'" filter="{primaryContactName: 'text'}" sortable="'primaryContactName'" ui-sref="app.viewCompany({id : row.id})">
117 120 {{row.primaryContactName}}
118 121 </td>
... ... @@ -723,7 +726,7 @@
723 726 </div>
724 727 <div class="pull-left" style="width: calc(100% - 110px);">
725 728 <select class="form-control" ng-model="order.fuelOn" style="width: 100%;">
726   - <option value="" disabled selected hidden>Select...</option>
  729 + <option value="" disabled selected hidden>Arrival</option>
727 730 <option value="Arrival">Arrival</option>
728 731 <option value="Departure">Departure</option>
729 732 </select>
... ...
app/partials/enterFuelOrder/enterFuelOrder.controller.js
Diff comments   View file @20f645d
... ... @@ -120,7 +120,7 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
120 120 $scope.order.aircraftName = aircraftObj.tail;
121 121 $scope.order.make = aircraftObj.make;
122 122 $scope.order.model = aircraftObj.model;
123   - $scope.order.fuelOn = $scope.order.fuelOn;
  123 + //$scope.order.fuelOn = $scope.order.fuelOn;
124 124  
125 125 $scope.order.invoiced = $scope.order.invoiced;
126 126 $scope.order.volume = $scope.order.volume;
... ... @@ -161,6 +161,11 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
161 161  
162 162 $scope.order.status = $scope.order.status;
163 163 }
  164 + if($scope.order.fuelOn === null || $scope.order.fuelOn ===undefined){
  165 + $scope.order.fuelOn = "Arrival"; //default fuelon
  166 + }else {
  167 + $scope.order.fuelOn = $scope.order.fuelOn ;
  168 + }
164 169  
165 170 if($scope.baseTenant && $scope.contractFuelVendor ){
166 171 $scope.order.source = "Tenant/CAA" ;
... ... @@ -171,7 +176,7 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
171 176 $scope.order.source = "CAA Member";
172 177 }
173 178  
174   - //console.log("===order====",$scope.order);
  179 + console.log("===order====",$scope.order);
175 180  
176 181 $scope.dispatchOrder.fuelOrderList.push($scope.order);
177 182  
... ...
app/partials/enterFuelOrder/enterFuelOrder.html
Diff comments   View file @20f645d
... ... @@ -164,7 +164,7 @@
164 164 </div>
165 165 <div class="pull-left" style="width: calc(100% - 110px);">
166 166 <select class="form-control" ng-model="order.fuelOn" style="width: 100%;">
167   - <option value="" disabled selected hidden>Select...</option>
  167 + <option value="" disabled selected hidden>Arrival</option>
168 168 <option value="Arrival">Arrival</option>
169 169 <option value="Departure">Departure</option>
170 170 </select>
... ...
app/partials/fuelOrders/fuelOrders.controller.js
Diff comments   View file @20f645d
... ... @@ -116,24 +116,18 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
116 116 for(var i=0 ; i < $scope.orderdata.length ; i++){
117 117 $scope.orderdata[i].upliftDateS = new Date($scope.orderdata[i].upliftDate);
118 118 $scope.orderdata[i].departingDateS = new Date($scope.orderdata[i].departingDate);
  119 + $scope.orderdata[i].fuelingDate = new Date($scope.orderdata[i].fuelingDate);
119 120  
120 121 var str = "" + ($scope.orderdata[i].upliftDateS.getMonth() + 1) + "/" + $scope.orderdata[i].upliftDateS.getDate() + "/" + $scope.orderdata[i].upliftDateS.getFullYear();
121 122 var departingStr = "" + ($scope.orderdata[i].departingDateS.getMonth() + 1) + "/" + $scope.orderdata[i].departingDateS.getDate() + "/" + $scope.orderdata[i].departingDateS.getFullYear();
  123 + var fuelingDateStr = "" + ($scope.orderdata[i].fuelingDate.getMonth() + 1) + "/" + $scope.orderdata[i].fuelingDate.getDate() + "/" + $scope.orderdata[i].fuelingDate.getFullYear();
122 124 $scope.orderdata[i].upliftDateString = str;
123 125 $scope.orderdata[i].departingDateString = departingStr;
124   - //not working in input type Time
125   - /*if ($scope.orderdata[i].etaTime != null) {
126   - var now = new Date();
127   -
128   - var hr = $scope.orderdata[i].etaTime.slice(0, 2);
129   - var mm = $scope.orderdata[i].etaTime.slice(3, 5);
130   - now.setHours(hr);
131   - now.setMinutes(mm);
132   - $scope.orderdata[i].etaTime = now;
133   - console.log("===eta====", now, hr, mm);
134   - }*/
  126 + $scope.orderdata[i].fuelingDate = fuelingDateStr;
  127 + //
135 128  
136 129 }
  130 + console.log("==result===",$scope.orderdata)
137 131  
138 132 $scope.displayFuelOrderList = new NgTableParams({
139 133 page: 1,
... ... @@ -292,7 +286,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
292 286 $scope.fuelData.aircraftName = aircraftObj.tail;
293 287 $scope.fuelData.make = aircraftObj.make;
294 288 $scope.fuelData.model = aircraftObj.model;
295   - $scope.fuelData.fuelOn = $scope.order.fuelOn;
  289 + // $scope.fuelData.fuelOn = $scope.order.fuelOn;
296 290 $scope.fuelData.invoiced = $scope.order.invoiced;
297 291 $scope.fuelData.volume = $scope.order.volume;
298 292 // $scope.fuelData.source = $scope.order.source;
... ... @@ -334,6 +328,12 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
334 328  
335 329 $scope.fuelData.status = $scope.order.status;
336 330 }
  331 +
  332 + if($scope.fuelData.fuelOn === null || $scope.fuelData.fuelOn ===undefined){
  333 + $scope.fuelData.fuelOn = "Arrival"; //default fuelon
  334 + }else {
  335 + $scope.fuelData.fuelOn = $scope.order.fuelOn ;
  336 + }
337 337  
338 338 if($scope.baseTenant && $scope.contractFuelVendor ){
339 339 $scope.fuelData.source = "Tenant/CAA" ;
... ... @@ -395,7 +395,6 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
395 395 $scope.fuelData = {};
396 396 $scope.updateData = function() {
397 397 if($scope.editdata.etaTime != null && $scope.editdata.etdTime != null){
398   - if($scope.editdata.fuelOn != null || $scope.editdata.fuelOn != undefined) {
399 398 $scope.showLoader = true;
400 399 $scope.fuelData.aircraftName = $scope.editdata.aircraftName;
401 400 $scope.fuelData.companyName = $scope.editdata.companyName;
... ... @@ -429,8 +428,12 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
429 428 $scope.fuelData.etaTime = $scope.editdata.etaTime;
430 429 $scope.fuelData.etdTime = $scope.editdata.etdTime;
431 430 $scope.fuelData.certificateType = $scope.editdata.certificateType;
432   - $scope.fuelData.fuelOn = $scope.editdata.fuelOn;
433   -
  431 + // $scope.fuelData.fuelOn = $scope.editdata.fuelOn;
  432 + if($scope.fuelData.fuelOn === null || $scope.fuelData.fuelOn ===undefined){
  433 + $scope.fuelData.fuelOn = "Arrival"; //default fuelon
  434 + }else {
  435 + $scope.fuelData.fuelOn = $scope.editdata.fuelOn ;
  436 + }
434 437 $scope.dispatchOrder.fuelOrderList.push($scope.fuelData);
435 438 fuelOrdersService.updateFuelOrder($scope.dispatchOrder).then(function(result) {
436 439 $scope.showLoader = false;
... ... @@ -443,13 +446,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
443 446 })
444 447  
445 448  
446   - } else{
447   - {
448   - toastr.error('Please select fuelOn.', {
449   - closeButton: true
450   - })
451   - }
452   - }
  449 +
453 450  
454 451 }else
455 452 {
... ...
app/partials/fuelOrders/fuelOrders.html
Diff comments   View file @20f645d
... ... @@ -95,8 +95,8 @@
95 95 <td data-title="'Company Name'" filter="{companyName: 'text'}" sortable="'companyName'" ng-click="editTableRow(row)">
96 96 {{row.companyName}}
97 97 </td>
98   - <td data-title="'Fueling date'" filter="{upliftDateString: 'text'}" sortable="'upliftDateString'" ng-click="editTableRow(row)">
99   - {{row.upliftDateString}}
  98 + <td data-title="'Fueling date'" filter="{fuelingDate: 'text'}" sortable="'fuelingDate'" ng-click="editTableRow(row)">
  99 + {{row.fuelingDate}}
100 100 </td>
101 101 <td data-title="'Tail #'" filter="{aircraftName: 'text'}" sortable="'aircraftName'" ng-click="editTableRow(row)">
102 102 {{row.aircraftName}}
... ... @@ -682,7 +682,7 @@
682 682 </div>
683 683 <div class="pull-left" style="width: calc(100% - 110px);">
684 684 <select class="form-control" ng-model="order.fuelOn" style="width: 100%;">
685   - <option value="" disabled selected hidden>Select...</option>
  685 + <option value="" disabled selected hidden>Arrival</option>
686 686 <option value="Arrival">Arrival</option>
687 687 <option value="Departure">Departure</option>
688 688 </select>
... ... @@ -851,7 +851,7 @@
851 851 </div>
852 852 <div class="pull-left" style="width: calc(100% - 110px);">
853 853 <select class="form-control" ng-model="editdata.fuelOn" style="width: 100%;">
854   - <option value="" disabled selected hidden>Select...</option>
  854 + <option value="" disabled selected hidden>Arrival</option>
855 855 <option value="Arrival">Arrival</option>
856 856 <option value="Departure">Departure</option>
857 857 </select>
... ...