viithiisys / Acufuel

Download as
Browse Code ยป

Commit 731e27f5e156b051198e9c6ba86840d036eb8d90

Authored by Kuldeep Arora
1 parent 00400ff35d
Exists in master

fuel order ui

Showing 4 changed files with 112 additions and 86 deletions   Show diff stats
... ... @@ -239,5 +239,12 @@
239 239  
240 240 <script src="bower_components/angular-nvd3/dist/angular-nvd3.js"></script>
241 241  
  242 + <!-- for reginal pap graph -->
  243 + <script src="https://code.jquery.com/jquery-3.1.1.min.js"></script>
  244 + <script src="https://code.highcharts.com/maps/js/highmaps.js"></script>
  245 + <script src="https://code.highcharts.com/maps/js/modules/data.js"></script>
  246 + <script src="https://code.highcharts.com/maps/js/modules/exporting.js"></script>
  247 + <script src="https://code.highcharts.com/mapdata/countries/us/us-all.js"></script>
  248 +
242 249 </body>
243 250 </html>
244 251 \ No newline at end of file
... ...
app/partials/enterFuelOrder/enterFuelOrder.controller.js
Diff comments   View file @731e27f
... ... @@ -12,7 +12,6 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
12 12 enterFuelOrderService.getAllCompanies().then(function(result) {
13 13 $scope.showLoader = false;
14 14 $scope.companyList = result;
15   - //console.log("---",result);
16 15 })
17 16  
18 17 $scope.order = {};
... ... @@ -29,19 +28,13 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
29 28 $scope.selectedCompanyName = company;
30 29  
31 30 $scope.showLoader = true;
32   - //console.log(--company---,$scope.selectedCompanyName);
33 31 for (var i = 0; i < $scope.companyList.length; i++) {
34 32 if ($scope.companyList[i].companyName == company) {
35   - //console.log($scope.companyList[i].margin);
36   - //console.log($scope.companyList[i].marginAVGAS);
37 33 if($scope.companyList[i].margin != null && $scope.companyList[i].marginAVGAS != null){
38 34 enterFuelOrderService.getFuelCost($scope.companyList[i].id).then(function(margins) {
39 35 $scope.marginList = margins;
40   - //console.log('$scope.marginList', $scope.marginList);
41 36 })
42 37 } else if ($scope.companyList[i].margin != null && $scope.companyList[i].marginAVGAS == null) {
43   - //console.log('--------------------',$scope.companyList[i].margin);
44   - //console.log('--------------------',$scope.companyList[i].marginAVGAS);
45 38 enterFuelOrderService.getATypeFuelPricing($scope.companyList[i].id).then(function(margins) {
46 39 $scope.marginList = margins;
47 40 })
... ... @@ -53,14 +46,12 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
53 46 enterFuelOrderService.getPapFuelPricing($scope.companyList[i].id).then(function(margins) {
54 47 $scope.marginList = margins;
55 48 })
56   - //console.log('--------------------',$scope.companyList[i].margin);
57 49 }
58 50 $scope.selectedCompanyId = $scope.companyList[i].id;
59 51  
60 52 if ($scope.selectedCompanyId != '') {
61 53 enterFuelOrderService.getAircraft($scope.selectedCompanyId).then(function(aircraft) {
62 54 $scope.aircraftList = aircraft;
63   - //console.log("aircraft",$scope.aircraftList);
64 55 })
65 56 }
66 57 if($scope.companyList[i].margin == null) {
... ... @@ -76,7 +67,6 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
76 67 $scope.tierList = tiers;
77 68 $scope.showLoader = false;
78 69 $scope.selectedTier = $scope.tierList[0];
79   - //console.log("--tier--",$scope.tierList)
80 70 })
81 71 }else{
82 72 $scope.showLoader = false;
... ... @@ -89,7 +79,6 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
89 79  
90 80 $scope.tiervalue=function(){
91 81 $scope.order.tierBreak=$scope.selectedTier.minTierBreak+'-'+$scope.selectedTier.maxTierBreak;
92   - //console.log('tier value', $scope.order.tierBreak);
93 82 }
94 83  
95 84  
... ... @@ -115,7 +104,6 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
115 104 $scope.order.upliftDate = $scope.order.upliftDate + ' ' + hours + ':' + min + ':' + sec;
116 105 $scope.order.upliftDate = new Date($scope.order.upliftDate);
117 106 $scope.order.upliftDate = $scope.order.upliftDate.getTime();
118   - // console.log("---date---",$scope.order.upliftDate)
119 107 }
120 108 /*if ($scope.order.departingDate != '') {
121 109 $scope.order.departingDate = new Date($scope.order.departingDate);
... ... @@ -134,10 +122,7 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
134 122 $scope.order.make = aircraftObj.make;
135 123 $scope.order.model = aircraftObj.model;
136 124 $scope.dispatchOrder.fuelOrderList.push($scope.order);
137   - //console.log('$scope.order', $scope.dispatchOrder);
138 125 enterFuelOrderService.dispathFuelOrder($scope.dispatchOrder).then(function(result) {
139   - //console.log("--final data--",$scope.dispatchOrder)
140   - //console.log('result', result);
141 126 $scope.showLoader = false;
142 127 $scope.order = {};
143 128 toastr.success('Fuel Order Dispatched Successfully', {
... ...
app/partials/fuelOrders/fuelOrders.controller.js
Diff comments   View file @731e27f
... ... @@ -42,7 +42,6 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
42 42  
43 43 function getAllCompanies(){
44 44 fuelOrdersService.getAllCompanies().then(function(result) {
45   - // console.log('log', result);
46 45 $scope.companyList = result;
47 46 for (var i = 0; i < $scope.companyList.length; i++) {
48 47 if ($scope.companyList[i].companyContact != null) {
... ... @@ -82,7 +81,6 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
82 81 var myselect = document.getElementById('colorfulSelectbox'),
83 82 colour = myselect.options[myselect.selectedIndex].className;
84 83 myselect.style.background = colour;
85   - // console.log('colour', myselect);
86 84 myselect.blur();
87 85 }
88 86  
... ... @@ -110,7 +108,6 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
110 108  
111 109 $scope.getOrders = function() {
112 110 fuelOrdersService.getOrders().then(function(result) {
113   - //console.log("==kd===",result);
114 111 $scope.orderdata = result;
115 112 for(var i=0 ; i < $scope.orderdata.length ; i++){
116 113 $scope.orderdata[i].upliftDateS = new Date($scope.orderdata[i].upliftDate);
... ... @@ -120,6 +117,17 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
120 117 var departingStr = "" + ($scope.orderdata[i].departingDateS.getMonth() + 1) + "/" + $scope.orderdata[i].departingDateS.getDate() + "/" + $scope.orderdata[i].departingDateS.getFullYear();
121 118 $scope.orderdata[i].upliftDateString = str;
122 119 $scope.orderdata[i].departingDateString = departingStr;
  120 + //not working in input type Time
  121 + /*if ($scope.orderdata[i].etaTime != null) {
  122 + var now = new Date();
  123 +
  124 + var hr = $scope.orderdata[i].etaTime.slice(0, 2);
  125 + var mm = $scope.orderdata[i].etaTime.slice(3, 5);
  126 + now.setHours(hr);
  127 + now.setMinutes(mm);
  128 + $scope.orderdata[i].etaTime = now;
  129 + console.log("===eta====", now, hr, mm);
  130 + }*/
123 131  
124 132 }
125 133  
... ... @@ -281,27 +289,29 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
281 289 $scope.order.departingDate = $scope.order.departingDate.getTime();
282 290 }
283 291 var obj =JSON.parse($scope.order.priceQuote);
284   - $scope.order.priceQuote = obj.papMargin;
285   -
  292 + //$scope.order.priceQuote = obj.papMargin;
  293 + $scope.order.priceQuote = obj.papTotal;
286 294 $scope.fuelData = {};
287   - $scope.fuelData.aircraftName = $scope.order.aircraftName
288   - $scope.fuelData.companyName = $scope.order.companyName
289   - $scope.fuelData.departingDate = $scope.order.departingDate
290   - $scope.fuelData.fboCost = $scope.order.fboCost
291   - $scope.fuelData.id = $scope.order.id
292   - $scope.fuelData.invoiced = $scope.order.invoiced
293   - $scope.fuelData.priceQuote = $scope.order.priceQuote
294   - $scope.fuelData.volume = $scope.order.volume
295   - $scope.fuelData.source = $scope.order.source
296   - $scope.fuelData.status = $scope.order.status
297   - $scope.fuelData.tierBreak = $scope.order.tierBreak
298   - $scope.fuelData.total = $scope.order.total
299   - $scope.fuelData.upliftDate = $scope.order.upliftDate
  295 + $scope.fuelData.aircraftName = $scope.order.aircraftName;
  296 + $scope.fuelData.companyName = $scope.order.companyName;
  297 + $scope.fuelData.departingDate = $scope.order.departingDate;
  298 + $scope.fuelData.fboCost = $scope.order.fboCost;
  299 + $scope.fuelData.id = $scope.order.id;
  300 + $scope.fuelData.invoiced = $scope.order.invoiced;
  301 + $scope.fuelData.priceQuote = $scope.order.priceQuote;
  302 + $scope.fuelData.productName = obj.productName;
  303 + $scope.fuelData.volume = $scope.order.volume;
  304 + $scope.fuelData.source = $scope.order.source;
  305 + $scope.fuelData.status = $scope.order.status;
  306 + $scope.fuelData.tierBreak = $scope.order.tierBreak;
  307 + $scope.fuelData.total = $scope.order.total;
  308 + $scope.fuelData.upliftDate = $scope.order.upliftDate;
300 309 $scope.fuelData.companyId = $scope.selectedCompanyId;
301 310  
302 311  
303 312  
304 313 $scope.dispatchOrder.fuelOrderList.push($scope.fuelData);
  314 + //console.log("=====$scope.fueldata======",$scope.fuelData)
305 315 fuelOrdersService.dispathFuelOrder($scope.dispatchOrder).then(function(result) {
306 316 $scope.showLoader = false;
307 317 $scope.order = {};
... ... @@ -351,48 +361,58 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
351 361 $scope.fuelData = {};
352 362 $scope.updateData = function() {
353 363 if($scope.editdata.etaTime != null && $scope.editdata.etdTime != null){
354   - $scope.showLoader = true;
355   -
356   - $scope.fuelData.aircraftName = $scope.editdata.aircraftName;
357   - $scope.fuelData.companyName = $scope.editdata.companyName;
358   - $scope.fuelData.fboCost = $scope.editdata.fboCost;
359   - $scope.fuelData.id = $scope.editdata.id;
360   - $scope.fuelData.invoiced = $scope.editdata.invoiced;
361   - $scope.fuelData.priceQuote = $scope.editdata.priceQuote;
362   - $scope.fuelData.volume = $scope.editdata.requestedVolume;
363   - $scope.fuelData.source = $scope.editdata.source;
364   - $scope.fuelData.status = $scope.editdata.status;
365   - $scope.fuelData.tierBreak = $scope.editdata.tierBreak;
366   - $scope.fuelData.total = $scope.editdata.total;
367   -
368   - $scope.editdata.upliftDateString = new Date($scope.editdata.upliftDateString);
369   - $scope.editdata.upliftDateString = $scope.editdata.upliftDateString.getTime();
370   -
371   - $scope.editdata.departingDateString = new Date($scope.editdata.departingDateString);
372   - $scope.editdata.departingDateString = $scope.editdata.departingDateString.getTime();
373   -
374   - $scope.fuelData.upliftDate = $scope.editdata.upliftDateString;
375   - $scope.fuelData.departingDate = $scope.editdata.departingDateString;
376   - $scope.fuelData.productName = $scope.editdata.productName;
377   - $scope.fuelData.etaTime = $scope.editdata.etaTime;
378   - $scope.fuelData.etdTime = $scope.editdata.etdTime;
379   - $scope.fuelData.certificateType = $scope.editdata.certificateType;
380   -
381   -
382   - $scope.dispatchOrder.fuelOrderList.push($scope.fuelData);
383   - // console.log("====fueldata===",$scope.dispatchOrder);
384   - //Disable below api code for temporary
385   - fuelOrdersService.updateFuelOrder($scope.dispatchOrder).then(function(result) {
386   - // console.log('result', result);
387   - $scope.showLoader = false;
388   - $scope.editdata = {};
389   - $('#demo-modal-5').css('display', '');
390   - $scope.getOrders();
391   - toastr.success('Fuel Order Updated Successfully', {
392   - closeButton: true
  364 + if($scope.editdata.fuelOn != null || $scope.editdata.fuelOn != undefined) {
  365 + $scope.showLoader = true;
  366 + $scope.fuelData.aircraftName = $scope.editdata.aircraftName;
  367 + $scope.fuelData.companyName = $scope.editdata.companyName;
  368 + $scope.fuelData.fboCost = $scope.editdata.fboCost;
  369 + $scope.fuelData.id = $scope.editdata.id;
  370 + $scope.fuelData.invoiced = $scope.editdata.invoiced;
  371 + $scope.fuelData.priceQuote = $scope.editdata.priceQuote;
  372 + $scope.fuelData.volume = $scope.editdata.requestedVolume;
  373 + $scope.fuelData.source = $scope.editdata.source;
  374 + $scope.fuelData.status = $scope.editdata.status;
  375 + $scope.fuelData.tierBreak = $scope.editdata.tierBreak;
  376 + $scope.fuelData.total = $scope.editdata.total;
  377 +
  378 + $scope.editdata.upliftDateString = new Date($scope.editdata.upliftDateString);
  379 + $scope.editdata.upliftDateString = $scope.editdata.upliftDateString.getTime();
  380 +
  381 + $scope.editdata.departingDateString = new Date($scope.editdata.departingDateString);
  382 + $scope.editdata.departingDateString = $scope.editdata.departingDateString.getTime();
  383 +
  384 + $scope.fuelData.upliftDate = $scope.editdata.upliftDateString;
  385 + $scope.fuelData.departingDate = $scope.editdata.departingDateString;
  386 + $scope.fuelData.productName = $scope.editdata.productName;
  387 + /*$scope.fuelData.etaTime = $scope.editdata.etaTime.toLocaleTimeString();
  388 + $scope.fuelData.etdTime = $scope.editdata.etdTime.toLocaleTimeString();*/
  389 + $scope.fuelData.etaTime = $scope.editdata.etaTime;
  390 + $scope.fuelData.etdTime = $scope.editdata.etdTime;
  391 + $scope.fuelData.certificateType = $scope.editdata.certificateType;
  392 + $scope.fuelData.fuelOn = $scope.editdata.fuelOn;
  393 +
  394 + $scope.dispatchOrder.fuelOrderList.push($scope.fuelData);
  395 + // console.log("====fueldata===",$scope.dispatchOrder);
  396 + fuelOrdersService.updateFuelOrder($scope.dispatchOrder).then(function(result) {
  397 + // console.log('result', result);
  398 + $scope.showLoader = false;
  399 + $scope.editdata = {};
  400 + $('#demo-modal-5').css('display', '');
  401 + $scope.getOrders();
  402 + toastr.success('Fuel Order Updated Successfully', {
  403 + closeButton: true
  404 + })
393 405 })
394   - })
395   -
  406 +
  407 +
  408 + } else{
  409 + {
  410 + toastr.error('Please select fuelOn.', {
  411 + closeButton: true
  412 + })
  413 + }
  414 + }
  415 +
396 416 }else
397 417 {
398 418 toastr.error('Please select Arrival Time and Departure time both.', {
... ... @@ -624,7 +644,6 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
624 644  
625 645 $scope.checkJetWithTail = function(tail, index){
626 646  
627   - //console.log("tail==============",tail, index)
628 647 ViewCompanyService.checkJetType(tail).then(function(result) {
629 648 if(result.jetA == "true"){
630 649 $scope.jetShow[index] = false;
... ... @@ -640,19 +659,19 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
640 659 $scope.etdTimeList =[];
641 660  
642 661 $scope.sourceList = [{source:"Direct Jet-A"},{source:"Direct AVGAS 100LL"}];
643   - $scope.etaTimeList = [{time:"12:00 AM","id":1},{time:"12:30 AM","id":2},{time:"01:00 AM","id":3},{time:"01:30 AM","id":4},{time:"02:00 AM","id":5},{time:"02:30 AM","id":6},{time:"03:00 AM","id":7},{time:"03:30 AM","id":8},
644   - {time:"04:00 AM","id":9},{time:"04:30 AM","id":10},{time:"05:00 AM","id":11},{time:"05:30 AM","id":12},{time:"06:00 AM","id":13},{time:"06:30 AM","id":14},{time:"07:00 AM","id":15},{time:"07:30 AM","id":16},
645   - {time:"08:00 AM","id":17},{time:"08:30 AM","id":18},{time:"09:00 AM","id":19},{time:"09:30 AM","id":20},{time:"10:00 AM","id":21},{time:"10:30 AM","id":22},{time:"11:00 AM","id":23},{time:"11:30 AM","id":24},
646   - {time:"12:00 PM","id":25},{time:"12:30 PM","id":26},{time:"01:00 PM","id":27},{time:"01:30 PM","id":28},{time:"02:00 PM","id":29},{time:"02:30 PM","id":30},{time:"03:00 PM","id":31},{time:"03:30 PM","id":32},
647   - {time:"04:00 PM","id":33},{time:"04:30 PM","id":34},{time:"05:00 PM","id":35},{time:"05:30 PM","id":36},{time:"06:00 PM","id":37},{time:"06:30 PM","id":38},{time:"07:00 PM","id":39},{time:"07:30 PM","id":40},
648   - {time:"08:00 PM","id":41},{time:"08:30 PM","id":42},{time:"9:00 PM","id":43},{time:"09:30 PM","id":44},{time:"10:00 PM","id":45},{time:"10:30 PM","id":46},{time:"11:00 PM","id":47},{time:"11:30 PM","id":48},]
  662 + $scope.etaTimeList = [{time:"12:00 AM"},{time:"12:30 AM"},{time:"01:00 AM"},{time:"01:30 AM"},{time:"02:00 AM"},{time:"02:30 AM"},{time:"03:00 AM"},{time:"03:30 AM"},
  663 + {time:"04:00 AM"},{time:"04:30 AM"},{time:"05:00 AM"},{time:"05:30 AM"},{time:"06:00 AM"},{time:"06:30 AM"},{time:"07:00 AM"},{time:"07:30 AM"},
  664 + {time:"08:00 AM"},{time:"08:30 AM"},{time:"09:00 AM"},{time:"09:30 AM"},{time:"10:00 AM"},{time:"10:30 AM"},{time:"11:00 AM"},{time:"11:30 AM"},
  665 + {time:"12:00 PM"},{time:"12:30 PM"},{time:"01:00 PM"},{time:"01:30 PM"},{time:"02:00 PM"},{time:"02:30 PM"},{time:"03:00 PM"},{time:"03:30 PM"},
  666 + {time:"04:00 PM"},{time:"04:30 PM"},{time:"05:00 PM"},{time:"05:30 PM"},{time:"06:00 PM"},{time:"06:30 PM"},{time:"07:00 PM"},{time:"07:30 PM"},
  667 + {time:"08:00 PM"},{time:"08:30 PM"},{time:"9:00 PM"},{time:"09:30 PM"},{time:"10:00 PM"},{time:"10:30 PM"},{time:"11:00 PM"},{time:"11:30 PM"},];
649 668  
650 669 $scope.etdTimeList = [{time:"12:00 AM"},{time:"12:30 AM"},{time:"01:00 AM"},{time:"01:30 AM"},{time:"02:00 AM"},{time:"02:30 AM"},{time:"03:00 AM"},{time:"03:30 AM"},
651 670 {time:"04:00 AM"},{time:"04:30 AM"},{time:"05:00 AM"},{time:"05:30 AM"},{time:"06:00 AM"},{time:"06:30 AM"},{time:"07:00 AM"},{time:"07:30 AM"},
652 671 {time:"08:00 AM"},{time:"08:30 AM"},{time:"09:00 AM"},{time:"09:30 AM"},{time:"10:00 AM"},{time:"10:30 AM"},{time:"11:00 AM"},{time:"11:30 AM"},
653 672 {time:"12:00 PM"},{time:"12:30 PM"},{time:"01:00 PM"},{time:"01:30 PM"},{time:"02:00 PM"},{time:"02:30 PM"},{time:"03:00 PM"},{time:"03:30 PM"},
654 673 {time:"04:00 PM"},{time:"04:30 PM"},{time:"05:00 PM"},{time:"05:30 PM"},{time:"06:00 PM"},{time:"06:30 PM"},{time:"07:00 PM"},{time:"07:30 PM"},
655   - {time:"08:00 PM"},{time:"08:30 PM"},{time:"9:00 PM"},{time:"09:30 PM"},{time:"10:00 PM"},{time:"10:30 PM"},{time:"11:00 PM"},{time:"11:30 PM"},]
  674 + {time:"08:00 PM"},{time:"08:30 PM"},{time:"9:00 PM"},{time:"09:30 PM"},{time:"10:00 PM"},{time:"10:30 PM"},{time:"11:00 PM"},{time:"11:30 PM"},];
656 675  
657 676 $scope.data = {};
658 677  
... ...
app/partials/fuelOrders/fuelOrders.html
Diff comments   View file @731e27f
... ... @@ -633,9 +633,15 @@
633 633 <label class="new-input-label"><b>Source</b></label>
634 634 </div>
635 635 <div class="pull-left" style="width: calc(100% - 110px);">
636   - <select ui-select2 ng-model="order.source" style="width: 100%;">
  636 + <!-- <select ui-select2 ng-model="order.source" style="width: 100%;">
637 637 <option value="" selected disabled>Select Source</option>
638 638 <option ng-repeat="list in sourceList">{{list.source}}</option>
  639 + </select> -->
  640 + <select class="form-control" ng-model="order.source" style="width: 100%;">
  641 + <option value="" disabled selected hidden>Select Source</option>
  642 + <option value="Tenant">Tenant</option>
  643 + <option value="CAA">CAA</option>
  644 + <option value="Tenant/CAA">Tenant/CAA</option>
639 645 </select>
640 646 </div>
641 647 <div class="clearfix"></div>
... ... @@ -750,6 +756,8 @@
750 756 <select class="form-control" ng-model="editdata.etaTime" style="width: 90%;">
751 757 <option ng-repeat="li in etaTimeList">{{li.time}}</option>
752 758 </select>
  759 + <!-- <input type="time" ng-model="editdata.etaTime" step="60" value="12:00" style="width: 90%"> -->
  760 +
753 761 </div>
754 762 </div>
755 763 <div class="clearfix"></div>
... ... @@ -780,6 +788,7 @@
780 788 <select class="form-control" ng-model="editdata.etdTime" style="width: 90%;">
781 789 <option ng-repeat="list in etdTimeList">{{list.time}}</option>
782 790 </select>
  791 + <!-- <input type="time" ng-model="editdata.etdTime" step="60" value="12:00" style="width: 90%"> -->
783 792 </div>
784 793 </div>
785 794 <div class="clearfix"></div>
... ... @@ -788,7 +797,13 @@
788 797 <div class="pull-left" style="width: 110px;">
789 798 <label class="new-input-label"><b>Fuel on</b></label>
790 799 </div>
791   - <div class="pull-left" style="width: calc(100% - 110px);">Arrival
  800 + <div class="pull-left" style="width: calc(100% - 110px);">
  801 + <select class="form-control" ng-model="editdata.fuelOn" style="width: 100%;">
  802 + <option value="" disabled selected hidden>Select...</option>
  803 + <option value="Arrival">Arrival</option>
  804 + <option value="Departure">Departure</option>
  805 + <!-- <option ng-repeat="list in sourceList">{{list.source}}</option> -->
  806 + </select>
792 807 <!-- <input type="text" ng-model="editdata.requestedVolume" ng-keyup="updateTotal(editdata.requestedVolume,'v')" class="form-control" placeholder=""> -->
793 808 </div>
794 809 <div class="clearfix"></div>
... ... @@ -860,7 +875,7 @@
860 875 </div>
861 876 <div class="pull-left" style="width: calc(100% - 110px);">
862 877 <select class="form-control" ng-model="editdata.source" style="width: 100%;">
863   - <option disabled>Select Source</option>
  878 + <option value="" disabled selected hidden>Select Source</option>
864 879 <option value="Tenant">Tenant</option>
865 880 <option value="CAA">CAA</option>
866 881 <option value="Tenant/CAA">Tenant/CAA</option>
... ... @@ -892,7 +907,7 @@
892 907 </div>
893 908 <div class="pull-left" style="width: calc(100% - 110px);">
894 909 <select class="form-control" ng-model="editdata.status" style="width: 100%;">
895   - <option disabled>Select Status</option>
  910 + <option value="" disabled selected hidden>Select Status</option>
896 911 <option value="pending">pending</option>
897 912 <option value="invoiced">invoiced</option>
898 913 <option value="paid">paid</option>
... ...