From 5a792005349243eededd2fb0004e4bb3b2f1a398 Mon Sep 17 00:00:00 2001
From: swarn <swarn.singh@viithiisys.com>
Date: Wed, 19 Jul 2017 18:41:11 +0530
Subject: [PATCH] selectbox color issue fixed

---
 app/css/custom.css                               | 27 ++++++++
 app/partials/fuelOrders/fuelOrders.controller.js | 86 +++++++++++++++---------
 app/partials/fuelOrders/fuelOrders.html          | 14 ++--
 3 files changed, 89 insertions(+), 38 deletions(-)

diff --git a/app/css/custom.css b/app/css/custom.css
index 81b6d72..8d3815d 100644
--- a/app/css/custom.css
+++ b/app/css/custom.css
@@ -722,4 +722,31 @@ font-size: 10px !important;
 }
 .select2-container .select2-choice{
 	padding: 2px 12px !important;
+}
+
+
+.blackOption{
+	color: #000;
+	background-color: #fff;
+}
+.blueOption{
+	color: #1c84c6;
+	background-color: #fff;
+}
+.greenOption{
+	color: #419641;
+	background-color: #fff;
+}
+.redOption{
+	color: #ed5565;
+	background-color: #fff;
+}
+.yellowOption{
+	color: #ff9900;
+	background-color: #fff;
+}
+.colorfulSelectbox, .colorfulSelectbox:focus, .colorfulSelectbox:hover{
+	color: #fff;
+	text-align: center !important;
+	outline: none !important;
 }
\ No newline at end of file
diff --git a/app/partials/fuelOrders/fuelOrders.controller.js b/app/partials/fuelOrders/fuelOrders.controller.js
index 16121e7..e77e77f 100644
--- a/app/partials/fuelOrders/fuelOrders.controller.js
+++ b/app/partials/fuelOrders/fuelOrders.controller.js
@@ -33,6 +33,18 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
      
       );
 
+    function colourFunction() {
+      var myselect = document.getElementById('colorfulSelectbox'),
+      colour = myselect.options[myselect.selectedIndex].className;
+      myselect.style.background = colour;
+      console.log('colour', myselect);
+      myselect.blur();
+    }
+
+    //setInterval(function(){
+     // colourFunction();
+    //}, 1)
+
 
       $scope.attachmentFilterOptions = [];
     $scope.attachmentFilterOptions.push({
@@ -70,6 +82,20 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
             }, {
               data: $scope.orderdata
             });
+            $(document).ready(function(){
+              var myselect = document.getElementsByClassName('colorfulSelectbox');
+
+              for (var i = 0; i < myselect.length; i++) {
+                var colourIndex = $(myselect[i]).prop('selectedIndex');
+                colourIndex = colourIndex + 1;
+                console.log(colourIndex);
+                var getColor = $('.colorfulSelectbox option:nth-child('+colourIndex+')').css('color');
+                $(myselect[i]).css('background-color', getColor);
+                console.log('colour', getColor);
+                myselect[i].blur();
+              }
+
+            })
            
           })
      }
@@ -227,37 +253,35 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
                               
                             }
     $scope.updateStatus = function(row, status) {
-                          $scope.showLoader = true;
-
-                          $scope.fuelData = {};
-                          $scope.fuelData.aircraftName = row.aircraftName 
-                          $scope.fuelData.companyName = row.companyName 
-                          $scope.fuelData.departingDate = row.departingDate 
-                          $scope.fuelData.fboCost = row.fboCost 
-                          $scope.fuelData.id = row.id 
-                          $scope.fuelData.invoiced = row.invoiced 
-                          $scope.fuelData.priceQuote = row.priceQuote 
-                          $scope.fuelData.volume = row.requestedVolume 
-                          $scope.fuelData.source = row.source 
-                          $scope.fuelData.status = status 
-                          $scope.fuelData.tierBreak = row.tierBreak 
-                          $scope.fuelData.total = row.total 
-                          $scope.fuelData.upliftDate = row.upliftDate 
-                          
-
-
-                             $scope.dispatchOrder.fuelOrderList.push($scope.fuelData);
-                              fuelOrdersService.updateFuelOrder($scope.dispatchOrder).then(function(result) {
-                                console.log('result', result);
-                                $scope.showLoader = false;
-                                $scope.editdata = {};
-                                $('#demo-modal-5').css('display', '');
-                                $scope.getOrders();
-                                toastr.success('Fuel Order Updated Successfully', {
-                                        closeButton: true
-                                      })
-                              })
-                            }
+      $scope.showLoader = true;
+      $scope.fuelData = {};
+      $scope.fuelData.aircraftName = row.aircraftName 
+      $scope.fuelData.companyName = row.companyName 
+      $scope.fuelData.departingDate = row.departingDate 
+      $scope.fuelData.fboCost = row.fboCost 
+      $scope.fuelData.id = row.id 
+      $scope.fuelData.invoiced = row.invoiced 
+      $scope.fuelData.priceQuote = row.priceQuote 
+      $scope.fuelData.volume = row.requestedVolume 
+      $scope.fuelData.source = row.source 
+      $scope.fuelData.status = status 
+      $scope.fuelData.tierBreak = row.tierBreak 
+      $scope.fuelData.total = row.total 
+      $scope.fuelData.upliftDate = row.upliftDate 
+
+      $scope.dispatchOrder.fuelOrderList.push($scope.fuelData);
+      fuelOrdersService.updateFuelOrder($scope.dispatchOrder).then(function(result) {
+        console.log('result', result);
+        $scope.showLoader = false;
+        $scope.editdata = {};
+        $('#demo-modal-5').css('display', '');
+        $scope.getOrders();
+        toastr.success('Fuel Order Updated Successfully', {
+          closeButton: true
+        });
+    })
+
+  }
 
       $scope.updateData = function() {
                           $scope.showLoader = true;
diff --git a/app/partials/fuelOrders/fuelOrders.html b/app/partials/fuelOrders/fuelOrders.html
index aeb56f6..cbe9de0 100644
--- a/app/partials/fuelOrders/fuelOrders.html
+++ b/app/partials/fuelOrders/fuelOrders.html
@@ -120,13 +120,13 @@
                               {{row.total}}
                              </td>
                              <td data-title="'Status'" filter="{status: 'select'}" filter-data="statusFilterOptions" sortable="'status'">
-                              <select class="btn btn-regular" ng-model="row.status" ng-style="abc" ng-change="updateStatus(row, row.status)">
-                                        <option value=""  disabled ng-selected="row.status == null"> Select</option>
-                                        <option value="pending" ng-selected="row.status == pending"> Pending</option>
-                                        <option value="invoiced" ng-selected="row.status == invoiced" >Invoiced</option>
-                                        <option value="paid" ng-selected="row.status == paid" >Paid</option>
-                                        <option value="cancelled" ng-selected="row.status == cancelled" >Cancelled</option>
-                                        <option value="archived" ng-selected="row.status == archived" >Archived</option>
+                                    <select class="btn btn-regular colorfulSelectbox" ng-model="row.status" ng-style="abc" ng-change="updateStatus(row, row.status)">
+                                        <!-- <option value=""  disabled ng-selected="row.status == null"> Select</option> -->
+                                        <option class="blackOption" value="pending" ng-selected="row.status == pending"> Pending</option>
+                                        <option class="blueOption" value="invoiced" ng-selected="row.status == invoiced" >Invoiced</option>
+                                        <option class="greenOption" value="paid" ng-selected="row.status == paid" >Paid</option>
+                                        <option class="redOption" value="cancelled" ng-selected="row.status == cancelled" >Cancelled</option>
+                                        <option class="yellowOption" value="archived" ng-selected="row.status == archived" >Archived</option>
                                     </select>
                              </td>
                              <td data-title="'Attachments'" filter="{orderInvoice : 'select'}" filter-data="attachmentFilterOptions" sortable="'orderInvoice '">
-- 
2.0.0