viithiisys / Acufuel

Download as
Browse Code ยป

Commit ffe62a0efeaae44133fb85979276cbc7a3f8b3d8

Authored by Kuldeep Arora
1 parent 7e0d0bdd54
Exists in master

time field display ui

Showing 2 changed files with 15 additions and 15 deletions   Show diff stats
app/partials/fuelOrders/fuelOrders.controller.js
Diff comments   View file @ffe62a0
... ... @@ -8,7 +8,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
8 8  
9 9 $scope.showFuelOrderModal = false;
10 10 $scope.optionSelected;
11   - $scope.orderdata = {}
  11 + $scope.orderdata = {};
12 12 $scope.showLoader = false;
13 13 $scope.jetShow = [];
14 14 $scope.marginShow = [];
... ... @@ -120,7 +120,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
120 120 var departingStr = "" + ($scope.orderdata[i].departingDateS.getMonth() + 1) + "/" + $scope.orderdata[i].departingDateS.getDate() + "/" + $scope.orderdata[i].departingDateS.getFullYear();
121 121 $scope.orderdata[i].upliftDateString = str;
122 122 $scope.orderdata[i].departingDateString = departingStr;
123   -
  123 +
124 124 }
125 125  
126 126 $scope.displayFuelOrderList = new NgTableParams({
... ... @@ -348,12 +348,11 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
348 348 })
349 349  
350 350 }
351   -
  351 + $scope.fuelData = {};
352 352 $scope.updateData = function() {
353   -
354   - if($scope.etaTimeList.length == 8 && $scope.etdTimeList.length ==8){
  353 + if($scope.editdata.etaTime != null && $scope.editdata.etdTime != null){
355 354 $scope.showLoader = true;
356   - $scope.fuelData = {};
  355 +
357 356 $scope.fuelData.aircraftName = $scope.editdata.aircraftName;
358 357 $scope.fuelData.companyName = $scope.editdata.companyName;
359 358 $scope.fuelData.fboCost = $scope.editdata.fboCost;
... ... @@ -375,15 +374,16 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
375 374 $scope.fuelData.upliftDate = $scope.editdata.upliftDateString;
376 375 $scope.fuelData.departingDate = $scope.editdata.departingDateString;
377 376 $scope.fuelData.productName = $scope.editdata.productName;
378   - $scope.fuelData.etaTime = $scope.etaTimeList;
379   - $scope.fuelData.etdTime = $scope.etdTimeList;
  377 + $scope.fuelData.etaTime = $scope.editdata.etaTime;
  378 + $scope.fuelData.etdTime = $scope.editdata.etdTime;
380 379 $scope.fuelData.certificateType = $scope.editdata.certificateType;
381 380  
382   - $scope.dispatchOrder.fuelOrderList.push($scope.fuelData);
383 381  
  382 + $scope.dispatchOrder.fuelOrderList.push($scope.fuelData);
  383 + // console.log("====fueldata===",$scope.dispatchOrder);
384 384 //Disable below api code for temporary
385 385 fuelOrdersService.updateFuelOrder($scope.dispatchOrder).then(function(result) {
386   - console.log('result', result);
  386 + // console.log('result', result);
387 387 $scope.showLoader = false;
388 388 $scope.editdata = {};
389 389 $('#demo-modal-5').css('display', '');
... ... @@ -636,8 +636,8 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
636 636 })
637 637 }
638 638  
639   - // $scope.etaTimeList=[];
640   - // $scope.etdTimeList =[];
  639 + $scope.etaTimeList=[];
  640 + $scope.etdTimeList =[];
641 641  
642 642 $scope.sourceList = [{source:"Direct Jet-A"},{source:"Direct AVGAS 100LL"}];
643 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},
... ...
app/partials/fuelOrders/fuelOrders.html
Diff comments   View file @ffe62a0
... ... @@ -746,8 +746,8 @@
746 746 </div>
747 747 <!-- {{editdata.upliftDateString}} -->
748 748 <div style="width: 50%; float: left;">
749   - Time
750   - <select ui-select2 ng-model="etaTimeList" style="width: 90%;">
  749 + Time
  750 + <select class="form-control" ng-model="editdata.etaTime" style="width: 90%;">
751 751 <option ng-repeat="li in etaTimeList">{{li.time}}</option>
752 752 </select>
753 753 </div>
... ... @@ -777,7 +777,7 @@
777 777 <input type="text" style="width: 90%" ng-model="editdata.departingDateString" class="form-control" placeholder="" datepicker/>
778 778 </div>
779 779 <div style="width: 50%; float: left;">
780   - <select ui-select2 ng-model="etdTimeList" style="width: 90%;">
  780 + <select class="form-control" ng-model="editdata.etdTime" style="width: 90%;">
781 781 <option ng-repeat="list in etdTimeList">{{list.time}}</option>
782 782 </select>
783 783 </div>
... ...