viithiisys / Acufuel

Download as
Browse Code ยป

Commit 5a792005349243eededd2fb0004e4bb3b2f1a398

Authored by Swarn Singh
1 parent e4b25147ac
Exists in master

selectbox color issue fixed

Showing 3 changed files with 89 additions and 38 deletions   Show diff stats
app/css/custom.css
Diff comments   View file @5a79200
... ... @@ -722,4 +722,31 @@ font-size: 10px !important;
722 722 }
723 723 .select2-container .select2-choice{
724 724 padding: 2px 12px !important;
  725 +}
  726 +
  727 +
  728 +.blackOption{
  729 + color: #000;
  730 + background-color: #fff;
  731 +}
  732 +.blueOption{
  733 + color: #1c84c6;
  734 + background-color: #fff;
  735 +}
  736 +.greenOption{
  737 + color: #419641;
  738 + background-color: #fff;
  739 +}
  740 +.redOption{
  741 + color: #ed5565;
  742 + background-color: #fff;
  743 +}
  744 +.yellowOption{
  745 + color: #ff9900;
  746 + background-color: #fff;
  747 +}
  748 +.colorfulSelectbox, .colorfulSelectbox:focus, .colorfulSelectbox:hover{
  749 + color: #fff;
  750 + text-align: center !important;
  751 + outline: none !important;
725 752 }
726 753 \ No newline at end of file
... ...
app/partials/fuelOrders/fuelOrders.controller.js
Diff comments   View file @5a79200
... ... @@ -33,6 +33,18 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
33 33  
34 34 );
35 35  
  36 + function colourFunction() {
  37 + var myselect = document.getElementById('colorfulSelectbox'),
  38 + colour = myselect.options[myselect.selectedIndex].className;
  39 + myselect.style.background = colour;
  40 + console.log('colour', myselect);
  41 + myselect.blur();
  42 + }
  43 +
  44 + //setInterval(function(){
  45 + // colourFunction();
  46 + //}, 1)
  47 +
36 48  
37 49 $scope.attachmentFilterOptions = [];
38 50 $scope.attachmentFilterOptions.push({
... ... @@ -70,6 +82,20 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
70 82 }, {
71 83 data: $scope.orderdata
72 84 });
  85 + $(document).ready(function(){
  86 + var myselect = document.getElementsByClassName('colorfulSelectbox');
  87 +
  88 + for (var i = 0; i < myselect.length; i++) {
  89 + var colourIndex = $(myselect[i]).prop('selectedIndex');
  90 + colourIndex = colourIndex + 1;
  91 + console.log(colourIndex);
  92 + var getColor = $('.colorfulSelectbox option:nth-child('+colourIndex+')').css('color');
  93 + $(myselect[i]).css('background-color', getColor);
  94 + console.log('colour', getColor);
  95 + myselect[i].blur();
  96 + }
  97 +
  98 + })
73 99  
74 100 })
75 101 }
... ... @@ -227,37 +253,35 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
227 253  
228 254 }
229 255 $scope.updateStatus = function(row, status) {
230   - $scope.showLoader = true;
231   -
232   - $scope.fuelData = {};
233   - $scope.fuelData.aircraftName = row.aircraftName
234   - $scope.fuelData.companyName = row.companyName
235   - $scope.fuelData.departingDate = row.departingDate
236   - $scope.fuelData.fboCost = row.fboCost
237   - $scope.fuelData.id = row.id
238   - $scope.fuelData.invoiced = row.invoiced
239   - $scope.fuelData.priceQuote = row.priceQuote
240   - $scope.fuelData.volume = row.requestedVolume
241   - $scope.fuelData.source = row.source
242   - $scope.fuelData.status = status
243   - $scope.fuelData.tierBreak = row.tierBreak
244   - $scope.fuelData.total = row.total
245   - $scope.fuelData.upliftDate = row.upliftDate
246   -
247   -
248   -
249   - $scope.dispatchOrder.fuelOrderList.push($scope.fuelData);
250   - fuelOrdersService.updateFuelOrder($scope.dispatchOrder).then(function(result) {
251   - console.log('result', result);
252   - $scope.showLoader = false;
253   - $scope.editdata = {};
254   - $('#demo-modal-5').css('display', '');
255   - $scope.getOrders();
256   - toastr.success('Fuel Order Updated Successfully', {
257   - closeButton: true
258   - })
259   - })
260   - }
  256 + $scope.showLoader = true;
  257 + $scope.fuelData = {};
  258 + $scope.fuelData.aircraftName = row.aircraftName
  259 + $scope.fuelData.companyName = row.companyName
  260 + $scope.fuelData.departingDate = row.departingDate
  261 + $scope.fuelData.fboCost = row.fboCost
  262 + $scope.fuelData.id = row.id
  263 + $scope.fuelData.invoiced = row.invoiced
  264 + $scope.fuelData.priceQuote = row.priceQuote
  265 + $scope.fuelData.volume = row.requestedVolume
  266 + $scope.fuelData.source = row.source
  267 + $scope.fuelData.status = status
  268 + $scope.fuelData.tierBreak = row.tierBreak
  269 + $scope.fuelData.total = row.total
  270 + $scope.fuelData.upliftDate = row.upliftDate
  271 +
  272 + $scope.dispatchOrder.fuelOrderList.push($scope.fuelData);
  273 + fuelOrdersService.updateFuelOrder($scope.dispatchOrder).then(function(result) {
  274 + console.log('result', result);
  275 + $scope.showLoader = false;
  276 + $scope.editdata = {};
  277 + $('#demo-modal-5').css('display', '');
  278 + $scope.getOrders();
  279 + toastr.success('Fuel Order Updated Successfully', {
  280 + closeButton: true
  281 + });
  282 + })
  283 +
  284 + }
261 285  
262 286 $scope.updateData = function() {
263 287 $scope.showLoader = true;
... ...
app/partials/fuelOrders/fuelOrders.html
Diff comments   View file @5a79200
... ... @@ -120,13 +120,13 @@
120 120 {{row.total}}
121 121 </td>
122 122 <td data-title="'Status'" filter="{status: 'select'}" filter-data="statusFilterOptions" sortable="'status'">
123   - <select class="btn btn-regular" ng-model="row.status" ng-style="abc" ng-change="updateStatus(row, row.status)">
124   - <option value="" disabled ng-selected="row.status == null"> Select</option>
125   - <option value="pending" ng-selected="row.status == pending"> Pending</option>
126   - <option value="invoiced" ng-selected="row.status == invoiced" >Invoiced</option>
127   - <option value="paid" ng-selected="row.status == paid" >Paid</option>
128   - <option value="cancelled" ng-selected="row.status == cancelled" >Cancelled</option>
129   - <option value="archived" ng-selected="row.status == archived" >Archived</option>
  123 + <select class="btn btn-regular colorfulSelectbox" ng-model="row.status" ng-style="abc" ng-change="updateStatus(row, row.status)">
  124 + <!-- <option value="" disabled ng-selected="row.status == null"> Select</option> -->
  125 + <option class="blackOption" value="pending" ng-selected="row.status == pending"> Pending</option>
  126 + <option class="blueOption" value="invoiced" ng-selected="row.status == invoiced" >Invoiced</option>
  127 + <option class="greenOption" value="paid" ng-selected="row.status == paid" >Paid</option>
  128 + <option class="redOption" value="cancelled" ng-selected="row.status == cancelled" >Cancelled</option>
  129 + <option class="yellowOption" value="archived" ng-selected="row.status == archived" >Archived</option>
130 130 </select>
131 131 </td>
132 132 <td data-title="'Attachments'" filter="{orderInvoice : 'select'}" filter-data="attachmentFilterOptions" sortable="'orderInvoice '">
... ...