From 5fe941ac619b100086bc3e100e3c529a2c183cb8 Mon Sep 17 00:00:00 2001
From: "kuldeep.arora" <kuldeep.arora@viithiisys.com>
Date: Wed, 23 May 2018 18:10:14 +0530
Subject: [PATCH] update fuel

---
 app/partials/fuelOrders/fuelOrders.controller.js | 17 ++++++++++++----
 app/partials/fuelOrders/fuelOrders.html          | 26 ++++++++++++++++--------
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/app/partials/fuelOrders/fuelOrders.controller.js b/app/partials/fuelOrders/fuelOrders.controller.js
index a4a86b0..fe35067 100644
--- a/app/partials/fuelOrders/fuelOrders.controller.js
+++ b/app/partials/fuelOrders/fuelOrders.controller.js
@@ -131,7 +131,9 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
             });
             $(document).ready(function(){
             	function changeSelectboxBg(){
-            		var myselect = document.getElementsByClassName('colorfulSelectbox');
+                setInterval(function(){
+
+            		  var myselect = document.getElementsByClassName('colorfulSelectbox');
 
                     for (var i = 0; i < myselect.length; i++) {
                       var colourIndex = $(myselect[i]).prop('selectedIndex');
@@ -142,12 +144,17 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
                      // console.log('colour', getColor);
                       myselect[i].blur();
                     }
+                }, 1000)
             	}
             	changeSelectboxBg();
               
-              $('.pagination , .recordCountSelect').click(function(){
+              /*$('.pagination , .recordCountSelect').click(function(){
             	  changeSelectboxBg();
               })
+              $('.input-filter').keydown(function(){
+                console.log('function..........');
+                changeSelectboxBg();
+              })*/
             })
           })
      }
@@ -369,9 +376,11 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
         $scope.fuelData.status = $scope.editdata.status 
         $scope.fuelData.tierBreak = $scope.editdata.tierBreak 
         $scope.fuelData.total = $scope.editdata.total 
-        $scope.fuelData.upliftDate = $scope.editdata.upliftDate 
+        
+        $scope.editdata.upliftDateString = new Date($scope.editdata.upliftDateString);
+        $scope.editdata.upliftDateString = $scope.editdata.upliftDateString.getTime();
       
-
+        $scope.fuelData.upliftDate = $scope.editdata.upliftDateString 
 
          $scope.dispatchOrder.fuelOrderList.push($scope.fuelData);
           fuelOrdersService.updateFuelOrder($scope.dispatchOrder).then(function(result) {
diff --git a/app/partials/fuelOrders/fuelOrders.html b/app/partials/fuelOrders/fuelOrders.html
index 2e3cfda..5cee431 100644
--- a/app/partials/fuelOrders/fuelOrders.html
+++ b/app/partials/fuelOrders/fuelOrders.html
@@ -605,9 +605,9 @@
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
                                        <select class="form-control" ng-model="order.aircraftName">
-									<option selected disabled value="">Select Aircraft</option>
-									<option ng-repeat="list in aircraftList" value="{{list.tail}}">{{list.tail}}</option>
-								</select>
+                      									<option selected disabled value="">Select Aircraft</option>
+                      									<option ng-repeat="list in aircraftList" value="{{list.tail}}">{{list.tail}}</option>
+                      								</select>
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
@@ -740,8 +740,8 @@
                                        <label class="new-input-label"><b>Fueling Date</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
-                                       <!--<input type="date" ng-model="editdata.departingDate" class="form-control"  placeholder="">-->
-                                       {{editdata.upliftDateString}}
+                                       <input type="text" ng-model="editdata.upliftDateString" class="form-control"  placeholder="" datepicker/> 
+                                       <!-- {{editdata.upliftDateString}} -->
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
@@ -821,11 +821,11 @@
                                        <label class="new-input-label"><b>Source</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
-                                       <!--<select ui-select2 ng-model="editdata.source"  style="width: 100%;">
+                                       <select ui-select2 ng-model="editdata.source"  style="width: 100%;">
                                             <option value="" selected disabled>Select Source</option>
                                             <option ng-repeat="list in sourceList">{{list.source}}</option>
-                                        </select>-->
-                                        {{editdata.source}}
+                                        </select>
+                                        <!-- {{editdata.source}} -->
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
@@ -850,7 +850,15 @@
                                        <label class="new-input-label"><b>Status</b></label>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
-                                      {{editdata.status}}
+                                      <select ui-select2 ng-model="editdata.status"  style="width: 100%;">
+                                          <option value="" selected disabled>Select Status</option>
+                                          <option>pending</option>
+                                          <option>invoiced</option>
+                                          <option>paid</option>
+                                          <option>cancelled</option>
+                                          <option>archived</option>
+                                       </select>
+                                      <!-- {{editdata.status}} -->
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
-- 
2.0.0